Merge remote-tracking branch 'upstream/master'

24 files changed, 498 insertions, 41 deletions

diff --git a/dev-python/compizconfig-python/Manifest b/dev-python/compizconfig-python/Manifest
index f961a78c..288e1b0c 100644
--- a/dev-python/compizconfig-python/Manifest
+++ b/dev-python/compizconfig-python/Manifest
@@ -1,18 +1 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST compizconfig-python-0.8.4.tar.bz2 269812 SHA256 6734ae35ee69d081f35f98a89cd3bccb411a4db7c5b35fbd226270d95ac76f5a SHA512 3cd20014a7d0b186c9659ce104576d8e08e9e9f1f60bed4b7f4097c12ca4c49392621d2328abb50017c7d9f86af5b43675468b1cd4b5d128e23c24371c4af9ef WHIRLPOOL d2b92846acc25a134604a8773f96b5745b65864f4365e864b9a43e72bbaa7a277592911932886ca3e0af052240f3a56d89ff66799bba0afad58bc8b6d33ba2ac
-EBUILD compizconfig-python-0.8.4-r5.ebuild 1031 SHA256 d02a4609c23e2bac67a64012030c4ff5d69be396c806ec958dccc406d12dff63 SHA512 5164211433a6ff9204adadb31217f43fbf157e219dcea2f021795d5ba963ba548bf458d648176ddcdd50aae8583f5b48ba566fac85568a43435bf0f09806dc2c WHIRLPOOL 67478d26ec64a5debb809ad838cc16b930ed57d5cc396ab1ce1c094fc1b623baa9793441bf753b007f96e76e014078371dd72f8ee134cf609c0cf715ee00457e
-MISC ChangeLog 4949 SHA256 e396282ea97bd2a25c4a11800d177bdf023ee9fe10d9ecfc36cca959698651f9 SHA512 af5e6309fd27b666ed21f7d2ae5777b79db7f46d052fd61ed7fef3fc5682727ef0738e3786d9cfe853e7d766176492f9172d518a7f4bbe9d919ee725f15c5abc WHIRLPOOL 40c073f1bb176414b7cc8c3afa30c37c8376d73284e6fbfc152d0b2501d4767ea1a32a0eff731027dff9acc97102906c16ebe1aa7ca4e97c3a59e3228484dbe5
-MISC metadata.xml 251 SHA256 5cf6e4528fd87ffa1e34b06bcee06396740ed034a225a2c23ea4cae1422c345f SHA512 e4e6d39ee3d5861e9376fb1192ac71cbe1aa124f1f1b309194519ee1d3d380f4b55a4663f380176e1f1fb71c760983824046d372be47c1f737d1ab7499d9fa92 WHIRLPOOL 47c6903ee91d103ca457ab33b5c41752fa8369908b43be76240cada264cb224aa3e0d2a7a481937f6efa9e5fa4d9206824a06c193c5ea17517db87f5a60be609
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQEcBAEBCAAGBQJSGhugAAoJECo/aRed9267lgcH/0BjUUzbnK1cqJcTRonbLZc2
-OmAfacOMWHlX7CWif1uIQZkxjOM2JXCURgZskKDqIeaF/7evXXmR5o4OXV0gu2Tl
-g0L1iFfYqGZ4FHyG3m/YpDpOQNRbl70iYuqWNnS9RVZYeZpGHQBVRBEiZJwZ/yJI
-a5N3Y6cl41flnq8CSKHaL1upBJ/3/pwzMU2UOrgHgQ9M/Pyy5BswX8Inup429qPg
-yhdN+SyDHNwmP7yE+SpZaCFG29ThMM1AElk6H2e0DHDXg0V0DOl3EFrJ78ymRk+w
-3BJSJoI4qIJ7c/DtxUx+X1h58cIdT+5AjaJrhdUUMO8Y/aKbxR4C7zWQusqjIm0=
-=fjZg
------END PGP SIGNATURE-----
diff --git a/dev-python/gdk-pixbuf/Manifest b/dev-python/gdk-pixbuf/Manifest
index 0862a829..a6fb0bec 100644
--- a/dev-python/gdk-pixbuf/Manifest
+++ b/dev-python/gdk-pixbuf/Manifest
@@ -1,5 +1 @@
-AUX gdk-pixbuf-2.21.4-fix-automagic-x11.patch 715 RMD160 efeaa25e97e7620018ae3ca5b62d74ff6e0fd0d1 SHA1 d67d28548ce340034f5afb0ca07b699fd1a0619e SHA256 e977da6d4731a0164b7346a790dfabb95a951f9986fa623abd171bce79f63bcb
-DIST gdk-pixbuf-2.24.0.tar.xz 1176324 RMD160 38e9896dd9a1ed6bf207509cd635828cebe674b8 SHA1 6a78751630a54fdef9a6a3928322c98e6c1ef60c SHA256 67c11d3aa40441c1cea42c365bf2d6a9a9dd52fae2d359a707ad5e8abb4d28a7
-EBUILD gdk-pixbuf-2.24.0-r1.ebuild 2845 RMD160 ccc538a207cd1dafbd668c3e94f14444a3fd8984 SHA1 64581e96f97860094003d33adb637cbc5fd83c86 SHA256 d125f224debd09c13f841a59d09c9db6c385907e897534173a8736c144a2e798
-MISC GENTOO 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0
+DIST gdk-pixbuf-2.24.0.tar.xz 1176324 SHA256 67c11d3aa40441c1cea42c365bf2d6a9a9dd52fae2d359a707ad5e8abb4d28a7
diff --git a/dev-python/pygobject-base/Manifest b/dev-python/pygobject-base/Manifest
index 541286cb..7c1e1f09 100644
--- a/dev-python/pygobject-base/Manifest
+++ b/dev-python/pygobject-base/Manifest
@@ -1,3 +1,4 @@
 DIST pygobject-3.12.1.tar.xz 701872 SHA256 da5fe04759e862d347b26b53a6aea0affa7cbe858b7004475fa8c7929496da35 SHA512 095754d06507bb5c5d802603d8fd97fabcc3057172f1fe6f34138e9553281cc7b474a0dd9f235678718eccc4f7adee38b10ec1365d5fd8c4c61a47e4a24fd5a1 WHIRLPOOL 3cc3c96f7f644c17ef9c9704107af3ff0577da3a54258de208b048eee1cf8e329ed572b4d8cea6e336a9757d6f60a969ce9c84fdd9987abf114b3e79a4ee3c18
 DIST pygobject-3.13.3.tar.xz 710452 SHA256 28c4d28c4083ce9c249cf7a8621a1452ecc557951650810a09bf946b21df7452 SHA512 3e8aca047f95d903e89bdfe0e24daf226a10a2bdf783142164fa22a11e6047da528d004711d289067b8cbd80d247c517b2a029cd4df11e54df7f6e6b907833a3 WHIRLPOOL b709d55b93986d7067c65be737c5824d9a26bf1d8ee3ab4c2a0193e24cfb29dea378407d4dbc41772d7ffa259bea1fbda43787a4aef68feafb1f27c416acdf0b
 DIST pygobject-3.14.0.tar.xz 720128 SHA256 779effa93f4b59cdb72f4ab0128fb3fd82900bf686193b570fd3a8ce63392d54 SHA512 f6e1e5826a6afe81eb0a37bb554b433769622f8a0d17ac9836498425d70c4583cf8157027a555c21fd7a0d6686863c7803a350550665a375a906fccdabca2090 WHIRLPOOL 0a665504b792691238b89d2704ce1cc024f89ddf96fd6b626f1f5b05dbccfd633e61f9b45b0ca09873029c576b9804edcfa77e1bceae9e995be44a3fd60852ca
