Sync with portage [Wed Dec 18 16:45:07 MSK 2013].

11 years ago · cf5e483da2
parent f62e6896d2
commit cf5e483da2
234 changed files with 3251 additions and 3773 deletions
--- a/app-admin/equo/Manifest
+++ b/app-admin/equo/Manifest
@ -1 +1 @@
-DIST entropy-216.tar.bz2 18429942 SHA256 c2569d7233b80b9373cde11645e6e9c4142038387ad4aa8943ed1ddfeb86f501 SHA512 8b6a19f311520ca48a998aadb10717f5ad81eb8c26b71c1f8a8b67f84fd9876117adf650eb4fa59893130fd3db669ba370804a33311fe7eff45546a5a92e6b7d WHIRLPOOL b220b870f099cfe014ad355760855dc91bbc11c76f39b34e03ec251e1f8f9bdf04bb4f1dd0ad9e0c5e63a4328f6c9691abd4f9e759b8546fac7026386b4c174b
+DIST entropy-254.tar.bz2 18516662 SHA256 5e411472eaf7016a68a4aa81ef92dd3aad8403fc65a0ffb09c57b91c959ca3a6 SHA512 3b3e82abad8008720e370b7892b7be1c48aaa6605914db977f68b9a108ada0a4adbaa5b7b50a9a02ba9c8b0bdefadcda1eceee2c7c2abc385b3daf669649e2da WHIRLPOOL 593469b858707e4ceca56146fa1d608141e44dda0a0921ed6a3ec566878c1e3c153410233f088d57db4f8bd9d1c796bd945cbea3ba455572efc05eca42023ce5
--- a/app-admin/equo/equo-254.ebuild
+++ b/app-admin/equo/equo-254.ebuild
@ -1,10 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/equo/equo-216.ebuild,v 1.1 2013/08/22 11:12:11 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/equo/equo-254.ebuild,v 1.2 2013/12/18 09:27:33 patrick Exp $

-EAPI=3
-PYTHON_DEPEND="2"
-inherit eutils python bash-completion-r1
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 bash-completion-r1

 DESCRIPTION="Entropy Package Manager text-based client"
 HOMEPAGE="http://www.sabayon.org"
@ -17,9 +19,12 @@ SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"

 S="${WORKDIR}/entropy-${PV}"

-DEPEND="~sys-apps/entropy-${PV}"
+DEPEND="${PYTHON_DEPS}
+	~sys-apps/entropy-${PV}[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND} sys-apps/file[python]"

