Sync with portage [Wed Dec 12 11:47:32 MSK 2012].

2012-12-12 11:47:40 +04:00 · 2012-12-12 11:47:40 +04:00 · 6f61bfd598
commit 6f61bfd598
parent 8871b6a753
562 changed files with 5250 additions and 9742 deletions
--- a/app-accessibility/brltty/brltty-4.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-4.2-r1.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-accessibility/brltty/brltty-4.2-r1.ebuild,v 1.1 2012/08/11 14:19:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2-r1.ebuild,v 1.3 2012/12/11 14:46:38 ssuominen Exp $

 EAPI="4"
 FINDLIB_USE="ocaml"

 inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
-	autotools
+	autotools udev

 DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person"
 HOMEPAGE="http://mielke.cc/brltty/"
@ -116,10 +116,7 @@ src_install() {

 	insinto /etc
 	doins Documents/brltty.conf
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	insinto "${udevdir}"/rules.d
-	newins Hotplug/udev.rules 70-brltty.rules
+	udev_newrules Hotplug/udev.rules 70-brltty.rules
 	newinitd "${FILESDIR}"/brltty.rc brltty

 	libdir="$(get_libdir)"
--- a/app-accessibility/brltty/brltty-4.2.ebuild
+++ b/app-accessibility/brltty/brltty-4.2.ebuild
@ -1,12 +1,12 @@
-# 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-accessibility/brltty/brltty-4.2.ebuild,v 1.16 2011/05/12 16:49:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild,v 1.17 2012/12/11 14:46:38 ssuominen Exp $

 EAPI="4"
 FINDLIB_USE="ocaml"

 inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
-	autotools
+	autotools udev

 DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person"
 HOMEPAGE="http://mielke.cc/brltty/"
@ -115,8 +115,7 @@ src_install() {

 	insinto /etc
 	doins Documents/brltty.conf
-	insinto /etc/udev/rules.d
-	newins Hotplug/udev.rules 70-brltty.rules
+	udev_newrules Hotplug/udev.rules 70-brltty.rules
 	newinitd "${FILESDIR}"/brltty.rc brltty

 	libdir="$(get_libdir)"
--- a/app-antivirus/clamav/clamav-0.97.6-r2.ebuild
+++ b/app-antivirus/clamav/clamav-0.97.6-r2.ebuild
@ -0,0 +1,123 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.6-r2.ebuild,v 1.1 2012/12/11 18:37:59 eras Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic user
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="http://www.clamav.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs uclibc"
+
+CDEPEND="bzip2? ( app-arch/bzip2 )
+	clamdtop? ( sys-libs/ncurses )
+	iconv? ( virtual/libiconv )
+	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	dev-libs/libtommath
+	>=sys-libs/zlib-1.2.2
+	sys-devel/libtool"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+RESTRICT="test"
+
+DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.97-nls.patch
+)
+
+pkg_setup() {
+	enewgroup clamav
+	enewuser clamav -1 -1 /dev/null clamav
+}
+
+src_prepare() {
+	use ppc64 && append-flags -mminimal-toic
+	use uclibc && export ac_cv_type_error_t=yes
+}
+
+src_configure() {
+	econf \
+		--disable-experimental \
+		--enable-id-check \
+		--with-dbdir="${EPREFIX}"/var/lib/clamav \
+		--with-system-tommath \
+		--with-zlib="${EPREFIX}"/usr \
+		$(use_enable bzip2) \
+		$(use_enable clamdtop) \
+		$(use_enable ipv6) \
+		$(use_enable milter) \
+		$(use_enable static-libs static) \
+		$(use_with iconv)
+}
+
+src_install() {
+	default
+
+	rm -rf "${ED}"/var/lib/clamav
+	newinitd "${FILESDIR}"/clamd.initd-r2 clamd
+	newconfd "${FILESDIR}"/clamd.conf clamd
+
+	keepdir /var/lib/clamav
+	fowners clamav:clamav /var/lib/clamav
+	keepdir /var/log/clamav
+	fowners clamav:clamav /var/log/clamav
+
+	dodir /etc/logrotate.d
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/clamav.logrotate clamav
+
+	# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
+		-e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
+		-e "s:.*\(User\) .*:\1 clamav:" \
+		-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
+		-e "s:^\#\(LogTime\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"${ED}"/etc/clamd.conf
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
+		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
+		-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
+		-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
+		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"${ED}"/etc/freshclam.conf
+
+	if use milter ; then
+		# MilterSocket one to include ' /' because there is a 2nd line for
+		# inet: which we want to leave
+		dodoc "${FILESDIR}"/clamav-milter.README.gentoo
+		sed -i -e "s:^\(Example\):\# \1:" \
+			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
+			-e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
+			-e "s:.*\(User\) .*:\1 clamav:" \
+			-e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
+			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
+			"${ED}"/etc/clamav-milter.conf
+		cat > "${ED}"/etc/conf.d/clamd <<-EOF
+			MILTER_NICELEVEL=19
+			START_MILTER=no
+		EOF
+	fi
+
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if use milter ; then
+		elog "For simple instructions how to setup the clamav-milter read the"
+		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
+	fi
+}
--- a/app-antivirus/clamav/files/clamd.initd-r2
+++ b/app-antivirus/clamav/files/clamd.initd-r2
@ -0,0 +1,119 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.initd-r2,v 1.1 2012/12/11 18:38:00 eras Exp $
+
+daemon_clamd="/usr/sbin/clamd"
+daemon_freshclam="/usr/bin/freshclam"
+daemon_milter="/usr/sbin/clamav-milter"
+
+extra_commands="logfix"
+
+depend() {
+	use net
+	provide antivirus
+}
+
+get_config() {
+	clamconf | sed 's/["=]//g' | \
+	awk "{
+	if(\$0==\"Config file: $1.conf\") S=1
+	if(S==1&&\$0==\"\") {
+		print \"$3\"
+		exit
+	}
+	if(S==1&&\$1~\"^$2\$\") {
+		print \$2!=\"disabled\"?\$2:\"$3\"
+		exit
+	}
+	}"
+}
+
+start() {
+	local clamd_socket=$(get_config clamd LocalSocket /var/run/clamav/clamd.sock)
+	logfix
+
+	if [ "${START_CLAMD}" = "yes" ]; then
+		checkpath --quiet --mode 755 \
+			--owner $(get_config clamd User clamav):root \
+			--directory `dirname ${clamd_socket}`
+		if [ -S "${clamd_socket}" ]; then
+			rm -f ${clamd_socket}
+		fi
+		ebegin "Starting clamd"
+		start-stop-daemon --start --quiet \
+			--nicelevel ${CLAMD_NICELEVEL:-0} \
+			--exec ${daemon_clamd}
+		eend $? "Failed to start clamd"
+	fi
+
+	if [ "${START_FRESHCLAM}" = "yes" ]; then
+		ebegin "Starting freshclam"
+		start-stop-daemon --start --quiet \
+			--nicelevel ${FRESHCLAM_NICELEVEL:-0} \
+			--exec ${daemon_freshclam} -- -d
+		retcode=$?
+		if [ ${retcode} = 1 ]; then
+			eend 0
+			einfo "Virus databases are already up to date."
+		else
+			eend ${retcode} "Failed to start freshclam"
+		fi
+	fi
+
+	if [ "${START_MILTER}" = "yes" ]; then
+		if [ -z "${MILTER_CONF_FILE}" ]; then
+			MILTER_CONF_FILE="/etc/clamav-milter.conf"
+		fi
+
+		ebegin "Starting clamav-milter"
+		start-stop-daemon --start --quiet \
+			--nicelevel ${MILTER_NICELEVEL:-0} \
+			--exec ${daemon_milter} -- -c ${MILTER_CONF_FILE}
+		eend $? "Failed to start clamav-milter"
+	fi
+}
+
+stop() {
+	if [ "${START_CLAMD}" = "yes" ]; then
+		ebegin "Stopping clamd"
+		start-stop-daemon --stop --quiet --name clamd
+		eend $? "Failed to stop clamd"
+	fi
+	if [ "${START_FRESHCLAM}" = "yes" ]; then
+		ebegin "Stopping freshclam"
+		start-stop-daemon --stop --quiet --name freshclam
+		eend $? "Failed to stop freshclam"
+	fi
+	if [ "${START_MILTER}" = "yes" ]; then
+		ebegin "Stopping clamav-milter"
+		start-stop-daemon --stop --quiet --name clamav-milter
+		eend $? "Failed to stop clamav-milter"
+	fi
+}
+
+logfix() {
+	if [ "${START_CLAMD}" = "yes" ]; then
+		# fix clamd log permissions
+		# (might be clobbered by logrotate or something)
+		local logfile=$(get_config clamd LogFile)
+		if [ -n "${logfile}" ]; then
+			checkpath --quiet \
+				--owner $(get_config clamd User clamav):root \
+				--mode 640 \
+				--file ${logfile}
+		fi
+	fi
+
+	if [ "${START_FRESHCLAM}" = "yes" ]; then
+		# fix freshclam log permissions
+		# (might be clobbered by logrotate or something)
+		local logfile=$(get_config freshclam UpdateLogFile)
+		if [ -n "${logfile}" ]; then
+			checkpath --quiet \
+				--owner $(get_config freshclam DatabaseOwner clamav):root \
+				--mode 640 \
+				--file ${logfile}
+		fi
+	fi
+}
--- a/app-crypt/acr38u/acr38u-1.7.10-r1.ebuild
+++ b/app-crypt/acr38u/acr38u-1.7.10-r1.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/acr38u/acr38u-1.7.10-r1.ebuild,v 1.3 2012/08/12 07:50:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/acr38u/acr38u-1.7.10-r1.ebuild,v 1.4 2012/12/11 14:50:43 ssuominen Exp $

 EAPI=3

-inherit multilib eutils versionator autotools
+inherit multilib eutils versionator autotools udev

 MY_P=ACR38U_driver_Lnx_$(get_version_component_range 1)$(get_version_component_range 2)$(get_version_component_range 3)_P.tar.gz

@ -47,6 +47,5 @@ src_install() {
 	# Remove useless .la files
 	find "${D}" -name '*.la' -delete

-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}/92-pcscd-acr38u.rules"
+	udev_newrules "${FILESDIR}/92-pcscd-acr38u.rules"
 }
--- a/app-crypt/acr38u/acr38u-1.7.11-r1.ebuild
+++ b/app-crypt/acr38u/acr38u-1.7.11-r1.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/acr38u/acr38u-1.7.11-r1.ebuild,v 1.1 2012/08/12 07:50:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/acr38u/acr38u-1.7.11-r1.ebuild,v 1.3 2012/12/11 14:50:43 ssuominen Exp $

 EAPI=4

-inherit multilib eutils versionator autotools toolchain-funcs
+inherit multilib eutils versionator autotools toolchain-funcs udev

 MY_P=ACR38_LINUX_$(get_version_component_range 1)00$(get_version_component_range 2)$(get_version_component_range 3)_P

@ -52,8 +52,6 @@ src_install() {

 	prune_libtool_files

-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	insinto "${udevdir}"/rules.d
-	newins "${FILESDIR}"/${PV}.rules 92-pcscd-acr38u.rules
+	# note: for eudev support this pkg may always need to install rules to /usr
+	udev_newrules "${FILESDIR}"/${PV}.rules 92-pcscd-acr38u.rules
 }
--- a/app-crypt/acr38u/acr38u-1.7.11.ebuild
+++ b/app-crypt/acr38u/acr38u-1.7.11.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/acr38u/acr38u-1.7.11.ebuild,v 1.2 2012/05/03 18:16:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/acr38u/acr38u-1.7.11.ebuild,v 1.3 2012/12/11 14:50:43 ssuominen Exp $

 EAPI=3

-inherit multilib eutils versionator autotools
+inherit multilib eutils versionator autotools udev

 MY_P=ACR38_LINUX_$(get_version_component_range 1)00$(get_version_component_range 2)$(get_version_component_range 3)_P

@ -51,6 +51,5 @@ src_install() {
 	# Remove useless .la files
 	find "${D}" -name '*.la' -delete

-	insinto /lib/udev/rules.d
-	newins "${FILESDIR}/${PV}.rules" 92-pcscd-acr38u.rules
+	udev_newrules "${FILESDIR}/${PV}.rules" 92-pcscd-acr38u.rules
 }
--- a/app-crypt/ccid/ccid-1.4.2.ebuild
+++ b/app-crypt/ccid/ccid-1.4.2.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-crypt/ccid/ccid-1.4.2.ebuild,v 1.7 2012/02/12 00:46:30 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.2.ebuild,v 1.8 2012/12/11 14:53:14 ssuominen Exp $

 EAPI="3"

 STUPID_NUM="3518"

-inherit eutils
+inherit eutils udev

 DESCRIPTION="CCID free software driver"
 HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
@ -35,8 +35,7 @@ src_configure() {
 }

 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc README AUTHORS || die
-	insinto /lib/udev/rules.d
-	doins src/92_pcscd_ccid.rules || die
+	udev_newrules src/92_pcscd_ccid.rules
 }
--- a/app-crypt/ccid/ccid-1.4.5.ebuild
+++ b/app-crypt/ccid/ccid-1.4.5.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-crypt/ccid/ccid-1.4.5.ebuild,v 1.7 2012/11/13 15:46:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.5.ebuild,v 1.8 2012/12/11 14:53:14 ssuominen Exp $

 EAPI="4"

 STUPID_NUM="3672"

-inherit eutils
+inherit eutils udev

 DESCRIPTION="CCID free software driver"
 HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
@ -39,6 +39,5 @@ src_configure() {
 src_install() {
 	default

-	insinto /lib/udev/rules.d
-	doins src/92_pcscd_ccid.rules
+	udev_newrules src/92_pcscd_ccid.rules
 }
--- a/app-crypt/ccid/ccid-1.4.8.ebuild
+++ b/app-crypt/ccid/ccid-1.4.8.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-crypt/ccid/ccid-1.4.8.ebuild,v 1.7 2012/12/06 03:56:50 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.8.ebuild,v 1.9 2012/12/11 14:53:14 ssuominen Exp $

 EAPI="4"

 STUPID_NUM="3768"

-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs udev

 DESCRIPTION="CCID free software driver"
 HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
@ -41,9 +41,7 @@ src_install() {
 	default

 	if use kernel_linux; then
-		local udevdir=/lib/udev
-		has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-		insinto "${udevdir}"/rules.d
-		newins src/92_pcscd_ccid.rules 92-pcsc-ccid.rules
+		# note: for eudev support, rules probably will always need to be installed to /usr
+		udev_newrules src/92_pcscd_ccid.rules 92-pcsc-ccid.rules
 	fi
 }
--- a/app-crypt/kencfs/files/kencfs-1.2-desktop.patch
+++ b/app-crypt/kencfs/files/kencfs-1.2-desktop.patch
@ -0,0 +1,11 @@
+--- /tmp/kencfs.desktop	2012-12-12 00:06:01.000000000 +1100
+++ kencfs.desktop	2012-12-12 00:07:54.000000000 +1100
+@@ -2,7 +2,7 @@
+ Name=KEncFS
+ Exec=kencfs
+ Icon=document-encrypt
+-Categories=System;Security
+Categories=Qt;KDE;System;Security;
+ Terminal=false
+ Type=Application
+ StartupNotify=false
--- a/app-crypt/kencfs/files/kencfs-1.2-encfs5.patch
+++ b/app-crypt/kencfs/files/kencfs-1.2-encfs5.patch
@ -0,0 +1,11 @@
+--- a/fsDialog.cpp	2011-06-12 17:26:23.000000000 +0300
+++ b/fsDialog.cpp	2012-12-09 22:51:40.329612830 +0200
+@@ -132,7 +132,7 @@
+         QStringList arg;
+         arg << cr << pm << "-S";
+         p->start(prg,arg);
+-        if (! QFile::exists(cr+"/.encfs6.xml")) p->write("\n");
+        if (! (QFile::exists(cr+"/.encfs6.xml") || QFile::exists(cr+"/.encfs5")) ) p->write("\n");
+         text.append("\n");
+         p->write(text.toLocal8Bit().data());
+         p->waitForFinished();
--- a/app-crypt/kencfs/kencfs-1.2-r1.ebuild
+++ b/app-crypt/kencfs/kencfs-1.2-r1.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-crypt/kencfs/kencfs-1.2-r1.ebuild,v 1.1 2012/12/11 13:30:01 kensington Exp $
+
+EAPI=5
+LANGS="it"
+
+inherit qt4-r2
+
+DESCRIPTION="GUI frontend for encfs"
+HOMEPAGE="http://kde-apps.org/content/show.php?content=134003"
+SRC_URI="http://kde-apps.org/CONTENT/content-files/134003-${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="kde-base/kdelibs
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+"
+RDEPEND="${DEPEND}
+	sys-fs/encfs
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1-underlinking.patch"
+	"${FILESDIR}/${P}-desktop.patch"
+	"${FILESDIR}/${P}-encfs5.patch"
+	"${FILESDIR}/${P}-gcc-4.7.patch"
+)
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	sed -i ${PN}.pro -e "/^doc.path =/s/${PN}-1.1/${PF}/" \
+		|| die "sed docdir failed"
+
+	if ! use linguas_it ; then
+		sed -i ${PN}.pro -e "s/*.qm//" \
+			|| die "sed TRANSLATIONS failed"
+	fi
+}
--- a/app-crypt/scl011-bin/scl011-bin-2.06.ebuild
+++ b/app-crypt/scl011-bin/scl011-bin-2.06.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/scl011-bin/scl011-bin-2.06.ebuild,v 1.3 2012/07/30 05:02:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/scl011-bin/scl011-bin-2.06.ebuild,v 1.4 2012/12/11 21:51:18 ssuominen Exp $

 EAPI=4

-inherit multilib toolchain-funcs
+inherit multilib toolchain-funcs udev

 DESCRIPTION="pcsc-lite driver for the German identification card (nPA)"
 HOMEPAGE="http://www.scmmicro.com/de/products-services/chipkartenleser-terminals/kontaktlos-dual-interface/it-sicherheitskit-basisleser/treiber.html"