+DIST pygobject-3.16.1.tar.xz 725220 SHA256 7d96dad050f15ec1688617b749bb485811842de46a22d31f9396023e8eaa1ec3 SHA512 f32db7620b6714fdc780ec28c282566c0e662648a53f37b2466cbed609d1cbbbf998e30fd42d24ae1e5c0334656b04276dd3a8bf210f9b93f2bfb66f305f7a72 WHIRLPOOL 7f3257f1743510d1c602d797bce4722f6f987676dee4186b7026277f94412663bef0b1e70519030e890ad330eb2cb2cdb7ac7bf8060d9c4a0aca019bd7d4f1a2
diff --git a/dev-python/pygobject-base/files/3.16.1-unittest.patch b/dev-python/pygobject-base/files/3.16.1-unittest.patch
new file mode 100644
index 00000000..5ee15b1d
--- /dev/null
+++ b/dev-python/pygobject-base/files/3.16.1-unittest.patch
@@ -0,0 +1,15 @@
+Comment out unittest that ought to work but for some reason does not want to.
+
+--- a/tests/test_glib.py	2015-05-10 14:01:45.873164005 +0200
++++ b/tests/test_glib.py	2015-03-05 09:32:55.000000000 +0100
+@@ -38,8 +38,8 @@
+     def test_xdg_dirs(self):
+         d = GLib.get_user_data_dir()
+         self.assertTrue('/' in d, d)
+-        d = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)
+-        self.assertTrue('/' in d, d)
++        #d = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)
++        #self.assertTrue('/' in d, d)
+         with warnings.catch_warnings():
+             warnings.simplefilter('ignore', PyGIDeprecationWarning)
+ 
diff --git a/dev-python/pygobject-base/pygobject-base-3.16.1.ebuild b/dev-python/pygobject-base/pygobject-base-3.16.1.ebuild
new file mode 100644
index 00000000..a75c5052
--- /dev/null
+++ b/dev-python/pygobject-base/pygobject-base-3.16.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+REAL_PN="${PN/-base}"
+GNOME_ORG_MODULE="${REAL_PN}"
+
+inherit autotools eutils gnome2 python-r1 virtualx
+
+DESCRIPTION="GLib's GObject library bindings for Python"
+HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cairo examples test +threads"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/gobject-introspection-1.39
+	virtual/libffi:=
+	${PYTHON_DEPS}
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	test? (
+		dev-libs/atk[introspection]
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection] )
+"
+# gnome-base/gnome-common required by eautoreconf
+
+# We now disable introspection support in slot 2 per upstream recommendation
+# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
+# older versions of slot 2 installed their own site-packages/gi, and
+# slot 3 will collide with them.
+RDEPEND="${COMMON_DEPEND}
+	!<dev-python/pygtk-2.13
+	!<dev-python/pygobject-2.28.6-r50:2[introspection]
+"
+
+src_prepare() {
+	# Comment out broken unittest
+	epatch "${FILESDIR}"/3.16.1-unittest.patch
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	# Hard-enable libffi support since both gobject-introspection and
+	# glib-2.29.x rdepend on it anyway
+	# docs disabled by upstream default since they are very out of date
+	python_foreach_impl run_in_build_dir \
+		gnome2_src_configure \
+			--disable-cairo \
+			$(use_enable threads thread)
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+	export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
+	export SKIP_PEP8="yes"
+	testing() {
+		export XDG_CACHE_HOME="${T}/${EPYTHON}"
+		run_in_build_dir Xemake check
+		unset XDG_CACHE_HOME
+	}
+	python_foreach_impl testing
+	unset GIO_USE_VFS
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog* NEWS README"
+
+	python_foreach_impl run_in_build_dir gnome2_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/pygobject-cairo/Manifest b/dev-python/pygobject-cairo/Manifest
index 23f104b2..ec25c511 100644
--- a/dev-python/pygobject-cairo/Manifest
+++ b/dev-python/pygobject-cairo/Manifest
@@ -2,3 +2,4 @@ DIST pygobject-3.12.1.tar.xz 701872 SHA256 da5fe04759e862d347b26b53a6aea0affa7cb
 DIST pygobject-3.13.3.tar.xz 710452 SHA256 28c4d28c4083ce9c249cf7a8621a1452ecc557951650810a09bf946b21df7452 SHA512 3e8aca047f95d903e89bdfe0e24daf226a10a2bdf783142164fa22a11e6047da528d004711d289067b8cbd80d247c517b2a029cd4df11e54df7f6e6b907833a3 WHIRLPOOL b709d55b93986d7067c65be737c5824d9a26bf1d8ee3ab4c2a0193e24cfb29dea378407d4dbc41772d7ffa259bea1fbda43787a4aef68feafb1f27c416acdf0b
 DIST pygobject-3.14.0.tar.xz 720128 SHA256 779effa93f4b59cdb72f4ab0128fb3fd82900bf686193b570fd3a8ce63392d54 SHA512 f6e1e5826a6afe81eb0a37bb554b433769622f8a0d17ac9836498425d70c4583cf8157027a555c21fd7a0d6686863c7803a350550665a375a906fccdabca2090 WHIRLPOOL 0a665504b792691238b89d2704ce1cc024f89ddf96fd6b626f1f5b05dbccfd633e61f9b45b0ca09873029c576b9804edcfa77e1bceae9e995be44a3fd60852ca
 DIST pygobject-3.15.0.tar.xz 722740 SHA256 ba6e9a0a2ca3942e3e35343b4b306b6560104eb5cf632a0cdcfe96999ac9be8d SHA512 e7895c89be6ec30c98e6c4fd15355cf2e53024fc31c82f1c6bc9155951d45b20baa6b2d4157c58588fcd6814051487b499c224ed8df057583b79c4f8e0954ffa WHIRLPOOL aa1865b763851f454ab1910ed99d1c11613f165e221d40ed25df57f645181f42690d856075deb58083d61753ebde51ddc72f3909865acb976887a98de6690a17
+DIST pygobject-3.16.1.tar.xz 725220 SHA256 7d96dad050f15ec1688617b749bb485811842de46a22d31f9396023e8eaa1ec3 SHA512 f32db7620b6714fdc780ec28c282566c0e662648a53f37b2466cbed609d1cbbbf998e30fd42d24ae1e5c0334656b04276dd3a8bf210f9b93f2bfb66f305f7a72 WHIRLPOOL 7f3257f1743510d1c602d797bce4722f6f987676dee4186b7026277f94412663bef0b1e70519030e890ad330eb2cb2cdb7ac7bf8060d9c4a0aca019bd7d4f1a2
diff --git a/dev-python/pygobject-cairo/files/3.16.1-unittest.patch b/dev-python/pygobject-cairo/files/3.16.1-unittest.patch
new file mode 100644
index 00000000..5ee15b1d
--- /dev/null
+++ b/dev-python/pygobject-cairo/files/3.16.1-unittest.patch
@@ -0,0 +1,15 @@
+Comment out unittest that ought to work but for some reason does not want to.
+
+--- a/tests/test_glib.py	2015-05-10 14:01:45.873164005 +0200
++++ b/tests/test_glib.py	2015-03-05 09:32:55.000000000 +0100
+@@ -38,8 +38,8 @@
+     def test_xdg_dirs(self):
+         d = GLib.get_user_data_dir()
+         self.assertTrue('/' in d, d)
+-        d = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)
+-        self.assertTrue('/' in d, d)
++        #d = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)
++        #self.assertTrue('/' in d, d)
+         with warnings.catch_warnings():
+             warnings.simplefilter('ignore', PyGIDeprecationWarning)
+ 
diff --git a/dev-python/pygobject-cairo/pygobject-cairo-3.16.1.ebuild b/dev-python/pygobject-cairo/pygobject-cairo-3.16.1.ebuild
new file mode 100644
index 00000000..8f57d7c7
--- /dev/null
+++ b/dev-python/pygobject-cairo/pygobject-cairo-3.16.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+REAL_PN="${PN/-cairo}"
+GNOME_ORG_MODULE="${REAL_PN}"
+
+inherit autotools eutils gnome2 python-r1 virtualx
+
+DESCRIPTION="GLib's GObject library bindings for Python, Cairo Libraries"
+HOMEPAGE="http://www.pygtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+threads"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	~dev-python/pygobject-base-${PV}[threads=]
+	>=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/cairo[glib]
+	gnome-base/gnome-common"
+RDEPEND="${COMMON_DEPEND}
+	!<dev-python/pygtk-2.13
+	!<dev-python/pygobject-2.28.6-r50:2[introspection]"
+
+# gnome-base/gnome-common required by eautoreconf
+
+src_prepare() {
+	# Comment out broken unittest
+	epatch "${FILESDIR}"/3.16.1-unittest.patch
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	# Hard-enable libffi support since both gobject-introspection and
+	# glib-2.29.x rdepend on it anyway
+	# docs disabled by upstream default since they are very out of date
+	python_foreach_impl run_in_build_dir \
+		gnome2_src_configure \
+			--enable-cairo \
+			$(use_enable threads thread)
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog* NEWS README"
+
+	python_foreach_impl run_in_build_dir gnome2_src_install
+	# just keep /usr/$(get_libdir)/*/site-packages/gi/_gi_cairo*.so
+	# discard the rest
+
+	# /usr/lib64/python2.7/site-packages/gi/_gi_cairo.so
+	# /usr/lib64/python3.3/site-packages/gi/_gi_cairo.cpython-33.so
+	# /usr/lib64/python3.4/site-packages/gi/_gi_cairo.cpython-34.so
+
+	rm $(find "${ED}" -type f | grep -v "gi/_gi_cairo.*\.so") \
+		$(find "${ED}" -type l | grep -v "gi/_gi_cairo.*\.so") || die
+	find "${ED}" -depth -type d -empty -exec rmdir {} \; || die
+}
diff --git a/dev-python/pygobject/metadata.xml b/dev-python/pygobject/metadata.xml
index ea70bd5c..9b1bc26a 100644
--- a/dev-python/pygobject/metadata.xml
+++ b/dev-python/pygobject/metadata.xml
@@ -3,8 +3,4 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <herd>python</herd>
-<use>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
-	introspection</flag>
-</use>
 </pkgmetadata>