+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 src_compile() {
 	cd "${S}"/client || die
 	emake || die "make failed"
@ -29,17 +34,6 @@ src_install() {
 	cd "${S}"/client || die
 	emake DESTDIR="${D}" LIBDIR="usr/lib" install || die "make install failed"
 	newbashcomp "${S}/misc/equo-completion.bash" equo
-}
-
-pkg_postinst() {
-	python_mod_optimize "/usr/lib/entropy/client"
-	echo
-	elog "If you would like to allow users in the 'entropy' group"
-	elog "to update available package repositories, please consider"
-	elog "to install sys-apps/rigo-daemon"
-	echo
-}

-pkg_postrm() {
-	python_mod_cleanup "/usr/lib/entropy/client"
+	python_optimize "${D}/usr/lib/entropy/client"
 }
--- a/app-admin/matter/Manifest
+++ b/app-admin/matter/Manifest
@ -1 +1 @@
-DIST entropy-216.tar.bz2 18429942 SHA256 c2569d7233b80b9373cde11645e6e9c4142038387ad4aa8943ed1ddfeb86f501 SHA512 8b6a19f311520ca48a998aadb10717f5ad81eb8c26b71c1f8a8b67f84fd9876117adf650eb4fa59893130fd3db669ba370804a33311fe7eff45546a5a92e6b7d WHIRLPOOL b220b870f099cfe014ad355760855dc91bbc11c76f39b34e03ec251e1f8f9bdf04bb4f1dd0ad9e0c5e63a4328f6c9691abd4f9e759b8546fac7026386b4c174b
+DIST entropy-254.tar.bz2 18516662 SHA256 5e411472eaf7016a68a4aa81ef92dd3aad8403fc65a0ffb09c57b91c959ca3a6 SHA512 3b3e82abad8008720e370b7892b7be1c48aaa6605914db977f68b9a108ada0a4adbaa5b7b50a9a02ba9c8b0bdefadcda1eceee2c7c2abc385b3daf669649e2da WHIRLPOOL 593469b858707e4ceca56146fa1d608141e44dda0a0921ed6a3ec566878c1e3c153410233f088d57db4f8bd9d1c796bd945cbea3ba455572efc05eca42023ce5
--- a/app-admin/matter/matter-254.ebuild
+++ b/app-admin/matter/matter-254.ebuild
@ -1,10 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/matter/matter-216.ebuild,v 1.1 2013/08/22 11:12:47 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/matter/matter-254.ebuild,v 1.1 2013/12/18 05:04:03 lxnay Exp $

-EAPI=3
-PYTHON_DEPEND="2"
-inherit eutils python bash-completion-r1
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 bash-completion-r1

 DESCRIPTION="Automated Packages Builder for Portage and Entropy"
 HOMEPAGE="http://www.sabayon.org"
@ -18,8 +20,11 @@ SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
 S="${WORKDIR}/entropy-${PV}/${PN}"

 DEPEND=""
-RDEPEND="entropy? ( ~sys-apps/entropy-${PV} )
-	sys-apps/file[python]"
+RDEPEND="entropy? ( ~sys-apps/entropy-${PV}[${PYTHON_USEDEP}] )
+	sys-apps/file[python]
+	${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"

 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
@ -27,12 +32,6 @@ src_install() {
 	if use entropy; then
 		emake DESTDIR="${D}" entropysrv-install || die "make base-install failed"
 	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize "/usr/lib/matter"
-}

-pkg_postrm() {
-	python_mod_cleanup "/usr/lib/matter"
+	python_optimize "${D}/usr/lib/matter"
 }
--- a/app-admin/packagekit-base/Manifest
+++ b/app-admin/packagekit-base/Manifest
@ -1,2 +1,2 @@
-DIST PackageKit-0.6.22.tar.xz 7886160 SHA256 b9f71721b0b16e106c0a1ce28c97b2277a34b0c15d1a171f4898f34117ebaa2d SHA512 965647e0016f6ffc21084722393bd71464d1e18c939be49414dbdcb3eec6d89115690f8b30bd6648e2f297c72cccc35ec8600377453a51e8b28b4f4b055dca85 WHIRLPOOL 013520e1e0ae821ec1c0a6f908a1e71a8521663ac44b2c1921ff8351390804d629f5e133229dc6db1086e69784324a5da0d82c522ff874ddd9e6b67c2bf72a77
 DIST PackageKit-0.7.4.tar.xz 1493656 SHA256 4112c86d67afbbb9be5d3a706c63c537babbbe1f96e398ae306f5e5e02563a98 SHA512 a2cee60f499ec6c5359f3dc2eddda02cfb9c287f80a6b38aa1d9d87558ce5938ade87ab34f6cb1f9640749a0f19625b44c89f72dea5fbb0cbd5f34aec8dbb9f6 WHIRLPOOL 2827cb038c86164ae58021fafe9f2bbf21e69b5c63c4ef5e0f613806f5725f910af3d5aa51646fd258da9c91b81b086cf9560f66bf042e1cb6d1c25128f984b3
+DIST PackageKit-0.8.15.tar.xz 1506084 SHA256 76aa44994d63b403b1f1154406539951502f5ab92624a8a7dedbeb5437ed0af5 SHA512 d6a1a4582212b02350b8a5ab8413346b0b33a49d329d3c5c4314e3db0c7c40b891d64d275c3acd8eafc45a59462b537cd031919027db2176502861271ce34a02 WHIRLPOOL bcc75e8a05b5616fbec1a2772af53ae51cf8c44a9feda4ca9cff4567f274aed62d3cf01751ab89834f423b77a74dcc1445c32390c323a46bb4340cde568760ce
--- a/app-admin/packagekit-base/files/0001-entropy-PackageKitEntropyClient.output-API-update.patch
+++ b/app-admin/packagekit-base/files/0001-entropy-PackageKitEntropyClient.output-API-update.patch
@ -0,0 +1,26 @@
+From ee2dfacb275e8145c7ae1ba8da86779054adf902 Mon Sep 17 00:00:00 2001
+From: Fabio Erculiani <lxnay@sabayon.org>
+Date: Fri, 6 Dec 2013 07:40:15 +0100
+Subject: [PATCH] entropy: PackageKitEntropyClient.output API update
+
+---
+ backends/entropy/entropyBackend.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/backends/entropy/entropyBackend.py b/backends/entropy/entropyBackend.py
+index 57b6c59..bec8ef6 100755
+--- a/backends/entropy/entropyBackend.py
+++ b/backends/entropy/entropyBackend.py
+@@ -776,7 +776,8 @@ class PackageKitEntropyClient(Client):
+     def init_singleton(self):
+         Client.init_singleton(self, url_fetcher = PkUrlFetcher)
+ 
+-    def output(self, text, header = "", footer = "", back = False,
+    @classmethod
+    def output(cls, text, header = "", footer = "", back = False,
+         importance = 0, level = "info", count = None, percent = False):
+         """
+         Reimplemented from entropy.output.TextInterface.
+-- 
+1.8.4.4
+
--- a/app-admin/packagekit-base/files/packagekit-base-0.6.22-npapi-sdk.patch
+++ b/app-admin/packagekit-base/files/packagekit-base-0.6.22-npapi-sdk.patch
@ -1,74 +0,0 @@
--- PackageKit-0.6.22.orig/configure
-+++ PackageKit-0.6.22/configure
-@@ -20504,7 +20504,7 @@ if test -n "$PK_BROWSER_PLUGIN_CFLAGS";
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
-			  mozilla-plugin >= 8.0	\\
-+			  npapi-sdk		\\
- 			  gio-unix-2.0		\\
- 			  nspr >= 4.8		\\
- 			  cairo			\\
-@@ -20512,7 +20512,7 @@ if test -n "$PK_BROWSER_PLUGIN_CFLAGS";
- 			  gtk+-2.0 >= 2.14.0	\\
- 			  dbus-glib-1\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "\
-			  mozilla-plugin >= 8.0	\
-+			  npapi-sdk		\
- 			  gio-unix-2.0		\
- 			  nspr >= 4.8		\
- 			  cairo			\
-@@ -20523,7 +20523,7 @@ if test -n "$PK_BROWSER_PLUGIN_CFLAGS";
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-   pkg_cv_PK_BROWSER_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "\
-			  mozilla-plugin >= 8.0	\
-+			  npapi-sdk		\
- 			  gio-unix-2.0		\
- 			  nspr >= 4.8		\
- 			  cairo			\
-@@ -20541,7 +20541,7 @@ if test -n "$PK_BROWSER_PLUGIN_LIBS"; th
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
-			  mozilla-plugin >= 8.0	\\
-+			  npapi-sdk		\\
- 			  gio-unix-2.0		\\
- 			  nspr >= 4.8		\\
- 			  cairo			\\
-@@ -20549,7 +20549,7 @@ if test -n "$PK_BROWSER_PLUGIN_LIBS"; th
- 			  gtk+-2.0 >= 2.14.0	\\
- 			  dbus-glib-1\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "\
-			  mozilla-plugin >= 8.0	\
-+			  npapi-sdk	\
- 			  gio-unix-2.0		\
- 			  nspr >= 4.8		\
- 			  cairo			\
-@@ -20560,7 +20560,7 @@ if test -n "$PK_BROWSER_PLUGIN_LIBS"; th
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-   pkg_cv_PK_BROWSER_PLUGIN_LIBS=`$PKG_CONFIG --libs "\
-			  mozilla-plugin >= 8.0	\
-+			  npapi-sdk		\
- 			  gio-unix-2.0		\
- 			  nspr >= 4.8		\
- 			  cairo			\
-@@ -20587,7 +20587,7 @@ else
- fi
-         if test $_pkg_short_errors_supported = yes; then
- 	        PK_BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
-			  mozilla-plugin >= 8.0	\
-+			  npapi-sdk		\
- 			  gio-unix-2.0		\
- 			  nspr >= 4.8		\
- 			  cairo			\
-@@ -20596,7 +20596,7 @@ fi
- 			  dbus-glib-1" 2>&1`
-         else
- 	        PK_BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
-			  mozilla-plugin >= 8.0	\
-+			  npapi-sdk		\
- 			  gio-unix-2.0		\
- 			  nspr >= 4.8		\
- 			  cairo			\
--- a/app-admin/packagekit-base/files/packagekit-base-0.8.x-npapi-sdk.patch
+++ b/app-admin/packagekit-base/files/packagekit-base-0.8.x-npapi-sdk.patch
@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 3e8d301..7ba7f4b 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -361,7 +361,7 @@ AC_ARG_ENABLE(browser_plugin, AS_HELP_STRING([--enable-browser-plugin],[Build br
+ 	      enable_browser_plugin=$enableval,enable_browser_plugin=yes)
+ if test x$enable_browser_plugin = xyes; then
+ 	PKG_CHECK_MODULES(PK_BROWSER_PLUGIN,	\
+-			  mozilla-plugin >= 8.0	\
+			  npapi-sdk		\
+ 			  gio-unix-2.0		\
+ 			  nspr >= 4.8		\
+ 			  cairo			\
--- a/app-admin/packagekit-base/metadata.xml
+++ b/app-admin/packagekit-base/metadata.xml
@ -6,6 +6,7 @@
 		<name>Fabio Erculiani</name>
 	</maintainer>
 	<use>
+		<flag name="command-not-found">Enable packagekit support on shell "command not found"</flag>
 		<flag name="cron">Install cron script for auto-update</flag>
 		<flag name="entropy">
 			Enable Entropy backend
--- a/app-admin/packagekit-base/packagekit-base-0.6.22.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-0.6.22.ebuild
@ -1,186 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/packagekit-base-0.6.22.ebuild,v 1.5 2012/12/31 18:23:37 ago Exp $
-
-EAPI="3"
-
-# 0.6.x doesn't work with Python 3.x
-PYTHON_DEPEND="2"
-
-inherit eutils multilib python nsplugins bash-completion-r1
-
-MY_PN="PackageKit"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API"
-HOMEPAGE="http://www.packagekit.org/"
-SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="connman cron doc +introspection networkmanager nsplugin pm-utils +policykit entropy static-libs test udev"
-
-CDEPEND="connman? ( net-misc/connman )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
-	networkmanager? ( >=net-misc/networkmanager-0.6.4 )
-	nsplugin? (
-		dev-libs/nspr
-		x11-libs/cairo
-		>=x11-libs/gtk+-2.14.0:2
-		x11-libs/pango
-	)
-	policykit? ( >=sys-auth/polkit-0.94 )
-	udev? ( virtual/udev[gudev] )
-	dev-db/sqlite:3
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.16.1:2
-	>=sys-apps/dbus-1.3.0"
-DEPEND="${CDEPEND}
-	doc? ( dev-util/gtk-doc )
-	nsplugin? ( <net-misc/npapi-sdk-0.27.1 )
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-RDEPEND="${CDEPEND}
-	entropy? ( >=sys-apps/entropy-1.0_rc27 )
-	pm-utils? ( sys-power/pm-utils )
-	>=app-portage/layman-1.2.3
-	>=sys-apps/portage-2.1.9
-	sys-auth/consolekit"
-
-APP_LINGUAS="as bg bn ca cs da de el en_GB es fi fr gu he hi hu it ja kn ko ml mr
-ms nb nl or pa pl pt pt_BR ro ru sk sr sr@latin sv ta te th tr uk zh_CN zh_TW"
-for X in ${APP_LINGUAS}; do
-	IUSE=" ${IUSE} linguas_${X}"
-done
-
-S="${WORKDIR}/${MY_P}"
-RESTRICT="test" # tests are failing atm
-
-# NOTES:
-# do not use a specific user, useless and not more secure according to upstream
-# doc is in the tarball and always installed
-# mono doesn't install anything (RDEPEND dev-dotnet/gtk-sharp-gapi:2
-#	(R)DEPEND dev-dotnet/glib-sharp:2 dev-lang/mono), upstream bug 23247
-# >=npapi-sdk-0.27.1 has slightly changed API, once it is unmasked in tree
-# drop the npapi-api-change patch below and relax the dependency constraints
-
-# UPSTREAM:
-# documentation/website with --enable-doc-install
-# failing tests
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.6.22-npapi-sdk.patch #383141
-	epatch "${FILESDIR}"/${PN}-0.7.x-npapi-api-change.patch #416711
-}
-
-src_configure() {
-	local myconf=""
-
-	if use policykit; then
-		myconf+=" --with-security-framework=polkit"
-	else
-		myconf+=" --with-security-framework=dummy"
-	fi
-
-	if [[ -z "${LINGUAS}" ]]; then
-		myconf+=" --disable-nls"
-	else
-		myconf+=" --enable-nls"
-	fi
-
-	# localstatedir: for gentoo it's /var/lib but for $PN it's /var
-	# dep-tracking,option-check,libtool-lock,strict,local: obvious reasons
-	# command,debuginfo,gstreamer,service-packs: not supported by backend
-
-	# NOTE: default backend is autodetected at runtime, also
-	if use entropy; then
-		myconf+=" --with-default-backend=entropy"
-	else
-		myconf+=" --with-default-backend=portage"
-	fi
-	econf \
-		${myconf} \
-		--enable-introspection=no \
-		--localstatedir=/var \
-		--disable-dependency-tracking \
-		--enable-option-checking \
-		--enable-libtool-lock \
-		--disable-strict \
-		--disable-local \
-		$(use_enable doc gtk-doc) \
-		$(use_enable bash-completion command-not-found) \
-		--disable-debuginfo-install \
-		--disable-gstreamer-plugin \
-		--disable-service-packs \
-		--enable-man-pages \
-		--enable-portage \
-		$(use_enable entropy) \
-		$(use_enable cron) \
-		--disable-gtk-module \
-		$(use_enable introspection) \
-		$(use_enable networkmanager) \
-		$(use_enable connman) \
-		$(use_enable nsplugin browser-plugin) \
-		$(use_enable pm-utils) \
-		--disable-qt \
-		$(use_enable static-libs static) \
-		$(use_enable test tests) \
-		$(use_enable udev device-rebind)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS MAINTAINERS NEWS README TODO || die "dodoc failed"
-	dodoc ChangeLog || die "dodoc failed"
-
-	if use nsplugin; then
-		dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
-		mv "${D}"/usr/$(get_libdir)/mozilla/plugins/* \
-			"${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
-	fi
-
-	if ! use static-libs; then
-		find "${D}" -name *.la | xargs rm || die "removing .la files failed"
-	fi
-
-	# Remove precompiled python modules, we handle byte compiling
-	rm -f "${D}/$(python_get_sitedir)"/${PN}*.py[co]
-
-	newbashcomp "${S}/contrib/pk-completion.bash" ${PN}
-	# Remove bashcomp file installed by build-system
-	rm -f "${D}/bash_completion.d/pk-completion.bash"
-
-	# Remove unwanted PackageKit website stuff
-	rm -rf "${D}/usr/share/PackageKit/website"
-
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN/-base}
-
-	if ! use policykit; then
-		ewarn "You are not using policykit, the daemon can't be considered as secure."
-		ewarn "All users will be able to do anything through ${MY_PN}."
-		ewarn "Please, consider rebuilding ${MY_PN} with policykit USE flag."
-		ewarn "THIS IS A SECURITY ISSUE."
-		echo
-		ebeep
-		epause 5
-	fi
-	bash-completion_pkg_postinst
-}
-
-pkg_prerm() {
-	einfo "Removing downloaded files with ${MY_PN}..."
-	[[ -d "${ROOT}"/var/cache/${MY_PN}/downloads/ ]] && \
-		rm -rf /var/cache/PackageKit/downloads/*
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN/-base}
-}
--- a/app-admin/packagekit-base/packagekit-base-0.8.15.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-0.8.15.ebuild
@ -0,0 +1,121 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/packagekit-base-0.8.15.ebuild,v 1.1 2013/12/18 05:12:15 lxnay Exp $
+
+EAPI="5"
+
+# PackageKit supports 3.2+, but entropy and portage backends are untested
+# Future note: use --enable-python3
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils autotools multilib python-single-r1 nsplugins bash-completion-r1
+
+MY_PN="PackageKit"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="connman cron command-not-found doc +introspection networkmanager nsplugin entropy static-libs systemd udev"
+
+CDEPEND="connman? ( net-misc/connman )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.9[${PYTHON_USEDEP}] )
+	networkmanager? ( >=net-misc/networkmanager-0.6.4 )
+	nsplugin? (
+		>=dev-libs/nspr-4.8
+		x11-libs/cairo
+		>=x11-libs/gtk+-2.14.0:2
+		x11-libs/pango
+	)
+	udev? ( virtual/udev[gudev] )
+	dev-db/sqlite:3
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.32.0:2[${PYTHON_USEDEP}]
+	>=sys-auth/polkit-0.98
+	>=sys-apps/dbus-1.3.0
+	${PYTHON_DEPS}"
+DEPEND="${CDEPEND}
+	doc? ( dev-util/gtk-doc[${PYTHON_USEDEP}] )
+	nsplugin? ( >=net-misc/npapi-sdk-0.27 )
+	systemd? ( >=sys-apps/systemd-204 )
+	dev-libs/libxslt[${PYTHON_USEDEP}]
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+RDEPEND="${CDEPEND}
+	entropy? ( >=sys-apps/entropy-234[${PYTHON_USEDEP}] )
+	>=app-portage/layman-1.2.3[${PYTHON_USEDEP}]
+	>=sys-apps/portage-2.2[${PYTHON_USEDEP}]"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+APP_LINGUAS="as bg bn ca cs da de el en_GB es fi fr gu he hi hu it ja kn ko ml mr
+ms nb nl or pa pl pt pt_BR ro ru sk sr sr@latin sv ta te th tr uk zh_CN zh_TW"
+for X in ${APP_LINGUAS}; do
+	IUSE=" ${IUSE} linguas_${X}"
+done
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.8.x-npapi-sdk.patch #383141
+
+	# Upstreamed patches
+	epatch "${FILESDIR}/0001-entropy-PackageKitEntropyClient.output-API-update.patch"
+
+	epatch_user
+
+	# npapi-sdk patch and epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(test -n "${LINGUAS}" && echo -n "--enable-nls" || echo -n "--disable-nls") \
+		--enable-introspection=$(use introspection && echo -n "yes" || echo -n "no") \
+		--localstatedir=/var \
+		--enable-bash-completion \
+		--disable-dependency-tracking \
+		--enable-option-checking \
+		--enable-libtool-lock \
+		--disable-local \
+		--with-default-backend=$(use entropy && echo -n "entropy" || echo -n "portage") \
+		$(use_enable doc gtk-doc) \
+		$(use_enable command-not-found) \
+		--disable-debuginfo-install \
+		--disable-gstreamer-plugin \
+		--enable-man-pages \
+		--enable-portage \
+		$(use_enable entropy) \
+		$(use_enable cron) \
+		--disable-gtk-module \
+		$(use_enable introspection) \
+		$(use_enable networkmanager) \
+		$(use_enable nsplugin browser-plugin) \
+		$(use_enable static-libs static) \
+		$(use_enable systemd) \
+		$(use_enable systemd systemd-updates) \
+		$(use_enable connman)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS MAINTAINERS NEWS README TODO || die "dodoc failed"
+	dodoc ChangeLog || die "dodoc failed"
+
+	if use nsplugin; then
+		dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
+		mv "${D}/usr/$(get_libdir)/mozilla/plugins"/* \
+			"${D}/usr/$(get_libdir)/${PLUGINS_DIR}/" || die
+	fi
+
+	if ! use static-libs; then
+		prune_libtool_files --all
+	fi
+}
--- a/app-admin/packagekit-gtk/Manifest
+++ b/app-admin/packagekit-gtk/Manifest
@ -1,2 +1,2 @@
-DIST PackageKit-0.6.22.tar.xz 7886160 SHA256 b9f71721b0b16e106c0a1ce28c97b2277a34b0c15d1a171f4898f34117ebaa2d SHA512 965647e0016f6ffc21084722393bd71464d1e18c939be49414dbdcb3eec6d89115690f8b30bd6648e2f297c72cccc35ec8600377453a51e8b28b4f4b055dca85 WHIRLPOOL 013520e1e0ae821ec1c0a6f908a1e71a8521663ac44b2c1921ff8351390804d629f5e133229dc6db1086e69784324a5da0d82c522ff874ddd9e6b67c2bf72a77
 DIST PackageKit-0.7.4.tar.xz 1493656 SHA256 4112c86d67afbbb9be5d3a706c63c537babbbe1f96e398ae306f5e5e02563a98 SHA512 a2cee60f499ec6c5359f3dc2eddda02cfb9c287f80a6b38aa1d9d87558ce5938ade87ab34f6cb1f9640749a0f19625b44c89f72dea5fbb0cbd5f34aec8dbb9f6 WHIRLPOOL 2827cb038c86164ae58021fafe9f2bbf21e69b5c63c4ef5e0f613806f5725f910af3d5aa51646fd258da9c91b81b086cf9560f66bf042e1cb6d1c25128f984b3
+DIST PackageKit-0.8.15.tar.xz 1506084 SHA256 76aa44994d63b403b1f1154406539951502f5ab92624a8a7dedbeb5437ed0af5 SHA512 d6a1a4582212b02350b8a5ab8413346b0b33a49d329d3c5c4314e3db0c7c40b891d64d275c3acd8eafc45a59462b537cd031919027db2176502861271ce34a02 WHIRLPOOL bcc75e8a05b5616fbec1a2772af53ae51cf8c44a9feda4ca9cff4567f274aed62d3cf01751ab89834f423b77a74dcc1445c32390c323a46bb4340cde568760ce
--- a/app-admin/packagekit-gtk/packagekit-gtk-0.8.15.ebuild
+++ b/app-admin/packagekit-gtk/packagekit-gtk-0.8.15.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-gtk/packagekit-gtk-0.6.22.ebuild,v 1.1 2012/05/19 11:21:32 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-gtk/packagekit-gtk-0.8.15.ebuild,v 1.1 2013/12/18 05:14:53 lxnay Exp $

 EAPI="3"

@ -9,7 +9,7 @@ inherit eutils base
 MY_PN="PackageKit"
 MY_P=${MY_PN}-${PV}

-DESCRIPTION="GTK+ PackageKit backend library"
+DESCRIPTION="Gtk3 PackageKit backend library"
 HOMEPAGE="http://www.packagekit.org/"
 SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"

@ -20,8 +20,7 @@ IUSE=""

 RDEPEND="dev-libs/dbus-glib
 	media-libs/fontconfig
-	>=x11-libs/gtk+-2.14.0:2
-	>=x11-libs/gtk+-2.91.0:3
+	>=x11-libs/gtk+-3.0:3
 	x11-libs/pango
 	~app-admin/packagekit-base-${PV}"
 DEPEND="${RDEPEND} virtual/pkgconfig"
@ -30,27 +29,23 @@ S="${WORKDIR}/${MY_P}"

 src_configure() {
 	econf \
-		--localstatedir=/var \
-		--enable-introspection=no \
-		--disable-dependency-tracking \
-		--enable-option-checking \
-		--enable-libtool-lock \
-		--disable-strict \
-		--disable-local \
-		--disable-gtk-doc \
+		--disable-browser-plugin \
 		--disable-command-not-found \
+		--disable-cron \
 		--disable-debuginfo-install \
+		--disable-dependency-tracking \
 		--disable-gstreamer-plugin \
-		--disable-service-packs \
+		--disable-gtk-doc \
+		--disable-local \
 		--disable-man-pages \
-		--disable-cron \
-		--enable-gtk-module \
 		--disable-networkmanager \
-		--disable-browser-plugin \
-		--disable-pm-utils \
-		--disable-device-rebind \
-		--disable-tests \
-		--disable-qt
+		--disable-systemd \
+		--enable-dummy \
+		--enable-gtk-module \
+		--enable-introspection=yes \
+		--enable-libtool-lock \
+		--enable-option-checking \
+		--localstatedir=/var
 }

 src_compile() {
--- a/app-admin/packagekit-qt4/Manifest
+++ b/app-admin/packagekit-qt4/Manifest
@ -1,2 +1 @@
-DIST PackageKit-0.6.22.tar.xz 7886160 SHA256 b9f71721b0b16e106c0a1ce28c97b2277a34b0c15d1a171f4898f34117ebaa2d SHA512 965647e0016f6ffc21084722393bd71464d1e18c939be49414dbdcb3eec6d89115690f8b30bd6648e2f297c72cccc35ec8600377453a51e8b28b4f4b055dca85 WHIRLPOOL 013520e1e0ae821ec1c0a6f908a1e71a8521663ac44b2c1921ff8351390804d629f5e133229dc6db1086e69784324a5da0d82c522ff874ddd9e6b67c2bf72a77
 DIST PackageKit-0.7.4.tar.xz 1493656 SHA256 4112c86d67afbbb9be5d3a706c63c537babbbe1f96e398ae306f5e5e02563a98 SHA512 a2cee60f499ec6c5359f3dc2eddda02cfb9c287f80a6b38aa1d9d87558ce5938ade87ab34f6cb1f9640749a0f19625b44c89f72dea5fbb0cbd5f34aec8dbb9f6 WHIRLPOOL 2827cb038c86164ae58021fafe9f2bbf21e69b5c63c4ef5e0f613806f5725f910af3d5aa51646fd258da9c91b81b086cf9560f66bf042e1cb6d1c25128f984b3
--- a/app-admin/packagekit-qt4/packagekit-qt4-0.6.22.ebuild
+++ b/app-admin/packagekit-qt4/packagekit-qt4-0.6.22.ebuild
@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-qt4/packagekit-qt4-0.6.22.ebuild,v 1.3 2013/03/02 19:07:09 hwoarang Exp $
-
-EAPI="3"
-
-inherit eutils base
-
-MY_PN="PackageKit"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Qt4 PackageKit backend library"
-HOMEPAGE="http://www.packagekit.org/"
-SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND=">=dev-qt/qtcore-4.4.0:4
-	>=dev-qt/qtdbus-4.4.0:4
-	>=dev-qt/qtsql-4.4.0:4
-	~app-admin/packagekit-base-${PV}"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf \
-		--enable-introspection=no \
-		--localstatedir=/var \
-		--disable-dependency-tracking \
-		--enable-option-checking \
-		--enable-libtool-lock \
-		--disable-strict \
-		--disable-local \
-		--disable-gtk-doc \
-		--disable-command-not-found \
-		--disable-debuginfo-install \
-		--disable-gstreamer-plugin \
-		--disable-service-packs \
-		--disable-man-pages \
-		--disable-cron \
-		--disable-gtk-module \
-		--disable-networkmanager \
-		--disable-browser-plugin \
-		--disable-pm-utils \
-		--disable-device-rebind \
-		--disable-tests \
-		--enable-qt
-}
-
-src_compile() {
-	for qtdir in packagekit-qt packagekit-qt2; do
-		cd "${S}"/lib/${qtdir} || die
-		# fix buildsystem, let the build system regenerate the damn .moc files
-		if [[ "${qtdir}" = "packagekit-qt" ]]; then
-			rm src/*.moc || die
-		else
-			rm *.moc || die
-		fi
-		emake || die "emake install failed"
-	done
-}
-
-src_install() {
-	for qtdir in packagekit-qt packagekit-qt2; do
-		cd "${S}"/lib/${qtdir} || die
-		emake DESTDIR="${D}" install || die "emake install failed"
-	done
-}
--- a/app-admin/packagekit/packagekit-0.8.15.ebuild
+++ b/app-admin/packagekit/packagekit-0.8.15.ebuild
@ -1,11 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit/packagekit-0.6.22.ebuild,v 1.1 2012/05/19 11:21:33 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit/packagekit-0.8.15.ebuild,v 1.1 2013/12/18 05:28:40 lxnay Exp $

-EAPI="3"
-
-MY_PN="PackageKit"
-MY_P=${MY_PN}-${PV}
+EAPI="5"

 DESCRIPTION="PackageKit Package Manager interface (meta package)"
 HOMEPAGE="http://www.packagekit.org/"
@ -14,9 +11,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gtk qt4"
-
-RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} )
-	qt4? ( ~app-admin/packagekit-qt4-${PV} )"
+IUSE="gtk"

+RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} )"
 DEPEND="${RDEPEND}"
--- a/app-admin/pprocm/pprocm-1.0-r1.ebuild
+++ b/app-admin/pprocm/pprocm-1.0-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pprocm/pprocm-1.0-r1.ebuild,v 1.6 2012/07/29 16:06:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pprocm/pprocm-1.0-r1.ebuild,v 1.7 2013/12/17 20:37:28 zlogene Exp $

 MY_P="PProcM-"${PV}
 S=${WORKDIR}/${MY_P}
@ -18,6 +18,8 @@ DEPEND="dev-perl/POE
 	dev-perl/Sys-Statistics-Linux
 	dev-lang/perl"

+RDEPEND="dev-perl/IO-Pipely"
+
 src_install() {
 	dobin PProcM || die "dobin failed"
 	dodoc AUTHORS README || die "dodoc failed"
--- a/app-admin/rigo/Manifest
+++ b/app-admin/rigo/Manifest
@ -1 +1 @@
-DIST entropy-216.tar.bz2 18429942 SHA256 c2569d7233b80b9373cde11645e6e9c4142038387ad4aa8943ed1ddfeb86f501 SHA512 8b6a19f311520ca48a998aadb10717f5ad81eb8c26b71c1f8a8b67f84fd9876117adf650eb4fa59893130fd3db669ba370804a33311fe7eff45546a5a92e6b7d WHIRLPOOL b220b870f099cfe014ad355760855dc91bbc11c76f39b34e03ec251e1f8f9bdf04bb4f1dd0ad9e0c5e63a4328f6c9691abd4f9e759b8546fac7026386b4c174b
+DIST entropy-254.tar.bz2 18516662 SHA256 5e411472eaf7016a68a4aa81ef92dd3aad8403fc65a0ffb09c57b91c959ca3a6 SHA512 3b3e82abad8008720e370b7892b7be1c48aaa6605914db977f68b9a108ada0a4adbaa5b7b50a9a02ba9c8b0bdefadcda1eceee2c7c2abc385b3daf669649e2da WHIRLPOOL 593469b858707e4ceca56146fa1d608141e44dda0a0921ed6a3ec566878c1e3c153410233f088d57db4f8bd9d1c796bd945cbea3ba455572efc05eca42023ce5
--- a/app-admin/rigo/rigo-254.ebuild
+++ b/app-admin/rigo/rigo-254.ebuild
@ -1,10 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rigo/rigo-216.ebuild,v 1.1 2013/08/22 11:14:37 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rigo/rigo-254.ebuild,v 1.1 2013/12/18 05:07:53 lxnay Exp $

-EAPI="3"
-PYTHON_DEPEND="2"
-inherit eutils gnome2-utils fdo-mime python
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2-utils fdo-mime python-single-r1

 DESCRIPTION="Rigo, the Sabayon Application Browser"
 HOMEPAGE="http://www.sabayon.org"
@ -17,32 +19,30 @@ IUSE=""
 SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
 S="${WORKDIR}/entropy-${PV}/rigo"

-RDEPEND="
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${PYTHON_DEPS}
 	|| ( dev-python/pygobject-cairo:3 dev-python/pygobject:3[cairo] )
-	~sys-apps/entropy-${PV}
-	~sys-apps/rigo-daemon-${PV}
+	~sys-apps/entropy-${PV}[${PYTHON_USEDEP}]
+	~sys-apps/rigo-daemon-${PV}[${PYTHON_USEDEP}]
 	sys-devel/gettext
 	x11-libs/gtk+:3
 	x11-libs/vte:2.90
 	>=x11-misc/xdg-utils-1.1.0_rc1_p20120319"
-DEPEND=""

-src_compile() {
-	emake || die "make failed"
-}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"

 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
+
+	python_optimize "${D}/usr/lib/rigo/${PN}"
 }

 pkg_postinst() {
 	fdo-mime_mime_database_update
 	fdo-mime_desktop_database_update
-	python_mod_optimize "/usr/lib/rigo/${PN}"
 }

 pkg_postrm() {
 	fdo-mime_mime_database_update
 	fdo-mime_desktop_database_update
-	python_mod_cleanup "/usr/lib/rigo/${PN}"
 }
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@ -1 +1,2 @@
 DIST ulogd-2.0.2.tar.bz2 466664 SHA256 a36c4032d83edaef1b13f96b6647e9e150d7f20b5af7035f0a91c17fe2e066c5 SHA512 a7ac243ec67ab4325855df631bae011284c716495e5e2d26c1f392207448b6b793117124c89b66e7745a05b74cdddb5ed7acb44c34c24618cc27948a25e978df WHIRLPOOL 8113b5e35fe236fbcba8239daf13f435949aa7798f23794e1fc138cd6decc4119da3b06fdda1e3ad6f4c45f0521c44f0e1a50a7bef19644263df1972fedb00d8
+DIST ulogd-2.0.3.tar.bz2 447550 SHA256 1ec965073e7f4e5605b2bd1c143b2094e495ad24a298e6fc8f6fcbd131234376 SHA512 09d61cca6cd1c8137b3a4e5ce101f54e48f30c98761602a97766554bc4130eda632b8541f5c1e3e2ac686ec718bb4d440d3bea57c811317cabb274917c996140 WHIRLPOOL f79f0300e610ee9de82aee478dec1c28ffbe10c7b4348ddc586229ac53226f238371f1e71d0b33095904d373c26359b848e18069d8da3d7e22a4819568c1ee44
--- a/app-admin/ulogd/files/ulogd-2-ng.init
+++ b/app-admin/ulogd/files/ulogd-2-ng.init
@ -0,0 +1,40 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd-2-ng.init,v 1.1 2013/12/17 21:38:07 hwoarang Exp $
+
+ULOGD_PIDFILE="/run/ulogd.pid"
+ULOGD_EXEC="/usr/sbin/ulogd"
+ULOGD_OPTS="--daemon --uid ulogd --pidfile ${ULOGD_PIDFILE}"
+
+extra_started_commands="reload reopen_logs"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --quiet \
+		--exec ${ULOGD_EXEC} \
+		-- ${ULOGD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile ${ULOGD_PIDFILE}
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME} configuration"
+	start-stop-daemon --signal USR1 --pidfile ${ULOGD_PIDFILE}
+	eend $?
+}
+
+reopen_logs() {
+	ebegin "Reopening ${SVCNAME} logfiles"
+	start-stop-daemon --signal HUP --pidfile ${ULOGD_PIDFILE}
+	eend $?
+}
--- a/app-admin/ulogd/files/ulogd-2.logrotate
+++ b/app-admin/ulogd/files/ulogd-2.logrotate
@ -1,18 +1,7 @@
-/var/log/ulogd/ulogd.log {
-    notifempty
+/var/log/ulogd/ulogd.log /var/log/ulogd/ulogd_syslogemu.log {
+    sharedscripts
    missingok
-    size 1M
-    create 0640 ulogd
-    postrotate
-        /etc/init.d/ulogd reopen_logs > /dev/null
-    endscript
-}
-
-/var/log/ulogd/ulogd_syslogemu.log {
-    rotate 12
-    size 5M
    notifempty
-    missingok
    create 0640 ulogd
    postrotate
        /etc/init.d/ulogd reopen_logs > /dev/null
--- a/app-admin/ulogd/ulogd-2.0.3.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.3.ebuild
@ -0,0 +1,129 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.3.ebuild,v 1.1 2013/12/17 21:38:07 hwoarang Exp $
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools-utils eutils linux-info readme.gentoo user
+
+DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
+HOMEPAGE="http://netfilter.org/projects/ulogd/index.html"
+SRC_URI="http://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE="dbi doc mysql nfacct +nfct +nflog pcap postgres sqlite"
+
+RDEPEND="net-firewall/iptables
+	>=net-libs/libnfnetlink-1.0.1
+	dbi? ( dev-db/libdbi )
+	nfacct? (
+		>=net-libs/libmnl-1.0.3
+		>=net-libs/libnetfilter_acct-1.0.1
+	)
+	nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 )
+	nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
+	mysql? ( virtual/mysql )
+	pcap? ( net-libs/libpcap )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( dev-db/sqlite:3 )"
+
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/linuxdoc-tools
+		app-text/texlive-core
+		virtual/latex-base
+	)"
+
+DOCS=( AUTHORS README TODO )
+DOC_CONTENTS="You must have at least one logging stack enabled to make ulogd work.
+Please edit example configuration located at /etc/ulogd.conf"
+
+pkg_setup() {
+	enewgroup ulogd
+	enewuser ulogd -1 -1 /var/log/ulogd ulogd
+
+	linux-info_pkg_setup
+
+	if kernel_is lt 2 6 14; then
+		die "ulogd2 requires kernel newer than 2.6.14"
+	fi
+
+	if kernel_is lt 2 6 18; then
+		ewarn
+		ewarn "You are using kernel older than 2.6.18"
+		ewarn "Some ulogd2 features may be unavailable"
+		ewarn
+	fi
+
+	if use nfacct && kernel_is lt 3 3 0; then
+		ewarn "NFACCT input plugin requires kernel newer than 3.3.0"
+	fi
+}
+
+src_prepare() {
+	# - make all logs to be kept in a single dir /var/log/ulogd
+	# - place sockets in /run instead of /tmp
+	sed -i \
+		-e 's:var/log:var/log/ulogd:g' \
+		-e 's:tmp:run:g' \
+		ulogd.conf.in || die 'sed on ulogd.conf.in failed'
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with dbi)
+		$(use_enable nfacct)
+		$(use_enable nfct)
+		$(use_enable nflog)
+		$(use_with mysql)
+		$(use_with pcap)
+		$(use_with postgres pgsql)
+		$(use_with sqlite)
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	if use doc ; then
+		# prevent access violations from generation of bitmap font files
+		export VARTEXFONTS="${T}"/fonts
+		emake -C doc
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+	readme.gentoo_create_doc
+	prune_libtool_files --modules
+
+	if use doc ; then
+		dohtml doc/${PN}.html
+		dodoc doc/${PN}.dvi doc/${PN}.txt doc/${PN}.ps
+	fi
+
+	use sqlite && dodoc doc/sqlite3.table
+	use mysql && dodoc doc/mysql-*.sql
+	use postgres && dodoc doc/pgsql-*.sql
+	doman ${PN}.8
+
+	insinto /etc
+	doins ${PN}.conf
+	fowners root:ulogd /etc/ulogd.conf
+	fperms 640 /etc/ulogd.conf
+
+	newinitd "${FILESDIR}/${PN}-2-ng.init" ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}-2.logrotate" ${PN}
+
+	diropts -o ulogd -g ulogd
+	keepdir /var/log/ulogd
+}
--- a/app-emulation/q4wine/Manifest
+++ b/app-emulation/q4wine/Manifest
@ -1,3 +1,4 @@
 DIST q4wine-1.0-r3.tar.bz2 889308 SHA256 9f1319dd0baff3834a3938e0a048c1529cb9ea521158370176b706fce0d4d2ff SHA512 df10a2fbf6874f4c4e02dd9c43031453a46c76f03d83321f2d6e9544d0540dd07da1bc9246767c5c91ce17d67d5d236227294efaed9de09f3d5a18afbd60b224 WHIRLPOOL 51b5b4cfc157da6b99154269ef4ef9f38ff91f861864158b789352505af485d8b523a21c6d4b59544804ed3c15cb1c6c756db3f3203c8e3ba55c8396c3630df3
 DIST q4wine-1.1-r1.tar.bz2 888706 SHA256 bb95c2acdb2e4d56366cfd6c1cab21941032709414b740e7133fb8ded2f430ec SHA512 1c4505bea7457ffea9b6e9e2dbd7169a3a85f59275e09cb8ecbab25dbd22c715a1985d16a57ffea5bfc775659a62b6dfdef30757fa3cdaa25b95b7e59888ed83 WHIRLPOOL ee7f329d62b56c1998944327d89377f6d4d504dc3106623829e7478ac56819281f6aa0114d05ba5e0047b120a0d321ec46c043037e50f0f0ad43eabd4f0985c7
+DIST q4wine-1.1-r2.tar.bz2 888990 SHA256 01463f9ec3ef9f7ef987d2b77425f2806cf2b60f574deb6644458366782eafc7 SHA512 8aaeec46d239a86a9eb10377842d63d84a35864f920f9dc46a022ae1cf3e010273d3759701595e058a089f6418a297a0bf94ed62b580a71fa1c8c27a80f4ec7e WHIRLPOOL 6ae891e33a2bf3759c45930820e21a273b2bf36f2c386a841a96c3bf14cfdb6741871d3c90383dde3b6b01df1a87f5b1537ae40bac5a494bdd3023248c526244
 DIST q4wine-1.1.tar.bz2 888249 SHA256 a33cec421e6680f739cb710a0827be9b10f4271e98de51be6079a771da312255 SHA512 d5fda2283be89b6dc08a6cd46b892e65e104954ee2711ccd032d7455d2d8f037b77dea7f23a6b0987807e3ae8d7ed5f80b360f582b53544debbe819a1eb8032a WHIRLPOOL e4c81e2f2d9cee084a8e72ae661bcc609667931a0021dd3718309a68d90af88c1d04e01c08560997309bd31f14d0330726f718242e0851cccd03308fe182831b
--- a/app-emulation/q4wine/q4wine-1.1_p2.ebuild
+++ b/app-emulation/q4wine/q4wine-1.1_p2.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-1.1_p2.ebuild,v 1.1 2013/12/17 21:31:52 hwoarang Exp $
+
+EAPI="4"
+LANGS="cs de en es fa he it ru uk pl pt af"
+
+inherit cmake-utils
+
+# Upstream names the package PV-rX. We need to fix that to
+# PV_pX so we can use portage revisions.
+MY_PV="${PV/_p/-r}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Qt4 GUI configuration tool for Wine"
+HOMEPAGE="http://q4wine.brezblock.org.ua/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}%20${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +icoutils +wineappdb -dbus gnome kde"
+
+for x in ${LANGS}; do
+	IUSE+=" linguas_${x}"
+done
+
+CDEPEND="dev-qt/qtgui:4
+	dev-qt/qtsingleapplication
+	dev-qt/qtsql:4[sqlite]"
+
+DEPEND="${CDEPEND}
+	dev-util/cmake"
+
+RDEPEND="${CDEPEND}
+	app-admin/sudo
+	app-emulation/wine
+	>=sys-apps/which-2.19
+	icoutils? ( >=media-gfx/icoutils-0.26.0 )
+	sys-fs/fuseiso
+	kde? ( kde-base/kdesu )
+	gnome? ( x11-libs/gksu )
+	dbus? ( dev-qt/qtdbus:4 )"
+
+DOCS="README AUTHORS ChangeLog"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	mycmakeargs="${mycmakeargs} \
+		-DWITH_SYSTEM_SINGLEAPP=ON \
+		$(cmake-utils_use debug DEBUG) \
+		$(cmake-utils_use_with icoutils ICOUTILS) \
+		$(cmake-utils_use_with wineappdb WINEAPPDB) \
+		$(cmake-utils_use_with dbus DBUS)"
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	for x in ${LANGS}; do
+		if ! has ${x} ${LINGUAS}; then
+			find "${D}" -name "${PN}_${x}*.qm" -exec rm {} \;
+		fi
+	done
+}
--- a/app-misc/magneto-loader/Manifest
+++ b/app-misc/magneto-loader/Manifest
@ -1 +1 @@
-DIST entropy-216.tar.bz2 18429942 SHA256 c2569d7233b80b9373cde11645e6e9c4142038387ad4aa8943ed1ddfeb86f501 SHA512 8b6a19f311520ca48a998aadb10717f5ad81eb8c26b71c1f8a8b67f84fd9876117adf650eb4fa59893130fd3db669ba370804a33311fe7eff45546a5a92e6b7d WHIRLPOOL b220b870f099cfe014ad355760855dc91bbc11c76f39b34e03ec251e1f8f9bdf04bb4f1dd0ad9e0c5e63a4328f6c9691abd4f9e759b8546fac7026386b4c174b
+DIST entropy-254.tar.bz2 18516662 SHA256 5e411472eaf7016a68a4aa81ef92dd3aad8403fc65a0ffb09c57b91c959ca3a6 SHA512 3b3e82abad8008720e370b7892b7be1c48aaa6605914db977f68b9a108ada0a4adbaa5b7b50a9a02ba9c8b0bdefadcda1eceee2c7c2abc385b3daf669649e2da WHIRLPOOL 593469b858707e4ceca56146fa1d608141e44dda0a0921ed6a3ec566878c1e3c153410233f088d57db4f8bd9d1c796bd945cbea3ba455572efc05eca42023ce5
--- a/app-misc/magneto-loader/magneto-loader-254.ebuild
+++ b/app-misc/magneto-loader/magneto-loader-254.ebuild
@ -1,9 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/magneto-loader/magneto-loader-216.ebuild,v 1.1 2013/08/22 11:15:48 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/magneto-loader/magneto-loader-254.ebuild,v 1.1 2013/12/18 05:08:48 lxnay Exp $

-EAPI="2"
-inherit eutils
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1

 DESCRIPTION="Official Sabayon Linux Entropy Notification Applet Loader"
 HOMEPAGE="http://www.sabayon.org"
@ -16,13 +19,12 @@ IUSE=""
 SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
 S="${WORKDIR}/entropy-${PV}/magneto"

-DEPEND="~sys-apps/magneto-core-${PV}
-	~app-admin/rigo-${PV}"
+DEPEND="${PYTHON_DEPS}
+	~sys-apps/magneto-core-${PV}[${PYTHON_USEDEP}]
+	~app-admin/rigo-${PV}[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"

-src_compile() {
-	einfo "nothing to compile"
-}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"

 src_install() {
 	emake DESTDIR="${D}" LIBDIR="usr/lib" magneto-loader-install || die "make install failed"
--- a/app-misc/solaar/solaar-0.9.2-r1.ebuild
+++ b/app-misc/solaar/solaar-0.9.2-r1.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/solaar/solaar-0.9.2-r1.ebuild,v 1.1 2013/12/17 22:19:43 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
+
+inherit distutils-r1 udev user linux-info gnome2-utils
+
+DESCRIPTION="A Linux device manager for Logitech's Unifying Receiver peripherals"
+HOMEPAGE="http://pwr.github.com/Solaar/"
+SRC_URI="https://github.com/pwr/Solaar/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/Solaar-${PV}
+
+CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	udev_dorules rules.d/*.rules
+
+	if use doc; then
+		dodoc -r docs/*
+	fi
+}
+
+pkg_postinst() {
+	enewgroup plugdev
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Users must be in the plugdev group to use this application."
+	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postrm() { gnome2_icon_cache_update; }
--- a/app-vim/nginx-syntax/Manifest
+++ b/app-vim/nginx-syntax/Manifest
@ -1 +1,2 @@
 DIST nginx-syntax-0.3.2.tar.bz2 5736 SHA256 53481176a8a4197f9ddbb3c355672f990449fc6d50c5e693c1dde92eeebbdd40 SHA512 8397b6428a9141ba761bcbcd2763e9e3c8d676df45ff4e12e07dc59f1520282a390acc33a77ec7718b9cffe08c634170226abdc48d6e345b50e0e83e373b148c WHIRLPOOL 760897d25790480bdc273e1d50e90e1b1f0cbef0c46464d74d264775ec05a067f085f169a466bec98ebdb1a02322806fe64c30ae708faec1d394bcbab09b7e95
+DIST nginx-syntax-0.3.3.tar.bz2 5675 SHA256 1b729f6fb034750568fd7407192ba6787c998fad5c86ccd2d254a8392d4d583c SHA512 0142c9b825b9f9c262145c0d202651f020e5b3f3f3548ecbdd713cf66c5f7098b974e7d16eedfa9d722c2efdfbd9732097bf8b293a610a64c21571ec66a5886d WHIRLPOOL d32a86d52632127e0ce520bca3ccebc80e95aabe9cb3c2c673a41b306937e85165e8eed7b1a8b5cfff9da8396eb6f248c40a500bde68de8f88b2cb8e8dd77ebc
--- a/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
+++ b/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
@ -0,0 +1,12 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild,v 1.1 2013/12/18 01:30:55 radhermit Exp $
+
+EAPI="5"
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Nginx configuration files syntax"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1886"
+LICENSE="vim"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd"
--- a/dev-db/postgresql-base/postgresql-base-9999.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9999.ebuild,v 1.9 2013/09/15 21:15:12 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9999.ebuild,v 1.10 2013/12/17 20:40:26 grobian Exp $

 EAPI="5"

@ -140,7 +140,7 @@ src_compile() {
 }

 src_install() {
-	mkdir -p "${D}/usr/share/postgresql-${SLOT}"
+	mkdir -p "${ED}/usr/share/postgresql-${SLOT}"
 	emake DESTDIR="${D}" install
 	insinto /usr/include/postgresql-${SLOT}/postmaster
 	doins "${S}"/src/include/postmaster/*.h
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@ -2,3 +2,4 @@ DIST redis-2.6.13.tar.gz 994331 SHA256 3b9439636c58ca06bee538a0f7298e02a33fcf98b
 DIST redis-2.6.15.tar.gz 998865 SHA256 b0105c6ec526d40e90a0a0bc9d070a5602d839b930776b8ecaeb9fa32493e3bc SHA512 8614b5531049f99a19e3ba87c7d632ab43d02e1c62b6287534ebec35e4a484e3eefabd94d7ca52eb31eb56675451aef94265514be78fdaebd50db5230a525563 WHIRLPOOL c1eba6bccb17c6733d3b5f6e06933ff7ea8689d4cb16e0005f002fda75bda1d730b815546e5d3b50fcd6f85a05a35585244a7a69263795e7bda53bd1a588db03
 DIST redis-2.6.16.tar.gz 999579 SHA256 81490918dcf82d124b36e48b0a9911bfba3f13abba04d8c89820324eff7df03a SHA512 469a29e2a755543a3b2c3deb467a72ae62b81c54a60ed1baf6f9d5687ef4b87c22d9cec6a43cec43dd90d4b5561f5bbcd2448f6edf8a784041233b80d9403b0b WHIRLPOOL ed10212f6465083cc689d83cb0c4db63e15697a232a7e6621fb3b41e263cb8d16c7c3085317f0147e3cfe2d1620672b40049b764ebfb2f2710fd6737350f4804
 DIST redis-2.6.9.tar.gz 989119 SHA256 4d967eff2038aebea33875d17e85ed67179df6505df68529a622f7836d1c7489 SHA512 5263bccd4e175dd00318436be3818c07b880ba6f2e2552e1811d909fddf1fbbff5addbd684e116bd7f8cca727c61f6f45cd264fff61d2ffad18d57f6ae0456e5 WHIRLPOOL 57828b815e3591bd4b4ce6b1812b8f594062b6e63055fc88f50498aa2605ee79f829350026ac7ebb946bd1207c34935768db2f270197a4b979f8cec9b6d3d6a8
+DIST redis-2.8.3.tar.gz 1046106 SHA256 c0aa8065c230f9df1b77d1dd1e8840655e7846e23fe23f8e339d6246aec3e63f SHA512 09209c526a2f1e4bac0ecc95b16e67e390c792580d6ad0f4259795966fe1fe9b2850673f3e00e167908f6f4b2e0636dbe31a3f1b5eca17c4f1fa27d7fb024615 WHIRLPOOL 624922fba1a3951640dec710d11c8c8e1fb738125853bab0183bddce5b76c73bc1a1b470d124764325a9399c53216f594ffd86948570da6f8aac789684c2efbf
--- a/dev-db/redis/files/redis-2.8.3-config.patch
+++ b/dev-db/redis/files/redis-2.8.3-config.patch
@ -0,0 +1,59 @@
+commit 66f26c12faaeb8ed85a715d2dfd6a41c978a4bd1
+Author: Johan Bergström <bugs@bergstroem.nu>
+Date:   Mon Nov 25 09:23:10 2013 +1100
+
+    Modify config to gentoo defaults
+
+diff --git redis.conf redis.conf
+index 2e3239c..6c7ef4a 100644
+--- redis.conf
+++ redis.conf
+@@ -14,11 +14,11 @@
+ 
+ # By default Redis does not run as a daemon. Use 'yes' if you need it.
+ # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+-daemonize no
+daemonize yes
+ 
+ # When running daemonized, Redis writes a pid file in /var/run/redis.pid by
+ # default. You can specify a custom pid file location here.
+-pidfile /var/run/redis.pid
+pidfile /run/redis/redis.pid
+ 
+ # Accept connections on the specified port, default is 6379.
+ # If port 0 is specified Redis will not listen on a TCP socket.
+@@ -32,7 +32,7 @@ port 6379
+ # Examples:
+ #
+ # bind 192.168.1.100 10.0.0.1
+-# bind 127.0.0.1
+bind 127.0.0.1
+ 
+ # Specify the path for the unix socket that will be used to listen for
+ # incoming connections. There is no default, so Redis will not listen
+@@ -71,7 +71,7 @@ loglevel notice
+ # Specify the log file name. Also the emptry string can be used to force
+ # Redis to log on the standard output. Note that if you use standard
+ # output for logging but daemonize, logs will be sent to /dev/null
+-logfile ""
+logfile /var/log/redis/redis.log
+ 
+ # To enable logging to the system logger, just set 'syslog-enabled' to yes,
+ # and optionally update the other syslog parameters to suit your needs.
+@@ -155,7 +155,7 @@ dbfilename dump.rdb
+ # The Append Only File will also be created inside this directory.
+ # 
+ # Note that you must specify a directory here, not a file name.
+-dir ./
+dir /var/lib/redis/
+ 
+ ################################# REPLICATION #################################
+ 
+@@ -365,6 +365,7 @@ slave-priority 100
+ # output buffers (but this is not needed if the policy is 'noeviction').
+ #
+ # maxmemory <bytes>
+maxmemory 67108864
+ 
+ # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+ # is reached. You can select among five behaviors:
--- a/dev-db/redis/files/redis-2.8.3-shared.patch
+++ b/dev-db/redis/files/redis-2.8.3-shared.patch
@ -0,0 +1,36 @@
+commit 388a76f24c96767c831ee7682234fd9f2bc5b9ac
+Author: Johan Bergström <bugs@bergstroem.nu>
+Date:   Mon Nov 25 09:17:14 2013 +1100
+
+    Use shared jemalloc
+
+diff --git src/Makefile src/Makefile
+index c37549d..77e6255 100644
+--- src/Makefile
+++ src/Makefile
+@@ -26,12 +26,7 @@ PREFIX?=/usr/local
+ INSTALL_BIN=$(PREFIX)/bin
+ INSTALL=install
+ 
+-# Default allocator
+-ifeq ($(uname_S),Linux)
+-	MALLOC=jemalloc
+-else
+-	MALLOC=libc
+-endif
+MALLOC?=jemalloc
+ 
+ # Backwards compatibility for selecting an allocator
+ ifeq ($(USE_TCMALLOC),yes)
+@@ -79,9 +74,8 @@ ifeq ($(MALLOC),tcmalloc_minimal)
+ endif
+ 
+ ifeq ($(MALLOC),jemalloc)
+-	DEPENDENCY_TARGETS+= jemalloc
+-	FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
+-	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
+	FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE
+	FINAL_LIBS+= -ljemalloc -ldl
+ endif
+ 
+ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
--- a/dev-db/redis/redis-2.8.3.ebuild
+++ b/dev-db/redis/redis-2.8.3.ebuild
@ -0,0 +1,109 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.8.3.ebuild,v 1.1 2013/12/17 21:47:33 hwoarang Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic systemd toolchain-funcs user
+
+DESCRIPTION="A persistent caching system, key-value and data structures database."
+HOMEPAGE="http://redis.io/"
+SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~x86-macos ~x86-solaris"
+IUSE="+jemalloc tcmalloc test"
+SLOT="0"
+
+RDEPEND="tcmalloc? ( dev-util/google-perftools )
+	jemalloc? ( >=dev-libs/jemalloc-3.2 )"
+DEPEND=">=sys-devel/autoconf-2.63
+	test? ( dev-lang/tcl )
+	${RDEPEND}"
+REQUIRED_USE="tcmalloc? ( !jemalloc )
+	jemalloc? ( !tcmalloc )"
+
+S="${WORKDIR}/${PN}-${PV/_/-}"
+
+pkg_setup() {
+	enewgroup redis 75
+	enewuser redis 75 -1 /var/lib/redis redis
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}"-{shared,config}.patch
+
+	# bug 467172, 467174
+	sed -i -e 's:AR=:AR?=:g' -e 's:RANLIB=:RANLIB?=:g' "${S}/deps/lua/src/Makefile" || die
+
+	# now we will rewrite present Makefiles
+	local makefiles=""
+	for MKF in $(find -name 'Makefile' | cut -b 3-); do
+		mv "${MKF}" "${MKF}.in"
+		sed -i	-e 's:$(CC):@CC@:g' \
+			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+			-e 's: $(DEBUG)::g' \
+			-e 's:$(OBJARCH)::g' \
+			-e 's:ARCH:TARCH:g' \
+			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+			"${MKF}.in" \
+		|| die "Sed failed for ${MKF}"
+		makefiles+=" ${MKF}"
+	done
+	# autodetection of compiler and settings; generates the modified Makefiles
+	cp "${FILESDIR}"/configure.ac-2.2 configure.ac
+	sed -i	-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+		configure.ac || die "Sed failed for configure.ac"
+	eautoconf
+}
+
+src_configure() {
+	econf
+
+	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+	# also, don't define ANSI/c99 for lua twice
+	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+	tc-export CC AR RANLIB
+
+	local myconf=""
+
+	if use tcmalloc ; then
+		myconf="${myconf} USE_TCMALLOC=yes"
+	elif use jemalloc ; then
+		myconf="${myconf} JEMALLOC_SHARED=yes"
+	else
+		myconf="${myconf} MALLOC=yes"
+	fi
+
+	emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
+}
+
+src_install() {
+	insinto /etc/
+	doins redis.conf sentinel.conf
+	use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
+	fperms 0644 /etc/{redis,sentinel}.conf
+
+	newconfd "${FILESDIR}/redis.confd" redis
+	newinitd "${FILESDIR}/redis.initd-3" redis
+
+	systemd_dounit "${FILESDIR}/redis.service"
+	systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
+
+	nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README
+
+	dobin src/redis-cli
+	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump
+	fperms 0750 /usr/sbin/redis-benchmark
+	dosym /usr/sbin/redis-server /usr/sbin/redis-sentinel
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o redis -g redis
+	fi
+	keepdir /var/{log,lib}/redis
+}
--- a/dev-lang/v8/Manifest
+++ b/dev-lang/v8/Manifest
@ -1,5 +0,0 @@
-DIST v8-3.19.18.19.tar.bz2 10621763 SHA256 4230036b4e64d0a03dc3ab913ac0eb8c73b87c62cec9694de37dfd41a3fece8f SHA512 dfb385452acbf82bad046437605c42259b5df0d1a7c0019e3997f7f4e491e1384860e14aa7c561a0d8a0485c4fa934c4a026befc5197100f88560bea05082400 WHIRLPOOL 705f82a3a69a02c8f754075f88885bb85321fe1586937484b584eeda575ad5e7b712d642c4cbdef2ee77feb5b04f82510b3d0bd7f7a98ed4d4723dede5aae05e
-DIST v8-3.20.17.13.tar.bz2 46755305 SHA256 472dcceb944685243b405ec131e3205ef5754110b0031c2cb135a44db6fa8755 SHA512 141503b11c2d966d9e575bdd3703ac00aeef581c649493c0b9ead39218ac0b5a272bc253b0e5a21838398d3ecd1aa1cb70da1841d746cb3b201d94c5316ac8e8 WHIRLPOOL 66d1666feebe06c19bd583c951b3041270cb70cf6677ef4b5652f9a90c177cf5013af6e1ebbabed1b94c5bcf4cc829718474fea33bbc40a40df756bc53a3f60d
-DIST v8-3.20.17.15.tar.bz2 46752400 SHA256 3472726f4de152aeb7ea7c382d770f0fcb808c28d74660a58eaa230a7ce32285 SHA512 f819c89b500065622a291edafb9b3932c28a81cde6b4e1ac73b9f3280a34bfac7fe799bbf710fbeb519cab99e3ee47ab065050d806a0bce206e7855c503a07ae WHIRLPOOL 066eee830c04f396ea2ddd5c2ee62e841b9dd416e20bc44beb38fab0d953df40775dee4380886f905fb9c6eb53107f971065b4aaf7c668c09079b8d363faa342
-DIST v8-3.21.10.1-lite.tar.bz2 11909880 SHA256 deb3d3bcf15506245f52bfecb912397de99e9b62ab9d212d3a4e6afd37413988 SHA512 00526b5912a9a52c0f608b3c87098c651a44fe44f8ec380fdab16aab443d2d251716a56c45a2844a7037bc4fcab4d7d651de9c3018b4f85534de8f17dfb9be7b WHIRLPOOL d788a1e23270c26fe21819929b2568d0ea46959ffe4bb80ad70abf819f7e2e7ce68436a7338f2fccf389dbb427bcbbf6b289eb3742e66c8ffd0e03284df845c6
-DIST v8-3.21.12.1-lite.tar.bz2 11908651 SHA256 2ad11163400336dc20fa1f2fa0a303a10172b010dc7087f5aa667b3a84fa8d32 SHA512 c30daf609ce02d7c06a062d0e93f1cbdf1f7b8ad15dec4b8bff19baa6742da0d85d6868c188009769b0bf446af7d28a11a70c1c012d156b2120e4e442e9074de WHIRLPOOL 1c1fe934ad32daac02783c46a4e3ce9a51a5442d8aba41e38ff5fc27486a25dffa00e36a586f8943403c61ea75dc3dc0a1c8084387e4c7030893f89f1f541fb8
--- a/dev-lang/v8/files/v8-3.10.8.10-darwin-arch.patch
+++ b/dev-lang/v8/files/v8-3.10.8.10-darwin-arch.patch
@ -1,29 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=417401
-
-The Prefix toolchain on OSX doesn't support -arch, even though using
-gcc-apple.  This is not really a problem (FSF GCC doesn't understand
-this flag either), because we never build FAT objects.  It is however a
-problem when people forcibly add -arch to CFLAGS and LDFLAGS.  Leave it
-to the toolchain such that we can also build 64-bits.  (Pro!)
-
-Request for removing this when unnecessary:
-http://code.google.com/p/gyp/issues/detail?id=260
-
--- build/gyp/pylib/gyp/xcode_emulation.py
-+++ build/gyp/pylib/gyp/xcode_emulation.py
-@@ -317,7 +317,6 @@
-       # TODO: Supporting fat binaries will be annoying.
-       self._WarnUnimplemented('ARCHS')
-       archs = ['i386']
-    cflags.append('-arch ' + archs[0])
- 
-     if archs[0] in ('i386', 'x86_64'):
-       if self._Test('GCC_ENABLE_SSE3_EXTENSIONS', 'YES', default='NO'):
-@@ -435,7 +434,6 @@
-       # TODO: Supporting fat binaries will be annoying.
-       self._WarnUnimplemented('ARCHS')
-       archs = ['i386']
-    ldflags.append('-arch ' + archs[0])
- 
-     # Xcode adds the product directory by default.
-     ldflags.append('-L' + product_dir)
--- a/dev-lang/v8/files/v8-3.10.8.10-freebsd9.patch
+++ b/dev-lang/v8/files/v8-3.10.8.10-freebsd9.patch
@ -1,12 +0,0 @@
-diff --git a/build/gyp/pylib/gyp/common.py b/build/gyp/pylib/gyp/common.py
-index fb11029..a33efd0 100644
--- a/build/gyp/pylib/gyp/common.py
-+++ b/build/gyp/pylib/gyp/common.py
-@@ -355,6 +355,7 @@ def GetFlavor(params):
-     'sunos5': 'solaris',
-     'freebsd7': 'freebsd',
-     'freebsd8': 'freebsd',
-+    'freebsd9': 'freebsd',
-   }
-   flavor = flavors.get(sys.platform, 'linux')
-   return params.get('flavor', flavor)
--- a/dev-lang/v8/files/v8-makefile-hardfp-r0.patch
+++ b/dev-lang/v8/files/v8-makefile-hardfp-r0.patch
@ -1,15 +0,0 @@
-Index: Makefile
-===================================================================
--- Makefile	(revision 12403)
-+++ Makefile	(working copy)
-@@ -99,6 +99,10 @@
- ifeq ($(regexp), interpreted)
-   GYPFLAGS += -Dv8_interpreted_regexp=1
- endif
-+# hardfp=on
-+ifeq ($(hardfp), on)
-+  GYPFLAGS += -Dv8_use_arm_eabi_hardfloat=true
-+endif
- 
- # ----------------- available targets: --------------------
- # - "dependencies": pulls in external dependencies (currently: GYP)
--- a/dev-lang/v8/files/v8-vfp2-r0.patch
+++ b/dev-lang/v8/files/v8-vfp2-r0.patch
@ -1,12 +0,0 @@
-diff -ur a/build/common.gypi b/build/common.gypi
--- a/build/common.gypi	2012-10-13 09:07:14.000000000 +0200
-+++ b/build/common.gypi	2012-11-05 00:41:32.338031279 +0100
-@@ -152,7 +152,7 @@
-           [ 'v8_use_arm_eabi_hardfloat=="true"', {
-             'defines': [
-               'USE_EABI_HARDFLOAT=1',
-              'CAN_USE_VFP3_INSTRUCTIONS',
-+              'CAN_USE_VFP2_INSTRUCTIONS',
-             ],
-             'target_conditions': [
-               ['_toolset=="target"', {
--- a/dev-lang/v8/metadata.xml
+++ b/dev-lang/v8/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>chromium</herd>
-</pkgmetadata>
--- a/dev-lang/v8/v8-3.19.18.19.ebuild
+++ b/dev-lang/v8/v8-3.19.18.19.ebuild
@ -1,173 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.19.18.19.ebuild,v 1.4 2013/08/21 21:39:44 ago Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit chromium eutils multilib multiprocessing pax-utils python-any-r1 \
-	toolchain-funcs versionator
-
-DESCRIPTION="Google's open source JavaScript engine"
-HOMEPAGE="http://code.google.com/p/v8"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
-LICENSE="BSD"
-
-soname_version="${PV}"
-SLOT="0/${soname_version}"
-KEYWORDS="amd64 ~arm x86 ~x86-fbsd ~x64-macos ~x86-macos"
-IUSE="neon readline"
-
-RDEPEND="readline? ( sys-libs/readline:0 )"
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}"
-
-src_configure() {
-	tc-export AR CC CXX RANLIB
-	export LINK=${CXX}
-
-	local myconf=""
-
-	# Always build v8 as a shared library with proper SONAME.
-	myconf+=" -Dcomponent=shared_library -Dsoname_version=${soname_version}"
-
-	# Use target arch detection logic from bug #354601.
-	case ${CHOST} in
-		i?86-*)
-			myarch="ia32"
-			myconf+=" -Dv8_target_arch=ia32" ;;
-		x86_64-*)
-			if [[ $ABI = x86 ]] ; then
-				myarch="ia32"
-				myconf+=" -Dv8_target_arch=ia32"
-			else
-				myarch="x64"
-				myconf+=" -Dv8_target_arch=x64"
-			fi ;;
-		arm*-*)
-			myarch="arm"
-			myconf+=" -Dv8_target_arch=arm -Darm_fpu=default"
-			if [[ ${CHOST} == *-hardfloat-* ]] ; then
-				myconf+=" -Dv8_use_arm_eabi_hardfloat=true"
-			else
-				myconf+=" -Dv8_use_arm_eabi_hardfloat=false"
-			fi
-			if [[ ${CHOST} == armv7*-* ]] ; then
-				myconf+=" -Darmv7=1"
-			else
-				myconf+=" -Darmv7=0"
-			fi
-			myconf+=" $(gyp_use neon arm_neon)" ;;
-		mips*)
-			if [[ ${CHOST} == mips*el* ]] ; then
-				myarch="mipsel"
-				myconf+=" -Dv8_target_arch=mipsel"
-			else
-				die "big-endian MIPS is not yet supported"
-			fi
-			if [[ ${CHOST} == *softfloat* ]] ; then
-				myconf+=" -Dv8_use_mips_abi_hardfloat=false"
-			else
-				myconf+=" -Dv8_use_mips_abi_hardfloat=true"
-			fi
-			if [[ ${CHOST} == *loongson* ]] ; then
-				myconf+=" -Dmips_arch_variant=loongson"
-			elif [[ ${CHOST} == mips*64* ]] ; then
-				die "generic MIPS 64bit is not yet supported"
-			elif [[ ${CHOST} == mips*r2* ]] ; then
-				myconf+=" -Dmips_arch_variant=mips32r2"
-			else
-				myconf+=" -Dmips_arch_variant=mips32"
-			fi
-			;;
-		*) die "Unrecognized CHOST: ${CHOST}"
-	esac
-
-	myconf+=" $(gyp_use readline console readline dumb)"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't
-	# want the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# gyp does this only for linux, but we always want to use "out" dir, or
-	# all else below fails due to not finding "out" dir
-	myconf+=" --generator-output=out"
-	# gyp defaults to whatever makes the most sense on the platform at hand,
-	# but we want to build using Makefiles, so force that
-	myconf+=" -f make"
-
-	EGYP_CHROMIUM_COMMAND=build/gyp_v8 egyp_chromium ${myconf} || die
-}
-
-src_compile() {
-	local makeargs=(
-		-C out
-		builddir="${S}/out/Release"
-		V=1
-		BUILDTYPE=Release
-	)
-
-	# Build mksnapshot so we can pax-mark it.
-	emake "${makeargs[@]}" mksnapshot.${myarch}
-	pax-mark m out/Release/mksnapshot.${myarch}
-
-	# Build everything else.
-	emake "${makeargs[@]}"
-	pax-mark m out/Release/{cctest,d8,preparser}
-}
-
-src_test() {
-	LD_LIBRARY_PATH=out/Release/lib.target tools/run-tests.py \
-		-j$(makeopts_jobs) \
-		--no-presubmit \
-		--outdir=out \
-		--buildbot \
-		--arch=native \
-		--mode=Release \
-		--progress=dots || die
-}
-
-src_install() {
-	insinto /usr
-	doins -r include
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# buildsystem is too horrific to get this built correctly
-		mkdir -p out/Release/lib.target || die
-		mv out/Release/libv8.so.${soname_version} \
-			out/Release/lib.target/libv8$(get_libname ${soname_version}) || die
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
-			out/Release/lib.target/libv8$(get_libname ${soname_version}) \
-			|| die
-		install_name_tool \
-			-change \
-			/usr/local/lib/libv8.so.${soname_version} \
-			"${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
-			out/Release/d8 || die
-	fi
-
-	dobin out/Release/d8
-	pax-mark m "${ED}usr/bin/d8"
-
-	dolib out/Release/lib.target/libv8$(get_libname ${soname_version})
-	dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname)
-
-	dodoc AUTHORS ChangeLog
-}
-
-# TODO: remove functions below after they are removed from chromium.eclass'
-# EXPORT_FUNCTIONS .
-
-pkg_preinst() {
-	return
-}
-
-pkg_postinst() {
-	return
-}
-
-pkg_postrm() {
-	return
-}
--- a/dev-lang/v8/v8-3.20.17.13.ebuild
+++ b/dev-lang/v8/v8-3.20.17.13.ebuild
@ -1,184 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.20.17.13.ebuild,v 1.3 2013/10/02 06:09:15 ago Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit chromium eutils multilib multiprocessing pax-utils python-any-r1 \
-	toolchain-funcs versionator
-
-DESCRIPTION="Google's open source JavaScript engine"
-HOMEPAGE="http://code.google.com/p/v8"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
-LICENSE="BSD"
-
-soname_version="${PV}"
-SLOT="0/${soname_version}"
-KEYWORDS="amd64 ~arm x86 ~x86-fbsd ~x64-macos ~x86-macos"
-IUSE="icu neon readline"
-
-RDEPEND="icu? ( dev-libs/icu:= )
-	readline? ( sys-libs/readline:0 )"
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}"
-
-src_prepare() {
-	# Make sure no bundled libraries are used.
-	find third_party -type f \! -iname '*.gyp*' -delete || die
-}
-
-src_configure() {
-	tc-export AR CC CXX RANLIB
-	export LINK=${CXX}
-
-	local myconf=""
-
-	# Always build v8 as a shared library with proper SONAME.
-	myconf+=" -Dcomponent=shared_library -Dsoname_version=${soname_version}"
-
-	# Use target arch detection logic from bug #354601.
-	case ${CHOST} in
-		i?86-*)
-			myarch="ia32"
-			myconf+=" -Dv8_target_arch=ia32" ;;
-		x86_64-*)
-			if [[ $ABI = x86 ]] ; then
-				myarch="ia32"
-				myconf+=" -Dv8_target_arch=ia32"
-			else
-				myarch="x64"
-				myconf+=" -Dv8_target_arch=x64"
-			fi ;;
-		arm*-*)
-			myarch="arm"
-			myconf+=" -Dv8_target_arch=arm -Darm_fpu=default"
-			if [[ ${CHOST} == *-hardfloat-* ]] ; then
-				myconf+=" -Dv8_use_arm_eabi_hardfloat=true"
-			else
-				myconf+=" -Dv8_use_arm_eabi_hardfloat=false"
-			fi
-			if [[ ${CHOST} == armv7*-* ]] ; then
-				myconf+=" -Darmv7=1"
-			else
-				myconf+=" -Darmv7=0"
-			fi
-			myconf+=" $(gyp_use neon arm_neon)" ;;
-		mips*)
-			if [[ ${CHOST} == mips*el* ]] ; then
-				myarch="mipsel"
-				myconf+=" -Dv8_target_arch=mipsel"
-			else
-				die "big-endian MIPS is not yet supported"
-			fi
-			if [[ ${CHOST} == *softfloat* ]] ; then
-				myconf+=" -Dv8_use_mips_abi_hardfloat=false"
-			else
-				myconf+=" -Dv8_use_mips_abi_hardfloat=true"
-			fi
-			if [[ ${CHOST} == *loongson* ]] ; then
-				myconf+=" -Dmips_arch_variant=loongson"
-			elif [[ ${CHOST} == mips*64* ]] ; then
-				die "generic MIPS 64bit is not yet supported"
-			elif [[ ${CHOST} == mips*r2* ]] ; then
-				myconf+=" -Dmips_arch_variant=mips32r2"
-			else
-				myconf+=" -Dmips_arch_variant=mips32"
-			fi
-			;;
-		*) die "Unrecognized CHOST: ${CHOST}"
-	esac
-
-	myconf+="
-		$(gyp_use icu v8_enable_i18n_support)
-		$(gyp_use readline console readline dumb)"
-
-	myconf+="
-		-Duse_system_icu=1"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't
-	# want the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# gyp does this only for linux, but we always want to use "out" dir, or
-	# all else below fails due to not finding "out" dir
-	myconf+=" --generator-output=out"
-	# gyp defaults to whatever makes the most sense on the platform at hand,
-	# but we want to build using Makefiles, so force that
-	myconf+=" -f make"
-
-	EGYP_CHROMIUM_COMMAND=build/gyp_v8 egyp_chromium ${myconf} || die
-}
-
-src_compile() {
-	local makeargs=(
-		-C out
-		builddir="${S}/out/Release"
-		V=1
-		BUILDTYPE=Release
-	)
-
-	# Build mksnapshot so we can pax-mark it.
-	emake "${makeargs[@]}" mksnapshot.${myarch}
-	pax-mark m out/Release/mksnapshot.${myarch}
-
-	# Build everything else.
-	emake "${makeargs[@]}"
-	pax-mark m out/Release/{cctest,d8,preparser}
-}
-
-src_test() {
-	LD_LIBRARY_PATH=out/Release/lib.target tools/run-tests.py \
-		-j$(makeopts_jobs) \
-		--no-presubmit \
-		--outdir=out \
-		--buildbot \
-		--arch=native \
-		--mode=Release \
-		--progress=dots || die
-}
-
-src_install() {
-	insinto /usr
-	doins -r include
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# buildsystem is too horrific to get this built correctly
-		mkdir -p out/Release/lib.target || die
-		mv out/Release/libv8.so.${soname_version} \
-			out/Release/lib.target/libv8$(get_libname ${soname_version}) || die
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
-			out/Release/lib.target/libv8$(get_libname ${soname_version}) \
-			|| die
-		install_name_tool \
-			-change \
-			/usr/local/lib/libv8.so.${soname_version} \
-			"${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
-			out/Release/d8 || die
-	fi
-
-	dobin out/Release/d8
-	pax-mark m "${ED}usr/bin/d8"
-
-	dolib out/Release/lib.target/libv8$(get_libname ${soname_version})
-	dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname)
-
-	dodoc AUTHORS ChangeLog
-}
-
-# TODO: remove functions below after they are removed from chromium.eclass'
-# EXPORT_FUNCTIONS .
-
-pkg_preinst() {
-	return
-}
-
-pkg_postinst() {
-	return
-}
-
-pkg_postrm() {
-	return
-}
--- a/dev-lang/v8/v8-3.20.17.15.ebuild
+++ b/dev-lang/v8/v8-3.20.17.15.ebuild
@ -1,184 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.20.17.15.ebuild,v 1.3 2013/10/16 12:48:51 ago Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit chromium eutils multilib multiprocessing pax-utils python-any-r1 \
-	toolchain-funcs versionator
-
-DESCRIPTION="Google's open source JavaScript engine"
-HOMEPAGE="http://code.google.com/p/v8"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
-LICENSE="BSD"
-
-soname_version="${PV}"
-SLOT="0/${soname_version}"
-KEYWORDS="amd64 ~arm x86 ~x86-fbsd ~x64-macos ~x86-macos"
-IUSE="icu neon readline"
-
-RDEPEND="icu? ( dev-libs/icu:= )
-	readline? ( sys-libs/readline:0 )"
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}"
-
-src_prepare() {
-	# Make sure no bundled libraries are used.
-	find third_party -type f \! -iname '*.gyp*' -delete || die
-}
-
-src_configure() {
-	tc-export AR CC CXX RANLIB
-	export LINK=${CXX}
-
-	local myconf=""
-
-	# Always build v8 as a shared library with proper SONAME.
-	myconf+=" -Dcomponent=shared_library -Dsoname_version=${soname_version}"
-
-	# Use target arch detection logic from bug #354601.
-	case ${CHOST} in
-		i?86-*)
-			myarch="ia32"
-			myconf+=" -Dv8_target_arch=ia32" ;;
-		x86_64-*)
-			if [[ $ABI = x86 ]] ; then
-				myarch="ia32"
-				myconf+=" -Dv8_target_arch=ia32"
-			else
-				myarch="x64"
-				myconf+=" -Dv8_target_arch=x64"
-			fi ;;
-		arm*-*)
-			myarch="arm"
-			myconf+=" -Dv8_target_arch=arm -Darm_fpu=default"
-			if [[ ${CHOST} == *-hardfloat-* ]] ; then
-				myconf+=" -Dv8_use_arm_eabi_hardfloat=true"
-			else
-				myconf+=" -Dv8_use_arm_eabi_hardfloat=false"
-			fi
-			if [[ ${CHOST} == armv7*-* ]] ; then
-				myconf+=" -Darmv7=1"
-			else
-				myconf+=" -Darmv7=0"
-			fi
-			myconf+=" $(gyp_use neon arm_neon)" ;;
-		mips*)
-			if [[ ${CHOST} == mips*el* ]] ; then
-				myarch="mipsel"
-				myconf+=" -Dv8_target_arch=mipsel"
-			else
-				die "big-endian MIPS is not yet supported"
-			fi
-			if [[ ${CHOST} == *softfloat* ]] ; then
-				myconf+=" -Dv8_use_mips_abi_hardfloat=false"
-			else
-				myconf+=" -Dv8_use_mips_abi_hardfloat=true"
-			fi
-			if [[ ${CHOST} == *loongson* ]] ; then
-				myconf+=" -Dmips_arch_variant=loongson"
-			elif [[ ${CHOST} == mips*64* ]] ; then
-				die "generic MIPS 64bit is not yet supported"
-			elif [[ ${CHOST} == mips*r2* ]] ; then
-				myconf+=" -Dmips_arch_variant=mips32r2"
-			else
-				myconf+=" -Dmips_arch_variant=mips32"
-			fi
-			;;
-		*) die "Unrecognized CHOST: ${CHOST}"
-	esac
-
-	myconf+="
-		$(gyp_use icu v8_enable_i18n_support)
-		$(gyp_use readline console readline dumb)"
-
-	myconf+="
-		-Duse_system_icu=1"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't
-	# want the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# gyp does this only for linux, but we always want to use "out" dir, or
-	# all else below fails due to not finding "out" dir
-	myconf+=" --generator-output=out"
-	# gyp defaults to whatever makes the most sense on the platform at hand,
-	# but we want to build using Makefiles, so force that
-	myconf+=" -f make"
-
-	EGYP_CHROMIUM_COMMAND=build/gyp_v8 egyp_chromium ${myconf} || die
-}
-
-src_compile() {
-	local makeargs=(
-		-C out
-		builddir="${S}/out/Release"
-		V=1
-		BUILDTYPE=Release
-	)
-
-	# Build mksnapshot so we can pax-mark it.
-	emake "${makeargs[@]}" mksnapshot.${myarch}
-	pax-mark m out/Release/mksnapshot.${myarch}
-
-	# Build everything else.
-	emake "${makeargs[@]}"
-	pax-mark m out/Release/{cctest,d8,preparser}
-}
-
-src_test() {
-	LD_LIBRARY_PATH=out/Release/lib.target tools/run-tests.py \
-		-j$(makeopts_jobs) \
-		--no-presubmit \
-		--outdir=out \
-		--buildbot \
-		--arch=native \
-		--mode=Release \
-		--progress=dots || die
-}
-
-src_install() {
-	insinto /usr
-	doins -r include
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# buildsystem is too horrific to get this built correctly
-		mkdir -p out/Release/lib.target || die
-		mv out/Release/libv8.so.${soname_version} \
-			out/Release/lib.target/libv8$(get_libname ${soname_version}) || die
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
-			out/Release/lib.target/libv8$(get_libname ${soname_version}) \
-			|| die
-		install_name_tool \
-			-change \
-			/usr/local/lib/libv8.so.${soname_version} \
-			"${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
-			out/Release/d8 || die
-	fi
-
-	dobin out/Release/d8
-	pax-mark m "${ED}usr/bin/d8"
-
-	dolib out/Release/lib.target/libv8$(get_libname ${soname_version})
-	dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname)
-
-	dodoc AUTHORS ChangeLog
-}
-
-# TODO: remove functions below after they are removed from chromium.eclass'
-# EXPORT_FUNCTIONS .
-
-pkg_preinst() {
-	return
-}
-
-pkg_postinst() {
-	return
-}
-
-pkg_postrm() {
-	return
-}
--- a/dev-lang/v8/v8-3.21.10.1.ebuild
+++ b/dev-lang/v8/v8-3.21.10.1.ebuild
@ -1,184 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.21.10.1.ebuild,v 1.1 2013/09/10 15:59:33 phajdan.jr Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit chromium eutils multilib multiprocessing pax-utils python-any-r1 \
-	toolchain-funcs versionator
-
-DESCRIPTION="Google's open source JavaScript engine"
-HOMEPAGE="http://code.google.com/p/v8"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.bz2"
-LICENSE="BSD"
-
-soname_version="${PV}"
-SLOT="0/${soname_version}"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x64-macos ~x86-macos"
-IUSE="icu neon readline"
-
-RDEPEND="icu? ( dev-libs/icu:= )
-	readline? ( sys-libs/readline:0 )"
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}"
-
-src_prepare() {
-	# Make sure no bundled libraries are used.
-	find third_party -type f \! -iname '*.gyp*' -delete || die
-}
-
-src_configure() {
-	tc-export AR CC CXX RANLIB
-	export LINK=${CXX}
-
-	local myconf=""
-
-	# Always build v8 as a shared library with proper SONAME.
-	myconf+=" -Dcomponent=shared_library -Dsoname_version=${soname_version}"
-
-	# Use target arch detection logic from bug #354601.
-	case ${CHOST} in
-		i?86-*)
-			myarch="ia32"
-			myconf+=" -Dv8_target_arch=ia32" ;;
-		x86_64-*)
-			if [[ $ABI = x86 ]] ; then
-				myarch="ia32"
-				myconf+=" -Dv8_target_arch=ia32"
-			else
-				myarch="x64"
-				myconf+=" -Dv8_target_arch=x64"
-			fi ;;
-		arm*-*)
-			myarch="arm"
-			myconf+=" -Dv8_target_arch=arm -Darm_fpu=default"
-			if [[ ${CHOST} == *-hardfloat-* ]] ; then
-				myconf+=" -Dv8_use_arm_eabi_hardfloat=true"
-			else
-				myconf+=" -Dv8_use_arm_eabi_hardfloat=false"
-			fi
-			if [[ ${CHOST} == armv7*-* ]] ; then
-				myconf+=" -Darmv7=1"
-			else
-				myconf+=" -Darmv7=0"
-			fi
-			myconf+=" $(gyp_use neon arm_neon)" ;;
-		mips*)
-			if [[ ${CHOST} == mips*el* ]] ; then
-				myarch="mipsel"
-				myconf+=" -Dv8_target_arch=mipsel"
-			else
-				die "big-endian MIPS is not yet supported"
-			fi
-			if [[ ${CHOST} == *softfloat* ]] ; then
-				myconf+=" -Dv8_use_mips_abi_hardfloat=false"
-			else
-				myconf+=" -Dv8_use_mips_abi_hardfloat=true"
-			fi
-			if [[ ${CHOST} == *loongson* ]] ; then
-				myconf+=" -Dmips_arch_variant=loongson"
-			elif [[ ${CHOST} == mips*64* ]] ; then
-				die "generic MIPS 64bit is not yet supported"
-			elif [[ ${CHOST} == mips*r2* ]] ; then
-				myconf+=" -Dmips_arch_variant=mips32r2"
-			else
-				myconf+=" -Dmips_arch_variant=mips32"
-			fi
-			;;
-		*) die "Unrecognized CHOST: ${CHOST}"
-	esac
-
-	myconf+="
-		$(gyp_use icu v8_enable_i18n_support)
-		$(gyp_use readline console readline dumb)"
-
-	myconf+="
-		-Duse_system_icu=1"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't
-	# want the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# gyp does this only for linux, but we always want to use "out" dir, or
-	# all else below fails due to not finding "out" dir
-	myconf+=" --generator-output=out"
-	# gyp defaults to whatever makes the most sense on the platform at hand,
-	# but we want to build using Makefiles, so force that
-	myconf+=" -f make"
-
-	EGYP_CHROMIUM_COMMAND=build/gyp_v8 egyp_chromium ${myconf} || die
-}
-
-src_compile() {
-	local makeargs=(
-		-C out
-		builddir="${S}/out/Release"
-		V=1
-		BUILDTYPE=Release
-	)
-
-	# Build mksnapshot so we can pax-mark it.
-	emake "${makeargs[@]}" mksnapshot.${myarch}
-	pax-mark m out/Release/mksnapshot.${myarch}
-
-	# Build everything else.
-	emake "${makeargs[@]}"
-	pax-mark m out/Release/{cctest,d8,preparser}
-}
-
-src_test() {
-	LD_LIBRARY_PATH=out/Release/lib.target tools/run-tests.py \
-		-j$(makeopts_jobs) \
-		--no-presubmit \
-		--outdir=out \
-		--buildbot \
-		--arch=native \
-		--mode=Release \
-		--progress=dots || die
-}
-
-src_install() {
-	insinto /usr
-	doins -r include
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# buildsystem is too horrific to get this built correctly
-		mkdir -p out/Release/lib.target || die
-		mv out/Release/libv8.so.${soname_version} \
-			out/Release/lib.target/libv8$(get_libname ${soname_version}) || die
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
-			out/Release/lib.target/libv8$(get_libname ${soname_version}) \
-			|| die
-		install_name_tool \
-			-change \
-			/usr/local/lib/libv8.so.${soname_version} \
-			"${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
-			out/Release/d8 || die
-	fi
-
-	dobin out/Release/d8
-	pax-mark m "${ED}usr/bin/d8"
-
-	dolib out/Release/lib.target/libv8$(get_libname ${soname_version})
-	dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname)
-
-	dodoc AUTHORS ChangeLog
-}
-
-# TODO: remove functions below after they are removed from chromium.eclass'
-# EXPORT_FUNCTIONS .
-
-pkg_preinst() {
-	return
-}
-
-pkg_postinst() {
-	return
-}
-
-pkg_postrm() {
-	return
-}
--- a/dev-lang/v8/v8-3.21.12.1.ebuild
+++ b/dev-lang/v8/v8-3.21.12.1.ebuild
@ -1,184 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.21.12.1.ebuild,v 1.1 2013/09/20 02:43:22 phajdan.jr Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit chromium eutils multilib multiprocessing pax-utils python-any-r1 \
-	toolchain-funcs versionator
-
-DESCRIPTION="Google's open source JavaScript engine"
-HOMEPAGE="http://code.google.com/p/v8"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.bz2"
-LICENSE="BSD"
-
-soname_version="${PV}"
-SLOT="0/${soname_version}"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x64-macos ~x86-macos"
-IUSE="icu neon readline"
-
-RDEPEND="icu? ( dev-libs/icu:= )
-	readline? ( sys-libs/readline:0 )"
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}"
-
-src_prepare() {
-	# Make sure no bundled libraries are used.
-	find third_party -type f \! -iname '*.gyp*' -delete || die
-}
-
-src_configure() {
-	tc-export AR CC CXX RANLIB
-	export LINK=${CXX}
-
-	local myconf=""
-
-	# Always build v8 as a shared library with proper SONAME.
-	myconf+=" -Dcomponent=shared_library -Dsoname_version=${soname_version}"
-
-	# Use target arch detection logic from bug #354601.
-	case ${CHOST} in
-		i?86-*)
-			myarch="ia32"
-			myconf+=" -Dv8_target_arch=ia32" ;;
-		x86_64-*)
-			if [[ $ABI = x86 ]] ; then
-				myarch="ia32"
-				myconf+=" -Dv8_target_arch=ia32"
-			else
-				myarch="x64"
-				myconf+=" -Dv8_target_arch=x64"
-			fi ;;
-		arm*-*)
-			myarch="arm"
-			myconf+=" -Dv8_target_arch=arm -Darm_fpu=default"
-			if [[ ${CHOST} == *-hardfloat-* ]] ; then
-				myconf+=" -Dv8_use_arm_eabi_hardfloat=true"
-			else
-				myconf+=" -Dv8_use_arm_eabi_hardfloat=false"
-			fi
-			if [[ ${CHOST} == armv7*-* ]] ; then
-				myconf+=" -Darmv7=1"
-			else
-				myconf+=" -Darmv7=0"
-			fi
-			myconf+=" $(gyp_use neon arm_neon)" ;;
-		mips*)
-			if [[ ${CHOST} == mips*el* ]] ; then
-				myarch="mipsel"
-				myconf+=" -Dv8_target_arch=mipsel"
-			else
-				die "big-endian MIPS is not yet supported"
-			fi
-			if [[ ${CHOST} == *softfloat* ]] ; then
-				myconf+=" -Dv8_use_mips_abi_hardfloat=false"
-			else
-				myconf+=" -Dv8_use_mips_abi_hardfloat=true"
-			fi
-			if [[ ${CHOST} == *loongson* ]] ; then
-				myconf+=" -Dmips_arch_variant=loongson"
-			elif [[ ${CHOST} == mips*64* ]] ; then
-				die "generic MIPS 64bit is not yet supported"
-			elif [[ ${CHOST} == mips*r2* ]] ; then
-				myconf+=" -Dmips_arch_variant=mips32r2"
-			else
-				myconf+=" -Dmips_arch_variant=mips32"
-			fi
-			;;
-		*) die "Unrecognized CHOST: ${CHOST}"
-	esac
-
-	myconf+="
-		$(gyp_use icu v8_enable_i18n_support)
-		$(gyp_use readline console readline dumb)"
-
-	myconf+="
-		-Duse_system_icu=1"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't
-	# want the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# gyp does this only for linux, but we always want to use "out" dir, or
-	# all else below fails due to not finding "out" dir
-	myconf+=" --generator-output=out"
-	# gyp defaults to whatever makes the most sense on the platform at hand,
-	# but we want to build using Makefiles, so force that
-	myconf+=" -f make"
-
-	EGYP_CHROMIUM_COMMAND=build/gyp_v8 egyp_chromium ${myconf} || die
-}
-
-src_compile() {
-	local makeargs=(
-		-C out
-		builddir="${S}/out/Release"
-		V=1
-		BUILDTYPE=Release
-	)
-
-	# Build mksnapshot so we can pax-mark it.
-	emake "${makeargs[@]}" mksnapshot.${myarch}
-	pax-mark m out/Release/mksnapshot.${myarch}
-
-	# Build everything else.
-	emake "${makeargs[@]}"
-	pax-mark m out/Release/{cctest,d8,preparser}
-}
-
-src_test() {
-	LD_LIBRARY_PATH=out/Release/lib.target tools/run-tests.py \
-		-j$(makeopts_jobs) \
-		--no-presubmit \
-		--outdir=out \
-		--buildbot \
-		--arch=native \
-		--mode=Release \
-		--progress=dots || die
-}
-
-src_install() {
-	insinto /usr
-	doins -r include
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# buildsystem is too horrific to get this built correctly
-		mkdir -p out/Release/lib.target || die
-		mv out/Release/libv8.so.${soname_version} \
-			out/Release/lib.target/libv8$(get_libname ${soname_version}) || die
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
-			out/Release/lib.target/libv8$(get_libname ${soname_version}) \
-			|| die
-		install_name_tool \
-			-change \
-			/usr/local/lib/libv8.so.${soname_version} \
-			"${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
-			out/Release/d8 || die
-	fi
-
-	dobin out/Release/d8
-	pax-mark m "${ED}usr/bin/d8"
-
-	dolib out/Release/lib.target/libv8$(get_libname ${soname_version})
-	dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname)
-
-	dodoc AUTHORS ChangeLog
-}
-
-# TODO: remove functions below after they are removed from chromium.eclass'
-# EXPORT_FUNCTIONS .
-
-pkg_preinst() {
-	return
-}
-
-pkg_postinst() {
-	return
-}
-
-pkg_postrm() {
-	return
-}
--- a/dev-lang/v8/v8-9999.ebuild
+++ b/dev-lang/v8/v8-9999.ebuild
@ -1,185 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-9999.ebuild,v 1.48 2013/08/18 03:12:49 steev Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit chromium eutils multilib multiprocessing pax-utils python-any-r1 \
-	subversion toolchain-funcs
-
-DESCRIPTION="Google's open source JavaScript engine"
-HOMEPAGE="http://code.google.com/p/v8"
-ESVN_REPO_URI="http://v8.googlecode.com/svn/trunk"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS=""
-IUSE="icu readline neon"
-
-RDEPEND="icu? ( dev-libs/icu:= )
-	readline? ( sys-libs/readline:0 )"
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}"
-
-src_unpack() {
-	subversion_src_unpack
-	cd "${S}"
-	make dependencies || die
-}
-
-src_prepare() {
-	# Make sure no bundled libraries are used.
-	find third_party -type f \! -iname '*.gyp*' -delete || die
-}
-
-src_configure() {
-	tc-export AR CC CXX RANLIB
-	export LINK=${CXX}
-
-	local myconf=""
-
-	subversion_wc_info
-	soname_version="${PV}.${ESVN_WC_REVISION}"
-
-	# Always build v8 as a shared library with proper SONAME.
-	myconf+=" -Dcomponent=shared_library -Dsoname_version=${soname_version}"
-
-	# Use target arch detection logic from bug #354601.
-	case ${CHOST} in
-		i?86-*)
-			myarch="ia32"
-			myconf+=" -Dv8_target_arch=ia32" ;;
-		x86_64-*)
-			if [[ $ABI = x86 ]] ; then
-				myarch="ia32"
-				myconf+=" -Dv8_target_arch=ia32"
-			else
-				myarch="x64"
-				myconf+=" -Dv8_target_arch=x64"
-			fi ;;
-		arm*-*)
-			myarch="arm"
-			myconf+=" -Dv8_target_arch=arm -Darm_fpu=default"
-			if [[ ${CHOST} == *-hardfloat-* ]] ; then
-				myconf+=" -Dv8_use_arm_eabi_hardfloat=true"
-			else
-				myconf+=" -Dv8_use_arm_eabi_hardfloat=false"
-			fi
-			if [[ ${CHOST} == armv7*-* ]] ; then
-				myconf+=" -Darmv7=1"
-			else
-				myconf+=" -Darmv7=0"
-			fi
-			myconf+=" $(gyp_use neon arm_neon)" ;;
-		mips*)
-			if [[ ${CHOST} == mips*el* ]] ; then
-				myarch="mipsel"
-				myconf+=" -Dv8_target_arch=mipsel"
-			else
-				die "big-endian MIPS is not yet supported"
-			fi
-			if [[ ${CHOST} == *softfloat* ]] ; then
-				myconf+=" -Dv8_use_mips_abi_hardfloat=false"
-			else
-				myconf+=" -Dv8_use_mips_abi_hardfloat=true"
-			fi
-			if [[ ${CHOST} == *loongson* ]] ; then
-				myconf+=" -Dmips_arch_variant=loongson"
-			elif [[ ${CHOST} == mips*64* ]] ; then
-				die "generic MIPS 64bit is not yet supported"
-			elif [[ ${CHOST} == mips*r2* ]] ; then
-				myconf+=" -Dmips_arch_variant=mips32r2"
-			else
-				myconf+=" -Dmips_arch_variant=mips32"
-			fi
-			;;
-		*) die "Unrecognized CHOST: ${CHOST}"
-	esac
-
-	myconf+="
-		$(gyp_use icu v8_enable_i18n_support)
-		$(gyp_use readline console readline dumb)"
-
-	myconf+="
-		-Duse_system_icu=1"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't
-	# want the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	EGYP_CHROMIUM_COMMAND=build/gyp_v8 egyp_chromium ${myconf} || die
-}
-
-src_compile() {
-	local makeargs=(
-		-C out
-		builddir="${S}/out/Release"
-		V=1
-		BUILDTYPE=Release
-	)
-
-	# Build mksnapshot so we can pax-mark it.
-	emake "${makeargs[@]}" mksnapshot.${myarch}
-	pax-mark m out/Release/mksnapshot.${myarch}
-
-	# Build everything else.
-	emake "${makeargs[@]}"
-	pax-mark m out/Release/{cctest,d8,preparser}
-}
-
-src_test() {
-	LD_LIBRARY_PATH=out/Release/lib.target tools/run-tests.py \
-		-j$(makeopts_jobs) \
-		--no-presubmit \
-		--outdir=out \
-		--buildbot \
-		--arch=native \
-		--mode=Release \
-		--progress=dots || die
-}
-
-src_install() {
-	insinto /usr
-	doins -r include
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# buildsystem is too horrific to get this built correctly
-		mkdir -p out/Release/lib.target || die
-		mv out/Release/libv8.so.${soname_version} \
-			out/Release/lib.target/libv8$(get_libname ${soname_version}) || die
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
-			out/Release/lib.target/libv8$(get_libname ${soname_version}) \
-			|| die
-		install_name_tool \
-			-change \
-			/usr/local/lib/libv8.so.${soname_version} \
-			"${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
-			out/Release/d8 || die
-	fi
-
-	dobin out/Release/d8
-	pax-mark m "${ED}usr/bin/d8"
-
-	dolib out/Release/lib.target/libv8$(get_libname ${soname_version})
-	dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname)
-
-	dodoc AUTHORS ChangeLog
-}
-
-# TODO: remove functions below after they are removed from chromium.eclass'
-# EXPORT_FUNCTIONS .
-
-pkg_preinst() {
-	return
-}
-
-pkg_postinst() {
-	return
-}
-
-pkg_postrm() {
-	return
-}
--- a/dev-lang/v8cgi/Manifest
+++ b/dev-lang/v8cgi/Manifest
@ -1 +0,0 @@
-DIST v8cgi-0.9.2-src.tar.gz 11665177 SHA256 74b469f9513a2bea34b53439841871334cd2da6fb7ce0e49fbf6ea958c6e39d4 SHA512 13ceee80bb6f3bf887fafacc2a737a291b0a3d15c54dc2f4c3c489c24628fdaa5a76ae6fa97db1b18a811240e4d3b68553dc257b03fefc5820dba54c6aff804b WHIRLPOOL 18335cd841c3df5389c0df367c53dfc0592055c39506558bd805f70dc7404d922e38ac2b1b9d853d1335c91620a0e7f24fbce91f812e06f6d54ffe9c55d037c1
--- a/dev-lang/v8cgi/metadata.xml
+++ b/dev-lang/v8cgi/metadata.xml
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>dev-tools</herd>
-	<use>
-		<flag name="memcached">Support for the memcached daemon</flag>
-		<flag name="fcgi">Support for FastCGI</flag>
-		<flag name="xerces">Use the xerces XML parser</flag>
-		<flag name="apache">Support for apache</flag>
-	</use>
-	<upstream>
-		<remote-id type="google-code">v8cgi</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/dev-lang/v8cgi/v8cgi-0.9.2.ebuild
+++ b/dev-lang/v8cgi/v8cgi-0.9.2.ebuild
@ -1,100 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8cgi/v8cgi-0.9.2.ebuild,v 1.1 2011/12/24 01:02:35 weaver Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_P=${P}-src
-LIB_P="v8"
-
-DESCRIPTION="Small set of C++ and JS libraries, allowing coder to use JS as a server-side HTTP processing language"
-HOMEPAGE="http://code.google.com/p/${PN}/"
-SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug mysql postgres sqlite memcached fcgi gd xerces opengl apache"
-
-RDEPEND="dev-lang/v8
-	memcached? ( dev-libs/libmemcached )
-	apache? ( www-servers/apache )
-	opengl? ( virtual/opengl )
-	xerces? ( >=dev-libs/xerces-c-3.0.0 )
-	gd? ( media-libs/gd )
-	sqlite? ( dev-db/sqlite )
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-db/postgresql-server )"
-DEPEND="${RDEPEND}
-	>=dev-util/scons-0.96.93"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	local myconf
-
-	filter-flags -ftracer -fomit-frame-pointer
-	if [[ $(gcc-major-version) -eq 3 ]] ; then
-		filter-flags -fstack-protector
-		append-flags -fno-stack-protector
-	fi
-
-	myconf="${myconf} v8_path=/usr/lib/"
-	myconf="${myconf} os=posix"
-
-	if use debug ; then
-		myconf="${myconf} debug=1"
-	fi
-	if use !mysql ; then
-		myconf="${myconf} mysql=0"
-	fi
-	if use postgres ; then
-		myconf="${myconf} pgsql=1"
-	fi
-	if use !sqlite ; then
-		myconf="${myconf} sqlite=0"
-	fi
-	if use fcgi ; then
-		myconf="${myconf} fcgi=1"
-	fi
-	if use !gd ; then
-		myconf="${myconf} gd=0"
-	fi
-	if use !memcached ; then
-		myconf="${myconf} memcached=0"
-	fi
-	if use xerces ; then
-		myconf="${myconf} xdom=1"
-	fi
-	if use opengl ; then
-		myconf="${myconf} gl=1"
-	fi
-	if use !apache ; then
-		myconf="${myconf} module=0"
-	fi
-
-	cd ${PN}
-	scons $myconf \
-		${MAKEOPTS/-l[0-9]} \
-		--implicit-deps-unchanged \
-		prefix=/usr \
-		docdir=/usr/share/doc/${PF} \
-		default_targets=none || die "scons failed"
-}
-
-src_install() {
-	cd ${PN}
-
-	insinto /usr/lib/${PN}
-	doins lib/*
-
-	insinto /usr/share/${PN}/example
-	doins example/*
-
-	insinto /etc
-	newins v8cgi.conf.posix v8cgi.conf
-
-	dobin v8cgi
-}
--- a/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.810.0.ebuild
+++ b/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.810.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.810.0.ebuild,v 1.1 2013/08/25 07:28:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.810.0.ebuild,v 1.2 2013/12/17 20:04:55 zlogene Exp $

 EAPI=4

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Create DateTime parser classes and objects"

 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-aix ~x86-solaris"
+KEYWORDS="amd64 x86 ~ppc-aix ~x86-solaris"
 IUSE="test"

 RDEPEND="dev-perl/DateTime
--- a/dev-perl/IO-Pipely/IO-Pipely-0.005.0.ebuild
+++ b/dev-perl/IO-Pipely/IO-Pipely-0.005.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-Pipely/IO-Pipely-0.005.0.ebuild,v 1.2 2013/09/18 06:01:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-Pipely/IO-Pipely-0.005.0.ebuild,v 1.3 2013/12/17 20:32:24 zlogene Exp $

 EAPI=5

@ -11,5 +11,5 @@ inherit perl-module
 DESCRIPTION="Portably create pipe() or pipe-like handles, one way or another."

 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
--- a/dev-python/hp3parclient/hp3parclient-2.0.0.ebuild
+++ b/dev-python/hp3parclient/hp3parclient-2.0.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hp3parclient/hp3parclient-2.0.0.ebuild,v 1.1 2013/11/15 01:26:54 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hp3parclient/hp3parclient-2.0.0.ebuild,v 1.3 2013/12/18 10:15:35 idella4 Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@ -20,7 +20,8 @@ RDEPEND=">=dev-python/httplib2-0.6.0"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/werkzeug[${PYTHON_USEDEP}]
 		dev-python/nose-testconfig[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
+		dev-python/nose[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"

 # Instructions on running tests are utter nonsense.  Tried and gave up
 python_compile_all() {
--- a/dev-python/oslo-sphinx/metadata.xml
+++ b/dev-python/oslo-sphinx/metadata.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <herd>openstack</herd>
  <maintainer>
    <email>prometheanfire@gentoo.org</email>
    <name>Matthew Thode</name>
--- a/dev-python/oslo-sphinx/oslo-sphinx-1.0-r1.ebuild
+++ b/dev-python/oslo-sphinx/oslo-sphinx-1.0-r1.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-sphinx/oslo-sphinx-1.0-r1.ebuild,v 1.1 2013/12/18 10:49:44 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_6 python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Theme and extension support for Sphinx documentation from the OpenStack project."
+HOMEPAGE="https://pypi.python.org/pypi/oslo.config"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.sphinx/oslo.sphinx-${PV}.tar.gz"
+S="${WORKDIR}/oslo.sphinx-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.5[${PYTHON_USEDEP}]
+		<dev-python/pbr-0.6[${PYTHON_USEDEP}]
+		>=dev-python/d2to1-0.2.10[${PYTHON_USEDEP}]
+		<dev-python/d2to1-0.3[${PYTHON_USEDEP}]
+	test? ( >=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.8[${PYTHON_USEDEP}]
+		~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
+		~dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
+		~dev-python/flake8-2.0[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+python_test() {
+	flake8 oslo || die "run by flake8 over folder oslo drew error"
+}
--- a/dev-python/python-augeas/Manifest
+++ b/dev-python/python-augeas/Manifest
@ -1 +1,3 @@
 DIST python-augeas-0.4.0.tar.gz 88982 SHA256 f7a38913bb7aa1b94dd1cda86d9179902e89ba9f70dd41401989db844a69e590 SHA512 cf9c110b7ca98c1f7ca87273891366c879c1360e2c3f7ec0bc10929ce29c89a8c7009dd25bb6158aa0ca79bd725bad2c013d00e25a445763de84b0c0998a9d38 WHIRLPOOL 898ae74d46c1593578c33738339036075c13c09f6e51209680f946d8facc9df6a26bec251f148e30307739bb80d265bfb954de0854e81a87a041899f0e47b4e1
+DIST python-augeas-0.4.1.tar.gz 89652 SHA256 2d9e618fad03f68033b5ac94d0d57136df9ed75bf21c6e7877d3107866af89bf SHA512 ccd6ea10f927f06eba74dd48c21c7ca9a99c2910741ef925f078c09cd8a3421e63de3b74df2903a2cfd17f3defaa8df4624c9743d20e13bb5bfeacd7d50c5938 WHIRLPOOL bdb389691d85b259f0dba50205f99efa48ccec1676b48b2df2a7180079d1b3a91bd59f1020adbfe0088e7a5912fad6a0313d8c65cfb785fcbea87914d2676aec
+DIST python-augeas-0.4.2_pre131218.tar.xz 77636 SHA256 1ef4547c48e8ea155a1fd9908fc6b8e4d9bdfd9d51aa79488352de4ef3d40f50 SHA512 3677dfa4d7b6bbb22009ebee4ed4b46e50f7e5712354f5061476d5d21c86b956c4408f5ca005b674ad0e14e26c970830572aa077af6bb594dbff116991676e86 WHIRLPOOL 8bd303ce00811a2c686ccb840cb445eaa35e47888f5a53599e49d848020201adfe0a17b37137817d1cafd05d61b0783e6a65bb989bfb7195ec59d6c7eb438046
--- a/dev-python/python-augeas/metadata.xml
+++ b/dev-python/python-augeas/metadata.xml
@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>prometheanfire@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">
+  <maintainer>
+    <email>prometheanfire@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
 python-augeas is a set of Python bindings around augeas.
 </longdescription>
 </pkgmetadata>
-
--- a/dev-python/python-augeas/python-augeas-0.4.1.ebuild
+++ b/dev-python/python-augeas/python-augeas-0.4.1.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-augeas/python-augeas-0.4.1.ebuild,v 1.1 2013/12/17 21:20:25 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for Augeas"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-admin/augeas"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS README.txt PKG-INFO"
+PYTHON_MODNAME="augeas.py"
+
+python_test() {
+	cd test || die
+	"${PYTHON}" test_augeas.py || die
+}
--- a/dev-python/python-augeas/python-augeas-0.4.2_pre131218.ebuild
+++ b/dev-python/python-augeas/python-augeas-0.4.2_pre131218.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-augeas/python-augeas-0.4.2_pre131218.ebuild,v 1.1 2013/12/18 07:59:59 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for Augeas"
+HOMEPAGE="http://augeas.net/"
+#SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-admin/augeas"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS README.txt PKG-INFO"
+PYTHON_MODNAME="augeas.py"
+
+python_test() {
+	cd test || die
+	"${PYTHON}" test_augeas.py || die
+}
--- a/kde-misc/magneto-kde/Manifest
+++ b/kde-misc/magneto-kde/Manifest
@ -1 +1 @@
-DIST entropy-216.tar.bz2 18429942 SHA256 c2569d7233b80b9373cde11645e6e9c4142038387ad4aa8943ed1ddfeb86f501 SHA512 8b6a19f311520ca48a998aadb10717f5ad81eb8c26b71c1f8a8b67f84fd9876117adf650eb4fa59893130fd3db669ba370804a33311fe7eff45546a5a92e6b7d WHIRLPOOL b220b870f099cfe014ad355760855dc91bbc11c76f39b34e03ec251e1f8f9bdf04bb4f1dd0ad9e0c5e63a4328f6c9691abd4f9e759b8546fac7026386b4c174b
+DIST entropy-254.tar.bz2 18516662 SHA256 5e411472eaf7016a68a4aa81ef92dd3aad8403fc65a0ffb09c57b91c959ca3a6 SHA512 3b3e82abad8008720e370b7892b7be1c48aaa6605914db977f68b9a108ada0a4adbaa5b7b50a9a02ba9c8b0bdefadcda1eceee2c7c2abc385b3daf669649e2da WHIRLPOOL 593469b858707e4ceca56146fa1d608141e44dda0a0921ed6a3ec566878c1e3c153410233f088d57db4f8bd9d1c796bd945cbea3ba455572efc05eca42023ce5
--- a/kde-misc/magneto-kde/magneto-kde-254.ebuild
+++ b/kde-misc/magneto-kde/magneto-kde-254.ebuild
@ -1,10 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/magneto-kde/magneto-kde-216.ebuild,v 1.1 2013/08/22 11:16:24 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/magneto-kde/magneto-kde-254.ebuild,v 1.1 2013/12/18 05:09:19 lxnay Exp $

-EAPI="3"
-PYTHON_DEPEND="2"
-inherit eutils python
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1

 DESCRIPTION="Entropy Package Manager notification applet KDE frontend"
 HOMEPAGE="http://www.sabayon.org"
@ -17,23 +19,15 @@ IUSE=""
 SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
 S="${WORKDIR}/entropy-${PV}/magneto"

-RDEPEND="~app-misc/magneto-loader-${PV}
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="~app-misc/magneto-loader-${PV}[${PYTHON_USEDEP}]
 	kde-base/pykde4
-	dev-python/PyQt4[dbus]"
-DEPEND=""
+	dev-python/PyQt4[dbus]
+	${DEPEND}"

-src_compile() {
-	einfo "nothing to compile"
-}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"

 src_install() {
 	emake DESTDIR="${D}" LIBDIR="usr/lib" magneto-kde-install || die "make install failed"
-}
-
-pkg_postinst() {
-	python_mod_optimize "/usr/lib/entropy/magneto/magneto/kde"
-}
-
-pkg_postrm() {
-	python_mod_cleanup "/usr/lib/entropy/magneto/magneto/kde"
+	python_optimize "${D}/usr/lib/entropy/magneto/magneto/kde"
 }
--- a/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendmarc/opendmarc-1.1.3.ebuild,v 1.3 2013/10/30 00:58:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendmarc/opendmarc-1.1.3.ebuild,v 1.4 2013/12/17 20:49:49 grobian Exp $

 EAPI=5

@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~hppa"
 IUSE=""

 DEPEND="dev-perl/DBI
-	mail-filter/libmilter"
+	|| ( mail-filter/libmilter mail-mta/sendmail )"
 RDEPEND="${DEPEND}
 	virtual/perl-Switch"

--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@ -1,6 +1,6 @@
 DIST postfix-2.10.0.tar.gz 3826655 SHA256 4a42a6029af418cbd4a8668b4f8c7e1ea9975cbe9756df760649c0a941bfeb7b SHA512 88689c2b18aeecd6e363525955c8e3506acf7702eb7fabe148b72a149020c29a76b3f6ed57109380ebb2106cf798a0ce78d470bc4a104a8ecde6c1c4cd0da07e WHIRLPOOL b47559ff91651c699581757976628ab87ffda91ef85f2ccb86ddc4982de68fe7f6dedc419a2708e879969081a7d54681f88763500cd816aed51958bbe0880b70
 DIST postfix-2.10.1.tar.gz 3827595 SHA256 2e85a62e97418bbb022b4d4433098a7f25adc7dc707c37d9984db2c2f314b1c1 SHA512 34d5923748b38dd93609657011adc1371ab738ee86558aa4822cce6e879ccdd426bb4de994ab425b3a2745c8ca10a01b2d1c5f310872e839f9627afa8dcccdf0 WHIRLPOOL d1e6c029429e6ec2249b58cfa035a8819456557655711fe8d81ea9cfbd22fd66837be509e8b0f458ee6680330b1c5cf1c6fc580b75b2df6aeb30cb94cf478031
 DIST postfix-2.10.2.tar.gz 3828326 SHA256 f1a735a5a9ffeac8fca59046c437c3b76e7f923fb4249db2a55b2bff0306ddd4 SHA512 fa6c123da040a8e332c0bf2430f5b098523c2eff42a6cf4bfe6618b82d59be8e5a7f5c85b09ab8fd0312058b2135b174e00890423e4d3f8f732c3dc3c91f01c3 WHIRLPOOL 4e1e453ecd653058faf7420d6bfb6ac6a6c343f03f9c1a4213c403a7164d99f659a0b9ba744b803c3d94cfaf3216d3505f44d22069421f6cc4a4651b6be1f316
-DIST postfix-2.11-20131126.tar.gz 3993475 SHA256 481a6775aa2d0c11fa72fba64c2b3bbebe816b18e69bba812ae5ccc4755fc36e SHA512 a3c7a50ddb7a42a0a984a9da48c0ea2cacf9a6fa5f789b76679405fd906b8302bdb10ce519deb4fae6e86e92cc37a32c5af22a2378da1a26d97dec94cbadb37e WHIRLPOOL ffd707481fa86a383c3f5438230487c2d514dde847e86113d27464887d07642798ee204dc561c769e8ccef047f341d1f21ad61b9347da7cf527866fc6582d353
+DIST postfix-2.11-20131217.tar.gz 4012487 SHA256 8cc95d10c6c972c8363c6e108aebb86564b706c1a793800fc0a511cef08761a6 SHA512 2ffa464fa7eb17e706dbf6d5d141cbb34261b4c9e56cb5c83aaf109d3982466726402c48d2b992a8b6b2dc4682edc0e9b56af553e09cad132897b4e2f9895865 WHIRLPOOL 1e62053b553fd2e4b941c4a9fcab8c02fef28ca3d1d1d67efe7540ccdd45c1cbb9c7c0a301612cedb601b1701003976704041734d95b31d3b2c0e32db011458e
 DIST postfix-vda-v11-2.9.5.patch 55009 SHA256 df30379c456971a514ae5587531bb5cd8492921a6a27e6d23f5014a1434945aa SHA512 c44497536e2bc313f2301e799a6614f396fc7bb06ef31493460edc59b0922b4d9a24802a84e2b8cf158277f5b0c8c59b53a4f8ef6896ee1e2ba538c562687010 WHIRLPOOL 70c438d2e98aaae6ebd37fadb5d5d0cbe3b31baf2119657009802be62bfeef7dc6a6e62fc8259bfe635ccbf4b0c8ffa17b35a04648c6c138575dda8314a28744
 DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3
--- a/mail-mta/postfix/postfix-2.11_pre20131217.ebuild
+++ b/mail-mta/postfix/postfix-2.11_pre20131217.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.11_pre20131126.ebuild,v 1.1 2013/11/27 10:21:00 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.11_pre20131217.ebuild,v 1.1 2013/12/18 06:43:31 eras Exp $

 EAPI=5
 inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@ -3,8 +3,10 @@ DIST gmic_1.5.5.2.tar.gz 1683717 SHA256 4e1ff3dcd7dc79dcc7f8ac92cae49951854aea28
 DIST gmic_1.5.6.1.tar.gz 2137616 SHA256 8399a97f4479a379d8e7fda6a0a73bde0ac120f781111b9ed8a2e28e5a3ed22f SHA512 3c3af5e071dc53c6f6971c494ceaec0d08a34ffc9595dea8c03c56be7ce6eb9dc4c0a91c49b93b01fc112192703aa0f53b2a859b855c4d5ab1f57ca22a45e0eb WHIRLPOOL 8071751c1e318e7aeac28a98c9a89e15008d5799422445cd9ca5e95c1ad9cbbd8ce1d703518a3f9ede5ed00d7deb5cf078a36d15122e4bf01d84069e20ab5321
 DIST gmic_1.5.7.1.tar.gz 2174947 SHA256 bc55fe0309c08fd4b4d97c37704db77965316c818c169ac573b8b12a5a44d42f SHA512 945e688fca9116cc53dafda63f7ec26bc0dd8c57e8fa9ae380f16c2b14086a2c1925327d71713d1e8249948d95b4f455b6bf217c1f1fa9c4ee8596cb81dcba62 WHIRLPOOL 088541176c84c6e6b4d25bc61ea68a87cd75ea60c9e2bd2a0d9080f32861bf1a014028d4a69bb1cc1d4e13ad84c8d1fd9757fefd4d302f7e7bcb60db1cf11616
 DIST gmic_1.5.8.0.tar.gz 2257558 SHA256 94382a599c23dd0be2ed9bf539072c057b7f780a8ac63b391a27522fec28f1e9 SHA512 46c7d46da2fd1f063dbb23df9cc8e894ff741871cc8d7ee570de54c5313ed101a3352915a71d952913e5bca97e35074fb025646aa05fd087d1575383ac2972b8 WHIRLPOOL 33ea1d72619bb40cc89357732b0f12c14377c9a5c7ab61d40300f9e81570d4e7fb01089597b9bb45e09358c67bbcf0ca2e25841e5e5e7c7b998feb870fccbad9
+DIST gmic_1.5.8.1.tar.gz 2265467 SHA256 2b0b813253e8c409a8535d350894245b35836cd849af31986055e0a09b8d1cea SHA512 6fea97ae18abe770ba827946457955c74cb4180a272e7fb0a6e2a0f612bec6f8fd83daa4c1010eb236886ebacef331d9b1b0a4f0c64dbde27261e76f71244ef7 WHIRLPOOL f9fc34c21f87c222b081bcef2ae819cbe6f25c1b66a890a569ffae667acbdc5f334496ba8d1d5ddf811550ec0844bd2936ee3564f131bb7f5b1b35ba7a70dcde
 DIST gmic_reference-1.5.5.1.pdf.xz 15343940 SHA256 c8649d36b87c24743f3afb0f0b0cb03699d65b7eac86d5ee1c33e36ebb76e1e2 SHA512 becec9f9d7ba8b716eda85aab49c9d091cdbbf7e643911639b21a15e9c9b10e450316094a3c5f52b407c73ca31c4675a25dc318360716cbca7ac593d686b44dc WHIRLPOOL ecf048a48d18eb4f4f736621e0e6f08f98e4c9513ab27e4e323b889a40c694c4830312e8add94aa8de640de6b129b5d6158beff61f695cee59abff1130bd3a2b
 DIST gmic_reference-1.5.5.2.pdf.xz 15384132 SHA256 d0fd745ec708ccd4c63e817a9de20833bfa64c5d3365356bc680a2be05814e80 SHA512 eaeebef81d7df2ed98d52a0519161edba570ae1002d1cf9601f4dc672aef51a42a18a3d7c9b6a8c0872e16574d82586f9d080dad7ad68c151cd9ae3087156c1e WHIRLPOOL eb97ab3508d57313d257fe90f9dde0649b4787664ac17cde3e5fc354b2bf53eb1bcd5bd3c6cb79c92f69d80a4fa0b0a2a703f83fd3e4773844a243b0eaa146f4
 DIST gmic_reference-1.5.6.1.pdf.xz 15629240 SHA256 e5fbaf82a68f19fd5914c26fb3eb8fe4888b94508c2893658adc132d72289221 SHA512 45eee7d021ff071edadb89c355dd1a7906bf9dc2166a8401509b61059b6e1005a07ed087a8cc260959d7e204cbacc014064aa3bf9a5db7bf1fdc3812e18764c7 WHIRLPOOL 9ba89f40a1746b45be13659aa1dd4580607e4f9467841897e584a860715e1b033fecfc11a13d4886f4698b569b68bed268706f80b668cb4534e286b77837b03c
 DIST gmic_reference-1.5.7.1.pdf.xz 15847624 SHA256 b2fb780b70c29ca5ea1fca553a20878eaf57b97d4533a3d2de0f6659a3a7c9b4 SHA512 6028dab9f63a667137a35783b48f2b11d93e0259eaf55a18db1add071e793f88865f8170d1f03fcb0bcdffd44015cb21dc799fd4be95b037baaae1ef4813c835 WHIRLPOOL 05368539c8037331237c0abc5d1bf704d3f44d27ea25fd6975f2c9b8b006c4dff3510adabeb4fafbebcb5e78d9e02f866bb3564e62e8a4bc5aeb13782ef3726d
 DIST gmic_reference-1.5.8.0.pdf.xz 16097444 SHA256 42b7c29d141fa382d5cdaa2236382682b13f64d705c7c42ac7959decbdfae08b SHA512 6222a729a5d1fdd0ccab50c45b5ce60f92a8122570938e8c71f50e86d91f10bb91f7853d59fc4e6d1b918498fe0483ad4a513192b3f46863a0b7580ffc51d1a7 WHIRLPOOL b1900f4ccb34aebd1a8e5c3cfff901b4fa09ae1f26b8ef96ce298d98d23338e3f9d71bf7a777821e43322dc9fe5ad3d0da452b82b86248467575b5b6b03b4b97
+DIST gmic_reference-1.5.8.1.pdf.xz 16100496 SHA256 15aa3e4d4e67b8263640dee2a1eae4bb6de6ae6f4f681c320c0f33841e231799 SHA512 aaae69edb2833edd82568449cc428d03dc426001c69ed588442be65c5de75ee5f19d41852fb84b10f0c6c55279d5275eb6aaf929fb4e331e33aa51ecaae276b6 WHIRLPOOL 1003a188d2153046cf463a55ffd45e9693a1be4ad87653af2e76613d634f7e858479f9e1915f351061a7525d197cd3685556222968013e8700aadb8acd1dfd5a
--- a/media-gfx/gmic/gmic-1.5.8.1.ebuild
+++ b/media-gfx/gmic/gmic-1.5.8.1.ebuild
@ -0,0 +1,77 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.8.1.ebuild,v 1.1 2013/12/18 10:55:50 radhermit Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs bash-completion-r1 flag-o-matic
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="http://gmic.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz
+	doc? ( http://dev.gentoo.org/~radhermit/dist/gmic_reference-${PV}.pdf.xz )"
+
+LICENSE="CeCILL-2 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ffmpeg fftw graphicsmagick jpeg opencv openexr png tiff X zlib"
+
+RDEPEND="
+	ffmpeg? ( virtual/ffmpeg )
+	fftw? ( sci-libs/fftw:3.0[threads] )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg? ( virtual/jpeg )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
+	openexr? (
+		media-libs/ilmbase
+		media-libs/openexr
+	)
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/xz-utils )"
+
+S=${WORKDIR}/${P}/src
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.5.8.0-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.5.2.2-ffmpeg.patch
+
+	for i in ffmpeg fftw jpeg opencv png tiff zlib ; do
+		use $i || { sed -i -r "s/^(${i}_(C|LD)FLAGS =).*/\1/I" Makefile || die ; }
+	done
+
+	use graphicsmagick || { sed -i -r "s/^(MAGICK_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
+	use openexr || { sed -i -r "s/^(EXR_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
+
+	if ! use X ; then
+		sed -i -r "s/^((X11|XSHM)_(C|LD)FLAGS =).*/\1/" Makefile || die
+
+		# disable display capabilities when X support is disabled
+		append-cppflags -Dcimg_display=0
+	fi
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" custom lib
+}
+
+src_install() {
+	dobin gmic
+	newlib.so libgmic.so libgmic.so.1
+
+	insinto /usr/include
+	doins gmic.h
+
+	doman ../man/gmic.1.gz
+	dodoc ../README
+
+	use doc && dodoc "${WORKDIR}"/gmic_reference-${PV}.pdf
+
+	newbashcomp gmic_bashcompletion.sh ${PN}
+}
--- a/media-gfx/photivo/photivo-9999.ebuild
+++ b/media-gfx/photivo/photivo-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/photivo/photivo-9999.ebuild,v 1.6 2013/08/01 20:51:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/photivo/photivo-9999.ebuild,v 1.7 2013/12/17 21:13:39 hwoarang Exp $

 EAPI=4

@ -9,7 +9,6 @@ inherit qt4-r2 mercurial
 DESCRIPTION="Photo processor for RAW and Bitmap images"
 HOMEPAGE="http://www.photivo.org"
 EHG_REPO_URI="https://photivo.googlecode.com/hg/"
-EHG_REVISION="default"

 LICENSE="GPL-3"
 SLOT="0"
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@ -2,3 +2,4 @@ DIST avidemux_2.6.2.tar.gz 17009420 SHA256 67c5676692152094033fbab490fbea24af27d
 DIST avidemux_2.6.3.tar.gz 17025710 SHA256 78972b46c6ef1eb52fc012cafdeb2b6275913b968a49053016fb91ef0e9e5137 SHA512 a51e3cd95695a8500f1355c7a76b8313ae3fe68855b8eb9351038c00cd3d05bbf3ada3b75bf9d817fcddf1786a55c1c09cdbc4fe774974c5e4484c12ccd0a8fc WHIRLPOOL 899c5135e92cd3a830c84b1701ac6bfaf73d7417fa869ab26dd16b3754e5b71c5e667b30d747c5f19b902e1a8d53679447e86f9c6403f32a31554e551929e2bf
 DIST avidemux_2.6.4.tar.gz 17109929 SHA256 2937c6c09248445942ac7e71b100ff8f7e272c4ad9c38e7d8c519ce4a11cec44 SHA512 1b80f65ac5a1da844b521a82bab8976d01c81923460004dc76ed0f6994f95da0ad9a836c90ffa1595ad060f0d6f27ce30add0204ca9d5295084a62e79dd484c9 WHIRLPOOL a1cbfcfeafa163ed24881edb085126a69eca3e0e8eaee50091ceadb993105a0cb43068b7725fa54871bc04b20ca5b51650ac536688b1d1f8d5b0a2d7356459ef
 DIST avidemux_2.6.5.tar.gz 17322253 SHA256 428e1f6d99e2d854ccdcb68f2260d853c47c809eee6bd92f151cb298d98b1861 SHA512 e7f8be29812ca787a1ec2cfddb1c611e1032ed94f24f41c0684f106970085bb6d219c822f3e713c472508a3f7b306540d2cabeb665bdbac061a49bccf8c23a80 WHIRLPOOL 192ce60afe4634319567cd7a1440ba212d83e02c054d6625ad738955fde02d0e722eba948c60932f520bb5e76c46ebbab0001230c1da50d893fb99a18f1da76f
+DIST avidemux_2.6.7.tar.gz 17337193 SHA256 d28202273d23be85c748c12d6e4df5e013bb861ea52b9bac7e0f90ba3d23249f SHA512 deea9811a0b6f618fab2ecf63c675b37dac12ea0ab09136a6b251e13601cd62cdc1c97d032762ea54f38e07275380106026541243bc87e230ce302fb821f2e5c WHIRLPOOL a41c338fc51e14d2c900dcef86a3887f94164548e8b904945d47915a78db907d152fda4ae53e5c37bf368348ff9912b529005a271f85d993776f042b5b997553
--- a/media-libs/avidemux-core/avidemux-core-2.6.7.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.6.7.ebuild
@ -0,0 +1,108 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.7.ebuild,v 1.1 2013/12/17 23:26:40 tomwij Exp $
+
+EAPI="5"
+
+inherit cmake-utils eutils flag-o-matic
+
+SLOT="2.6"
+
+DESCRIPTION="Core libraries for a video editor designed for simple cutting, filtering and encoding tasks."
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+IUSE="debug nls sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv"
+KEYWORDS="~amd64 ~x86"
+
+MY_PN="${PN/-core/}"
+if [[ ${PV} == *9999* ]] ; then
+	KEYWORDS=""
+	EGIT_REPO_URI="git://gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git https://git.gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git"
+
+	inherit git-2
+else
+	MY_P="${MY_PN}_${PV}"
+	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
+DEPEND="
+	!<media-video/avidemux-${PV}:${SLOT}
+	dev-db/sqlite:3
+	nls? ( sys-devel/gettext:0 )
+	sdl? ( media-libs/libsdl:0 )
+	system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
+	xv? ( x11-libs/libXv:0 )
+	vaapi? ( x11-libs/libva:0 )
+	vdpau? ( x11-libs/libvdpau:0 )
+	video_cards_fglrx? ( x11-libs/xvba-video:0 )
+"
+RDEPEND="
+	$DEPEND
+"
+DEPEND="
+	$DEPEND
+	virtual/pkgconfig:0
+	!system-ffmpeg? ( dev-lang/yasm:0[nls=] )
+"
+
+S="${WORKDIR}/${MY_P}"
+BUILD_DIR="${S}/buildCore"
+
+DOCS=( AUTHORS README )
+
+src_prepare() {
+	mkdir "${BUILD_DIR}" || die "Can't create build folder."
+
+	cmake-utils_src_prepare
+
+	if use system-ffmpeg ; then
+		# Preparations to support the system ffmpeg. Currently fails because it depends on files the system ffmpeg doesn't install.
+		local error="Failed to remove ffmpeg."
+
+		rm -rf cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package buildCore/ffmpeg || die "${error}"
+		sed -i -e 's/include(admFFmpegUtil)//g' avidemux/commonCmakeApplication.cmake || die "${error}"
+		sed -i -e '/registerFFmpeg/d' avidemux/commonCmakeApplication.cmake || die "${error}"
+		sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "${error}"
+	else
+		# Avoid existing avidemux installations from making the build process fail, bug #461496.
+		sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${S}/buildCore/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \
+			|| die "Failed to avoid existing avidemux installation from making the build fail."
+	fi
+
+	# Add lax vector typing for PowerPC.
+	if use ppc || use ppc64 ; then
+		append-cflags -flax-vector-conversions
+	fi
+
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+}
+
+src_configure() {
+	local mycmakeargs="
+		-DAVIDEMUX_SOURCE_DIR='${S}'
+		$(cmake-utils_use nls GETTEXT)
+		$(cmake-utils_use sdl SDL)
+		$(cmake-utils_use vaapi LIBVA)
+		$(cmake-utils_use vdpau VDPAU)
+		$(cmake-utils_use video_cards_fglrx XVBA)
+		$(cmake-utils_use xv XVIDEO)
+	"
+
+	if use debug ; then
+		mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
+	fi
+
+	CMAKE_USE_DIR="${S}"/avidemux_core cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile -j1
+}
+
+src_install() {
+	cmake-utils_src_install -j1
+}
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-9999.ebuild,v 1.3 2013/08/31 09:29:52 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-9999.ebuild,v 1.4 2013/12/17 23:26:40 tomwij Exp $

 EAPI="5"

@ -24,7 +24,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-2
 else
 	MY_P="${MY_PN}_${PV}"
-	SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_P}.tar.gz"
+	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
 fi

 # Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@ -2,3 +2,4 @@ DIST avidemux_2.6.2.tar.gz 17009420 SHA256 67c5676692152094033fbab490fbea24af27d
 DIST avidemux_2.6.3.tar.gz 17025710 SHA256 78972b46c6ef1eb52fc012cafdeb2b6275913b968a49053016fb91ef0e9e5137 SHA512 a51e3cd95695a8500f1355c7a76b8313ae3fe68855b8eb9351038c00cd3d05bbf3ada3b75bf9d817fcddf1786a55c1c09cdbc4fe774974c5e4484c12ccd0a8fc WHIRLPOOL 899c5135e92cd3a830c84b1701ac6bfaf73d7417fa869ab26dd16b3754e5b71c5e667b30d747c5f19b902e1a8d53679447e86f9c6403f32a31554e551929e2bf
 DIST avidemux_2.6.4.tar.gz 17109929 SHA256 2937c6c09248445942ac7e71b100ff8f7e272c4ad9c38e7d8c519ce4a11cec44 SHA512 1b80f65ac5a1da844b521a82bab8976d01c81923460004dc76ed0f6994f95da0ad9a836c90ffa1595ad060f0d6f27ce30add0204ca9d5295084a62e79dd484c9 WHIRLPOOL a1cbfcfeafa163ed24881edb085126a69eca3e0e8eaee50091ceadb993105a0cb43068b7725fa54871bc04b20ca5b51650ac536688b1d1f8d5b0a2d7356459ef
 DIST avidemux_2.6.5.tar.gz 17322253 SHA256 428e1f6d99e2d854ccdcb68f2260d853c47c809eee6bd92f151cb298d98b1861 SHA512 e7f8be29812ca787a1ec2cfddb1c611e1032ed94f24f41c0684f106970085bb6d219c822f3e713c472508a3f7b306540d2cabeb665bdbac061a49bccf8c23a80 WHIRLPOOL 192ce60afe4634319567cd7a1440ba212d83e02c054d6625ad738955fde02d0e722eba948c60932f520bb5e76c46ebbab0001230c1da50d893fb99a18f1da76f
+DIST avidemux_2.6.7.tar.gz 17337193 SHA256 d28202273d23be85c748c12d6e4df5e013bb861ea52b9bac7e0f90ba3d23249f SHA512 deea9811a0b6f618fab2ecf63c675b37dac12ea0ab09136a6b251e13601cd62cdc1c97d032762ea54f38e07275380106026541243bc87e230ce302fb821f2e5c WHIRLPOOL a41c338fc51e14d2c900dcef86a3887f94164548e8b904945d47915a78db907d152fda4ae53e5c37bf368348ff9912b529005a271f85d993776f042b5b997553
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.7.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.6.7.ebuild
@ -0,0 +1,145 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/avidemux-plugins-2.6.7.ebuild,v 1.1 2013/12/17 23:28:48 tomwij Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eutils flag-o-matic python-single-r1
+
+SLOT="2.6"
+
+DESCRIPTION="Plugins for avidemux; a video editor designed for simple cutting, filtering and encoding tasks."
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vdpau vpx"
+KEYWORDS="~amd64 ~x86"
+
+MY_PN="${PN/-plugins/}"
+if [[ ${PV} == *9999* ]] ; then
+	KEYWORDS=""
+	EGIT_REPO_URI="git://gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git https://git.gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git"
+
+	inherit git-2
+else
+	MY_P="${MY_PN}_${PV}"
+	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+DEPEND="
+	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
+	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt4?]
+	>=dev-lang/spidermonkey-1.5-r2:0=
+	dev-libs/libxml2:2
+	media-libs/libpng:0=
+	virtual/libiconv:0
+	aac? (
+		media-libs/faac:0
+		media-libs/faad2:0
+	)
+	aften? ( media-libs/aften:0 )
+	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 )
+	amr? ( media-libs/opencore-amr:0 )
+	dts? ( media-libs/libdca:0 )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	fribidi? ( dev-libs/fribidi:0 )
+	jack? (
+		media-sound/jack-audio-connection-kit:0
+		libsamplerate? ( media-libs/libsamplerate:0 )
+	)
+	lame? ( media-sound/lame:0 )
+	oss? ( virtual/os-headers:0 )
+	pulseaudio? ( media-sound/pulseaudio:0 )
+	truetype? ( media-libs/freetype:2 )
+	twolame? ( media-sound/twolame:0 )
+	x264? ( media-libs/x264:0= )
+	xv? (
+		x11-libs/libX11:0
+		x11-libs/libXext:0
+		x11-libs/libXv:0
+	)
+	xvid? ( media-libs/xvid:0 )
+	vorbis? ( media-libs/libvorbis:0 )
+	vpx? ( media-libs/libvpx:0 )
+	${PYTHON_DEPS}
+"
+RDEPEND="$DEPEND"
+
+S="${WORKDIR}/${MY_P}"
+
+processes="buildPluginsCommon:avidemux_plugins
+	buildPluginsCLI:avidemux_plugins"
+use qt4 && processes+=" buildPluginsQt4:avidemux_plugins"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.6.4-optional-pulse.patch )
+
+src_configure() {
+	# Add lax vector typing for PowerPC.
+	if use ppc || use ppc64 ; then
+		append-cflags -flax-vector-conversions
+	fi
+
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+
+	for process in ${processes} ; do
+		local build="${process%%:*}"
+
+		local mycmakeargs="
+			-DAVIDEMUX_SOURCE_DIR='${S}'
+			-DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]')
+			$(cmake-utils_use aac FAAC)
+			$(cmake-utils_use aac FAAD)
+			$(cmake-utils_use alsa)
+			$(cmake-utils_use aften)
+			$(cmake-utils_use amr OPENCORE_AMRWB)
+			$(cmake-utils_use amr OPENCORE_AMRNB)
+			$(cmake-utils_use dts LIBDCA)
+			$(cmake-utils_use fontconfig)
+			$(cmake-utils_use jack)
+			$(cmake-utils_use lame)
+			$(cmake-utils_use oss)
+			$(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE)
+			$(cmake-utils_use qt4)
+			$(cmake-utils_use truetype FREETYPE2)
+			$(cmake-utils_use twolame)
+			$(cmake-utils_use x264)
+			$(cmake-utils_use xv XVIDEO)
+			$(cmake-utils_use xvid)
+			$(cmake-utils_use vdpau)
+			$(cmake-utils_use vorbis)
+			$(cmake-utils_use vorbis LIBVORBIS)
+			$(cmake-utils_use vpx VPXDEC)
+		"
+
+		if use debug ; then
+			mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
+		fi
+
+		mkdir "${S}"/${build} || die "Can't create build folder."
+
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${S}"/${build} cmake-utils_src_configure
+	done
+}
+
+src_compile() {
+	for process in ${processes} ; do
+		BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_compile
+	done
+}
+
+src_install() {
+	for process in ${processes} ; do
+		# cmake-utils_src_install doesn't respect BUILD_DIR
+		# and there sometimes is a preinstall phase present.
+		pushd "${S}/${process%%:*}" > /dev/null || die
+			grep '^preinstall/fast' Makefile && emake DESTDIR="${D}" preinstall/fast
+			grep '^install/fast' Makefile && emake DESTDIR="${D}" install/fast
+		popd > /dev/null || die
+	done
+
+	python_fix_shebang "${D}"
+}
--- a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild,v 1.3 2013/09/01 11:51:16 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild,v 1.4 2013/12/17 23:28:48 tomwij Exp $

 EAPI="5"

@ -15,7 +15,7 @@ HOMEPAGE="http://fixounet.free.fr/avidemux"

 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vpx"
+IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vdpau vpx"
 KEYWORDS="~amd64 ~x86"

 MY_PN="${PN/-plugins/}"
@ -26,10 +26,11 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-2
 else
 	MY_P="${MY_PN}_${PV}"
-	SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_P}.tar.gz"
+	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
 fi

 DEPEND="
+	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
 	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt4?]
 	>=dev-lang/spidermonkey-1.5-r2:0=
 	dev-libs/libxml2:2
@ -108,6 +109,7 @@ src_configure() {
 			$(cmake-utils_use x264)
 			$(cmake-utils_use xv XVIDEO)
 			$(cmake-utils_use xvid)
+			$(cmake-utils_use vdpau)
 			$(cmake-utils_use vorbis)
 			$(cmake-utils_use vorbis LIBVORBIS)
 			$(cmake-utils_use vpx VPXDEC)
--- a/media-plugins/gimp-gmic/Manifest
+++ b/media-plugins/gimp-gmic/Manifest
@ -3,3 +3,4 @@ DIST gmic_1.5.5.2.tar.gz 1683717 SHA256 4e1ff3dcd7dc79dcc7f8ac92cae49951854aea28
 DIST gmic_1.5.6.1.tar.gz 2137616 SHA256 8399a97f4479a379d8e7fda6a0a73bde0ac120f781111b9ed8a2e28e5a3ed22f SHA512 3c3af5e071dc53c6f6971c494ceaec0d08a34ffc9595dea8c03c56be7ce6eb9dc4c0a91c49b93b01fc112192703aa0f53b2a859b855c4d5ab1f57ca22a45e0eb WHIRLPOOL 8071751c1e318e7aeac28a98c9a89e15008d5799422445cd9ca5e95c1ad9cbbd8ce1d703518a3f9ede5ed00d7deb5cf078a36d15122e4bf01d84069e20ab5321
 DIST gmic_1.5.7.1.tar.gz 2174947 SHA256 bc55fe0309c08fd4b4d97c37704db77965316c818c169ac573b8b12a5a44d42f SHA512 945e688fca9116cc53dafda63f7ec26bc0dd8c57e8fa9ae380f16c2b14086a2c1925327d71713d1e8249948d95b4f455b6bf217c1f1fa9c4ee8596cb81dcba62 WHIRLPOOL 088541176c84c6e6b4d25bc61ea68a87cd75ea60c9e2bd2a0d9080f32861bf1a014028d4a69bb1cc1d4e13ad84c8d1fd9757fefd4d302f7e7bcb60db1cf11616
 DIST gmic_1.5.8.0.tar.gz 2257558 SHA256 94382a599c23dd0be2ed9bf539072c057b7f780a8ac63b391a27522fec28f1e9 SHA512 46c7d46da2fd1f063dbb23df9cc8e894ff741871cc8d7ee570de54c5313ed101a3352915a71d952913e5bca97e35074fb025646aa05fd087d1575383ac2972b8 WHIRLPOOL 33ea1d72619bb40cc89357732b0f12c14377c9a5c7ab61d40300f9e81570d4e7fb01089597b9bb45e09358c67bbcf0ca2e25841e5e5e7c7b998feb870fccbad9
+DIST gmic_1.5.8.1.tar.gz 2265467 SHA256 2b0b813253e8c409a8535d350894245b35836cd849af31986055e0a09b8d1cea SHA512 6fea97ae18abe770ba827946457955c74cb4180a272e7fb0a6e2a0f612bec6f8fd83daa4c1010eb236886ebacef331d9b1b0a4f0c64dbde27261e76f71244ef7 WHIRLPOOL f9fc34c21f87c222b081bcef2ae819cbe6f25c1b66a890a569ffae667acbdc5f334496ba8d1d5ddf811550ec0844bd2936ee3564f131bb7f5b1b35ba7a70dcde
--- a/media-plugins/gimp-gmic/gimp-gmic-1.5.8.1.ebuild
+++ b/media-plugins/gimp-gmic/gimp-gmic-1.5.8.1.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/gimp-gmic-1.5.8.1.ebuild,v 1.1 2013/12/18 10:56:07 radhermit Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="G'MIC GIMP plugin"
+HOMEPAGE="http://gmic.sourceforge.net/gimp.shtml"
+SRC_URI="mirror://sourceforge/gmic/gmic_${PV}.tar.gz"
+
+LICENSE="CeCILL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-gfx/gimp-2.4.0
+	media-libs/libpng:0=
+	sci-libs/fftw:3.0[threads]
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/gmic-${PV}/src
+
+src_prepare() {
+	epatch "${FILESDIR}"/gmic-1.5.8.0-makefile.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" gimp
+}
+
+src_install() {
+	exeinto $(gimptool-2.0 --gimpplugindir)/plug-ins
+	doexe gmic_gimp
+	dodoc ../README
+}
+
+pkg_postinst() {
+	elog "The G'MIC plugin is accessible from the menu:"
+	elog "Filters -> G'MIC"
+}
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@ -3,3 +3,4 @@ DIST avidemux_2.6.2.tar.gz 17009420 SHA256 67c5676692152094033fbab490fbea24af27d
 DIST avidemux_2.6.3.tar.gz 17025710 SHA256 78972b46c6ef1eb52fc012cafdeb2b6275913b968a49053016fb91ef0e9e5137 SHA512 a51e3cd95695a8500f1355c7a76b8313ae3fe68855b8eb9351038c00cd3d05bbf3ada3b75bf9d817fcddf1786a55c1c09cdbc4fe774974c5e4484c12ccd0a8fc WHIRLPOOL 899c5135e92cd3a830c84b1701ac6bfaf73d7417fa869ab26dd16b3754e5b71c5e667b30d747c5f19b902e1a8d53679447e86f9c6403f32a31554e551929e2bf
 DIST avidemux_2.6.4.tar.gz 17109929 SHA256 2937c6c09248445942ac7e71b100ff8f7e272c4ad9c38e7d8c519ce4a11cec44 SHA512 1b80f65ac5a1da844b521a82bab8976d01c81923460004dc76ed0f6994f95da0ad9a836c90ffa1595ad060f0d6f27ce30add0204ca9d5295084a62e79dd484c9 WHIRLPOOL a1cbfcfeafa163ed24881edb085126a69eca3e0e8eaee50091ceadb993105a0cb43068b7725fa54871bc04b20ca5b51650ac536688b1d1f8d5b0a2d7356459ef
 DIST avidemux_2.6.5.tar.gz 17322253 SHA256 428e1f6d99e2d854ccdcb68f2260d853c47c809eee6bd92f151cb298d98b1861 SHA512 e7f8be29812ca787a1ec2cfddb1c611e1032ed94f24f41c0684f106970085bb6d219c822f3e713c472508a3f7b306540d2cabeb665bdbac061a49bccf8c23a80 WHIRLPOOL 192ce60afe4634319567cd7a1440ba212d83e02c054d6625ad738955fde02d0e722eba948c60932f520bb5e76c46ebbab0001230c1da50d893fb99a18f1da76f
+DIST avidemux_2.6.7.tar.gz 17337193 SHA256 d28202273d23be85c748c12d6e4df5e013bb861ea52b9bac7e0f90ba3d23249f SHA512 deea9811a0b6f618fab2ecf63c675b37dac12ea0ab09136a6b251e13601cd62cdc1c97d032762ea54f38e07275380106026541243bc87e230ce302fb821f2e5c WHIRLPOOL a41c338fc51e14d2c900dcef86a3887f94164548e8b904945d47915a78db907d152fda4ae53e5c37bf368348ff9912b529005a271f85d993776f042b5b997553
--- a/media-video/avidemux/avidemux-2.6.7.ebuild
+++ b/media-video/avidemux/avidemux-2.6.7.ebuild
@ -0,0 +1,127 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.7.ebuild,v 1.1 2013/12/17 23:26:58 tomwij Exp $
+
+EAPI="5"
+
+PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
+
+inherit cmake-utils eutils flag-o-matic l10n
+
+SLOT="2.6"
+
+DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks."
+HOMEPAGE="http://fixounet.free.fr/${PN}"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+IUSE="debug opengl nls qt4 sdl vaapi vdpau video_cards_fglrx xv"
+KEYWORDS="~amd64 ~x86"
+
+if [[ ${PV} == *9999* ]] ; then
+	KEYWORDS=""
+	EGIT_REPO_URI="git://gitorious.org/${PN}2-6/${PN}2-6.git https://git.gitorious.org/${PN}2-6/${PN}2-6.git"
+
+	inherit git-2
+else
+	MY_P="${PN}_${PV}"
+	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+DEPEND="
+	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,video_cards_fglrx?,xv?]
+	opengl? ( virtual/opengl:0 )
+	qt4? ( >=dev-qt/qtgui-4.8.3:4 )
+	vaapi? ( x11-libs/libva:0 )
+	video_cards_fglrx? ( x11-libs/xvba-video:0 )
+"
+RDEPEND="$DEPEND"
+PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]"
+
+S="${WORKDIR}/${MY_P}"
+
+processes="buildCli:avidemux/cli"
+use qt4 && processes+=" buildQt4:avidemux/qt4"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Fix icon name -> avidemux-2.6.png
+	sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die "Icon name fix failed."
+
+	# The desktop file is broken. It uses avidemux2 instead of avidemux3
+	# so it will actually launch avidemux-2.5 if it is installed.
+	sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed."
+	sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}2.desktop || die "Desktop file fix failed."
+
+	# Fix QA warnings that complain a trailing ; is missing and Application is deprecated.
+	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || die "Desktop file fix failed."
+
+	# Now rename the desktop file to not collide with 2.5.
+	mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename failed."
+
+	# Remove "Build Option" dialog because it doesn't reflect what the GUI can or has been built with. (Bug #463628)
+	sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog."
+}
+
+src_configure() {
+	local mycmakeargs="
+		-DAVIDEMUX_SOURCE_DIR='${S}'
+		$(cmake-utils_use nls GETTEXT)
+		$(cmake-utils_use sdl)
+		$(cmake-utils_use vaapi LIBVA)
+		$(cmake-utils_use vdpau)
+		$(cmake-utils_use video_cards_fglrx XVBA)
+		$(cmake-utils_use xv XVIDEO)
+	"
+
+	if use debug ; then
+		mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
+	fi
+
+	for process in ${processes} ; do
+		local build="${process%%:*}"
+
+		mkdir "${S}"/${build} || die "Can't create build folder."
+		cd "${S}"/${build} || die "Can't enter build folder."
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${S}"/${build} cmake-utils_src_configure
+	done
+
+	# Add lax vector typing for PowerPC.
+	if use ppc || use ppc64 ; then
+		append-cflags -flax-vector-conversions
+	fi
+
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+}
+
+src_compile() {
+	for process in ${processes} ; do
+		BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_compile
+	done
+}
+
+DOCS=( AUTHORS README )
+
+src_install() {
+	for process in ${processes} ; do
+		BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_install
+	done
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_cli ]] ; then
+		fperms +x /usr/bin/avidemux3_cli
+	fi
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_jobs ]] ; then
+		fperms +x /usr/bin/avidemux3_jobs
+	fi
+
+	cd "${S}" || die "Can't enter source folder."
+	newicon ${PN}_icon.png ${PN}-2.6.png
+
+	if use qt4 ; then
+		fperms +x /usr/bin/avidemux3_qt4
+		domenu ${PN}-2.6.desktop
+	fi
+}
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-9999.ebuild,v 1.3 2013/09/01 11:24:28 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-9999.ebuild,v 1.4 2013/12/17 23:26:58 tomwij Exp $

 EAPI="5"

@ -25,7 +25,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-2
 else
 	MY_P="${PN}_${PV}"
-	SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.gz"
+	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz"
 fi

 DEPEND="
--- a/media-video/makemkv/files/makemkv-1.8.7-makefile.linux.patch
+++ b/media-video/makemkv/files/makemkv-1.8.7-makefile.linux.patch
@ -1,5 +1,5 @@
--- makemkv-oss-1.8.6/Makefile.in.orig	2013-11-20 19:48:33.000000000 -0800
-+++ makemkv-oss-1.8.6/Makefile.in	2013-11-21 19:05:22.319663127 -0800
+--- makemkv-oss-1.8.7/Makefile.in.orig	2013-11-20 19:48:33.000000000 -0800
+++ makemkv-oss-1.8.7/Makefile.in	2013-11-21 19:05:22.319663127 -0800
@@ -50,7 +50,7 @@
 endif
 
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Tue, 17 Dec 2013 20:07:01 +0000
+Wed, 18 Dec 2013 11:37:01 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Tue, 17 Dec 2013 20:07:01 +0000
+Wed, 18 Dec 2013 11:37:01 +0000
--- a/metadata/md5-cache/app-admin/equo-216
+++ b/metadata/md5-cache/app-admin/equo-216
@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm
-DEPEND=~sys-apps/entropy-216 =dev-lang/python-2*
-DESCRIPTION=Entropy Package Manager text-based client
-EAPI=3
-HOMEPAGE=http://www.sabayon.org
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=~sys-apps/entropy-216 sys-apps/file[python] =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://sabayon/sys-apps/entropy-216.tar.bz2
-_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	a82a329b538368791f5a6113c60e557e	multilib	892e597faee02a5b94eb02ab512e7622	python	305197b0aa1194fa3ef67ca21f6faa7e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d72de8ebc982245f61af235d83b4231b
--- a/metadata/md5-cache/app-admin/equo-254
+++ b/metadata/md5-cache/app-admin/equo-254
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ~sys-apps/entropy-254[python_targets_python2_7(-)?,python_single_target_python2_7(+)?]
+DESCRIPTION=Entropy Package Manager text-based client
+EAPI=5
+HOMEPAGE=http://www.sabayon.org
+IUSE=python_targets_python2_7 python_single_target_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ~sys-apps/entropy-254[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] sys-apps/file[python]
+REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-254.tar.bz2
+_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	a82a329b538368791f5a6113c60e557e	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	49ee0ca5e1019d8f256a23692dad2642	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2caee19422138cb4adf185cb3908a7db
--- a/metadata/md5-cache/app-admin/matter-216
+++ b/metadata/md5-cache/app-admin/matter-216
@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND==dev-lang/python-2*
-DESCRIPTION=Automated Packages Builder for Portage and Entropy
-EAPI=3
-HOMEPAGE=http://www.sabayon.org
-IUSE=+entropy
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=entropy? ( ~sys-apps/entropy-216 ) sys-apps/file[python] =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://sabayon/sys-apps/entropy-216.tar.bz2
-_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	a82a329b538368791f5a6113c60e557e	multilib	892e597faee02a5b94eb02ab512e7622	python	305197b0aa1194fa3ef67ca21f6faa7e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=685fad32efc956e3cac80388a0ab13c0
--- a/metadata/md5-cache/app-admin/matter-254
+++ b/metadata/md5-cache/app-admin/matter-254
@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DESCRIPTION=Automated Packages Builder for Portage and Entropy
+EAPI=5
+HOMEPAGE=http://www.sabayon.org
+IUSE=+entropy python_targets_python2_7 python_single_target_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=entropy? ( ~sys-apps/entropy-254[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) sys-apps/file[python] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?]
+REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-254.tar.bz2
+_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	a82a329b538368791f5a6113c60e557e	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	49ee0ca5e1019d8f256a23692dad2642	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=fdf29f85a439861f3a571011d267723c
--- a/metadata/md5-cache/app-admin/packagekit-0.6.22
+++ b/metadata/md5-cache/app-admin/packagekit-0.6.22
@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=gtk? ( ~app-admin/packagekit-gtk-0.6.22 ) qt4? ( ~app-admin/packagekit-qt4-0.6.22 )
-DESCRIPTION=PackageKit Package Manager interface (meta package)
-EAPI=3
-HOMEPAGE=http://www.packagekit.org/
-IUSE=gtk qt4
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=gtk? ( ~app-admin/packagekit-gtk-0.6.22 ) qt4? ( ~app-admin/packagekit-qt4-0.6.22 )
-SLOT=0
-_md5_=1207fe26b4ae3a758915e38a6dc46425
--- a/metadata/md5-cache/app-admin/packagekit-0.8.15
+++ b/metadata/md5-cache/app-admin/packagekit-0.8.15
@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=gtk? ( ~app-admin/packagekit-gtk-0.8.15 )
+DESCRIPTION=PackageKit Package Manager interface (meta package)
+EAPI=5
+HOMEPAGE=http://www.packagekit.org/
+IUSE=gtk
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=gtk? ( ~app-admin/packagekit-gtk-0.8.15 )
+SLOT=0
+_md5_=e3e3e0c3a12e0eb5025dc50f3c203bb1
--- a/metadata/md5-cache/app-admin/packagekit-base-0.6.22
+++ b/metadata/md5-cache/app-admin/packagekit-base-0.6.22
@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare prerm
-DEPEND=connman? ( net-misc/connman ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) networkmanager? ( >=net-misc/networkmanager-0.6.4 ) nsplugin? ( dev-libs/nspr x11-libs/cairo >=x11-libs/gtk+-2.14.0:2 x11-libs/pango ) policykit? ( >=sys-auth/polkit-0.94 ) udev? ( virtual/udev[gudev] ) dev-db/sqlite:3 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.16.1:2 >=sys-apps/dbus-1.3.0 doc? ( dev-util/gtk-doc ) nsplugin? ( <net-misc/npapi-sdk-0.27.1 ) dev-libs/libxslt >=dev-util/intltool-0.35.0 virtual/pkgconfig sys-devel/gettext =dev-lang/python-2* app-arch/unzip
-DESCRIPTION=Manage packages in a secure way using a cross-distro and cross-architecture API
-EAPI=3
-HOMEPAGE=http://www.packagekit.org/
-IUSE=connman cron doc +introspection networkmanager nsplugin pm-utils +policykit entropy static-libs test udev linguas_as linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_fi linguas_fr linguas_gu linguas_he linguas_hi linguas_hu linguas_it linguas_ja linguas_kn linguas_ko linguas_ml linguas_mr linguas_ms linguas_nb linguas_nl linguas_or linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sr@latin linguas_sv linguas_ta linguas_te linguas_th linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW
-KEYWORDS=~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=connman? ( net-misc/connman ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) networkmanager? ( >=net-misc/networkmanager-0.6.4 ) nsplugin? ( dev-libs/nspr x11-libs/cairo >=x11-libs/gtk+-2.14.0:2 x11-libs/pango ) policykit? ( >=sys-auth/polkit-0.94 ) udev? ( virtual/udev[gudev] ) dev-db/sqlite:3 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.16.1:2 >=sys-apps/dbus-1.3.0 entropy? ( >=sys-apps/entropy-1.0_rc27 ) pm-utils? ( sys-power/pm-utils ) >=app-portage/layman-1.2.3 >=sys-apps/portage-2.1.9 sys-auth/consolekit =dev-lang/python-2*
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.packagekit.org/releases/PackageKit-0.6.22.tar.xz
-_eclasses_=bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	a82a329b538368791f5a6113c60e557e	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	892e597faee02a5b94eb02ab512e7622	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	python	305197b0aa1194fa3ef67ca21f6faa7e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=f86f32fd40b86ef0bfd0e50603f7ddad
--- a/metadata/md5-cache/app-admin/packagekit-base-0.8.15
+++ b/metadata/md5-cache/app-admin/packagekit-base-0.8.15
@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=connman? ( net-misc/connman ) introspection? ( >=dev-libs/gobject-introspection-0.9.9[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) networkmanager? ( >=net-misc/networkmanager-0.6.4 ) nsplugin? ( >=dev-libs/nspr-4.8 x11-libs/cairo >=x11-libs/gtk+-2.14.0:2 x11-libs/pango ) udev? ( virtual/udev[gudev] ) dev-db/sqlite:3 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32.0:2[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] >=sys-auth/polkit-0.98 >=sys-apps/dbus-1.3.0 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] doc? ( dev-util/gtk-doc[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) nsplugin? ( >=net-misc/npapi-sdk-0.27 ) systemd? ( >=sys-apps/systemd-204 ) dev-libs/libxslt[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] >=dev-util/intltool-0.35.0 virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/unzip
+DESCRIPTION=Manage packages in a secure way using a cross-distro and cross-architecture API
+EAPI=5
+HOMEPAGE=http://www.packagekit.org/
+IUSE=connman cron command-not-found doc +introspection networkmanager nsplugin entropy static-libs systemd udev linguas_as linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_fi linguas_fr linguas_gu linguas_he linguas_hi linguas_hu linguas_it linguas_ja linguas_kn linguas_ko linguas_ml linguas_mr linguas_ms linguas_nb linguas_nl linguas_or linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sr@latin linguas_sv linguas_ta linguas_te linguas_th linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW python_targets_python2_7 python_single_target_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=connman? ( net-misc/connman ) introspection? ( >=dev-libs/gobject-introspection-0.9.9[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) networkmanager? ( >=net-misc/networkmanager-0.6.4 ) nsplugin? ( >=dev-libs/nspr-4.8 x11-libs/cairo >=x11-libs/gtk+-2.14.0:2 x11-libs/pango ) udev? ( virtual/udev[gudev] ) dev-db/sqlite:3 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32.0:2[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] >=sys-auth/polkit-0.98 >=sys-apps/dbus-1.3.0 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] entropy? ( >=sys-apps/entropy-234[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) >=app-portage/layman-1.2.3[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] >=sys-apps/portage-2.2[python_targets_python2_7(-)?,python_single_target_python2_7(+)?]
+REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://www.packagekit.org/releases/PackageKit-0.8.15.tar.xz
+_eclasses_=autotools	d491cbee372fe390ce066f901abdaaaf	bash-completion-r1	d339dd40b2014cf1edba8592580eef42	eutils	a82a329b538368791f5a6113c60e557e	libtool	60a86ca1cbe8068e3d9df0d3004dc520	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	326c654a30b9c5763247114fc680d5f8	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	49ee0ca5e1019d8f256a23692dad2642	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=b9fbc2ed320e406b11df8fcc4dd8089f
--- a/metadata/md5-cache/app-admin/packagekit-gtk-0.8.15
+++ b/metadata/md5-cache/app-admin/packagekit-gtk-0.8.15
@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/dbus-glib media-libs/fontconfig >=x11-libs/gtk+-2.14.0:2 >=x11-libs/gtk+-2.91.0:3 x11-libs/pango ~app-admin/packagekit-base-0.6.22 virtual/pkgconfig
-DESCRIPTION=GTK+ PackageKit backend library
+DEPEND=dev-libs/dbus-glib media-libs/fontconfig >=x11-libs/gtk+-3.0:3 x11-libs/pango ~app-admin/packagekit-base-0.8.15 virtual/pkgconfig
+DESCRIPTION=Gtk3 PackageKit backend library
 EAPI=3
 HOMEPAGE=http://www.packagekit.org/
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/dbus-glib media-libs/fontconfig >=x11-libs/gtk+-2.14.0:2 >=x11-libs/gtk+-2.91.0:3 x11-libs/pango ~app-admin/packagekit-base-0.6.22
+RDEPEND=dev-libs/dbus-glib media-libs/fontconfig >=x11-libs/gtk+-3.0:3 x11-libs/pango ~app-admin/packagekit-base-0.8.15
 SLOT=0
-SRC_URI=http://www.packagekit.org/releases/PackageKit-0.6.22.tar.xz
+SRC_URI=http://www.packagekit.org/releases/PackageKit-0.8.15.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	a82a329b538368791f5a6113c60e557e	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=45a20cb80d14df402485a74c60b5e5bf
+_md5_=8609f23bc129acbaf2ca0b72f01554de
--- a/metadata/md5-cache/app-admin/packagekit-qt4-0.6.22
+++ b/metadata/md5-cache/app-admin/packagekit-qt4-0.6.22
@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-qt/qtcore-4.4.0:4 >=dev-qt/qtdbus-4.4.0:4 >=dev-qt/qtsql-4.4.0:4 ~app-admin/packagekit-base-0.6.22 dev-libs/libxslt virtual/pkgconfig
-DESCRIPTION=Qt4 PackageKit backend library
-EAPI=3
-HOMEPAGE=http://www.packagekit.org/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtcore-4.4.0:4 >=dev-qt/qtdbus-4.4.0:4 >=dev-qt/qtsql-4.4.0:4 ~app-admin/packagekit-base-0.6.22
-SLOT=0
-SRC_URI=http://www.packagekit.org/releases/PackageKit-0.6.22.tar.xz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	a82a329b538368791f5a6113c60e557e	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4f808777cc3652f4257535c119806ec5
--- a/metadata/md5-cache/app-admin/pprocm-1.0-r1
+++ b/metadata/md5-cache/app-admin/pprocm-1.0-r1
@ -4,7 +4,7 @@ DESCRIPTION=a ncurses which monitors the CPU, disk, network and memory usage.
 HOMEPAGE=http://www.fusedcreations.com/PProcM/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-perl/POE dev-perl/Sys-Statistics-Linux dev-lang/perl
+RDEPEND=dev-perl/IO-Pipely
 SLOT=0
 SRC_URI=http://www.fusedcreations.com/PProcM/PProcM-1.0.tar.gz
-_md5_=07b9075e759f82048b65d03e8b238141
+_md5_=884a145152b91ebeb36a3028349fdf19
--- a/metadata/md5-cache/app-admin/rigo-216
+++ b/metadata/md5-cache/app-admin/rigo-216
@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm
-DEPEND=>=sys-apps/sed-4 =dev-lang/python-2*
-DESCRIPTION=Rigo, the Sabayon Application Browser
-EAPI=3
-HOMEPAGE=http://www.sabayon.org
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=|| ( dev-python/pygobject-cairo:3 dev-python/pygobject:3[cairo] ) ~sys-apps/entropy-216 ~sys-apps/rigo-daemon-216 sys-devel/gettext x11-libs/gtk+:3 x11-libs/vte:2.90 >=x11-misc/xdg-utils-1.1.0_rc1_p20120319 =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://sabayon/sys-apps/entropy-216.tar.bz2
-_eclasses_=eutils	a82a329b538368791f5a6113c60e557e	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	multilib	892e597faee02a5b94eb02ab512e7622	python	305197b0aa1194fa3ef67ca21f6faa7e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=357ed9f75b1138bcaf24d0fbbb123878
--- a/metadata/md5-cache/app-admin/rigo-254
+++ b/metadata/md5-cache/app-admin/rigo-254
@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] >=sys-apps/sed-4
+DESCRIPTION=Rigo, the Sabayon Application Browser
+EAPI=5
+HOMEPAGE=http://www.sabayon.org
+IUSE=python_targets_python2_7 python_single_target_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] || ( dev-python/pygobject-cairo:3 dev-python/pygobject:3[cairo] ) ~sys-apps/entropy-254[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ~sys-apps/rigo-daemon-254[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] sys-devel/gettext x11-libs/gtk+:3 x11-libs/vte:2.90 >=x11-misc/xdg-utils-1.1.0_rc1_p20120319
+REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-254.tar.bz2
+_eclasses_=eutils	a82a329b538368791f5a6113c60e557e	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	49ee0ca5e1019d8f256a23692dad2642	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ea70dd5f3504bd91d89283a024434357
--- a/metadata/md5-cache/app-admin/ulogd-2.0.3
+++ b/metadata/md5-cache/app-admin/ulogd-2.0.3
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=net-firewall/iptables >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) nfacct? ( >=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_acct-1.0.1 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 ) nflog? ( >=net-libs/libnetfilter_log-1.0.0 ) mysql? ( virtual/mysql ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) doc? ( app-text/linuxdoc-tools app-text/texlive-core virtual/latex-base ) || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A userspace logging daemon for netfilter/iptables related logging
+EAPI=5
+HOMEPAGE=http://netfilter.org/projects/ulogd/index.html
+IUSE=dbi doc mysql nfacct +nfct +nflog pcap postgres sqlite
+KEYWORDS=~amd64 ~ia64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=net-firewall/iptables >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) nfacct? ( >=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_acct-1.0.1 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 ) nflog? ( >=net-libs/libnetfilter_log-1.0.0 ) mysql? ( virtual/mysql ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 )
+SLOT=0
+SRC_URI=http://ftp.netfilter.org/pub/ulogd/ulogd-2.0.3.tar.bz2
+_eclasses_=autotools	d491cbee372fe390ce066f901abdaaaf	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	a82a329b538368791f5a6113c60e557e	libtool	60a86ca1cbe8068e3d9df0d3004dc520	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	326c654a30b9c5763247114fc680d5f8	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=f7fc3c0087987ea036e317856d94db2d
--- a/metadata/md5-cache/app-emulation/q4wine-1.1_p2
+++ b/metadata/md5-cache/app-emulation/q4wine-1.1_p2
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtgui:4 dev-qt/qtsingleapplication dev-qt/qtsql:4[sqlite] dev-util/cmake sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Qt4 GUI configuration tool for Wine
+EAPI=4
+HOMEPAGE=http://q4wine.brezblock.org.ua/
+IUSE=debug +icoutils +wineappdb -dbus gnome kde linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_he linguas_it linguas_ru linguas_uk linguas_pl linguas_pt linguas_af
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtgui:4 dev-qt/qtsingleapplication dev-qt/qtsql:4[sqlite] app-admin/sudo app-emulation/wine >=sys-apps/which-2.19 icoutils? ( >=media-gfx/icoutils-0.26.0 ) sys-fs/fuseiso kde? ( kde-base/kdesu ) gnome? ( x11-libs/gksu ) dbus? ( dev-qt/qtdbus:4 )
+SLOT=0
+SRC_URI=mirror://sourceforge/q4wine/q4wine/q4wine%201.1-r2/q4wine-1.1-r2.tar.bz2
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	a82a329b538368791f5a6113c60e557e	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3798b540851441e50266653eeafbd317
--- a/metadata/md5-cache/app-misc/magneto-loader-216
+++ b/metadata/md5-cache/app-misc/magneto-loader-216
@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=~sys-apps/magneto-core-216 ~app-admin/rigo-216
-DESCRIPTION=Official Sabayon Linux Entropy Notification Applet Loader
-EAPI=2
-HOMEPAGE=http://www.sabayon.org
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=~sys-apps/magneto-core-216 ~app-admin/rigo-216
-SLOT=0
-SRC_URI=mirror://sabayon/sys-apps/entropy-216.tar.bz2
-_eclasses_=eutils	a82a329b538368791f5a6113c60e557e	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ee0e71f7d896c712fef2945c32579eb6
--- a/metadata/md5-cache/app-misc/magneto-loader-254
+++ b/metadata/md5-cache/app-misc/magneto-loader-254
@ -0,0 +1,14 @@
+DEFINED_PHASES=install setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ~sys-apps/magneto-core-254[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ~app-admin/rigo-254[python_targets_python2_7(-)?,python_single_target_python2_7(+)?]
+DESCRIPTION=Official Sabayon Linux Entropy Notification Applet Loader
+EAPI=5
+HOMEPAGE=http://www.sabayon.org
+IUSE=python_targets_python2_7 python_single_target_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ~sys-apps/magneto-core-254[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ~app-admin/rigo-254[python_targets_python2_7(-)?,python_single_target_python2_7(+)?]
+REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-254.tar.bz2
+_eclasses_=eutils	a82a329b538368791f5a6113c60e557e	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	49ee0ca5e1019d8f256a23692dad2642	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e61174a4dd78d735f5cedc850d69ce23
--- a/metadata/md5-cache/app-misc/solaar-0.9.2-r1
+++ b/metadata/md5-cache/app-misc/solaar-0.9.2-r1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A Linux device manager for Logitech's Unifying Receiver peripherals
+EAPI=5
+HOMEPAGE=http://pwr.github.com/Solaar/
+IUSE=doc python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-python/pyudev-0.13[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
+SLOT=0
+SRC_URI=https://github.com/pwr/Solaar/archive/0.9.2.tar.gz -> solaar-0.9.2.tar.gz
+_eclasses_=distutils-r1	59b53892e6e67d8f2c5592e8a5ff3aac	eutils	a82a329b538368791f5a6113c60e557e	gnome2-utils	b66c7c3889d2dd0913e9f3d2ac1c0859	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multibuild	56d4120419072116417e8de1bd1040ff	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	326c654a30b9c5763247114fc680d5f8	python-r1	cd956d5a4bac2209a64d0f4851cc115d	python-utils-r1	49ee0ca5e1019d8f256a23692dad2642	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=67a34d030407620c4973d10c83d9f5a9
--- a/metadata/md5-cache/app-vim/nginx-syntax-0.3.3
+++ b/metadata/md5-cache/app-vim/nginx-syntax-0.3.3
@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: Nginx configuration files syntax
+EAPI=5
+HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1886
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-fbsd
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/nginx-syntax-0.3.3.tar.bz2 http://dev.gentoo.org/~radhermit/vim/nginx-syntax-0.3.3.tar.bz2
+_eclasses_=vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	286547e90fbbc4c841eee80cd73e646c
+_md5_=780a079ad606f8783e8dfc53ee857089
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`DIST v8cgi-0.9.2-src.tar.gz 11665177 SHA256 74b469f9513a2bea34b53439841871334cd2da6fb7ce0e49fbf6ea958c6e39d4 SHA512 13ceee80bb6f3bf887fafacc2a737a291b0a3d15c54dc2f4c3c489c24628fdaa5a76ae6fa97db1b18a811240e4d3b68553dc257b03fefc5820dba54c6aff804b WHIRLPOOL 18335cd841c3df5389c0df367c53dfc0592055c39506558bd805f70dc7404d922e38ac2b1b9d853d1335c91620a0e7f24fbce91f812e06f6d54ffe9c55d037c1`