@ -39,6 +39,5 @@ src_install() {
 	exeinto "${INSTALL_DIR}"/SCL011.bundle/Contents/Linux
 	doexe "${BASEPATH}"/proprietary/SCL011.bundle/Contents/Linux/libSCL011.so.${PV}

-	insinto /$(get_libdir)/udev/rules.d
-	doins "${FILESDIR}"/92_pcscd_scl011-bin.rules
+	udev_dorules "${FILESDIR}"/92_pcscd_scl011-bin.rules
 }
--- a/app-crypt/tpm-emulator/tpm-emulator-0.5.1-r1.ebuild
+++ b/app-crypt/tpm-emulator/tpm-emulator-0.5.1-r1.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/tpm-emulator-0.5.1-r1.ebuild,v 1.1 2012/08/11 16:43:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/tpm-emulator-0.5.1-r1.ebuild,v 1.3 2012/12/11 15:44:01 axs Exp $

 EAPI=2
-inherit toolchain-funcs linux-mod eutils multilib user
+inherit toolchain-funcs linux-mod eutils multilib udev user

 MY_P=${P/-/_}
 DESCRIPTION="Emulator driver for tpm"
@ -69,10 +69,7 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}.initd-0.5.1 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd-0.5.1 ${PN}

-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	insinto "${udevdir}"/rules.d
-	newins "${FILESDIR}"/${PN}.udev 60-${PN}.rules
+	udev_newrules "${FILESDIR}"/${PN}.udev 60-${PN}.rules

 	keepdir /var/run/tpm
 	fowners tss /var/run/tpm
--- a/app-crypt/trousers/trousers-0.3.10.ebuild
+++ b/app-crypt/trousers/trousers-0.3.10.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/trousers/trousers-0.3.10.ebuild,v 1.3 2012/11/16 14:51:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.10.ebuild,v 1.4 2012/12/11 15:57:04 axs Exp $

 EAPI=4

@ -89,8 +89,7 @@ src_install() {
 	use doc && dodoc doc/*
 	newinitd "${FILESDIR}"/tcsd.initd tcsd
 	newconfd "${FILESDIR}"/tcsd.confd tcsd
-	insinto "$(udev_get_udevdir)"/rules.d
-	doins "${FILESDIR}"/61-trousers.rules
+	udev_dorules "${FILESDIR}"/61-trousers.rules
 	fowners tss:tss /var/lib/tpm
 	rm -f "${ED}"/usr/lib*/libtspi.la
 }
--- a/app-crypt/trousers/trousers-0.3.6-r1.ebuild
+++ b/app-crypt/trousers/trousers-0.3.6-r1.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.6-r1.ebuild,v 1.2 2012/09/10 23:00:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.6-r1.ebuild,v 1.4 2012/12/11 15:57:04 axs Exp $

 EAPI="3"

-inherit autotools eutils linux-info user toolchain-funcs
+inherit autotools eutils linux-info user udev toolchain-funcs

 #MY_P="${PN}-${PV%.*}-${PV##*.}"