diff --git a/dev-python/pygobject/pygobject-3.16.1.ebuild b/dev-python/pygobject/pygobject-3.16.1.ebuild
new file mode 100644
index 00000000..1c755cf9
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.16.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit python-r1
+
+DESCRIPTION="GLib's GObject library bindings for Python, meta package"
+HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cairo examples test +threads"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	~dev-python/pygobject-base-${PV}[threads=,examples=,test=,${PYTHON_USEDEP}]
+	cairo? ( ~dev-python/pygobject-cairo-${PV}[threads=,${PYTHON_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
diff --git a/dev-python/pymaxe/Manifest b/dev-python/pymaxe/Manifest
index 2cbcfe25..faeb836e 100644
--- a/dev-python/pymaxe/Manifest
+++ b/dev-python/pymaxe/Manifest
@@ -1,2 +1 @@
 DIST pymaxe.tar.gz 195654 SHA256 3532b56bf3fbf9188f81684cb4148099ea9fbb870234495dcdef095933724c36 SHA512 6f9bbdf2fe3b63cd1186c64716303a75dc1a69378cddca76abb5003ccd95d01741d637a36f6272c5377149c3517e2fb1fa105977e9b46bedf1e1ea81e9394471 WHIRLPOOL e7ce1674aa0cb5ed521beb04117d81401f9e6cd461eb7d60c3e5d4daaff3269abecedd95403fa924b3242a3b94b4331819e7e2478c891f7ba83c1139701f0d84
-EBUILD pymaxe-20130303.ebuild 476 SHA256 1c40a47ef9c64f6614bb65d970d455d3e7bc71127f07116fd8bfe18a5592dd3a SHA512 e87a3f5e375b1011839cb8642dd4b2459c2c898b12086945dcdd8aba58268a326e4dc22046de9b7f25dd0cb4e2cd990eaff8f974054533687e0e03d9fd9fec60 WHIRLPOOL 2fb9835b84c0a6bb51b0e9ee04e8e7ec2e5f0ba6c7e25aaa6e259d78a54970c53160f3447fc0046e4fa795d5220c39343d1bece6004a0dae73ef100d4cce13eb
diff --git a/dev-python/pysmbc/Manifest b/dev-python/pysmbc/Manifest
index d96b52a1..d7d03e0b 100644
--- a/dev-python/pysmbc/Manifest
+++ b/dev-python/pysmbc/Manifest
@@ -1,2 +1 @@
-DIST pysmbc-1.0.13.tar.bz2 20795 RMD160 ed573822da34210aa6e0f9c09159de75db0aa505 SHA1 bf37346af4a6b543f7f91c46d0d1d0cc6020db32 SHA256 479fbb70d97fb64208d95975dc745f06f75661f954a8cbb988fe8b5bce4f379b
-EBUILD pysmbc-1.0.13.ebuild 409 RMD160 07a0d9727c3300ec4f57f1e00a9a865d71e52fb6 SHA1 995ae53230058273e1ea62f016be22608efc5d96 SHA256 2a863812aa96941b867446de0aea974bce5a8b9fa51144f395d5df66b9524e02
+DIST pysmbc-1.0.13.tar.bz2 20795 SHA256 479fbb70d97fb64208d95975dc745f06f75661f954a8cbb988fe8b5bce4f379b
diff --git a/dev-python/python-blivet/Manifest b/dev-python/python-blivet/Manifest
new file mode 100644
index 00000000..50286488
--- /dev/null
+++ b/dev-python/python-blivet/Manifest
@@ -0,0 +1 @@
+DIST blivet-0.23.9-1.tar.gz 230824 SHA256 4cf312640c7cf040e621f997cd16496b67b84f98a70cb9aee4adce4f3353abd7 SHA512 8ca5484291b1531c7af7f2122b6a05177b685f3f112d146d382fdd6e940c8e9c51c200439d7f0fe0fd9d80e5ae0bd1ae53c07d90159c1c63aa5fa6c739789b3e WHIRLPOOL ab1bf6d45f43172e15f8f149528fb02c615677b634cfde3780c2ff5f40b63e7c67d1ca844531aaeb4f33fa39404677268de1d7ecc8bf0e432ac0143138237a97
diff --git a/dev-python/python-blivet/files/0001-Update-package-names-to-reflect-Gentoo-ones.patch b/dev-python/python-blivet/files/0001-Update-package-names-to-reflect-Gentoo-ones.patch
new file mode 100644
index 00000000..142ad49c
--- /dev/null
+++ b/dev-python/python-blivet/files/0001-Update-package-names-to-reflect-Gentoo-ones.patch
@@ -0,0 +1,144 @@
+From 149d6e87069036aec413834ff93fa59fb9db2ab6 Mon Sep 17 00:00:00 2001
+From: Fabio Erculiani <lxnay@sabayon.org>
+Date: Sat, 10 May 2014 14:01:13 +0100
+Subject: [PATCH] Update package names to reflect Gentoo ones
+
+---
+ blivet/devices.py           | 10 +++++-----
+ blivet/formats/fs.py        |  4 ++--
+ blivet/formats/luks.py      |  2 +-
+ blivet/formats/multipath.py |  2 +-
+ blivet/platform.py          |  6 +++---
+ 5 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/blivet/devices.py b/blivet/devices.py
+index 1af4e00..137a61b 100644
+--- a/blivet/devices.py
++++ b/blivet/devices.py
+@@ -1987,7 +1987,7 @@ class DMCryptDevice(DMDevice):
+ class LUKSDevice(DMCryptDevice):
+     """ A mapped LUKS device. """
+     _type = "luks/dm-crypt"
+-    _packages = ["cryptsetup-luks"]
++    _packages = ["cryptsetup"]
+ 
+     def __init__(self, name, format=None, size=None, uuid=None,
+                  exists=False, sysfsPath='', parents=None):
+@@ -3612,7 +3612,7 @@ class DMRaidArrayDevice(DMDevice):
+ class MultipathDevice(DMDevice):
+     """ A multipath device """
+     _type = "dm-multipath"
+-    _packages = ["device-mapper-multipath"]
++    _packages = ["multipath-tools"]
+     _services = ["multipathd"]
+     _partitionable = True
+     _isDisk = True
+@@ -3990,7 +3990,7 @@ class LoopDevice(StorageDevice):
+ class iScsiDiskDevice(DiskDevice, NetworkStorageDevice):
+     """ An iSCSI disk. """
+     _type = "iscsi"
+-    _packages = ["iscsi-initiator-utils", "dracut-network"]
++    _packages = ["open-iscsi"]
+ 
+     def __init__(self, device, **kwargs):
+         self.node = kwargs.pop("node")
+@@ -4055,7 +4055,7 @@ class iScsiDiskDevice(DiskDevice, NetworkStorageDevice):
+ class FcoeDiskDevice(DiskDevice, NetworkStorageDevice):
+     """ An FCoE disk. """
+     _type = "fcoe"
+-    _packages = ["fcoe-utils", "dracut-network"]
++    _packages = ["fcoe-utils"]
+ 
+     def __init__(self, device, **kwargs):
+         self.nic = kwargs.pop("nic")
+@@ -4227,7 +4227,7 @@ class DASDDevice(DiskDevice):
+ class NFSDevice(StorageDevice, NetworkStorageDevice):
+     """ An NFS device """
+     _type = "nfs"
+-    _packages = ["dracut-network"]
++    _packages = []
+ 
+     def __init__(self, device, format=None, parents=None):
+         # we could make host/ip, path, &c but will anything use it?
+diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py
+index 103717e..a03d3b6 100644
+--- a/blivet/formats/fs.py
++++ b/blivet/formats/fs.py
+@@ -1153,7 +1153,7 @@ class ReiserFS(FS):
+     _supported = False
+     _dump = True
+     _check = True
+-    _packages = ["reiserfs-utils"]
++    _packages = ["reiserfsprogs"]
+     _infofs = "debugreiserfs"
+     _defaultInfoOptions = []
+     _existingSizeFields = ["Count of blocks on the device:", "Blocksize:"]
+@@ -1255,7 +1255,7 @@ class HFSPlus(FS):
+     _udevTypes = ["hfsplus"]
+     _mkfs = "mkfs.hfsplus"
+     _fsck = "fsck.hfsplus"
+-    _packages = ["hfsplus-tools"]
++    _packages = ["hfsutils"]
+     _formattable = True
+     _mountType = "hfsplus"
+     _minSize = 1
+diff --git a/blivet/formats/luks.py b/blivet/formats/luks.py
+index 8f9ae7b..0eea209 100644
+--- a/blivet/formats/luks.py
++++ b/blivet/formats/luks.py
+@@ -49,7 +49,7 @@ class LUKS(DeviceFormat):
+     _formattable = True                 # can be formatted
+     _supported = False                  # is supported
+     _linuxNative = True                 # for clearpart
+-    _packages = ["cryptsetup-luks"]     # required packages
++    _packages = ["cryptsetup"]          # required packages
+     _minSize = crypto.LUKS_METADATA_SIZE
+ 
+     def __init__(self, *args, **kwargs):
+diff --git a/blivet/formats/multipath.py b/blivet/formats/multipath.py
+index 2d6a5f3..b5c808b 100644
+--- a/blivet/formats/multipath.py
++++ b/blivet/formats/multipath.py
+@@ -39,7 +39,7 @@ class MultipathMember(DeviceFormat):
+     _formattable = False                # can be formatted
+     _supported = True                   # is supported
+     _linuxNative = False                # for clearpart
+-    _packages = ["device-mapper-multipath"] # required packages
++    _packages = ["multipath-tools"]     # required packages
+     _resizable = False                  # can be resized
+     _maxSize = 0                        # maximum size in MB
+     _minSize = 0                        # minimum size in MB
+diff --git a/blivet/platform.py b/blivet/platform.py
+index 31c4f50..f5d4dda 100644
+--- a/blivet/platform.py
++++ b/blivet/platform.py
+@@ -129,7 +129,7 @@ class Platform(object):
+     def packages (self):
+         _packages = self._packages
+         if flags.boot_cmdline.get('fips', None) == '1':
+-            _packages.append('dracut-fips')
++            _packages.append('sys-kernel/dracut')
+         return _packages
+ 
+     def setDefaultPartitioning(self):
+@@ -211,7 +211,7 @@ class MacEFI(EFI):
+     _boot_stage1_format_types = ["macefi"]
+     _boot_efi_description = N_("Apple EFI Boot Partition")
+     _non_linux_format_types = ["macefi"]
+-    _packages = ["mactel-boot"]
++    _packages = []
+ 
+     def setDefaultPartitioning(self):
+         ret = Platform.setDefaultPartitioning(self)
+@@ -276,7 +276,7 @@ class PS3(PPC):
+     pass
+ 
+ class S390(Platform):
+-    _packages = ["s390utils"]
++    _packages = ["sys-apps/s390-tools"]
+     _disklabel_types = ["msdos", "dasd"]
+     _boot_stage1_device_types = ["disk", "partition"]
+     _boot_dasd_description = N_("DASD")
+-- 
+1.9.2
+
diff --git a/dev-python/python-blivet/files/0001-devices-enable-UUID-for-dm-based-devices-in-fstab.patch b/dev-python/python-blivet/files/0001-devices-enable-UUID-for-dm-based-devices-in-fstab.patch
new file mode 100644
index 00000000..5b795345
--- /dev/null
+++ b/dev-python/python-blivet/files/0001-devices-enable-UUID-for-dm-based-devices-in-fstab.patch
@@ -0,0 +1,28 @@
+From f026c2980c7c82599427645f7cd36e18bc02536f Mon Sep 17 00:00:00 2001
+From: Fabio Erculiani <lxnay@sabayon.org>
+Date: Sun, 11 May 2014 21:18:37 +0100
+Subject: [PATCH] devices: enable UUID= for dm-based devices in fstab
+
+---
+ blivet/devices.py | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/blivet/devices.py b/blivet/devices.py
+index 137a61b..714c849 100644
+--- a/blivet/devices.py
++++ b/blivet/devices.py
+@@ -1820,11 +1820,6 @@ class DMDevice(StorageDevice):
+         return d
+ 
+     @property
+-    def fstabSpec(self):
+-        """ Return the device specifier for use in /etc/fstab. """
+-        return self.path
+-
+-    @property
+     def mapName(self):
+         """ This device's device-mapper map name """
+         return self.name
+-- 
+1.9.2
+
diff --git a/dev-python/python-blivet/files/python-blivet-commit-to-disk-settle.patch b/dev-python/python-blivet/files/python-blivet-commit-to-disk-settle.patch
new file mode 100644
index 00000000..17de6606
--- /dev/null
+++ b/dev-python/python-blivet/files/python-blivet-commit-to-disk-settle.patch
@@ -0,0 +1,12 @@
+diff --git a/blivet/formats/disklabel.py b/blivet/formats/disklabel.py
+index 5015548..9071596 100644
+--- a/blivet/formats/disklabel.py
++++ b/blivet/formats/disklabel.py
+@@ -304,6 +304,7 @@ class DiskLabel(DeviceFormat):
+             raise DiskLabelCommitError(msg)
+         else:
+             self.updateOrigPartedDisk()
++            udev_settle()
+ 
+     def addPartition(self, *args, **kwargs):
+         partition = kwargs.get("partition", None)
diff --git a/dev-python/python-blivet/files/python-blivet-udev-path.patch b/dev-python/python-blivet/files/python-blivet-udev-path.patch
new file mode 100644
index 00000000..013080b8
--- /dev/null
+++ b/dev-python/python-blivet/files/python-blivet-udev-path.patch
@@ -0,0 +1,11 @@
+--- a/blivet/pyudev.py
++++ b/blivet/pyudev.py
+@@ -9,7 +9,7 @@ from ctypes import CDLL, c_char_p, c_int
+ # XXX this one may need some tweaking...
+ def find_library(name, somajor=0):
+     env = os.environ.get("LD_LIBRARY_PATH")
+-    common = ["/lib64", "/lib"]
++    common = ["/lib64", "/lib", "/usr/lib64", "/usr/lib"]
+ 
+     if env:
+         libdirs = env.split(":") + common
diff --git a/dev-python/python-blivet/files/python-blivet-workaround-disable-multipath.patch b/dev-python/python-blivet/files/python-blivet-workaround-disable-multipath.patch
new file mode 100644
index 00000000..0102e10d
--- /dev/null
+++ b/dev-python/python-blivet/files/python-blivet-workaround-disable-multipath.patch
@@ -0,0 +1,9 @@
+--- a/blivet/devicelibs/mpath.py
++++ b/blivet/devicelibs/mpath.py
+@@ -11,4 +11,5 @@ def flush_mpaths():
+         log.error("multipath: some devices could not be flushed")
+ 
+ def is_multipath_member(path):
+-    return (util.run_program(["multipath", "-c", path]) == 0)
++    return False
++    # return (util.run_program(["multipath", "-c", path]) == 0)
diff --git a/dev-python/python-blivet/metadata.xml b/dev-python/python-blivet/metadata.xml
new file mode 100644
index 00000000..de483c53
--- /dev/null
+++ b/dev-python/python-blivet/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>python</herd>
+</pkgmetadata>
diff --git a/dev-python/python-blivet/python-blivet-0.23.9-r3.ebuild b/dev-python/python-blivet/python-blivet-0.23.9-r3.ebuild
new file mode 100644
index 00000000..db930029
--- /dev/null
+++ b/dev-python/python-blivet/python-blivet-0.23.9-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils distutils
+
+REAL_PN="${PN/python-}"
+
+DESCRIPTION="python module for examining and modifying storage configuration."
+HOMEPAGE="https://fedoraproject.org/wiki/Blivet"
+SRC_URI="https://github.com/Sabayon/${REAL_PN}/archive/${REAL_PN}-${PV}-1.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-util/pykickstart-1.99.22
+	>=sys-apps/util-linux-2.15.1
+	>=sys-block/parted-1.8.1
+	sys-fs/cryptsetup
+	>=dev-python/python-cryptsetup-0.1.1
+	sys-fs/mdadm
+	sys-fs/dosfstools
+	>=sys-fs/e2fsprogs-1.41.0
+	sys-fs/btrfs-progs
+	>=dev-python/pyblock-0.45
+	sys-fs/multipath-tools
+	sys-process/lsof
+	"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${REAL_PN}-${REAL_PN}-${PV}-1"
+
+src_prepare() {
+	# libudev in Gentoo is in /usr/lib64 if systemd
+	epatch "${FILESDIR}/${PN}-udev-path.patch"
+
+	# multipath -c hangs on x86 due to a libc bug
+	# Temporarily disable this
+	use x86 && epatch "${FILESDIR}/${PN}-workaround-disable-multipath.patch"
+
+	# Fix package names
+	epatch "${FILESDIR}/0001-Update-package-names-to-reflect-Gentoo-ones.patch"
+	# enable UUID= support for dm-based devices (dmcrypt, md, etc)
+	epatch "${FILESDIR}/0001-devices-enable-UUID-for-dm-based-devices-in-fstab.patch"
+
+	# Sabayon: commitToDisk should wait on udev. There is a missing udev_settle() call.
+	epatch "${FILESDIR}/${PN}-commit-to-disk-settle.patch"
+
+	distutils_src_prepare
+}
diff --git a/dev-python/python-report/files/bugs.sabayon.org.ini b/dev-python/python-report/files/bugs.kogaion.org.ini
index 9fa29826..2bb98c9c 100644
--- a/dev-python/python-report/files/bugs.sabayon.org.ini
+++ b/dev-python/python-report/files/bugs.kogaion.org.ini
@@ -1,9 +1,9 @@
-[bugs.sabayon.org]
+[bugs.rogentos.ro]
 # template
 template=bugzilla-template
 
 # rhbz url
-bugzilla_host=bugs.sabayon.org
+bugzilla_host=bugs.rogentos.ro
 
 # rhbz login, a password is always asked.
 # username=user@example.com
diff --git a/dev-python/python-report/python-report-0.10-r1.ebuild b/dev-python/python-report/python-report-0.10-r1.ebuild
index b2c37da1..cd4a57b6 100644
--- a/dev-python/python-report/python-report-0.10-r1.ebuild
+++ b/dev-python/python-report/python-report-0.10-r1.ebuild
@@ -54,8 +54,8 @@ src_install() {
 	rm "${D}"/etc/report.d/dropbox.redhat.com.ini
 	rm "${D}"/etc/report.d/bugzilla.redhat.com.ini
 
-	# XXX: {not yet implemented} install Sabayon configuration
-	# cp "${FILESDIR}"/bugs.sabayon.org.ini "${D}/etc/report.d/"
+	# XXX: {not yet implemented} install Kogaion configuration
+	# cp "${FILESDIR}"/bugs.rogentos.ro.ini "${D}/etc/report.d/"
 	find "${D}"/ -name "bugzilla-template" -type d | xargs rm -rf
 	find "${D}"/ -name "RHEL-template" -type d | xargs rm -rf
 	find "${D}"/ -name "strata-template" -type d | xargs rm -rf
diff --git a/dev-python/pyvlc/Manifest b/dev-python/pyvlc/Manifest
deleted file mode 100644
index 0ab08d99..00000000
--- a/dev-python/pyvlc/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD pyvlc-1.0.ebuild 854 SHA256 4bc104f41d0b9efdca7c0c064e4160dc8ab0da58777cac8e6c95d9f02ce980ef SHA512 c41f96dbad375d9859d3cd9825b2ca6b053228f4e9291b9e2b3e6c71df022d074c1dd2c96934812950f4843d556fdcbc977d1a4c614be6f9064c3c5ad17f2852 WHIRLPOOL 6755d10ae194fbba7a47cf390755dd11bf774f6e7b389b53f18b341b66327d7e543ddc8758f6007f6119fab8750c3ab2f433df2ebc40bbdacf28c4fea35688ca
-EBUILD pyvlc-9999.ebuild 854 SHA256 4bc104f41d0b9efdca7c0c064e4160dc8ab0da58777cac8e6c95d9f02ce980ef SHA512 c41f96dbad375d9859d3cd9825b2ca6b053228f4e9291b9e2b3e6c71df022d074c1dd2c96934812950f4843d556fdcbc977d1a4c614be6f9064c3c5ad17f2852 WHIRLPOOL 6755d10ae194fbba7a47cf390755dd11bf774f6e7b389b53f18b341b66327d7e543ddc8758f6007f6119fab8750c3ab2f433df2ebc40bbdacf28c4fea35688ca
diff --git a/dev-python/qtstatemachine/Manifest b/dev-python/qtstatemachine/Manifest
index aada8f2b..e0bd0c51 100644
--- a/dev-python/qtstatemachine/Manifest
+++ b/dev-python/qtstatemachine/Manifest
@@ -1,6 +1 @@
-AUX qstatemachines_add_CMake_support.patch_003 4827 RMD160 b462cf9d1c91cc6af0dfe0ffe1d4c1df68ec51ad SHA1 3323225f77d9fba7ec3431f53775883f0d15b439 SHA256 4822daf62e6e266e00220da108300e8c4cafadf2bcb08e973d9f721d004d357e
-AUX qstatemachines_fix_compound_state.patch_002 2809 RMD160 87788328b902681f10c736f0a39d7b828509429a SHA1 ffed349fa3087f435b92eeb8c8c08074f9865f35 SHA256 58d9330eec0d22f9f54fb18276ea86fbaeee95a762a33a2d95c011270bbe3b40
-AUX qstatemachines_fix_history.patch_001 7507 RMD160 2417563f065816d8012587633e7fa921009676ee SHA1 e03a79b912a305ac0c8c3467994845a970fe0aaf SHA256 eec10835e5733dc9554cf7dd814bdad02f8183b28a32f949004059ce6ce30771
-DIST qtstatemachine-1.1-opensource.tar.gz 1339216 RMD160 102189d7bbb9d2260b1b15020f37f5a078dd8098 SHA1 25a748433bf1807165d176957710739a653c51a4 SHA256 141b78bccb709c203c62bb16c7a328b024d71e83263438e3e65d49c49d9486bd
-EBUILD qtstatemachine-1.1-r1.ebuild 925 RMD160 1064b64d8dae03aa6b82bb2f85d5be32fdc96086 SHA1 73b7efa14d2af213faf4fb7d4696e3a0a523cea9 SHA256 0876be0b8faea518b038a5d880b8f9b55bdf61f4f1701ea0b36a821eb61d4fad
-EBUILD qtstatemachine-1.1.ebuild 1024 RMD160 eced99f95ad1f4d24a9334acdcb73ebe37864b54 SHA1 64d9b1d191a6243bf14a889b8a0b5cbf65b6cbbb SHA256 da925a8b35bc4ca53f31486d03942192074ebd877798ad41dc0e51d5a8e5a188
+DIST qtstatemachine-1.1-opensource.tar.gz 1339216 SHA256 141b78bccb709c203c62bb16c7a328b024d71e83263438e3e65d49c49d9486bd