@ -89,10 +89,7 @@ src_install() {
 	use doc && dodoc doc/*
 	newinitd "${FILESDIR}/tcsd.initd" tcsd
 	newconfd "${FILESDIR}/tcsd.confd" tcsd
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	insinto "${udevdir}"/rules.d
-	doins "${FILESDIR}"/61-trousers.rules
+	udev_dorules "${FILESDIR}"/61-trousers.rules
 	fowners tss:tss /var/lib/tpm
 }

--- a/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo-3.12.1.el
+++ b/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo-3.12.1.el
@ -0,0 +1,10 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'auto-mode-alist '("\\.ml[iylp]?\\'" . caml-mode))
+(autoload 'caml-mode "caml" "Major mode for editing Caml code." t)
+(autoload 'run-caml "inf-caml" "Run an inferior Caml process." t)
+(autoload 'camldebug "camldebug"
+  "Run camldebug on program FILE in buffer *camldebug-FILE*." t)
+(autoload 'inferior-caml-set-font-lock "caml-font")
+
+(eval-after-load "caml" '(require 'caml-font))
+(add-hook 'inferior-caml-mode-hooks 'inferior-caml-set-font-lock)
--- a/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild
+++ b/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild,v 1.1 2012/12/11 21:55:49 ulm Exp $
+
+EAPI=5
+
+inherit elisp
+
+MY_P=${P/-mode/}
+DESCRIPTION="Emacs mode for OCaml"
+HOMEPAGE="http://www.ocaml.org/"
+SRC_URI="http://caml.inria.fr/distrib/${MY_P%.*}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+S="${WORKDIR}/${MY_P}/emacs"
+SITEFILE="50${PN}-gentoo-${PV}.el"
+DOCS="README README.itz"
--- a/app-emulation/e-uae/e-uae-0.8.28-r3.ebuild
+++ b/app-emulation/e-uae/e-uae-0.8.28-r3.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-emulation/e-uae/e-uae-0.8.28-r3.ebuild,v 1.10 2011/03/27 10:22:51 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/e-uae-0.8.28-r3.ebuild,v 1.11 2012/12/11 18:21:18 grobian Exp $

 EAPI="1"

@ -101,6 +101,8 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-fix-JIT-cache-on-NX-cpu.patch"
 	epatch "${FILESDIR}/${P}-gtkui_64bit_fix.diff"
 	epatch "${FILESDIR}/${P}-themes_rendering_fix.diff"
+	# bug #425680
+	sed -i -e 's/getline/mygetline/' src/gui-none/nogui.c || die
 }

 src_compile() {
--- a/app-emulation/e-uae/e-uae-0.8.29_rc4-r2.ebuild
+++ b/app-emulation/e-uae/e-uae-0.8.29_rc4-r2.ebuild
@ -0,0 +1,140 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/e-uae-0.8.29_rc4-r2.ebuild,v 1.1 2012/12/11 18:07:17 grobian Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic pax-utils
+
+DESCRIPTION="The Ubiquitous Amiga Emulator with an emulation core largely based on WinUAE"
+HOMEPAGE="http://www.rcdrummond.net/uae/"
+# We support _rcX for WIPX versions and _preYYYYMMDD for CVS snapshots.
+if [[ "${PV%%_rc*}" = "${PV}" ]] ; then
+	# _pre is used, cvs version
+	my_ver=${PV%%_pre*}
+	snap_ver=${PV##*_pre}
+	S="${WORKDIR}"/${PN}-${my_ver}-${snap_ver}
+	SRC_URI="http://www.rcdrummond.net/uae/test/${snap_ver}/${PN}-${my_ver}-${snap_ver}.tar.bz2"
+else
+	my_ver=${PV%%_rc*}
+	WIP_ver=${PV##*_rc}
+	S="${WORKDIR}"/${PN}-${my_ver}-WIP${WIP_ver}
+	SRC_URI="http://www.rcdrummond.net/uae/${PN}-${my_ver}-WIP${WIP_ver}/${PN}-${my_ver}-WIP${WIP_ver}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X dga ncurses sdl alsa oss sdl-sound capslib"
+
+# Note: opposed to ./configure --help zlib support required! Check
+# src/Makefile.am that includes zfile.c unconditionaly.
+RDEPEND="X? ( x11-libs/libXt
+			 x11-libs/libxkbfile
+			 x11-libs/libXext
+			 x11-misc/xkeyboard-config
+			 dga? ( x11-libs/libXxf86dga
+				    x11-libs/libXxf86vm )
+			)
+		!X? ( sdl? ( media-libs/libsdl )
+			  !sdl? ( sys-libs/ncurses ) )
+		alsa? ( media-libs/alsa-lib )
+		!alsa? ( sdl-sound? ( media-libs/sdl-sound ) )
+		capslib? ( >=games-emulation/caps-20060612 )
+		sys-libs/zlib
+		virtual/cdrtools"
+
+DEPEND="${RDEPEND}
+		X? ( dga? ( x11-proto/xf86vidmodeproto
+					x11-proto/xf86dgaproto ) )"
+
+src_prepare() {
+	# Fix for high cpu use when compiled with --disable-audio
+	use alsa || use sdl-sound || use oss || epatch "${FILESDIR}"/${P}-high-cpu-usage.patch
+}
+
+src_configure() {
+	strip-flags
+	
+	local myconf
+
+	# Sound setup.
+	if use alsa; then
+		elog "Choosing alsa as sound target to use."
+		myconf="--with-alsa --without-sdl-sound"
+	elif use sdl-sound ; then
+		if ! use sdl ; then
+			ewarn "sdl-sound is not enabled because sdl USE flag is disabled. Leaving"
+			ewarn "sound on oss autodetection."
+			myconf="--without-alsa --without-sdl-sound"
+			ebeep
+		else
+			elog "Choosing sdl-sound as sound target to use."
+			ewarn "E-UAE with the SDL audio back-end doesn't work correctly in Linux."
+			ewarn "Better use alsa... You've been warned ;)"
+			ebeep
+			myconf="--without-alsa --with-sdl-sound"
+		fi
+	elif use oss ; then
+		elog "Choosing oss as sound target to use."
+		ewarn "oss will be autodetected. See output of configure."
+		myconf="--without-alsa --without-sdl-sound"
+	else
+		ewarn "There is no alsa, sdl-sound or oss in USE. Sound target disabled!"
+		myconf="--disable-audio"
+	fi
+
+	# VIDEO setup. X is autodetected (there is no --with-X option).
+	if use X ; then
+		elog "Using X11 for video output."
+		ewarn "Fullscreen mode is not working in X11 currently. Use sdl."
+		myconf="$myconf --without-curses --without-sdl-gfx"
+		use dga && ewarn "To use dga you have to run e-uae as root."
+		use dga && myconf="$myconf --enable-dga --enable-vidmode"
+	elif use sdl ; then
+		elog "Using sdl for video output."
+		myconf="$myconf --with-sdl --with-sdl-gfx --without-curses"
+	elif use ncurses; then
+		elog "Using ncurses for video output."
+		myconf="$myconf --with-curses --without-sdl-gfx"
+	else
+		ewarn "There is no X or sdl or ncurses in USE!"
+		ewarn "Following upstream falling back on ncurses."
+		myconf="$myconf --with-curses --without-sdl-gfx"
+		ebeep
+	fi
+
+	# bug #415787
+	myconf="$myconf --disable-ui"
+
+	myconf="$myconf $(use_with capslib caps)"
+
+	myconf="$myconf --with-zlib"
+
+	# And explicitly state defaults:
+	myconf="$myconf --enable-aga"
+	myconf="$myconf --enable-autoconfig --enable-scsi-device --enable-cdtv --enable-cd32"
+	myconf="$myconf --enable-bsdsock"
+
+	econf ${myconf} \
+		--with-libscg-includedir="${EPREFIX}"/usr/include/scsilib \
+		|| die "./configure failed"
+}
+
+src_compile() {
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# The emulator needs to be able to create executable heap
+	# - doesn't need trampoline emulation though.
+	pax-mark me "${ED}/usr/bin/uae"
+
+	# Rename it to e-uae
+	mv "${ED}/usr/bin/uae" "${ED}/usr/bin/e-uae"
+	mv "${ED}/usr/bin/readdisk" "${ED}/usr/bin/e-readdisk"
+
+	dodoc docs/* README ChangeLog
+}
--- a/app-pda/barry/barry-0.17.1-r1.ebuild
+++ b/app-pda/barry/barry-0.17.1-r1.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.17.1-r1.ebuild,v 1.2 2012/10/03 15:39:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.17.1-r1.ebuild,v 1.4 2012/12/11 15:54:56 axs Exp $

 EAPI="4"

-inherit autotools-utils bash-completion eutils toolchain-funcs
+inherit autotools-utils bash-completion eutils udev toolchain-funcs

 DESCRIPTION="Sync, backup, program management, and charging for BlackBerry devices"
 HOMEPAGE="http://www.netdirect.ca/software/packages/barry/"
@ -72,13 +72,10 @@ src_install() {
 	dodoc -r "${S}"/doc/*

 	#  udev rules
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	insinto "${udevdir}"/rules.d
-	doins "${S}"/udev/10-blackberry.rules
-#	doins "${S}"/udev/69-blackberry.rules
+	udev_dorules "${S}"/udev/10-blackberry.rules
+#	udev_dorules "${S}"/udev/69-blackberry.rules
 	sed -i -e 's:plugdev:usb:g' "${S}"/udev/99-blackberry-perms.rules || die
-	doins "${S}"/udev/99-blackberry-perms.rules
+	udev_dorules "${S}"/udev/99-blackberry-perms.rules

 	#  blacklist for BERRY_CHARGE kernel module
 	insinto /etc/modprobe.d
--- a/app-pda/usbmuxd/usbmuxd-1.0.8-r1.ebuild
+++ b/app-pda/usbmuxd/usbmuxd-1.0.8-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-pda/usbmuxd/usbmuxd-1.0.8-r1.ebuild,v 1.3 2012/11/03 07:23:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/usbmuxd/usbmuxd-1.0.8-r1.ebuild,v 1.5 2012/12/11 16:05:23 axs Exp $

 EAPI=4
 inherit cmake-utils user udev
@ -26,7 +26,7 @@ pkg_setup() {
 }

 src_configure() {
-	if has_version sys-fs/udev; then
+	if [[ $(udev_get_udevdir) != "/lib/udev" ]]; then
 		sed -i -e "/rules/s:/lib/udev:$(udev_get_udevdir):" udev/CMakeLists.txt || die
 	fi

--- a/app-text/dvisvgm/dvisvgm-1.0.12.ebuild
+++ b/app-text/dvisvgm/dvisvgm-1.0.12.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/dvisvgm/dvisvgm-1.0.12.ebuild,v 1.1 2012/10/10 12:52:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvisvgm/dvisvgm-1.0.12.ebuild,v 1.2 2012/12/11 18:03:10 ago Exp $

 EAPI=4

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

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 # Tests don't work from $WORKDIR: kpathsea tries to search in relative
 # directories from where the binary is executed.
--- a/app-text/migemo/migemo-0.40-r4.ebuild
+++ b/app-text/migemo/migemo-0.40-r4.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-text/migemo/migemo-0.40-r4.ebuild,v 1.8 2010/09/27 11:02:27 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/migemo/migemo-0.40-r4.ebuild,v 1.9 2012/12/11 15:53:35 jer Exp $

 EAPI=2

@ -17,7 +17,7 @@ IUSE="emacs"

 DEPEND="dev-lang/ruby
 	dev-ruby/ruby-romkan
-	dev-ruby/ruby-bsearch
+	dev-ruby/bsearch
 	app-dicts/migemo-dict[-unicode]
 	emacs? ( virtual/emacs
 		app-emacs/apel )"
--- a/app-text/migemo/migemo-0.40-r5.ebuild
+++ b/app-text/migemo/migemo-0.40-r5.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-text/migemo/migemo-0.40-r5.ebuild,v 1.1 2011/10/12 17:05:30 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/migemo/migemo-0.40-r5.ebuild,v 1.2 2012/12/11 15:53:35 jer Exp $

 EAPI=4
 # ruby19, jruby: dev-ruby/ruby-romkan not work
@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="emacs"

-ruby_add_bdepend "dev-ruby/ruby-romkan dev-ruby/ruby-bsearch"
+ruby_add_bdepend "dev-ruby/ruby-romkan dev-ruby/bsearch"

 DEPEND="${DEPEND}
 	app-dicts/migemo-dict[-unicode]
--- a/dev-lang/gdl/gdl-0.9.2-r2.ebuild
+++ b/dev-lang/gdl/gdl-0.9.2-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-lang/gdl/gdl-0.9.2-r2.ebuild,v 1.2 2012/07/29 19:53:42 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9.2-r2.ebuild,v 1.3 2012/12/11 19:42:52 bicatali Exp $

 EAPI=4

@ -18,11 +18,12 @@ SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="fftw grib gshhs hdf hdf5 imagemagick netcdf openmp proj postscript python
 	static-libs udunits wxwidgets"

-RDEPEND="sci-libs/gsl
+RDEPEND="
+	sci-libs/gsl
 	sci-libs/plplot
 	sys-libs/ncurses
 	sys-libs/readline
@ -92,7 +93,7 @@ src_prepare() {
 src_configure() {
 	# MPI is still very buggy
 	# x11=off does not compile
-	mycmakeargs+=(
+	local mycmakeargs+=(
 		-DMPICH=OFF
 		-DBUNDLED_ANTLR=OFF
 		-DX11=ON
@ -138,6 +139,6 @@ src_install() {
 		python_execute_function -s installation
 		dodoc PYTHON.txt
 	fi
-	echo "GDL_PATH=\"+${EPREFIX}/usr/share/gnudatalanguage\"" > 50gdl
+	echo "GDL_PATH=\"+${EROOT}/usr/share/gnudatalanguage\"" > 50gdl
 	doenvd 50gdl
 }
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild
@ -0,0 +1,131 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild,v 1.1 2012/12/11 21:26:41 axs Exp $
+
+EAPI="5"
+WANT_AUTOCONF="2.1"
+inherit autotools eutils toolchain-funcs multilib python versionator pax-utils
+
+MY_PN="js"
+TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
+MY_P="${MY_PN}-${PV}"
+TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
+DESCRIPTION="Stand-alone JavaScript C library"
+HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
+SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${TARBALL_P}.tar.gz"
+
+LICENSE="NPL-1.1"
+SLOT="0/mozjs185"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug minimal static-libs test"
+
+S="${WORKDIR}/${MY_P}"
+BUILDDIR="${S}/js/src"
+
+RDEPEND=">=dev-libs/nspr-4.7.0"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	=dev-lang/python-2*[threads]
+	virtual/pkgconfig"
+
+pkg_setup(){
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		python_set_active_version 2
+		python_pkg_setup
+		export LC_ALL="C"
+	fi
+}
+
+src_prepare() {
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
+	epatch "${FILESDIR}/${P}-fix-install-symlinks.patch"
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
+	epatch "${FILESDIR}/${P}-fix-ppc64.patch"
+	# https://bugs.gentoo.org/show_bug.cgi?id=400727
+	# https://bugs.gentoo.org/show_bug.cgi?id=420471
+	epatch "${FILESDIR}/${P}-arm_respect_cflags-3.patch"
+	# https://bugs.gentoo.org/show_bug.cgi?id=438746
+	epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch
+	# https://bugs.gentoo.org/show_bug.cgi?id=441928
+	epatch "${FILESDIR}"/${PN}-1.8.5-perf_event-check.patch
+	# https://bugs.gentoo.org/show_bug.cgi?id=439260
+	epatch "${FILESDIR}"/${P}-symbol-versions.patch
+
+	epatch_user
+
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		# Don't try to be smart, this does not work in cross-compile anyway
+		ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk" || die
+	fi
+
+	cd "${BUILDDIR}" || die
+	eautoconf
+}
+
+src_configure() {
+	cd "${BUILDDIR}" || die
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
+	LD="$(tc-getLD)" PYTHON="$(PYTHON)" \
+	econf \
+		${myopts} \
+		--enable-jemalloc \
+		--enable-readline \
+		--enable-threadsafe \
+		--with-system-nspr \
+		$(use_enable debug) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests)
+}
+
+src_compile() {
+	cd "${BUILDDIR}" || die
+	if tc-is-cross-compiler; then
+		make CFLAGS="" CXXFLAGS="" \
+			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
+			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
+			jscpucfg host_jsoplengen host_jskwgen || die
+		make CFLAGS="" CXXFLAGS="" \
+			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
+			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
+			-C config nsinstall || die
+		mv {,native-}jscpucfg || die
+		mv {,native-}host_jskwgen || die
+		mv {,native-}host_jsoplengen || die
+		mv config/{,native-}nsinstall || die
+		sed -e 's@./jscpucfg@./native-jscpucfg@' \
+			-e 's@./host_jskwgen@./native-host_jskwgen@' \
+			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
+			-i Makefile || die
+		sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk || die
+		rm -f config/host_nsinstall.o \
+			config/host_pathsub.o \
+			host_jskwgen.o \
+			host_jsoplengen.o || die
+	fi
+	emake
+}
+
+src_test() {
+	cd "${BUILDDIR}/jsapi-tests" || die
+	emake check
+}
+
+src_install() {
+	cd "${BUILDDIR}" || die
+	emake DESTDIR="${D}" install
+	# bug 437520 , exclude js shell for small systems
+	if ! use minimal ; then
+		dobin shell/js
+		pax-mark m "${ED}/usr/bin/js"
+	fi
+	dodoc ../../README
+	dohtml README.html
+
+	if ! use static-libs; then
+		# We can't actually disable building of static libraries
+		# They're used by the tests and in a few other places
+		find "${D}" -iname '*.a' -delete || die
+	fi
+}
--- a/dev-lang/spidermonkey/spidermonkey-1.8.7-r3.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.7-r3.ebuild
@ -0,0 +1,142 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.7-r3.ebuild,v 1.1 2012/12/11 21:26:41 axs Exp $
+
+EAPI="5"
+WANT_AUTOCONF="2.1"
+inherit autotools eutils toolchain-funcs multilib python versionator pax-utils
+
+MY_PN="js"
+TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
+MY_P="${MY_PN}-${PV}"
+TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
+SPIDERPV="${PV}-patches-0.1"
+DESCRIPTION="Stand-alone JavaScript C library"
+HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
+SRC_URI="http://people.mozilla.com/~dmandelin/${TARBALL_P}.tar.gz
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-${SPIDERPV}.tar.xz"
+
+LICENSE="NPL-1.1"
+SLOT="0/mozjs187"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug jit minimal static-libs test"
+
+S="${WORKDIR}/${MY_P}"
+BUILDDIR="${S}/js/src"
+
+RDEPEND=">=dev-libs/nspr-4.7.0
+	virtual/libffi"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	=dev-lang/python-2*[threads]
+	virtual/pkgconfig"
+
+pkg_setup(){
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		python_set_active_version 2
+		python_pkg_setup
+		export LC_ALL="C"
+	fi
+}
+
+src_prepare() {
+	# Apply patches that are required for misc archs
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/spidermonkey"
+
+	epatch "${FILESDIR}"/${PN}-1.8.5-fix-install-symlinks.patch
+	epatch "${FILESDIR}"/${PN}-1.8.7-filter_desc.patch
+	epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch
+	epatch "${FILESDIR}"/${PN}-1.8.7-x32.patch
+	# https://bugs.gentoo.org/show_bug.cgi?id=439260
+	epatch "${FILESDIR}"/${P}-symbol-versions.patch
+
+	epatch_user
+
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		# Don't try to be smart, this does not work in cross-compile anyway
+		ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk" || die
+	fi
+
+	cd "${BUILDDIR}" || die
+	eautoconf
+}
+
+src_configure() {
+	cd "${BUILDDIR}" || die
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
+	LD="$(tc-getLD)" PYTHON="$(PYTHON)" \
+	econf \
+		${myopts} \
+		--enable-jemalloc \
+		--enable-readline \
+		--enable-threadsafe \
+		--with-system-nspr \
+		--enable-system-ffi \
+		--enable-jemalloc \
+		$(use_enable debug) \
+		$(use_enable jit tracejit) \
+		$(use_enable jit methodjit) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests)
+}
+
+src_compile() {
+	cd "${BUILDDIR}" || die
+	if tc-is-cross-compiler; then
+		make CFLAGS="" CXXFLAGS="" \
+			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
+			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
+			jscpucfg host_jsoplengen host_jskwgen || die
+		make CFLAGS="" CXXFLAGS="" \
+			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
+			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
+			-C config nsinstall || die
+		mv {,native-}jscpucfg || die
+		mv {,native-}host_jskwgen || die
+		mv {,native-}host_jsoplengen || die
+		mv config/{,native-}nsinstall || die
+		sed -e 's@./jscpucfg@./native-jscpucfg@' \
+			-e 's@./host_jskwgen@./native-host_jskwgen@' \
+			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
+			-i Makefile || die
+		sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk || die
+		rm -f config/host_nsinstall.o \
+			config/host_pathsub.o \
+			host_jskwgen.o \
+			host_jsoplengen.o || die
+	fi
+	emake
+}
+
+src_test() {
+	cd "${BUILDDIR}/jsapi-tests" || die
+	emake check
+}
+
+src_install() {
+	cd "${BUILDDIR}" || die
+	emake DESTDIR="${D}" install
+	if ! use minimal; then
+		dobin shell/js
+		if use jit; then
+			pax-mark m "${ED}/usr/bin/js"
+		fi
+	fi
+	dodoc ../../README
+	dohtml README.html
+	# install header files needed but not part of build system
+	insinto /usr/include/js
+	doins ../public/*.h
+	insinto /usr/include/js/mozilla
+	doins "${S}"/mfbt/*.h
+
+	if ! use static-libs; then
+		# We can't actually disable building of static libraries
+		# They're used by the tests and in a few other places
+		find "${D}" -iname '*.a' -delete || die
+	fi
+}
--- a/dev-libs/mini-xml/Manifest
+++ b/dev-libs/mini-xml/Manifest
@ -1,2 +1,3 @@
 DIST mxml-2.2.1.tar.gz 208282 SHA256 cf63024a3f3bff3829a7f484c855b38246ec8350c32354e0dec7a3b38935f17f SHA512 959455c88118e64a2883b760738bd0fc82cc392a561a9aa776a190f319181910b24aee84ba2e6e3abd0a6239d8842981eb94848ae12337707ddcb1bda67365ed WHIRLPOOL 058f3e44ddd3e83ed90d66cd265897b963f3df9f5be0b92b7480ec4991b0302315a9947e2a5c4d01e3c7f1dafa790f5eef69a10eff13f6f2d576382ed406de5b
 DIST mxml-2.6.tar.gz 254455 SHA256 b0d347da1a0d5a8c9e82f66087d55cfe499728dacae563740d7e733648c69795 SHA512 ca66a18a44ad8b6a204ed2130107c73c746fafd7925fd229fed9ba56f4c1654c5d289c08954eb102941d1b2a0c164c1174e169d472b7867c0cb3d0822616219b WHIRLPOOL 96ec16843f333f8661a8515102b75b19bdfa3bec902fe0c0e3d901914b86c5fe50141b291cafcfc81996c5b853d37764e4cb9f1103675ddcf3562819afb583b7
+DIST mxml-2.7.tar.gz 262027 SHA256 a77200ee4c1e1cf2eb531595ec17ce31805760699d260915496c39d3388eb803 SHA512 9fac34975c35d0ff9686a20a882824040b0b96b38ab9f1f5b1ef24a323668974860d4d977bb07c90a3e2b3410a2d8358eec1682b2c7ff2cda7f36f630ff97007 WHIRLPOOL 1c899377e69f2763e9502d60e957aa0318710f45b57ebc2099090e8439d27f7024bdeaa59042edf202aa1579f81d3e6296f7718dd7bc34faf346967ad6b05d64
--- a/dev-libs/mini-xml/metadata.xml
+++ b/dev-libs/mini-xml/metadata.xml
@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>ruepel@gmx.li</email>
+		<name>Rüpel</name>
 	</maintainer>
 </pkgmetadata>
--- a/dev-libs/mini-xml/mini-xml-2.7.ebuild
+++ b/dev-libs/mini-xml/mini-xml-2.7.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mini-xml/mini-xml-2.7.ebuild,v 1.1 2012/12/11 19:53:15 hwoarang Exp $
+
+EAPI=4
+
+inherit autotools multilib
+
+MY_P="${P/mini-xml/mxml}"
+
+DESCRIPTION="Small XML parsing library to read XML and XML-like data files"
+HOMEPAGE="http://www.easysw.com/~mike/mxml"
+SRC_URI="mirror://easysw/mxml/${PV}/${MY_P}.tar.gz"
+
+LICENSE="Mini-XML"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="threads"
+
+DEPEND="virtual/pkgconfig"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i -e "s:755 -s:755:" Makefile.in || die "sed failed"
+	sed -i "/^TARGETS/s: testmxml::" Makefile.in || die "sed failed"
+	sed -i -e 's:$(DSO) $(DSOFLAGS) -o libmxml.so.1.5 $(LIBOBJS):$(DSO) $(DSOFLAGS) $(LDFLAGS) -o libmxml.so.1.5 $(LIBOBJS):' \
+			Makefile.in || die "sed failed"
+	sed -i -e 's:OPTIM="-Os -g":OPTIM="":' configure.in || die "sed failed"
+	rm configure
+#	eautoreconf
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--libdir="/usr/$(get_libdir)" \
+		--with-docdir="/usr/share/doc/${PF}/html" \
+		$(use_enable threads)
+}
+
+src_compile() {
+	emake libmxml.a  libmxml.so.1.5 mxmldoc doc/mxml.man || die "make failed"
+}
+
+src_install() {
+	emake DSTROOT="${D}" install || die "install failed"
+	dodoc ANNOUNCEMENT CHANGES README
+	rm "${D}/usr/share/doc/${PF}/html/"{CHANGES,COPYING,README}
+}
+
+src_test() {
+	emake testmxml || die "make testmxml failed"
+}
--- a/dev-libs/openct/openct-0.6.20-r3.ebuild
+++ b/dev-libs/openct/openct-0.6.20-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-libs/openct/openct-0.6.20-r3.ebuild,v 1.6 2012/12/04 13:18:50 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/openct-0.6.20-r3.ebuild,v 1.7 2012/12/11 21:57:16 ssuominen Exp $

 EAPI=5

@ -60,10 +60,7 @@ src_install() {
 	prune_libtool_files --all
 	rm "${D}"/usr/$(get_libdir)/openct-ifd.*

-	if use udev; then
-		insinto "$(udev_get_udevdir)"/rules.d
-		newins etc/openct.udev 70-openct.rules
-	fi
+	use udev && udev_newrules etc/openct.udev 70-openct.rules

 	newinitd "${FILESDIR}"/openct.rc.2 openct
 }
--- a/dev-libs/openct/openct-0.6.20.ebuild
+++ b/dev-libs/openct/openct-0.6.20.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/openct-0.6.20.ebuild,v 1.9 2012/11/28 22:39:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/openct-0.6.20.ebuild,v 1.10 2012/12/11 21:57:16 ssuominen Exp $

 EAPI="2"

-inherit eutils multilib user
+inherit eutils multilib user udev

 DESCRIPTION="library for accessing smart card terminals"
 HOMEPAGE="http://www.opensc-project.org/openct/"
@ -35,7 +35,7 @@ src_configure() {
 		--docdir="/usr/share/doc/${PF}" \
 		--htmldir="/usr/share/doc/${PF}/html" \
 		--localstatedir=/var \
-		--with-udev="/$(get_libdir)/udev" \
+		--with-udev="$(udev_get_udevdir)" \
 		--enable-non-privileged \
 		--with-daemon-user=openctd \
 		--with-daemon-groups=usb \
@ -48,8 +48,7 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"

-	insinto /etc/udev/rules.d/
-	newins etc/openct.udev 70-openct.rules || die "newins 70-openct.rules failed"
+	udev_newrules etc/openct.udev 70-openct.rules || die "newins 70-openct.rules failed"

 	diropts -m0750 -gopenct -oopenctd
 	keepdir /var/run/openct
--- a/dev-libs/serd/serd-0.18.0.ebuild
+++ b/dev-libs/serd/serd-0.18.0.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/serd/serd-0.18.0.ebuild,v 1.1 2012/08/30 22:09:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/serd/serd-0.18.0.ebuild,v 1.2 2012/12/11 19:13:44 ago Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"

 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc static-libs test"

 RDEPEND=""
--- a/dev-libs/sord/sord-0.10.4.ebuild
+++ b/dev-libs/sord/sord-0.10.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/sord/sord-0.10.4.ebuild,v 1.1 2012/10/20 22:47:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/sord/sord-0.10.4.ebuild,v 1.2 2012/12/11 19:14:01 ago Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"

 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc static-libs test"

 RDEPEND=">=dev-libs/serd-0.14.0"
--- a/dev-perl/Capture-Tiny/Capture-Tiny-0.210.0.ebuild
+++ b/dev-perl/Capture-Tiny/Capture-Tiny-0.210.0.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-perl/Capture-Tiny/Capture-Tiny-0.210.0.ebuild,v 1.1 2012/11/17 20:01:30 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Capture-Tiny/Capture-Tiny-0.210.0.ebuild,v 1.2 2012/12/11 18:07:41 ago Exp $

 EAPI=4

@ -12,7 +12,7 @@ DESCRIPTION="Capture STDOUT and STDERR from Perl, XS or external programs"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"

 DEPEND="
--- a/dev-perl/Term-ProgressBar/Term-ProgressBar-2.130.0.ebuild
+++ b/dev-perl/Term-ProgressBar/Term-ProgressBar-2.130.0.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-perl/Term-ProgressBar/Term-ProgressBar-2.130.0.ebuild,v 1.2 2012/12/05 11:34:37 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Term-ProgressBar/Term-ProgressBar-2.130.0.ebuild,v 1.3 2012/12/11 18:08:33 ago Exp $

 EAPI=4

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl module for Term-ProgressBar"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/Test-Warn/Test-Warn-0.240.0.ebuild
+++ b/dev-perl/Test-Warn/Test-Warn-0.240.0.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-perl/Test-Warn/Test-Warn-0.240.0.ebuild,v 1.9 2012/12/09 17:06:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Warn/Test-Warn-0.240.0.ebuild,v 1.10 2012/12/11 17:15:11 ago Exp $

 EAPI=4

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension to test methods for warnings"

 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"

 RDEPEND=">=dev-perl/Sub-Uplevel-0.12
--- a/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.60.0.ebuild
+++ b/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.60.0.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-perl/Tree-DAG_Node/Tree-DAG_Node-1.60.0.ebuild,v 1.14 2012/09/22 13:21:38 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.60.0.ebuild,v 1.15 2012/12/11 17:15:37 ago Exp $

 EAPI=4

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="(Super)class for representing nodes in a tree"

 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""

 SRC_TEST="do"
--- a/dev-python/isodate/isodate-0.4.9.ebuild
+++ b/dev-python/isodate/isodate-0.4.9.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-python/isodate/isodate-0.4.9.ebuild,v 1.1 2012/11/11 10:56:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/isodate/isodate-0.4.9.ebuild,v 1.2 2012/12/11 19:14:35 ago Exp $

 EAPI="4"
 SUPPORT_PYTHON_ABIS="1"
@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""

 DEPEND="dev-python/setuptools"
--- a/dev-python/kiwi/kiwi-1.9.36.ebuild
+++ b/dev-python/kiwi/kiwi-1.9.36.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-python/kiwi/kiwi-1.9.36.ebuild,v 1.1 2012/11/13 09:54:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kiwi/kiwi-1.9.36.ebuild,v 1.3 2012/12/11 17:06:30 ago Exp $

 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-interix ~amd64-linux ~x86-linux"
 IUSE="examples test"

 RDEPEND="dev-python/pygtk"
--- a/dev-python/oct2py/Manifest
+++ b/dev-python/oct2py/Manifest
@ -1,3 +1 @@
-DIST oct2py-0.3.2.tar.gz 105039 SHA256 22e353b6c5e693327cafdc7add05d4d8810eb5ef5a6cc3b36173078cc4f68b98 SHA512 1cda6da7e5b7dfef43ec2e48190a94ed8251ae1967cf3c2eb457c1a6b44a62b744b1f685f21f4fe404ea9734f60bba26a5cd489399bab37e27cc850e26e2b1fe WHIRLPOOL 4939ae2261f22d255b05752ccdcee4d7cfd96ff72dd577bb7a2c69f3d8ac04757626b662785004a0714adc3acdad73151d000bc16d08ec2b0866db091764d23a
-DIST oct2py-0.3.4.tar.gz 109025 SHA256 76013947b907260df9a9422404a47440eff8cc6f36532c1b07d2c23f7aa906cb SHA512 c581267910cc411ffab5b8316dbc671ef13a5f8aebd8cd41dca7c2d5011ae5f52e56e0f47c3ba3b38656cda0ffb7b2e455dca23ab6caecacb37fd6fe4731d79d WHIRLPOOL 8c6d27aab8874a44471dcc126b5f2f85e4502575c196984178f4602677e7a7f214c8f1235c68c0860415e34c37efb308b819c0414c4b7c02f0e7c50876e8d1dc
 DIST oct2py-0.3.6.tar.gz 109852 SHA256 a05b36c8823e539497cadade4680d17f24672ae10c35e901fde1a179cb74a118 SHA512 f417c73f75c02a143af79b54c3a51bdb16c437841dec23667bc5b0256c8347738e75932ae47179d7ca4d3c8b4b5582e27493879de3ab97665d2b3d7bd492abac WHIRLPOOL 441ddb14575c578d9b382521aec56346a976bfaed86641ebe860a46d5d335da0bc6d44b760f02612f1dfa287e9180adfbcb31cfb619b0b26c39eee6216379bac
--- a/dev-python/oct2py/oct2py-0.3.2.ebuild
+++ b/dev-python/oct2py/oct2py-0.3.2.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oct2py/oct2py-0.3.2.ebuild,v 1.3 2012/08/09 08:16:43 patrick Exp $
-
-EAPI=4
-
-SUPPORT_PYTHON_ABIS=1
-DISTUTILS_SRC_TEST="nosetests"
-RESTRICT_PYTHON_ABIS="2.5 *-jython *-pypy-*"
-
-inherit distutils
-
-DESCRIPTION="Python to GNU Octave bridge"
-HOMEPAGE="http://pypi.python.org/pypi/oct2py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="sci-libs/scipy
-	sci-mathematics/octave"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		PYTHONPATH=build-"$(PYTHON -f --ABI)"/lib sphinx-build doc html || die
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	use doc && dohtml -r html/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r example/*
-	fi
-}
--- a/dev-python/oct2py/oct2py-0.3.4.ebuild
+++ b/dev-python/oct2py/oct2py-0.3.4.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oct2py/oct2py-0.3.4.ebuild,v 1.1 2012/08/20 18:17:21 bicatali Exp $
-
-EAPI=4
-
-SUPPORT_PYTHON_ABIS=1
-DISTUTILS_SRC_TEST="nosetests"
-RESTRICT_PYTHON_ABIS="2.5 *-jython *-pypy-*"
-
-inherit distutils
-
-DESCRIPTION="Python to GNU Octave bridge"
-HOMEPAGE="http://pypi.python.org/pypi/oct2py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="sci-libs/scipy
-	sci-mathematics/octave"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		PYTHONPATH="build-$(PYTHON -f --ABI)/lib" sphinx-build doc html || die
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	delete_tests() {
-		rm -r "${ED}$(python_get_sitedir)/oct2py/tests"
-	}
-	python_execute_function -q delete_tests
-	use doc && dohtml -r html/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r example/*
-	fi
-}
--- a/dev-python/pep8/pep8-1.3.3.ebuild
+++ b/dev-python/pep8/pep8-1.3.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/dev-python/pep8/pep8-1.3.3.ebuild,v 1.1 2012/07/13 03:30:31 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pep8/pep8-1.3.3.ebuild,v 1.3 2012/12/11 17:05:53 ago Exp $

 EAPI=4

@ -14,7 +14,7 @@ SRC_URI="https://github.com/jcrocholl/${PN}/tarball/${PV} -> ${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""

 DEPEND="dev-python/setuptools"
--- a/dev-python/pyflakes/pyflakes-0.5.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-0.5.0.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-python/pyflakes/pyflakes-0.5.0.ebuild,v 1.7 2012/11/09 16:22:17 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyflakes/pyflakes-0.5.0.ebuild,v 1.9 2012/12/11 17:06:10 ago Exp $

 EAPI="3"
 PYTHON_DEPEND="2"
@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""

 DEPEND=""
--- a/dev-python/rdflib/rdflib-3.2.3.ebuild
+++ b/dev-python/rdflib/rdflib-3.2.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/dev-python/rdflib/rdflib-3.2.3.ebuild,v 1.3 2012/11/26 12:27:32 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rdflib/rdflib-3.2.3.ebuild,v 1.4 2012/12/11 19:14:19 ago Exp $

 EAPI="4"
 SUPPORT_PYTHON_ABIS="1"
@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb examples mysql redland sqlite"

 RDEPEND="dev-python/isodate
--- a/dev-ruby/zentest/Manifest
+++ b/dev-ruby/zentest/Manifest
@ -1,3 +1,3 @@
-DIST ZenTest-4.4.2.gem 66048 SHA256 7325414108f87a5fab07242679e977ab7c69503189f67e88439f90df982c58e8 SHA512 5862bb636a7c2856ec41f54ffd66391ffd605ce4ade525b1c251f73d38003b25fa5793d50167ec463fb288a59e10b2504617ff83d90074677e547bf7f7bcfa1b WHIRLPOOL d2b016f11846ed87e84f056bbced4cfde9d3569901545d0affda2a137d0b4c5e25b912fe3278769b2d2ac1bc71d62fa063e97615a35b4f86fe99e192cc548c4f
 DIST ZenTest-4.7.0.gem 68096 SHA256 3c6cf0c9ca0461683ed08013edfdec936bfc549f06c00d9cc739f980b2aa70bf SHA512 a7d66f53301143bb71fd8c2f72494d0ac14bd3faaad24d1e7edb85fa8ea12b1587abfa580042a5de27a75bdff65af8a0648e79f264bb84ff9179896ddd2ec334 WHIRLPOOL 66ec799c2165c67b969c459138043093c66c76c9b25fcb9418727e3c5b24720c52003eb5a9cbd26e304c8f3804101f259c0368926ffe1d3770358a8a1e0ec20a
 DIST ZenTest-4.8.2.gem 68608 SHA256 4b5af0805b855ce03dc74e97db683974e71f710333a099f6dc368f6e52726c83 SHA512 d3cf05f946c2bb5fd776253203382aabf97e3f81a6633fc55c2005a5d124eaa37bf5ac27621b5461fa1c81f9bc2522486f472a66726c92337a66b286098024a7 WHIRLPOOL b7e2cfd623f3061b4858c94db2feaf3a94b6e23c5858e5467848defc250d23926a25c140d75c0e095e0dc279eb6df1d0f88ccb5a539d83194af5ab0b65b0632d
+DIST ZenTest-4.8.3.gem 68608 SHA256 ae5d35ce508a56120ce8c20f4a1344072cd5da0929dc1fd33688c7eedac662f6 SHA512 11fc3e0d3d6ebca38c90dc53ced39fbce3dc3c612fedde23c44137b70f1be0fd63a2d02f206fafbbe0c15ce0af0626d103762f114e08b8cbfe489540e4874d0b WHIRLPOOL 32ce86fdb7cc98d5ead17b7d4d20c5ff885874c86ddd933e9fc8930c65daef32aa7c1ad148d3be00443a27cdb02fccdd044251aebbddffda746fa967764fc13c
--- a/dev-ruby/zentest/zentest-4.8.3.ebuild
+++ b/dev-ruby/zentest/zentest-4.8.3.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/zentest/zentest-4.4.2.ebuild,v 1.12 2012/10/28 17:23:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/zentest/zentest-4.8.3.ebuild,v 1.1 2012/12/11 18:29:59 graaff Exp $

-EAPI=2
+EAPI=5

-USE_RUBY="ruby18 ree18 jruby"
+USE_RUBY="ruby18 ree18 ruby19 jruby"

 RUBY_FAKEGEM_NAME=ZenTest

@ -18,23 +18,17 @@ DESCRIPTION="ZenTest provides tools to support testing: zentest, unit_diff, auto
 HOMEPAGE="http://rubyforge.org/projects/zentest/"
 LICENSE="Ruby"

-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""

 ruby_add_bdepend "
 	doc? (
-		>=dev-ruby/hoe-2.6.1
+		>=dev-ruby/hoe-2.10
 		dev-ruby/hoe-seattlerb
 	)
 	test? (
-		>=dev-ruby/hoe-2.6.1
+		>=dev-ruby/hoe-2.10
 		dev-ruby/hoe-seattlerb
 		virtual/ruby-minitest
 	)"
-
-each_ruby_test() {
-	# JRuby needs the extended objectspace. We do it here
-	# unconditional in this easy way.
-	JRUBY_OPTS="${JRUBY_OPTS} -X+O" each_fakegem_test
-}
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@ -1,2 +1,3 @@
 DIST aruba-0.4.11.gem 62464 SHA256 d5629b0d48b3e9e3cc8636d5f6aee752dd57005eee88c9f2b1c6f9749c105204 SHA512 cbd6c41468175e4bce8289c4e504b9389af0f027389b02753eb2e3ff11996c7d0efe6307b62825421d1738e7f48692a74cb364535332a1d7ebfbb379694bb5d3 WHIRLPOOL 3006b07a41058e464d22a4406d3fb81fa9468a3b65034b28fbb6a54ac5c242ef39246905b9ddccdd33bac3aeeb60bb27dee1f09568b2fe831fe3e655b7a929a0
 DIST aruba-0.5.0.gem 65024 SHA256 164575ded042ebafbee36b7c6b7cdce00ba87b9a57fb25176e06b51a3cda83e1 SHA512 bc60d91aacc65a867108c5cb44462d326b08e6961b326ca09604434f137af439fd459bb070e15676b9b4ffee742e4a89117069491e46b3436f4059dd9999ca64 WHIRLPOOL b7493bf224354ec4e83ddfe05307a314c3be427822963167e96b067e79ab8ae9b8a68511169ba3d05f752a1e322b90b9778bc86fdad1bb01dd51a7100bc0dfe4
+DIST aruba-0.5.1.gem 66048 SHA256 677a770c35b1fcf3963312c8938a7ccfa3cbbf2240bf2583ec5e5f0ad973f43e SHA512 b4acbddc1fa43e6dc11ad762cd5e158fda7727f3b0e05d04f4f5c805c04e03058ea50f83afed0e8bcdeb8f338851038f5f5865c4bb34e04930049fb1f0b4fb75 WHIRLPOOL c9953413f318603325c39ecebbdfe28817eed3701c12d834d1528fb96089615234aff4d5f93742edff84a21fe347f2e461ae3abe24a9d3ec18186c340f3cc103
--- a/dev-util/aruba/aruba-0.5.1.ebuild
+++ b/dev-util/aruba/aruba-0.5.1.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/aruba/aruba-0.5.1.ebuild,v 1.1 2012/12/11 18:35:50 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ree18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="cucumber"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cucumber steps for driving out command line applications."
+HOMEPAGE="https://github.com/cucumber/aruba"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="${DEPEND} test? ( sys-devel/bc )"
+RDEPEND="${RDEPEND}"
+
+ruby_add_rdepend "
+	>=dev-ruby/bcat-0.6.1
+	>=dev-ruby/childprocess-0.3.6 =dev-ruby/childprocess-0.3*
+	>=dev-ruby/rspec-2.7
+	>=dev-util/cucumber-1.1.1"
+
+all_ruby_prepare() {
+	# Remove bundler-related code.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	rm Gemfile || die
+
+	# Remove references to git ls-files.
+	sed -i -e '/git ls-files/d' aruba.gemspec || die
+}
--- a/dev-util/sysprof/sysprof-1.1.8-r2.ebuild
+++ b/dev-util/sysprof/sysprof-1.1.8-r2.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/sysprof/sysprof-1.1.8-r2.ebuild,v 1.3 2012/09/18 09:59:26 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sysprof/sysprof-1.1.8-r2.ebuild,v 1.5 2012/12/11 16:08:45 axs Exp $

 EAPI="4"

-inherit gnome2-utils eutils linux-info toolchain-funcs
+inherit gnome2-utils eutils linux-info udev toolchain-funcs

 DESCRIPTION="System-wide Linux Profiler"
 HOMEPAGE="http://sysprof.com/"
@ -31,9 +31,7 @@ pkg_pretend() {

 src_install() {
 	# Install udev rules in the proper place
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	export MAKEOPTS="${MAKEOPTS} udevdir=${udevdir}/rules.d"
+	export MAKEOPTS="${MAKEOPTS} udevdir=$(udev_get_udevdir)"
 	default

 	# Symlink icons for use in application launchers
--- a/dev-util/sysprof/sysprof-1.2.0.ebuild
+++ b/dev-util/sysprof/sysprof-1.2.0.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/sysprof/sysprof-1.2.0.ebuild,v 1.4 2012/11/21 11:16:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sysprof/sysprof-1.2.0.ebuild,v 1.6 2012/12/11 16:08:45 axs Exp $

 EAPI="4"

-inherit gnome2-utils eutils linux-info toolchain-funcs
+inherit gnome2-utils eutils linux-info udev toolchain-funcs

 DESCRIPTION="System-wide Linux Profiler"
 HOMEPAGE="http://sysprof.com/"
@ -34,9 +34,7 @@ pkg_pretend() {

 src_install() {
 	# Install udev rules in the proper place
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	export MAKEOPTS="${MAKEOPTS} udevdir=${udevdir}/rules.d"
+	export MAKEOPTS="${MAKEOPTS} udevdir=$(udev_get_udevdir)"
 	default

 	# Symlink icons for use in application launchers
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@ -5,6 +5,7 @@ DIST git-1.7.12.tar.gz 4092043 SHA256 3b8661782dc280d3d4be5193bcb8a1895c1ba272cf
 DIST git-1.7.2.5.tar.bz2 2561345 SHA256 d84e6d76fe9d30af5515ea8177b0d8bfe774ee0836d21ed450cb4d52f5aa6311 SHA512 b78e59ea0b110c24121116abbbc191910ba8feae9ca2c89d661abc456cadfa21e42bdc72c961a94a46b47b20f64cd8bf23d0ed600ae40afb8572eb3455ea3ea4 WHIRLPOOL 36dc12f00c84f339502f9b3104a183e855e2b7eb5e11ef46c162804df0613dada52a237f1854177909ddd7d29bf9f317e3dfb6fe223f3e18db4518e7c35a6a1c
 DIST git-1.7.3.4.tar.bz2 2635522 SHA256 3e5e2b6547ee4aae82b4c5f589ff084996e9e6e0e2b52c92365e6baa1e4a0171 SHA512 93cb7a86020488bcb1e367442978c1f2c57be0c623f2f8d7d5cf385fcf2e43fff03354b18985e1560ef807f05d251ea1041440b09216408863cbc1ab7510a09a WHIRLPOOL bbe4f3c71d5322749203eec852aba838f591d24abcdc09949d0727155fa9ecdad9cc127de998173fc3e35459440d173317fda456822645f73c52c28fa37bcfd8
 DIST git-1.7.8.6.tar.gz 3546112 SHA256 45be602d0ca64eb44282cec7a5a7286487f7e9ed0c8112735456a22fdf1f6db9 SHA512 84b0341d040a0f99a40d2d316498a964cf386818673ccf04aacb3b2a7e3c09b275f819a7cd9746dec67e1d0300e13fe5706a57c94ae2d26fd1b82e9b93f405ae WHIRLPOOL 804e70176a229123e09348b6585a461bc162edf9786d617926f42fdab6e615ffba9a9b2b6654562d9757e96bdb3603aaa2ee78ac8c0f124d413409b0fcc7cfa8
+DIST git-1.8.0.2.tar.gz 4231410 SHA256 c06d5d29389e90583d16ec41d5be931593196f6842f9b14e910a0b5781c10e07 SHA512 b278eed9571f2d6449aef18f94fe0937c2f54d1ad9bc2a6b54d3082b550e1377b896aeb412438991219c454179b2590241b37e8ddfcf7096fe49bca564956779 WHIRLPOOL f61474fd1a7a76cb64c1202ff4270e0e84dfd82165eeeefda454127a69e778763c124da899ae0d95d9e737872f1bbbd46f66d9aa0d6d6cad1aa065001c6cc711
 DIST git-1.8.0.tar.gz 4225055 SHA256 ccc32f18ea12ea730a7d1d9d3d7bf51447439299a99d4d326f49f1f8bb488974 SHA512 9b251a77db39eb17a670c4b9673d20d256744edabfdd304656b083c523f9e41d063ada9002f399a81ddc8b7684af788ded59e1362affa15f7b56ccc5db15fd51 WHIRLPOOL cf771ef5633a8a4e652f4226d6eaeb75673e922d35a71e66a7bce0deb6de1bd74a0192f7cda63e0fba8c0df0c36878609efb989914ac7ecfb172f906e7d218c2
 DIST git-htmldocs-1.6.4.5.tar.bz2 772113 SHA256 12c13ead869918d8470d68c7331675c56a192eae819c283a398aaf9f0f7555d2 SHA512 155dfe08b752a268a680dfb3df3d7bf1453976824aa33eb6f98598db9ba52b56e770a31f9770013076dd518f212ec3e7cfd13408d77a0ba1c2ad6bc4921ddc22 WHIRLPOOL 59e25e92e4c1ca61af8b967c3e310886f520d93de230886c6ec9b86e370c1d8f8ce56edb1fa29365348f987c746a58e3954e8d891138a4459eb2149005e4bb29
 DIST git-htmldocs-1.7.12.3.tar.gz 1797128 SHA256 ec8e10b989e8f94d1607ecece7d4a2e91fa07e5f47e02944fdab3b7904f51a3f SHA512 cc4a4763ee3c34dbeea2df59401f9d927e10a4db9c6c1ea13ff62b9ae12b88e24b6ad19f98cdc7d287e8dd7d634d145eda369c6ec387854f902d8eb0022c2b61 WHIRLPOOL 4f40a391041e34e7c648deee31464b73cc6d58ef84f9f9ff666fc9f517e186c5df281f576536be8b14015ca49ce7011e8f29182dd06b56ef7a83897316d2b6b0
@ -13,6 +14,7 @@ DIST git-htmldocs-1.7.12.tar.gz 1787511 SHA256 7f58468a20ca7f7d225698d0747902c34
 DIST git-htmldocs-1.7.2.5.tar.bz2 919247 SHA256 6b6291ffad4eae80d2739acdffffdd6293b9e50366cfa53ffb0c3a1427700337 SHA512 e8b2bc14b1a687f76256dfcfae893252b091c6d60dcd0fc53da50ceaee1434d5c976f1d09d45f8cc5a2991a9051ee8d0482a281fe7559225b6c750fe241b713c WHIRLPOOL d1ea7a272ba728e01523439ac897e1ecbc22917aceaa8871ade522d18db37df0d305fd3dd1782ef20dc1c935ec3965ebbe86d4cc29419a9e82aee831002eabed
 DIST git-htmldocs-1.7.3.4.tar.bz2 929858 SHA256 24f03bcd6b5c3745c2395cf49260cdbf7fe80292883b0b4da3e1ac636aee6fba SHA512 3cda317a0608ef1ee18752fd9f0cba8bc91c3f5d66e0e1d8ee4beb63b7e50dd562721fe53bde3244528a915ad463fc60d13896f3344a7679256c11c79fdb33e4 WHIRLPOOL b83941afd6aaafa5354711fdeefa5cbce7e2b255c0ccab411f94dee48d97838fd7224d098c085eec5e1dfd3eb0599b1a39c8cddeeb1b727a15a2398d4c4b6d11
 DIST git-htmldocs-1.7.8.6.tar.gz 1688622 SHA256 7c7447fe136349b1807caba1c00fe6a46866c9b54cba068f322967c0f8b2c0bf SHA512 31a88363aad7a20a5633530a080258807ef52c1a4074dd308d00540f1dc2b6e1c68d1bb43fa55b14b0fff5e3c24034a15debc9236ad3a2eafa8440982a5462cd WHIRLPOOL a8bc612b3d3a453eb46cc7a79fd929b2ac1c9858a52b3687c59fd113c582c4330f44e1dd64f5c4b755ab49aefc03295a19c440af12001f2f42e5ab1836775f7f
+DIST git-htmldocs-1.8.0.2.tar.gz 1809932 SHA256 edba4dcc9dc131b32ba05d5cb9334a9ba7af3ca6c91795068b56d7e0d3b0f43a SHA512 f63f8b1e9efd96a5450ef5b31be992fe49fb5c8de8f79d9835ff5884dc4a4ba9e87c8c7f8e59e67250df880ee7221d2e4de754bd0af5d86a117bd4ee5d306dae WHIRLPOOL bc5508ae94024157ef1fb2fe19269eaa5189bb41a603390ec5d61ce9547ae9f68cad49a7b4b3da47f09a9a9a8258c8e76fab1fd03a222454fe48e4288524641c
 DIST git-htmldocs-1.8.0.tar.gz 1807615 SHA256 b5837f19815c5259355fc2ac1ea320bd869680218b82b9a0802ca015c0e24363 SHA512 bb3315640595e384b206af2e40aa82b80e50327da1792e72536754892aa6037b7624681e5a1142461019f5382a60247f1c4480e0a049bdd8d5308fa5ec1588a1 WHIRLPOOL 18024bfa6343cfe2c3bbbb3a9ea7221ef587cc09bb1c82f9466f846698abf2bbc1844806db0c73a14cf9eb623e406b0d6a1e19bb2022ddcfb861bb18ddeb835d
 DIST git-manpages-1.6.4.5.tar.bz2 254368 SHA256 f73ae98b0cea0ef6d8f7c8b599d6cad0bdae702b1fe58ad8ebab32a0bb7ba447 SHA512 9874bd63e138a2973f5912385e7972d17cd7bfebac7c67bca96ab041912ade4f2485d6536312c452d2b2fd6e89c1fec40b40cbd0ea91486db1d1b7e7e68c867e WHIRLPOOL 72ec9606acd277d90c5c6a46206c63991be7c256f43a1b866fe6da721434131646043fb5b03d448f1c75a3ffea92f4cf1b05e8a846919800e146e15a160dab04
 DIST git-manpages-1.7.12.3.tar.gz 521149 SHA256 fa85885f813c5081071629e3dd8832cad730b8e481f33e9cbb00edfb3af4f24f SHA512 f91bf027d59046507ae98f36066bddf61bcf10121674557efe7a497c992a1efd993835c6acdbf1a4fe4aef1364556e00e66fce2dcb162b26bd3fe3109ab83001 WHIRLPOOL a2d40a46b4566157a5987c2f5af6e68528b29ea54fb842922182a1b0de7e45b8b8b10ca0221694f4e730a6e01b902869f3566155d81a4db8297c49a089a3c175
@ -21,4 +23,5 @@ DIST git-manpages-1.7.12.tar.gz 517802 SHA256 146a4e0899a028fd4256654e472ecfe3be
 DIST git-manpages-1.7.2.5.tar.bz2 289543 SHA256 a42a977a1ecfd3cea62e1f02fc89f57029a94f163ff7205f6a56ab4b67d6bd6e SHA512 b4065ef9ed7beb84d56fdfeadf9608c0b6bd36a06460b68ba575583062612f469e7db1d08c232f3a9253ca0b957bacc508fd4ec702070eb4c84d174af1828ab9 WHIRLPOOL d22249c22ad9da862cb842e37463cff3a7967de70441a851640641d78d185da916db9f3d3fec328bc10e48bc318b2b4fa085fae81c2576a758dededf153cc78b
 DIST git-manpages-1.7.3.4.tar.bz2 294381 SHA256 2ff98641bc655b29a7fb72bced46da09c99b6fad3b651722b7b8057df4a9ce75 SHA512 d73e3d11a0b551d35cfb3fbc214ecec34ea7cb79e11e9453be5dd7c649f7fd93b7ab286590cb6101d5f011b35ee0469443325cd9636520717dc15057f34c413d WHIRLPOOL b17d6e9fefdb02faf4a33ad7ca4707432274e0a929e274d5347fb9917250e76295f2d28da930dff16d9cee4a5fc6fdfbf5b9b700a6d8fdcc218df6ded5088c1a
 DIST git-manpages-1.7.8.6.tar.gz 501678 SHA256 559b7a6ba8eaad655d725765b75aff9c6a5aaed2cc77abcdd2f88c773a0b3a6d SHA512 925c1775e0d57ee832c0794a8adaa5ebe332556358dbe75cedf9298d1f2e39b31e43693d8873667fdd1795e9e7dd71be83880d78d6ff6454959f325fc518bd88 WHIRLPOOL 2ef274e721013070440f8addbc4fd5cfb886db3b78f3a961bf7add2864e9ae609340ca26de88e3edcbd7513ebab1f46ef8d25d3e06bfe760233afdb1d7ccba4a
+DIST git-manpages-1.8.0.2.tar.gz 523757 SHA256 b04f0e7277927e8fb91c1c1f7b951b6d2770cfa6a7b69145462214954751be98 SHA512 0d443a1fd6f8b234012e33b5b5cd2bb83a6d0d9ae72b623a2fbc96163fc5b6c727c34094e87166559669afdf2d26af3681ebbb68ecfec33a949968a07a47c9d0 WHIRLPOOL 80f80a4e60dcf7ad15a09ccfc9e17b66b00dae0da41ca7a46891483572e3f720c574f5a7626670f6eabe3ee6d08283f072d6b794de06233382968977a9248a25
 DIST git-manpages-1.8.0.tar.gz 523324 SHA256 8914907f9d22b9a6a0ade9a8addda9a84a2db35b23cbd404f2682cebc9114205 SHA512 651b876c3c9253b1b8e7e9209af448d04606b67cf1933d5509ca9c91833477e4b6f620a775fbd961d90bed371aba3ce3976d6316c0cb904df11e210f9f9f3096 WHIRLPOOL 34de3e23b74a1305ab97d41681f114802bdb492fa40152f522627a292f61b690d33658fe1770579decf3c5c8d98315962bf9156785ce44eec0a26171a96be1b4
--- a/dev-vcs/git/git-1.8.0.2.ebuild
+++ b/dev-vcs/git/git-1.8.0.2.ebuild
@ -0,0 +1,595 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.0.2.ebuild,v 1.1 2012/12/11 19:33:02 robbat2 Exp $
+
+EAPI=4
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_DEPEND="python? 2"
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="gz"
+	SRC_URI_GOOG="http://git-core.googlecode.com/files"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	dev-libs/openssl
+	sys-libs/zlib
+	pcre? ( dev-libs/libpcre )
+	perl? ( dev-lang/perl[-build] )
+	tk? ( dev-lang/tk )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs? ( virtual/emacs )
+	gnome-keyring? ( gnome-base/gnome-keyring )"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	python? ( gtk?
+	(
+		>=dev-python/pygtk-2.8
+		dev-python/pygtksourceview:2
+	) )"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	app-arch/cpio
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+		app-text/xmlto
+	)
+	test? (
+		app-crypt/gnupg
+	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+pkg_setup() {
+	if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts="${myopts} BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts="${myopts} PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+	else
+		myopts="${myopts} NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of broken build system ...
+	myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts="${myopts} INSTALL=install TAR=tar"
+	myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts="${myopts} SANE_TOOL_PATH="
+	myopts="${myopts} OLD_ICONV="
+	myopts="${myopts} NO_EXTERNAL_GREP="
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use nls \
+		|| myopts="${myopts} NO_GETTEXT=YesPlease"
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use pcre \
+		&& myopts="${myopts} USE_LIBPCRE=yes"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use python \
+		|| myopts="${myopts} NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use cvs \
+		|| myopts="${myopts} NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts="${myopts} NO_MMAP=YesPlease"
+#		myopts="${myopts} NO_IPV6=YesPlease"
+#		myopts="${myopts} NO_STRLCPY=YesPlease"
+#		myopts="${myopts} NO_MEMMEM=YesPlease"
+#		myopts="${myopts} NO_MKDTEMP=YesPlease"
+#		myopts="${myopts} NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts="${myopts} NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts="${myopts} ASCIIDOC8=YesPlease"
+	myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts="${myopts} NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-2_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# bug #418431 - stated for upstream 1.7.13. Developed by Michael Schwern,
+	# funded as a bounty by the Gentoo Foundation. Merged upstream in 1.8.0.
+	#epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch
+
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	epatch "${FILESDIR}"/git-1.7.12-optional-cvs.patch
+
+	sed -i \
+		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC = \).*$:\1$(OPTCC):' \
+		-e 's:^\(AR = \).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile
+}
+
+git_emake() {
+	# bug #326625: PERL_PATH, PERL_MM_OPT
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="$(PYTHON -a)"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		"$@"
+	# This is the fix for bug #326625, but it also causes breakage, see bug
+	# #352693.
+	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	if use perl ; then
+	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+	fi
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el \
+			|| die "emacs modules failed"
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb/gitweb.cgi \
+			|| die "emake gitweb/gitweb.cgi failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
+		git_emake || die "emake credential-osxkeychain"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		git_emake || die "emake svn-fe failed"
+		if use doc ; then
+			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+		fi
+		cd "${S}"
+	fi
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/gnome-keyring
+		git_emake || die "emake git-credential-gnome-keyring failed"
+	fi
+
+	cd "${S}"/contrib/subtree
+	git_emake
+	use doc && git_emake doc
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		use doc && dohtml -p ${d} Documentation${d}*.html
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc} || die
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+
+	if use python && use gtk ; then
+		dobin "${S}"/contrib/gitview/gitview
+		python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	newbin contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	cd "${S}"/contrib/subtree
+	git_emake install || die "Failed to emake install git-subtree"
+	if use doc ; then
+		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	cd "${S}"
+
+	# git-diffall
+	dobin contrib/diffall/git-diffall
+	newdoc contrib/diffall/README git-diffall.txt
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	dobin contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/gnome-keyring
+		dobin git-credential-gnome-keyring
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		dobin svn-fe
+		dodoc svn-fe.txt
+		use doc && doman svn-fe.1 && dohtml svn-fe.html
+		cd "${S}"
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# credential/gnome-keyring TODO
+	# diff-highlight - done above
+	# diffall - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	for i in \
+		blameview buildsystems ciabot continuous convert-objects fast-import \
+		hg-to-git hooks remotes2config.sh rerere-train.sh \
+		stats vim workdir \
+		; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+
+	fixlocalpod
+}
+
+src_test() {
+	local disabled=""
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
+	local tests_perl="t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t0070-fundamental.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn="t9100-git-svn-basic.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled="${disabled} ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			built_with_use dev-vcs/cvs server && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled="${disabled} ${test_svn}"
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i "${S}"/t/Makefile
+
+	# Clean old results first, must always run
+	cd "${S}/t"
+	nonfatal git_emake clean
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	cd "${S}"
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	cd "${S}/t"
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use python && python_mod_optimize git_remote_helpers
+	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+	einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt"
+	einfo "Note that the prompt bash code is now in the seperate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use python && python_mod_cleanup git_remote_helpers
+}
--- a/dev-vcs/rabbitvcs/Manifest
+++ b/dev-vcs/rabbitvcs/Manifest
@ -1,3 +1 @@
-DIST rabbitvcs-0.15.0.5.tar.bz2 536235 SHA256 cdda568e4206490e97c287743b632802c729ad44f70743bc7ab9ddc84ada66b3 SHA512 12b2cc1b85d047084edacb25a8c518d9f23d7f2d64cc1fe25d5175c7418be27a2bc2eedb84302caf937e1ea0998a0bad1864ac949113e3f170e3341fb05a3104 WHIRLPOOL 37408efd4a65e67330a57575f57b54abb9ec3a53061cc4fbcd487dd6c70f0c431b18d3e0c5a615938f3cda50850bb916b08f8970e9b6e773becb9c6f89e2c616
-DIST rabbitvcs-0.15.1.tar.bz2 1189820 SHA256 9d27cb3977d00cc6b577d4d11009cc588c97badfff8cdf8dce688e36898a1c0d SHA512 da8b3ea3f8126be490e6b61b2e6d40cddafed20039908a320ae3dfdafd0a81c56e6cb5e90d0db126613e2c200eb0f38df87e3241cc326892a2d57b30b2892d77 WHIRLPOOL 9540d069c0736bee66a0db1f5f8d411976e55b639964706daf2c6ad0b9c131cec94ee2dafce2365c768605b97696121ff7c2d7bdf184e7250bae4ef72293f732
 DIST rabbitvcs-0.15.2.tar.bz2 1166612 SHA256 252edcc934705c59365ebbee35868de2bbb32ee9e173ef3f7245efb2653762e8 SHA512 4509261cd8e138c74388d3488c54a6dff82505d19498d557f9add6445f351e76d28d012ecdefe24d082464e634259f3f917c4374b08106131023115b1c22b393 WHIRLPOOL a575f275843775743e85f573a84504192b34628a34deb89deea067c09fb2ebd3f9abaa33478b325593f3114879f0db3b2f313c46bcf39be36961c844ac9fd483
--- a/dev-vcs/rabbitvcs/files/50_fix_gedit3_plugin.patch
+++ b/dev-vcs/rabbitvcs/files/50_fix_gedit3_plugin.patch
@ -1,309 +0,0 @@
-Description: Fix the gedit plugin for Gedit3
-From: Adam Plumb <adamplumb@gmail.com>
-Origin: upstream, http://code.google.com/p/rabbitvcs/source/detail?r=3022
-Bug: http://code.google.com/p/rabbitvcs/issues/detail?id=622
-Bug-Debian: http://bugs.debian.org/635123
-
--- a/rabbitvcs/util/contextmenuitems.py
-+++ b/rabbitvcs/util/contextmenuitems.py
-@@ -204,7 +204,7 @@
-         )
-             
-         return action
-        
-+
-     def make_gtk_menu_item(self, id_magic = None):
-         action = self.make_action(id_magic)
-             
-@@ -217,6 +217,17 @@
-         else:
-             menuitem = action.create_menu_item()
-             
-+        return menuitem
-+        
-+    def make_gtk3_menu_item(self, id_magic = None):
-+        action = self.make_action(id_magic)
-+        
-+        if self.icon:
-+            menuitem = action.create_menu_item()
-+            menuitem.set_image(gtk.Image.new_from_icon_name(self.icon, gtk.IconSize.MENU))
-+        else:
-+            menuitem = action.create_menu_item()
-+            
-         return menuitem
-     
-     def make_nautilus_menu_item(self, id_magic = None):
--- a/clients/gedit/rabbitvcs.gedit-plugin
-+++ /dev/null
-@@ -1,10 +0,0 @@
-[Gedit Plugin]
-Loader=python
-Module=rabbitvcs-plugin
-IAge=2
-Name=RabbitVCS
-Description=RabbitVCS plugin for Gedit
-Authors=Adam Plumb <adamplumb@gmail.com>
-Copyright=Copyright © 2009 Adam Plumb
-Website=http://www.rabbitvcs.org
-
--- /dev/null
-+++ b/clients/gedit/rabbitvcs-gedit2.gedit-plugin
-@@ -0,0 +1,10 @@
-+[Gedit Plugin]
-+Loader=python
-+Module=rabbitvcs-plugin
-+IAge=2
-+Name=RabbitVCS
-+Description=RabbitVCS plugin for Gedit
-+Authors=Adam Plumb <adamplumb@gmail.com>
-+Copyright=Copyright © 2011 Adam Plumb
-+Website=http://www.rabbitvcs.org
-+
--- a/clients/gedit/rabbitvcs-plugin.py
-+++ b/clients/gedit/rabbitvcs-plugin.py
-@@ -2,7 +2,7 @@
- # This is a Gedit plugin to allow for RabbitVCS integration in the Gedit
- # text editor.
- # 
-# Copyright (C) 2008-2008 by Adam Plumb <adamplumb@gmail.com>
-+# Copyright (C) 2008-2011 by Adam Plumb <adamplumb@gmail.com>
- # 
- # RabbitVCS is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -21,8 +21,17 @@
- from gettext import gettext as _
- 
- import os
-import gtk
-import gedit
-+
-+try:
-+    from gi.repository import Gedit
-+    os.environ["NAUTILUS_PYTHON_REQUIRE_GTK3"] = "1"
-+    GTK3 = True
-+except ImportError:
-+    import gedit
-+    GTK3 = False
-+
-+from gi.repository import GObject
-+from gi.repository import Gtk as gtk
- 
- import rabbitvcs.util.helper
- from rabbitvcs.vcs import create_vcs_instance
-@@ -327,8 +336,15 @@
-         
-         manager = self._window.get_ui_manager()
-         for menu_path in self._menu_paths:
-            widget = manager.get_widget(menu_path)
-            self._menubar_menu.update_action(widget.get_action())
-+            # Gtk3 changes how we access a widget's action.  Get it from the
-+            # UI Manager instead of the widget directly
-+            if hasattr(manager, "get_action"):
-+                action = manager.get_action(menu_path)
-+            else:
-+                widget = manager.get_widget(menu_path)
-+                action = widget.get_action()
-+
-+            self._menubar_menu.update_action(action)
- 
-     # Menu activate handlers
-     def reload_settings(self, proc):
-@@ -337,49 +353,100 @@
-     def on_context_menu_command_finished(self):
-         self.update_ui()
- 
-class RabbitVCSPlugin(gedit.Plugin):
-    def __init__(self):
-        gedit.Plugin.__init__(self)
-        self._instances = {}
-        self.id_name = "RabbitVCSContextMenuID"
-
-    def activate(self, window):
-        self._instances[window] = RabbitVCSWindowHelper(self, window)
-
-        handler_ids = []
-        for signal in ('tab-added', 'tab-removed'):
-            method = getattr(self, 'on_window_' + signal.replace('-', '_'))
-            handler_ids.append(window.connect(signal, method))
-        
-        window.set_data(self.id_name, handler_ids)
-        if window in self._instances:
-            for view in window.get_views():
-                self._instances[window].connect_view(view, self.id_name)
-
-    def deactivate(self, window):
-        widgets = [window] + window.get_views()
-        for widget in widgets:
-            handler_ids = widget.get_data(self.id_name)
-            if handler_ids is not None:
-                for handler_id in handler_ids:
-                    widget.disconnect(handler_id)
-                widget.set_data(self.id_name, None)
-
-        if window in self._instances:
-            self._instances[window].deactivate()
-            del self._instances[window]
-
-    def update_ui(self, window):
-        if window in self._instances:
-            self._instances[window].update_ui()
-
-    def on_window_tab_added(self, window, tab):
-        if window in self._instances:
-            self._instances[window].connect_view(tab.get_view(), self.id_name)
-    
-    def on_window_tab_removed(self, window, tab):
-        if window in self._instances:
-            self._instances[window].disconnect_view(tab.get_view(), self.id_name)
-+if GTK3:
-+    class RabbitVCSGedit3Plugin(GObject.Object, Gedit.WindowActivatable):
-+        __gtype_name__ = "RabbitVCSGedit3Plugin"
-+        window = GObject.property(type=Gedit.Window)
-+        
-+        def __init__(self):
-+            GObject.Object.__init__(self)
-+            self._instances = {}
-+            self.id_name = "RabbitVCSContextMenuID"
-+
-+        def do_activate(self):
-+            self._instances[self.window] = RabbitVCSWindowHelper(self, self.window)
-+
-+            handler_ids = []
-+            for signal in ('tab-added', 'tab-removed'):
-+                method = getattr(self, 'on_window_' + signal.replace('-', '_'))
-+                handler_ids.append(self.window.connect(signal, method))
-+            
-+            self.window.set_data(self.id_name, handler_ids)
-+            if self.window in self._instances:
-+                for view in self.window.get_views():
-+                    self._instances[self.window].connect_view(view, self.id_name)
-+
-+        def do_deactivate(self):
-+            widgets = [self.window] + self.window.get_views()
-+            for widget in widgets:
-+                handler_ids = widget.get_data(self.id_name)
-+                if handler_ids is not None:
-+                    for handler_id in handler_ids:
-+                        widget.disconnect(handler_id)
-+                    widget.set_data(self.id_name, None)
-+
-+            if self.window in self._instances:
-+                self._instances[self.window].deactivate()
-+                del self._instances[self.window]
-+
-+        def do_update_state(self):
-+            self.update_ui()
-+
-+        def update_ui(self):
-+            if self.window in self._instances:
-+                self._instances[self.window].update_ui()
-+
-+        def on_window_tab_added(self, window, tab):
-+            if self.window in self._instances:
-+                self._instances[self.window].connect_view(tab.get_view(), self.id_name)
-+        
-+        def on_window_tab_removed(self, window, tab):
-+            if window in self._instances:
-+                self._instances[self.window].disconnect_view(tab.get_view(), self.id_name)
-+else:
-+    class RabbitVCSGedit2Plugin(gedit.Plugin):
-+        def __init__(self):
-+            gedit.Plugin.__init__(self)
-+            self._instances = {}
-+            self.id_name = "RabbitVCSContextMenuID"
-+
-+        def activate(self, window):
-+            self._instances[window] = RabbitVCSWindowHelper(self, window)
-+
-+            handler_ids = []
-+            for signal in ('tab-added', 'tab-removed'):
-+                method = getattr(self, 'on_window_' + signal.replace('-', '_'))
-+                handler_ids.append(window.connect(signal, method))
-+            
-+            window.set_data(self.id_name, handler_ids)
-+            if window in self._instances:
-+                for view in window.get_views():
-+                    self._instances[window].connect_view(view, self.id_name)
-+
-+        def deactivate(self, window):
-+            widgets = [window] + window.get_views()
-+            for widget in widgets:
-+                handler_ids = widget.get_data(self.id_name)
-+                if handler_ids is not None:
-+                    for handler_id in handler_ids:
-+                        widget.disconnect(handler_id)
-+                    widget.set_data(self.id_name, None)
-+
-+            if window in self._instances:
-+                self._instances[window].deactivate()
-+                del self._instances[window]
-+
-+        def update_ui(self, window):
-+            if window in self._instances:
-+                self._instances[window].update_ui()
-+
-+        def on_window_tab_added(self, window, tab):
-+            if window in self._instances:
-+                self._instances[window].connect_view(tab.get_view(), self.id_name)
-+        
-+        def on_window_tab_removed(self, window, tab):
-+            if window in self._instances:
-+                self._instances[window].disconnect_view(tab.get_view(), self.id_name)
- 
- class MenuIgnoreByFilename(MenuItem):
-     identifier = "RabbitVCS::Ignore_By_Filename"
-@@ -593,7 +660,10 @@
-     signal = "activate"
-         
-     def make_menu_item(self, item, id_magic):
-        return item.make_gtk_menu_item(id_magic)
-+        if GTK3:
-+            return item.make_gtk3_menu_item(id_magic)
-+        else:
-+            return item.make_gtk_menu_item(id_magic)
-     
-     def attach_submenu(self, menu_node, submenu_list):
-         submenu = gtk.Menu()
--- /dev/null
-+++ b/clients/gedit/rabbitvcs-gedit3.plugin
-@@ -0,0 +1,9 @@
-+[Plugin]
-+Loader=python
-+Module=rabbitvcs-plugin
-+IAge=3
-+Name=RabbitVCS
-+Description=RabbitVCS plugin for Gedit
-+Authors=Adam Plumb <adamplumb@gmail.com>
-+Copyright=Copyright © 2011 Adam Plumb
-+Website=http://www.rabbitvcs.org
--- a/clients/gedit/README
-+++ b/clients/gedit/README
-@@ -8,14 +8,24 @@
-     * gedit
-     * (all other RabbitVCS requirements)
- 
-To install:
-+To install for Gedit 3:
-     To install for all users, copy rabbitvcs-plugin.py and 
-    rabbitvcs.gedit-plugin to:
-+    rabbitvcs-gedit3.plugin to:
-+        /usr/share/gedit/plugins
-+
-+    To install for a single user, copy rabbitvcs-plugin.py and 
-+    rabbitvcs-gedit3.plugin to:
-+        ~/.local/share/gedit/plugins
-+
-+To install for Gedit 2:
-+    To install for all users, copy rabbitvcs-plugin.py and 
-+    rabbitvcs-gedit2.gedit-plugin to:
-         /usr/lib/gedit-2/plugins
- 
-     To install for a single user, copy rabbitvcs-plugin.py and 
-    rabbitvcs.gedit-plugin to:
-        ~/.gnome2/gedit/plugins
-+    rabbitvcs-gedit2.gedit-plugin to:
-+        ~/.gnome2/gedit/plugins        
-+
- 
- Troubleshooting:
- 
--- a/dev-vcs/rabbitvcs/rabbitvcs-0.15.0.5-r2.ebuild
+++ b/dev-vcs/rabbitvcs/rabbitvcs-0.15.0.5-r2.ebuild
@ -1,96 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rabbitvcs/rabbitvcs-0.15.0.5-r2.ebuild,v 1.1 2012/06/04 20:24:23 xmw Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-inherit eutils gnome2-utils multilib distutils
-
-DESCRIPTION="Integrated version control support for your desktop"
-HOMEPAGE="http://rabbitvcs.org"
-SRC_URI="http://rabbitvcs.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli diff gedit git nautilus spell thunar"
-
-RDEPEND="dev-python/configobj
-	dev-python/pygobject:2
-	dev-python/pygtk
-	dev-python/pysvn
-	dev-python/simplejson
-	diff? ( dev-util/meld )
-	gedit? ( app-editors/gedit )
-	git? ( dev-python/dulwich )
-	nautilus? ( >=dev-python/nautilus-python-0.7.0
-		dev-python/dbus-python
-		dev-python/gnome-vfs-python )
-	spell? ( dev-python/gtkspell-python )
-	thunar? ( dev-python/thunarx-python
-		dev-python/dbus-python )"
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-
-	distutils_src_prepare
-
-	# we should not do gtk-update-icon-cache from setup script
-	# we prefer portage for that
-	sed -e 's/"install"/"fakeinstall"/' -i "${S}/setup.py" || die
-
-	epatch "${FILESDIR}"/50_fix_gedit3_plugin.patch #bug 419647
-}
-
-src_install() {
-	distutils_src_install
-
-	if use cli ; then
-		dobin clients/cli/${PN}
-	fi
-	if use gedit ; then
-		insinto /usr/$(get_libdir)/gedit-2/plugins
-		doins clients/gedit/${PN}-plugin.py
-		doins clients/gedit/${PN}-gedit2.gedit-plugin
-		insinto /usr/$(get_libdir)/gedit/plugins
-		doins clients/gedit/${PN}-plugin.py
-		doins clients/gedit/${PN}-gedit3.plugin
-	fi
-	if use nautilus ; then
-		insinto /usr/$(get_libdir)/nautilus/extensions-2.0/python
-		doins clients/nautilus/RabbitVCS.py
-		insinto /usr/share/nautilus-python/extensions
-		doins clients/nautilus-3.0/RabbitVCS.py
-	fi
-	if use thunar ; then
-		insinto "/usr/$(get_libdir)/thunarx-2/python"
-		doins clients/thunar/RabbitVCS.py
-		insinto "/usr/$(get_libdir)/thunarx-1/python"
-		doins clients/thunar/RabbitVCS.py
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	gnome2_icon_cache_update
-
-	elog "You should restart file manager to changes take effect:"
-	use nautilus && elog "\$ nautilus -q"
-	use thunar && elog "\$ thunar -q && thunar &"
-	elog ""
-	elog "Also you should really look at known issues page:"
-	elog "http://wiki.rabbitvcs.org/wiki/support/known-issues"
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	gnome2_icon_cache_update
-}
--- a/dev-vcs/rabbitvcs/rabbitvcs-0.15.1.ebuild
+++ b/dev-vcs/rabbitvcs/rabbitvcs-0.15.1.ebuild
@ -1,94 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rabbitvcs/rabbitvcs-0.15.1.ebuild,v 1.1 2012/09/18 15:45:15 xmw Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-inherit eutils gnome2-utils multilib distutils
-
-DESCRIPTION="Integrated version control support for your desktop"
-HOMEPAGE="http://rabbitvcs.org"
-SRC_URI="http://rabbitvcs.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli diff gedit git nautilus spell thunar"
-
-RDEPEND="dev-python/configobj
-	dev-python/pygobject:2
-	dev-python/pygtk
-	dev-python/pysvn
-	dev-python/simplejson
-	diff? ( dev-util/meld )
-	gedit? ( app-editors/gedit )
-	git? ( dev-python/dulwich )
-	nautilus? ( >=dev-python/nautilus-python-0.7.0
-		dev-python/dbus-python
-		dev-python/gnome-vfs-python )
-	spell? ( dev-python/gtkspell-python )
-	thunar? ( dev-python/thunarx-python
-		dev-python/dbus-python )"
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-
-	distutils_src_prepare
-
-	# we should not do gtk-update-icon-cache from setup script
-	# we prefer portage for that
-	sed -e 's/"install"/"fakeinstall"/' -i "${S}/setup.py" || die
-}
-
-src_install() {
-	distutils_src_install
-
-	if use cli ; then
-		dobin clients/cli/${PN}
-	fi
-	if use gedit ; then
-		insinto /usr/$(get_libdir)/gedit-2/plugins
-		doins clients/gedit/${PN}-plugin.py
-		doins clients/gedit/${PN}-gedit2.gedit-plugin
-		insinto /usr/$(get_libdir)/gedit/plugins
-		doins clients/gedit/${PN}-plugin.py
-		doins clients/gedit/${PN}-gedit3.plugin
-	fi
-	if use nautilus ; then
-		insinto /usr/$(get_libdir)/nautilus/extensions-2.0/python
-		doins clients/nautilus/RabbitVCS.py
-		insinto /usr/share/nautilus-python/extensions
-		doins clients/nautilus-3.0/RabbitVCS.py
-	fi
-	if use thunar ; then
-		insinto "/usr/$(get_libdir)/thunarx-2/python"
-		doins clients/thunar/RabbitVCS.py
-		insinto "/usr/$(get_libdir)/thunarx-1/python"
-		doins clients/thunar/RabbitVCS.py
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	gnome2_icon_cache_update
-
-	elog "You should restart file manager to changes take effect:"
-	use nautilus && elog "\$ nautilus -q"
-	use thunar && elog "\$ thunar -q && thunar &"
-	elog ""
-	elog "Also you should really look at known issues page:"
-	elog "http://wiki.rabbitvcs.org/wiki/support/known-issues"
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	gnome2_icon_cache_update
-}
--- a/games-emulation/dgen-sdl/Manifest
+++ b/games-emulation/dgen-sdl/Manifest
@ -1,2 +1,2 @@
-DIST dgen-sdl-1.23.tar.gz 340556 RMD160 ca5ac81b4c8436a63e8d776b182735ad63ffa77a SHA1 c37096e5dd7c9f2c2c75496769d6d2b610a3a488 SHA256 44396b3b324433187cf7082d1059cd9f519f02accddd667e627a57ff8514d436
-DIST dgen-sdl-1.30.tar.gz 608549 RMD160 6629a9e96650020aa596822bc82eeb48c64252ba SHA1 650c7badc8bf60c6042bff92d7199a8650e5bd97 SHA256 2ecd364ff64d4ba759b7159d73e1bb8f289f6d5a4b7dfa021d4ab5cbc6443b86
+DIST dgen-sdl-1.23.tar.gz 340556 SHA256 44396b3b324433187cf7082d1059cd9f519f02accddd667e627a57ff8514d436
+DIST dgen-sdl-1.30.tar.gz 608549 SHA256 2ecd364ff64d4ba759b7159d73e1bb8f289f6d5a4b7dfa021d4ab5cbc6443b86 SHA512 bb112c885d54a01082e2585837aba4f084012e86d5244c483f77d091572b6dda7c98769c47ac93cf92e59ad4731af0516a45dd92270fb23aefa0c91c12942f40 WHIRLPOOL 15abacb96d6ccbf9506bb61a51597d7e057baeeccc5b75df3f1167a612b46bc2b7fa8d64b64ef07f9e8043af6eb2906d391a6e2d2a7fb5691c9a6c0e3146a061
--- a/games-emulation/dgen-sdl/dgen-sdl-1.30.ebuild
+++ b/games-emulation/dgen-sdl/dgen-sdl-1.30.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/games-emulation/dgen-sdl/dgen-sdl-1.30.ebuild,v 1.4 2012/06/13 19:20:17 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dgen-sdl/dgen-sdl-1.30.ebuild,v 1.5 2012/12/11 20:55:46 ulm Exp $

 EAPI=2
 inherit games
@ -9,7 +9,7 @@ DESCRIPTION="A Linux/SDL-Port of the famous DGen MegaDrive/Genesis-Emulator"
 HOMEPAGE="http://dgen.sourceforge.net/"
 SRC_URI="mirror://sourceforge/dgen/files/${P}.tar.gz"

-LICENSE="dgen-sdl as-is LGPL-2.1 GPL-2 BSD"
+LICENSE="dgen-sdl BSD BSD-2 free-noncomm LGPL-2.1+ GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="joystick opengl"
--- a/games-util/deutex/Manifest
+++ b/games-util/deutex/Manifest
@ -1 +1 @@
-DIST deutex-4.4.0.tar.gz 215945 RMD160 a811e14a387e30d525ab2095ccb99bc0aeac9152 SHA1 f3d9cd68a03cf36aad3096ded6609be4b6f7c82b SHA256 e87ff2984c6555f30408ee7aa4e6461aac6f1d3d0a1e21b4e12a797a057ba3b7
+DIST deutex-4.4.0.tar.gz 215945 SHA256 e87ff2984c6555f30408ee7aa4e6461aac6f1d3d0a1e21b4e12a797a057ba3b7 SHA512 fc9aaf399bc9d8ea812102decdf6b3c6d5f4c4a69e925e02fe0e75fa8dc9e54ad36afc352e83819ba13b9ae5dda90bb65c1856825c3ee17c7bd370909b866fb5 WHIRLPOOL c3e86d74a55a65ca0645e9a1ca9de9f580eee3176e5fdff889964b7e34cda2662a43cf1586829b50277bde6cd03584b8dbf38e5b56c4af3e7d7ee39f41257320
--- a/games-util/deutex/deutex-4.4.0.ebuild
+++ b/games-util/deutex/deutex-4.4.0.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/games-util/deutex/deutex-4.4.0.ebuild,v 1.8 2011/01/12 22:49:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/deutex/deutex-4.4.0.ebuild,v 1.9 2012/12/11 23:34:40 ulm Exp $

 EAPI=2
 inherit base toolchain-funcs
@ -9,7 +9,7 @@ DESCRIPTION="A wad composer for Doom, Heretic, Hexen and Strife"
 HOMEPAGE="http://www.teaser.fr/~amajorel/deutex/"
 SRC_URI="http://www.teaser.fr/~amajorel/deutex/${P}.tar.gz"

-LICENSE="GPL-2 LGPL-2 as-is"
+LICENSE="GPL-2+ LGPL-2+ HPND"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-2.32.0.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-2.32.0.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/gnome-extra/gnome-color-manager/gnome-color-manager-2.32.0.ebuild,v 1.10 2012/07/16 10:33:06 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-2.32.0.ebuild,v 1.11 2012/12/11 14:09:43 axs Exp $

 EAPI="3"
 GCONF_DEBUG="no"
@ -25,7 +25,7 @@ RDEPEND=">=dev-libs/glib-2.14:2
 	media-libs/libcanberra[gtk]
 	media-libs/tiff
 	net-print/cups
-	|| ( sys-fs/udev[gudev] sys-fs/udev[extras] )
+	virtual/udev[gudev]
 	x11-libs/libX11
 	x11-libs/libXxf86vm
 	x11-libs/libXrandr
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@ -1,4 +1,3 @@
-DIST network-manager-applet-0.8.4.tar.bz2 1153760 SHA256 552bd805aa09261ff7bac6e599551439b93c26bd563a2bba6d04f1af77c434a9 SHA512 8c180b8086484a6bd315093a70fe7c393c45dca967597777c9682c5fd0260f2e33bd0453c7f9d313cf284a912123bdc04f2456d1817550b9898f1e771c15afa7 WHIRLPOOL b73714ae09830ea5bf3104aa61d47e0c508bb67dcf1885a294cd60c327d61a948e9df28ee4e113024ad874bd718315cef763348ec9a97fd8548d19f41b2b998a
 DIST network-manager-applet-0.9.4.1.tar.xz 1102856 SHA256 b6b6de75e28d1fbcdfdbb51c0e40fcd6bc0ec0385bfecd16c457260491cd2ff7 SHA512 6fc9ea8c2c30beeba2c7fca443b0d065fa2eb495af54654479f9edde7bdc008ebd41ddad4f2b31bdbea8609f10168c74b34388b4cb00616431cd1259221fb2ca WHIRLPOOL 1cd51b9d318ae20a59e19bb5c23003eff8dcbd11abb5f4a8d3b812c3fbec6891b96105279382bdeec89b18eeae74d0da468403e1924bca2a24b111c14605f239
 DIST network-manager-applet-0.9.6.2.tar.xz 1125536 SHA256 96c79ce199fe7770b66f2ddc5ee0a4b07a0ea1eaf5e2186b78d8dd69e38a3069 SHA512 713ea1f6788ff106b35d39da0a9ff81af7b3c2ff9a8887be5b808317b471080967d594e3d7e02c0e9d830cacb78921a58666316fbfd0a9b1c78719fd009ef6e3 WHIRLPOOL 0276296371b3a92adf0b02316fb2f5e87bdbd5e94bae5790d2a06c1b18485c878c72eef935aaaf5741042576d6e60f80c609139882fcc0352fa43ab62aef2956
 DIST network-manager-applet-0.9.6.4.tar.xz 1140868 SHA256 ae5667b165f0f83244ec76c42f17553ec2169f5250e144904994497137374141 SHA512 16aab6e5786d0d6e89b880e34c6b8883bd57a190fb7ae73048db69ad2757317822eff4c8e825239fba969f67a760ce90ac94c27c79780158f3a2d82a9069d242 WHIRLPOOL 940c31ef95cd0b3b7a78ca5083c442dd229c98cf389a0615e4a6ba39b39e3df947b2d3e9b59100e8379b8cdfb845eb2899b637a89a09647b777b2143018e5e80
--- a/gnome-extra/nm-applet/files/nm-applet-0.8.4-utils-libm.patch
+++ b/gnome-extra/nm-applet/files/nm-applet-0.8.4-utils-libm.patch
@ -1,23 +0,0 @@
-From 1c5a5eda712f004bf3266df60d36144466b5f1f2 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 8 Aug 2012 20:38:43 -0400
-Subject: [PATCH] utils: fix linking failure
-
-https://bugs.gentoo.org/show_bug.cgi?id=430360
---
- src/utils/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
-index e152373..da1b0cd 100644
--- a/src/utils/Makefile.am
-+++ b/src/utils/Makefile.am
-@@ -20,4 +20,4 @@ libutils_la_CPPFLAGS = \
- 	-I${top_srcdir}/src/gconf-helpers \
- 	-I${top_srcdir}/src
- 
-libutils_la_LIBADD = $(NMA_LIBS)
-+libutils_la_LIBADD = $(NMA_LIBS) -lm
-- 
-1.7.8.6
-
--- a/gnome-extra/nm-applet/nm-applet-0.8.4.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.8.4.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.4.ebuild,v 1.11 2012/10/26 22:58:18 tetromino Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Gnome applet for NetworkManager."
-HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="bluetooth"
-
-RDEPEND=">=dev-libs/glib-2.16:2
-	>=dev-libs/dbus-glib-0.88
-	>=sys-apps/dbus-1.4.1
-	>=x11-libs/gtk+-2.18:2
-	>=gnome-base/gconf-2.20:2
-	>=x11-libs/libnotify-0.4.3
-	>=gnome-base/gnome-keyring-2.20
-	>=sys-auth/polkit-0.96-r1
-
-	>=net-misc/networkmanager-${PV}
-	net-misc/mobile-broadband-provider-info
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6 )
-	virtual/freedesktop-icon-theme"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-
-	gnome-base/gnome-common"
-# eautoreconf needs gnome-base/gnome-common
-
-pkg_setup () {
-	G2CONF="${G2CONF}
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		$(use_with bluetooth)"
-
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-utils-libm.patch" #430360
-	eautoreconf
-	gnome2_src_prepare
-}
--- a/kde-misc/networkmanagement/Manifest
+++ b/kde-misc/networkmanagement/Manifest
@ -1,2 +1,2 @@
-DIST networkmanagement-0.9.0.4.tar.bz2 1296488 SHA256 520d0592171ce1aa1c54916f408e7f2d1e016da0acefc725f7170b67a292e256 SHA512 43c2984b194230c5c5f738c3d8c8a1b348c3de5e3ad02c34bfb8095c34cd307b8360a2cb66a0bcedf0566c97dea02aa6d905b2e390f65a935c39d1610f5b1cd3 WHIRLPOOL f74064e954ece7ec5166fa0ec3975b02924689d9e288e67174b71849379486247a92502f39cb2cd7963d88d06879a2b8a1adf48ae907a0d94b464654a43166ae
 DIST networkmanagement-0.9.0.5.tar.bz2 1303866 SHA256 aa7a467f1f2a0e1ad22486381284bfb1350d644d5fcf61f8449c475dbec963eb SHA512 e8d7e74a06933f9ae5c7ff7c29a3fcd80dcb6e9055bb72afb24b98457ca095c2902b698a0c303db66ce871a378cbbb3eaca68bee41d43ef2cec3a491ceab302e WHIRLPOOL afe81e0363302dc4ab271651fba024319eeeb2875fe896da8cf0f891cb834a85420118aa9760b2bea4ce2120c7673368f686c4b35a69740ff38b606645be5de4
+DIST networkmanagement-0.9.0.6.tar.bz2 1328455 SHA256 13fd521abd065117b6bd8091b038d0a7f1270defc24ac501fce54f9c491a4a23 SHA512 fc90f2aabbda9fc54a81fbe5d469be8ff834e70ad58aac4b3535f1fd0451b50bca57136d5307028e7ff493b0908e9f75a996205031da0b8c6c8c3c3d4a480eee WHIRLPOOL 8a73df4de75bc6f845ec23b861bdc8ee30fe4d7c37948ad232143767118d9bed49422ce2288728670345cfc5e60f32f15cf1a5cde1ddc3bf65e8d5458bd011cd
--- a/kde-misc/networkmanagement/networkmanagement-0.9.0.6.ebuild
+++ b/kde-misc/networkmanagement/networkmanagement-0.9.0.6.ebuild
@ -1,23 +1,20 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/networkmanagement/networkmanagement-0.9.0.4.ebuild,v 1.3 2012/08/17 09:42:20 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/networkmanagement/networkmanagement-0.9.0.6.ebuild,v 1.1 2012/12/11 12:49:40 kensington Exp $

-EAPI=4
-
-KDE_MINIMAL="4.6"
-KDE_LINGUAS="ar ca cs da de el es et fa fi ga hu it ja km lt nb nds nl nn pl pt
-pt_BR se sk sr sr@latin sr@ijekavian sr@ijekavianlatin sv tr uk zh_TW"
+EAPI=5

+KDE_LINGUAS="ar ca cs da de el es et fa fi fr ga hu it ja kk km lt nb nds nl nn pl
+pt pt_BR se sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_TW"
 KDE_SCM="git"
-EGIT_REPONAME="${PN}"
 inherit kde4-base

 DESCRIPTION="KDE frontend for NetworkManager"
-HOMEPAGE="http://kde.org/"
+HOMEPAGE="http://www.kde.org/"
 [[ ${PV} = 9999* ]] || SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"

 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 SLOT="4"
 IUSE="debug"

--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@ -1,4 +1,4 @@
-DIST postfix-2.10-20121123.tar.gz 3816796 SHA256 2ac901b2c933c5a1fff0a15880096384e3ce6f56a3d406ee9aac6de02e53ad78 SHA512 8f02b5fe4301742d93c6122be7be361bec9c08af75afb1164fa3839f4b50c657da48527c0b55011d362be4503c20f1308257738629ae571a660e6b619cab1f4b WHIRLPOOL c4fae847f73d52c967e96cd0d47bac3f7d9d1311d624a533d84949e92dbb4bd557931766e00f85fec7f8356fb2305491c19d1b6f5b21ec630c96a235226cc904
+DIST postfix-2.10-20121210.tar.gz 3817926 SHA256 985c6a10805f0b63dac42e36f96915435b811c1fa6b60a62a0e30876bfee6867 SHA512 49154b675c758fdc374c8d271cd2e2cdd1bf1bcdd318441cf8c3c868bb26c69c3fc1c58034f0efbf8923fcaa0e848d6ed58819b11b376255bb7b6cd1823cbcd2 WHIRLPOOL f64071c1da92e94318d653792f77d87cce38158234baa97b5778ebc99e9c67151183975c073fbe20bba772e33277fd637f21c436753b925380e439ec79ff70cc
 DIST postfix-2.8.12.tar.gz 3641269 SHA256 f46b0117cab52e862b12869810327e2bd248a60f209079a875818ee2653de087 SHA512 55141e75da43b13975f85af636dceeed7783440fb5f7b83642e5a146d8a06af3a847beff77fe0dd495c58c7caed492dbb2dc52f542f44b9388f2ded30e37acee WHIRLPOOL 1d3c454fc938546c74b666feb109229a71b4e55d72c6f3833a15a81ec8eb3b48e318df69611fe4c40ac970332a8fcdfe98fa235863ae44bdf952b2b74537100c
 DIST postfix-2.8.9.tar.gz 3648498 SHA256 6a63bafad1002abbab2d2592a40dc4b3e35defd97f2026d6ccc398e5d7ee9bf3 SHA512 74c3735e8e701f223c2730345fb3d2876e839579d431d21c9b5ae870eac06c17978e2071dd31e3e08f947d2a20281e644af011749407f9bd7afaf53ce278ca6a WHIRLPOOL 1809ece94697c7ae6a8e9dfaf3a89ddc7e1f2e049e51d02f6772f554b4af5040cc07538886ec32491cc40b57c17e03e32663ef3f811324f7a2a0cbe926ff7c8a
 DIST postfix-2.9.4.tar.gz 3760718 SHA256 58343afcc727594cc1f9a3980562d8199aa55fc2cf2330da6b9ddfbf31502679 SHA512 f8932ae510805261b4a6c204bd4bba41d50e1833f87326b986ef174b51eb695cf0588d7d98850bb7b83ba56f1257406da072c423cc768f68d3723daf645b9490 WHIRLPOOL 7d7d619e0fa8375f1b653b9e1a0a2fa723929ab87db05445f2c2a73c213e91476d202806a439dd9792499e6a4d43c86f84133e90ffbd3bc9828ba1a925d8d11c
--- a/mail-mta/postfix/postfix-2.10_pre20121210.ebuild
+++ b/mail-mta/postfix/postfix-2.10_pre20121210.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/mail-mta/postfix/postfix-2.10_pre20121123.ebuild,v 1.1 2012/11/27 19:59:36 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10_pre20121210.ebuild,v 1.1 2012/12/11 11:04:28 eras Exp $

 EAPI=4
 inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user versionator
--- a/media-gfx/argyllcms/argyllcms-1.4.0-r1.ebuild
+++ b/media-gfx/argyllcms/argyllcms-1.4.0-r1.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/argyllcms-1.4.0-r1.ebuild,v 1.3 2012/12/03 11:08:36 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/argyllcms-1.4.0-r1.ebuild,v 1.5 2012/12/11 16:10:46 axs Exp $

 EAPI=5

-inherit base toolchain-funcs
+inherit base udev toolchain-funcs

 MY_P="Argyll_V${PV}"
 DESCRIPTION="Open source, ICC compatible color management system"
@ -72,10 +72,7 @@ src_install() {
 	insinto /usr/share/${PN}/ref
 	doins   ref/*

-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	insinto "${udevdir}"/rules.d
-	doins libusb/55-Argyll.rules
+	udev_dorules libusb/55-Argyll.rules
 }

 pkg_postinst() {
--- a/media-gfx/argyllcms/argyllcms-1.4.0.ebuild
+++ b/media-gfx/argyllcms/argyllcms-1.4.0.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/argyllcms-1.4.0.ebuild,v 1.4 2012/10/13 11:00:14 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/argyllcms-1.4.0.ebuild,v 1.6 2012/12/11 16:10:46 axs Exp $

 EAPI=4

-inherit base toolchain-funcs
+inherit base udev toolchain-funcs

 MY_P="Argyll_V${PV}"
 DESCRIPTION="Open source, ICC compatible color management system"
@ -71,10 +71,7 @@ src_install() {
 	insinto /usr/share/${PN}/ref
 	doins   ref/*

-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	insinto "${udevdir}"/rules.d
-	doins libusb/55-Argyll.rules
+	udev_dorules libusb/55-Argyll.rules
 }

 pkg_postinst() {
--- a/media-gfx/enblend/enblend-4.1.ebuild
+++ b/media-gfx/enblend/enblend-4.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/media-gfx/enblend/enblend-4.1.ebuild,v 1.1 2012/12/09 16:26:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.ebuild,v 1.2 2012/12/11 22:33:45 maekke Exp $

 EAPI=2

@ -24,6 +24,7 @@ RDEPEND="
 	media-libs/plotutils[X]
 	media-libs/tiff
 	>=media-libs/vigra-1.8.0
+	sci-libs/gsl
 	virtual/jpeg
 	gpu? ( media-libs/freeglut )
 	openexr? ( >=media-libs/openexr-1.0 )"
--- a/media-gfx/potrace/Manifest
+++ b/media-gfx/potrace/Manifest
@ -1 +1 @@
-DIST potrace-1.10.tar.gz 617866 SHA256 5ace5b470866ba914def16a1cbc09d10b37bf93f22ff704769d25f573d32f8ed
+DIST potrace-1.10.tar.gz 617866 SHA256 5ace5b470866ba914def16a1cbc09d10b37bf93f22ff704769d25f573d32f8ed SHA512 f9793fb562ff2e8fd99dd37015bc797372e515041fb26aaaaea6121e29e166d6a32dea3a98d0c2069ddbbd5ff465988724495519c641646814251bbaae265f74 WHIRLPOOL 2f19bd0c20a0a6dfe83aa6234eb88707cb1d52bdc70e92bc47a10a7e8b071e3df7c4121ff63f9c38a2b2ee1c1dc920b2aee64f72bd0e9a66adb258b1e6591958
--- a/media-gfx/potrace/potrace-1.10-r1.ebuild
+++ b/media-gfx/potrace/potrace-1.10-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/media-gfx/potrace/potrace-1.10-r1.ebuild,v 1.13 2012/05/26 18:54:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/potrace/potrace-1.10-r1.ebuild,v 1.14 2012/12/11 17:50:01 ago Exp $

 EAPI="4"

@ -12,7 +12,7 @@ SRC_URI="http://potrace.sourceforge.net/download/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="metric static-libs"

 RDEPEND="sys-libs/zlib"
--- a/media-gfx/sane-backends/sane-backends-1.0.23.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.23.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.23.ebuild,v 1.2 2012/10/08 17:16:29 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.23.ebuild,v 1.4 2012/12/11 16:13:31 axs Exp $

 EAPI="4"

-inherit eutils flag-o-matic multilib user
+inherit eutils flag-o-matic multilib udev user

 # gphoto and v4l are handled by their usual USE flags.
 # The pint backend was disabled because I could not get it to compile.
@ -245,10 +245,7 @@ src_install () {
 		doexe tools/hotplug/libusbscanner
 		newdoc tools/hotplug/README README.hotplug
 	fi
-	local udevdir="/lib/udev"
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	insinto "${udevdir}"/rules.d
-	newins tools/udev/libsane.rules 41-libsane.rules
+	udev_newrules tools/udev/libsane.rules 41-libsane.rules
 	insinto "/usr/share/pkgconfig"
 	doins tools/sane-backends.pc

--- a/media-gfx/shotwell/shotwell-0.12.3.ebuild
+++ b/media-gfx/shotwell/shotwell-0.12.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/media-gfx/shotwell/shotwell-0.12.3.ebuild,v 1.3 2012/11/13 19:06:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.12.3.ebuild,v 1.4 2012/12/11 11:15:25 ssuominen Exp $

 EAPI=4
 GCONF_DEBUG="no"
@ -41,7 +41,7 @@ RDEPEND="
 	>=net-libs/libsoup-2.26.0:2.4
 	net-libs/rest:0.7
 	net-libs/webkit-gtk:3
-	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
+	virtual/udev[gudev]
 	x11-libs/gtk+:3"
 DEPEND="${RDEPEND}
 	dev-lang/vala:0.16
--- a/media-gfx/shotwell/shotwell-0.13.1.ebuild
+++ b/media-gfx/shotwell/shotwell-0.13.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/media-gfx/shotwell/shotwell-0.13.1.ebuild,v 1.2 2012/11/13 19:06:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.13.1.ebuild,v 1.3 2012/12/11 11:15:25 ssuominen Exp $

 EAPI=4
 GCONF_DEBUG="no"
@ -43,7 +43,7 @@ RDEPEND="
 	>=net-libs/libsoup-2.26.0:2.4
 	net-libs/rest:0.7
 	net-libs/webkit-gtk:3
-	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
+	virtual/udev[gudev]
 	x11-libs/gtk+:3"
 DEPEND="${RDEPEND}
 	$(vala_depend)
--- a/media-gfx/simple-scan/simple-scan-2.32.0.2.ebuild
+++ b/media-gfx/simple-scan/simple-scan-2.32.0.2.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/media-gfx/simple-scan/simple-scan-2.32.0.2.ebuild,v 1.6 2012/07/17 06:37:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/simple-scan-2.32.0.2.ebuild,v 1.7 2012/12/11 11:14:21 ssuominen Exp $

 EAPI=3

@ -23,7 +23,7 @@ COMMON_DEPEND="
 	gnome-base/gconf:2
 	>=media-gfx/sane-backends-1.0.20
 	virtual/jpeg
-	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
+	virtual/udev[gudev]
 	>=sys-libs/zlib-1.2.3.1
 	x11-libs/cairo"
 RDEPEND="${COMMON_DEPEND}
--- a/media-gfx/simple-scan/simple-scan-3.2.1.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.2.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/media-gfx/simple-scan/simple-scan-3.2.1.ebuild,v 1.6 2012/07/17 06:53:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/simple-scan-3.2.1.ebuild,v 1.7 2012/12/11 11:14:21 ssuominen Exp $

 EAPI="4"

@ -21,7 +21,7 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.28:2
 	>=media-gfx/sane-backends-1.0.20
 	virtual/jpeg
-	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
+	virtual/udev[gudev]
 	>=sys-libs/zlib-1.2.3.1
 	x11-libs/cairo
 	>=x11-libs/gtk+-3:3
--- a/media-gfx/simple-scan/simple-scan-3.4.2.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.4.2.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/media-gfx/simple-scan/simple-scan-3.4.2.ebuild,v 1.3 2012/10/04 14:56:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/simple-scan-3.4.2.ebuild,v 1.4 2012/12/11 11:14:21 ssuominen Exp $

 EAPI="4"

@ -21,7 +21,7 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.28:2
 	>=media-gfx/sane-backends-1.0.20
 	virtual/jpeg
-	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
+	virtual/udev[gudev]
 	>=sys-libs/zlib-1.2.3.1
 	x11-libs/cairo
 	>=x11-libs/gtk+-3:3
--- a/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.4.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/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild,v 1.19 2012/05/05 07:00:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild,v 1.20 2012/12/11 14:50:49 axs Exp $

 EAPI="2"

@ -199,7 +199,7 @@ pkg_preinst() {
 }

 pkg_postinst() {
-	if has_version sys-fs/devfsd || ! has_version sys-fs/udev ; then
+	if has_version sys-fs/devfsd || ! has_version virtual/udev ; then
 		elog "This package has been designed with udev in mind. Other solutions, such as"
 		elog "devfs or a static /dev tree might work, but are generally discouraged and"
 		elog "not supported. If you decide to switch to udev, you might want to have a"
--- a/media-gfx/splashutils/splashutils-1.5.4.4-r1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.4.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/media-gfx/splashutils/splashutils-1.5.4.4-r1.ebuild,v 1.5 2012/12/07 19:44:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4-r1.ebuild,v 1.6 2012/12/11 14:50:49 axs Exp $

 EAPI="2"

@ -186,7 +186,7 @@ pkg_preinst() {
 }

 pkg_postinst() {
-	if has_version sys-fs/devfsd || ! has_version sys-fs/udev ; then
+	if has_version sys-fs/devfsd || ! has_version virtual/udev ; then
 		elog "This package has been designed with udev in mind. Other solutions, such as"
 		elog "devfs or a static /dev tree might work, but are generally discouraged and"
 		elog "not supported. If you decide to switch to udev, you might want to have a"
--- a/media-gfx/splashutils/splashutils-1.5.4.4-r2.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.4.4-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/media-gfx/splashutils/splashutils-1.5.4.4-r2.ebuild,v 1.1 2012/10/26 20:29:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4-r2.ebuild,v 1.2 2012/12/11 14:50:49 axs Exp $

 EAPI=4

@ -188,7 +188,7 @@ pkg_preinst() {
 }

 pkg_postinst() {
-	if has_version sys-fs/devfsd || ! has_version sys-fs/udev ; then
+	if has_version sys-fs/devfsd || ! has_version virtual/udev ; then
 		elog "This package has been designed with udev in mind. Other solutions, such as"
 		elog "devfs or a static /dev tree might work, but are generally discouraged and"
 		elog "not supported. If you decide to switch to udev, you might want to have a"
--- a/media-gfx/splashutils/splashutils-1.5.4.4.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.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/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v 1.9 2012/05/05 07:00:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v 1.10 2012/12/11 14:50:49 axs Exp $

 EAPI="2"

@ -184,7 +184,7 @@ pkg_preinst() {
 }

 pkg_postinst() {
-	if has_version sys-fs/devfsd || ! has_version sys-fs/udev ; then
+	if has_version sys-fs/devfsd || ! has_version virtual/udev ; then
 		elog "This package has been designed with udev in mind. Other solutions, such as"
 		elog "devfs or a static /dev tree might work, but are generally discouraged and"
 		elog "not supported. If you decide to switch to udev, you might want to have a"
--- a/media-libs/libgphoto2/libgphoto2-2.4.14-r1.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.4.14-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/media-libs/libgphoto2/libgphoto2-2.4.14-r1.ebuild,v 1.1 2012/09/04 15:40:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.14-r1.ebuild,v 1.2 2012/12/11 16:25:46 axs Exp $

 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@ -8,7 +8,7 @@

 EAPI="4"

-inherit autotools eutils multilib user toolchain-funcs
+inherit autotools eutils multilib udev user toolchain-funcs

 DESCRIPTION="Library that implements support for numerous digital cameras"
 HOMEPAGE="http://www.gphoto.org/"
@ -122,9 +122,6 @@ src_configure() {
 		einfo "Enabled camera drivers: all"
 	fi

-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-
 	local myconf
 	use doc || myconf="ac_cv_path_DOXYGEN=false"
 	econf \
@ -141,7 +138,7 @@ src_configure() {
 		--with-html-dir=/usr/share/doc/${PF}/html \
 		--with-hotplug-doc-dir=/usr/share/doc/${PF}/hotplug \
 		--with-rpmbuild=$(type -P true) \
-		udevscriptdir="${udevdir}" \
+		udevscriptdir="$(udev_get_udevdir)" \
 		${myconf}

 # FIXME: gtk-doc is currently broken
@ -177,10 +174,7 @@ src_install() {
 	fi
 	# end fixup

-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-
-	UDEV_RULES="${udevdir}/rules.d/70-libgphoto2.rules"
+	UDEV_RULES="$(udev_get_udevdir)/rules.d/70-libgphoto2.rules"
 	CAM_LIST="/usr/$(get_libdir)/libgphoto2/print-camera-list"

 	if [ -x "${D}"${CAM_LIST} ]; then
--- a/media-libs/libmtp/libmtp-1.1.4.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.4.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-1.1.4.ebuild,v 1.5 2012/09/20 11:35:30 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-1.1.4.ebuild,v 1.6 2012/12/11 16:29:23 axs Exp $

 EAPI=4

-inherit autotools eutils user toolchain-funcs
+inherit autotools eutils udev user toolchain-funcs

 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
@ -41,14 +41,11 @@ src_prepare() {
 }

 src_configure() {
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable doc doxygen) \
 		$(use_enable crypt mtpz) \
-		--with-udev="${udevdir}" \
+		--with-udev="$(udev_get_udevdir)" \
 		--with-udev-group=plugdev \
 		--with-udev-mode=0660
 }
--- a/media-libs/libmtp/libmtp-1.1.5.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.5.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-1.1.5.ebuild,v 1.6 2012/11/20 20:06:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-1.1.5.ebuild,v 1.7 2012/12/11 16:29:23 axs Exp $

 EAPI=4

-inherit autotools eutils user toolchain-funcs
+inherit autotools eutils udev user toolchain-funcs

 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
@ -41,14 +41,11 @@ src_prepare() {
 }

 src_configure() {
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable doc doxygen) \
 		$(use_enable crypt mtpz) \
-		--with-udev="${udevdir}" \
+		--with-udev="$(udev_get_udevdir)" \
 		--with-udev-group=plugdev \
 		--with-udev-mode=0660
 }
--- a/media-libs/libmtp/libmtp-9999.ebuild
+++ b/media-libs/libmtp/libmtp-9999.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-9999.ebuild,v 1.5 2012/08/23 10:56:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-9999.ebuild,v 1.6 2012/12/11 16:29:23 axs Exp $

 EAPI=4

-inherit autotools eutils user toolchain-funcs
+inherit autotools eutils udev user toolchain-funcs

 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
@ -41,14 +41,11 @@ src_prepare() {
 }

 src_configure() {
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable doc doxygen) \
 		$(use_enable crypt mtpz) \
-		--with-udev="${udevdir}" \
+		--with-udev="$(udev_get_udevdir)" \
 		--with-udev-group=plugdev \
 		--with-udev-mode=0660
 }
--- a/media-libs/libnjb/Manifest
+++ b/media-libs/libnjb/Manifest
@ -1,2 +1,2 @@
-DIST libnjb-2.2.6.tar.gz 504329 RMD160 9a81674daa7b0163682ef7bc40cc852c7b69ea8d SHA1 339c24b1c007d914d2d4969315a3e128603a046a SHA256 c6eabf1fd3d32af6d3707574e1891919b25c3af35cadfc093456c00bccf3826e
-DIST libnjb-2.2.7.tar.gz 497862 RMD160 2772db533bc05575fa1bb6df84037925ecbb016c SHA1 7acd42b4e3e6edf8d48fcd758eb21ad0eb4aee38 SHA256 ccbcfc870bdc10ad7a144f81a340b61bad74a6f00f77cf08db5866332668d2b6
+DIST libnjb-2.2.6.tar.gz 504329 SHA256 c6eabf1fd3d32af6d3707574e1891919b25c3af35cadfc093456c00bccf3826e
+DIST libnjb-2.2.7.tar.gz 497862 SHA256 ccbcfc870bdc10ad7a144f81a340b61bad74a6f00f77cf08db5866332668d2b6
--- a/media-libs/libnjb/libnjb-2.2.6.ebuild
+++ b/media-libs/libnjb/libnjb-2.2.6.ebuild
@ -1,9 +1,9 @@
-# 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/media-libs/libnjb/libnjb-2.2.6.ebuild,v 1.8 2011/03/25 15:46:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/libnjb-2.2.6.ebuild,v 1.9 2012/12/11 21:53:18 ssuominen Exp $

 EAPI=2
-inherit libtool multilib
+inherit libtool multilib udev

 DESCRIPTION="a C library and API for communicating with the Creative Nomad JukeBox digital audio player."
 HOMEPAGE="http://libnjb.sourceforge.net"
@ -36,8 +36,7 @@ src_install() {

 	dodoc AUTHORS ChangeLog* FAQ HACKING README

-	insinto /$(get_libdir)/udev/rules.d
-	newins "${FILESDIR}"/${PN}.rules 80-${PN}.rules
+	udev_newrules "${FILESDIR}"/${PN}.rules 80-${PN}.rules

 	find "${D}" -name '*.la' -exec rm -f {} +
 }
--- a/media-libs/libnjb/libnjb-2.2.7.ebuild
+++ b/media-libs/libnjb/libnjb-2.2.7.ebuild
@ -1,9 +1,9 @@
-# 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/media-libs/libnjb/libnjb-2.2.7.ebuild,v 1.1 2011/07/05 20:42:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/libnjb-2.2.7.ebuild,v 1.2 2012/12/11 21:53:18 ssuominen Exp $

 EAPI=4
-inherit libtool multilib
+inherit libtool multilib udev

 DESCRIPTION="a C library and API for communicating with the Creative Nomad JukeBox digital audio player."
 HOMEPAGE="http://libnjb.sourceforge.net"
@ -38,8 +38,7 @@ src_configure() {
 src_install() {
 	default

-	insinto /$(get_libdir)/udev/rules.d
-	newins "${FILESDIR}"/${PN}.rules 80-${PN}.rules
+	udev_newrules "${FILESDIR}"/${PN}.rules 80-${PN}.rules

 	find "${ED}" -name '*.la' -exec rm -f {} +
 }
--- a/media-libs/libv4l/libv4l-0.8.9.ebuild
+++ b/media-libs/libv4l/libv4l-0.8.9.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/media-libs/libv4l/libv4l-0.8.9.ebuild,v 1.2 2012/12/10 12:04:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-0.8.9.ebuild,v 1.3 2012/12/11 17:25:57 nimiux Exp $

 EAPI=4
 inherit eutils linux-info multilib toolchain-funcs
@ -13,7 +13,7 @@ SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"

 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""

 RDEPEND="virtual/jpeg"
--- a/media-libs/lilv/lilv-0.14.4.ebuild
+++ b/media-libs/lilv/lilv-0.14.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/media-libs/lilv/lilv-0.14.4.ebuild,v 1.1 2012/08/30 22:26:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lilv/lilv-0.14.4.ebuild,v 1.2 2012/12/11 19:12:49 ago Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"

 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc +dyn-manifest static-libs test"

 RDEPEND="media-libs/lv2
--- a/media-libs/lv2/lv2-1.2.0.ebuild
+++ b/media-libs/lv2/lv2-1.2.0.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/media-libs/lv2/lv2-1.2.0.ebuild,v 1.1 2012/10/15 22:25:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lv2/lv2-1.2.0.ebuild,v 1.2 2012/12/11 19:13:09 ago Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://lv2plug.in/spec/${P}.tar.bz2"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc plugins"

 DEPEND="plugins? ( x11-libs/gtk+:2 media-libs/libsndfile )"
--- a/media-libs/sratom/sratom-0.4.0.ebuild
+++ b/media-libs/sratom/sratom-0.4.0.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/media-libs/sratom/sratom-0.4.0.ebuild,v 1.1 2012/08/30 21:55:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sratom/sratom-0.4.0.ebuild,v 1.2 2012/12/11 19:13:27 ago Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"

 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc static-libs test"

 RDEPEND="media-libs/lv2
--- a/media-plugins/quodlibet-plugins/Manifest
+++ b/media-plugins/quodlibet-plugins/Manifest
@ -1,2 +1,2 @@
-DIST quodlibet-plugins-2.3.92.tar.gz 91692 SHA256 2d1126c0eff5e2069a773128045c4af9edfcdf61898d495b7196743bee3dcc27
+DIST quodlibet-plugins-2.4.91.tar.gz 106690 SHA256 7e02deb4d8b9217b7cf628d00c3c2b40fe1e622672512fc6b96d4f094961a86b SHA512 6ccdd04dac7e021929bcc5b9970f30428b4c1e9ae860325ae3370d76e0dad526b90a157bf1ff1d30adffce8f7abff250248006948edf056c34d9976c1ee60220 WHIRLPOOL 36af1d636b91c10638002997e6990c22b2089e6797babfb0d9091d2ecf191e04213a74625fdbdc96b45e85e52ec2e12b377ba1229f6c6cdc108d63898fa291f6
 DIST quodlibet-plugins-2.4.tar.gz 92116 SHA256 c28186ee5833dc306a44350e6528616e52741d2ed2d48ce0156cb38a581432c0 SHA512 93b2d97af3d66bc396849d3936ea4a1fa869036251f4abd206f5082b0e0fa9dbb36a25f189ae7f6fde59c22076fb2d359579c4bd59d3251e61deb2a67a0e7c11 WHIRLPOOL 275629df879f9868c8c2084780de9447c7a6c899e74d2cd46db0f246040927b4aa6dc14b8c6a5645f87f39056d4bbdad8616d13c29e2ddd534d0d0eb5ac2644f
--- a/media-plugins/quodlibet-plugins/quodlibet-plugins-2.4.91.ebuild
+++ b/media-plugins/quodlibet-plugins/quodlibet-plugins-2.4.91.ebuild
@ -1,12 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/quodlibet-plugins/quodlibet-plugins-2.3.92.ebuild,v 1.4 2012/04/17 09:04:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/quodlibet-plugins/quodlibet-plugins-2.4.91.ebuild,v 1.1 2012/12/11 17:29:53 ssuominen Exp $

-EAPI=4
-
-PYTHON_DEPEND="2:2.7"
-
-inherit python
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit python-r1

 DESCRIPTION="Plugins for Quod Libet and Ex Falso"
 HOMEPAGE="http://code.google.com/p/quodlibet/"
@ -14,30 +12,17 @@ SRC_URI="http://quodlibet.googlecode.com/files/${P}.tar.gz"

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

 RDEPEND=">=media-sound/quodlibet-${PV}"
 DEPEND=""

-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_prepare() {
 	rm -f README || die
 }

 src_install() {
-	insinto "$(python_get_sitedir)"/quodlibet/plugins
-	doins -r *
-}
-
-pkg_postinst() {
-	python_mod_optimize quodlibet/plugins
-}
-
-pkg_postrm() {
-	python_mod_cleanup quodlibet/plugins
+	local python_moduleroot=quodlibet/plugins
+	python_foreach_impl python_domodule .
 }
--- a/Show more
+++ b/Show more