Merge remote-tracking branch 'upstream/master'

59 files changed, 1685 insertions, 95 deletions

diff --git a/app-editors/sublime-text/Manifest b/app-editors/sublime-text/Manifest
new file mode 100644
index 00000000..c4aafbae
--- /dev/null
+++ b/app-editors/sublime-text/Manifest
@@ -0,0 +1,2 @@
+DIST sublime_text_3_build_3083_x32.tar.bz2 7572911 SHA256 89e8e2bafa041c263d2c5ffd1b8ea3c36d9727c95a3f7a6603bdf1f6c4cc3165 SHA512 7329e689d0a212bb8ac255f05845b3dfb94f0c60d4d7e9b3445c390c9ae13d2a63e7df9385b1a2a7ff38cf5bce7151d51a4a482d94e2712684db7055dc78502f WHIRLPOOL 2d9f81480d75169e4e7dd6e7081dce9705c17347dba4e6579a6643b79a30d06589db21173a7ca33db352706067324103edebd5d5eb42d8f10a35c5754c0bb75a
+DIST sublime_text_3_build_3083_x64.tar.bz2 7505310 SHA256 4565c7f607b69ca6efa1751c739a11d42aeaf66d15987fbb9595e97e3ece14ee SHA512 a92c2ce4aa2e99d1c77cf65a8da8539d907bf28ea6190488d97e632c501f7d38182b8d6eec831387505fab61f7d0449de2797bc4f947a9198a2b0bc1280df386 WHIRLPOOL 00f01e3249600acd9eece42a6ee3a9b9421aac4546ade1130a835e13e559ba92978b2efab44af4ce472310173568bf40b4c48e16512f264c249faf569ce8b344
diff --git a/app-editors/sublime-text/sublime-text-3083.ebuild b/app-editors/sublime-text/sublime-text-3083.ebuild
new file mode 100644
index 00000000..0e2b70d9
--- /dev/null
+++ b/app-editors/sublime-text/sublime-text-3083.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit eutils gnome2-utils
+
+# get the major version from PV
+MV="${PV:0:1}"
+
+MY_PN="sublime_text_${MV}"
+MY_P="Sublime%20Text"
+S="${WORKDIR}/${MY_PN}"
+
+DESCRIPTION="Sophisticated text editor for code, markup and prose"
+HOMEPAGE="http://www.sublimetext.com"
+
+BASE_URI="http://c758482.r82.cf2.rackcdn.com"
+SRC_URI="amd64? ( ${BASE_URI}/${MY_PN}_build_${PV}_x64.tar.bz2 )
+	x86? ( ${BASE_URI}/${MY_PN}_build_${PV}_x32.tar.bz2 )"
+LICENSE="Sublime"
+SLOT="${MV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="multislot dbus"
+RESTRICT="bindist mirror strip"
+
+DEPEND=">=media-libs/libpng-1.2.46
+	>=x11-libs/gtk+-2.24.8-r1:2
+	multislot? ( app-admin/eselect-sublime )
+	dbus? ( sys-apps/dbus )"
+RDEPEND="${DEPEND}"
+
+QA_PREBUILT="*"
+
+pkg_nofetch() {
+	eerror "Sublime Text official site seems to be unresponsive."
+}
+
+src_install() {
+	insinto /opt/${MY_PN}
+	into /opt/${MY_PN}
+	exeinto /opt/${MY_PN}
+	doins -r "Icon"
+	doins -r "Packages"
+	doins "python3.3.zip"
+	doins "sublime.py"
+	doins "sublime_plugin.py"
+	doexe "sublime_text"
+	doexe "plugin_host"
+	dosym "/opt/${MY_PN}/sublime_text" /usr/bin/subl${MV}
+
+	local size
+	for size in 16 32 48 128 256 ; do
+		insinto /usr/share/icons/hicolor/${size}x${size}/apps
+		newins "Icon/${size}x${size}/sublime-text.png" sublime_text.png
+	done
+
+	make_desktop_entry "subl${MV} %F" "Sublime Text ${MV}" sublime_text "Development;TextEditor" "StartupNotify=true"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	if use multislot; then
+		eselect_sublime_update
+	else
+		einfo "using major version ${MV} as default"
+		dosym /usr/bin/subl${MV} /usr/bin/subl
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
+
+eselect_sublime_update() {
+	einfo
+	elog "Updating Sublime Text to the latest installed version"
+	elog "you can select the version you want to use just using"
+	elog
+	elog "eselect sublime set sublime_text_2"
+	einfo
+	eselect sublime set sublime_text_${MV} --use-old
+}
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
diff --git a/eclass/transmission-2.83.eclass b/eclass/transmission-2.83.eclass
new file mode 100644
index 00000000..075a5025
--- /dev/null
+++ b/eclass/transmission-2.83.eclass
@@ -0,0 +1,287 @@
+# Copyright 1999-2013 Sabayon
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# @ECLASS: transmission-2.xx.eclass
+# @MAINTAINER:
+# slawomir.nizio@sabayon.org
+# @AUTHOR:
+# Sławomir Nizio <slawomir.nizio@sabayon.org>
+# @BLURB: eclass to ease managing of Sabayon split net-p2p/transmission
+# @DESCRIPTION:
+# This eclass is to ease managing of split net-p2p/transmission for Sabayon.
+# Its name contains a version that corresponds to net-p2p/transmission one,
+# because the eclass will change often when needed to follow changes
+# in Gentoo ebuild.
+# Always call phase functions using their public names, such like:
+# transmission-2.83_src_configure, and never _transmission_src_configure.
+
+# @ECLASS-VARIABLE: TRANSMISSION_PATCHES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array that contains patches to apply just before eautoreconf.
+
+# @ECLASS-VARIABLE: TRANSMISSION_ECLASS_VERSION_OK
+# @DESCRIPTION:
+# Set this to x.y if you want to use transmission-x.y.eclass from ebuild
+# with ${PV} different than x.y. This is to catch bugs.
+: ${TRANSMISSION_ECLASS_VERSION_OK:=${PV}}
+
+# @ECLASS-VARIABLE: E_TRANSM_TAIL
+# @INTERNAL
+# @DESCRIPTION:
+# "Tail" of package name. Can take value gtk, qt4, etc. or can be empty.
+E_TRANSM_TAIL=${PN#transmission}
+E_TRANSM_TAIL=${E_TRANSM_TAIL#-}
+
+# @FUNCTION: _transmission_is
+# @INTERNAL
+# @DESCRIPTION:
+# Function used to check which variant of Transmission are we working on.
+# Argument should be one of these: (none), gtk, qt4, daemon, cli, base.
+# If argument is empty or omitted, true value means that it is
+# net-p2p/transmission (metapackage).
+_transmission_is() {
+	local what=$1
+	[[ ${what} = "${E_TRANSM_TAIL}" ]]
+}
+
+# @FUNCTION: _transmission_eclass_setup_functions
+# @INTERNAL
+# @DESCRIPTION:
+# Function to setup functions. The eval uses strictly controlled variables,
+# so it's OK.
+_transmission_eclass_setup_functions() {
+	local v=2.83
+	local func
+	for func in pkg_setup src_prepare src_configure src_compile \
+			pkg_preinst pkg_postinst pkg_postrm; do
+		eval "transmission-${v}_${func}() { _transmission_${func}; }"
+	done
+}
+
+_transmission_eclass_setup_functions
+
+MY_ECLASSES=""
+_transmission_is gtk && MY_ECLASSES+="fdo-mime gnome2-utils"
+_transmission_is qt4 && MY_ECLASSES+="fdo-mime qt4-r2"
+_transmission_is "" || MY_ECLASSES+=" autotools"
+_transmission_is base && MY_ECLASSES+=" user"
+
+inherit eutils multilib ${MY_ECLASSES}
+
+unset MY_ECLASSES
+
+case ${EAPI:-0} in
+	4|5) EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile \
+		pkg_preinst pkg_postinst pkg_postrm ;;
+	*) die "EAPI=${EAPI} is not supported" ;;
+esac
+
+[[ ${PN} = transmission* ]] || \
+	die "This eclass can only be used with net-p2p/transmission* ebuilds!"
+# Bug catcher!
+if ! [[ ${PV} = *9999* ]] && [[ ${TRANSMISSION_ECLASS_VERSION_OK} != ${ECLASS#*-} ]]; then
+	eerror "used eclass ${ECLASS}"
+	eerror "TRANSMISSION_ECLASS_VERSION_OK=${TRANSMISSION_ECLASS_VERSION_OK}"
+	die "ebuild version ${PV} doesn't match with the eclass"
+fi
+
+MY_PN="transmission"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client"
+HOMEPAGE="http://www.transmissionbt.com/"
+SRC_URI="http://download.transmissionbt.com/${MY_PN}/files/${MY_P}.tar.xz"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+IUSE=""
+
+# only common dependencies plus blockers
+RDEPEND=""
+_transmission_is base || RDEPEND+="~net-p2p/transmission-base-${PV}"
+if ! _transmission_is ""; then
+	RDEPEND+="
+	>=dev-libs/libevent-2.0.10:=
+	dev-libs/openssl:0=
+	net-libs/libnatpmp:=
+	>=net-libs/miniupnpc-1.7:=
+	>=net-misc/curl-7.16.3:=[ssl]
+	sys-libs/zlib:="
+fi
+
+DEPEND="${RDEPEND}"
+if _transmission_is base; then
+	RDEPEND+=" !<net-p2p/transmission-gtk-${PV}
+	!<net-p2p/transmission-qt4-${PV}
+	!<net-p2p/transmission-daemon-${PV}
+	!<net-p2p/transmission-cli-${PV}"
+fi
+if ! _transmission_is ""; then
+	DEPEND+=" >=dev-libs/glib-2.32
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+	virtual/os-headers"
+fi
+
+S="${WORKDIR}/${MY_P}"
+_transmission_is "" && S="${WORKDIR}"
+
+_transmission_pkg_setup() {
+	if _transmission_is base; then
+		enewgroup transmission
+		enewuser transmission -1 -1 -1 transmission
+	fi
+}
+
+_transmission_src_prepare() {
+	_transmission_is "" && return
+
+	sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die
+
+	if ! use_if_iuse ayatana; then
+		# Trick to avoid automagic dependency
+		sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die
+	fi
+
+	# Pass our configuration dir to systemd unit file
+	sed -i '/ExecStart/ s|$| -g /var/lib/transmission/config|' daemon/${MY_PN}-daemon.service || die
+
+	# http://trac.transmissionbt.com/ticket/4324
+	sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' lib${MY_PN}/Makefile.am || die
+
+	if [[ ${#TRANSMISSION_PATCHES[@]} -gt 0 ]]; then
+		epatch "${TRANSMISSION_PATCHES[@]}"
+	fi
+
+	# http://trac.transmissionbt.com/ticket/5700
+	sed -i -e '1iQMAKE_CXXFLAGS += -std=c++11' qt/qtr.pro || die
+
+	eautoreconf
+
+	if ! _transmission_is base; then
+		local sedcmd="s:\$(top_builddir)/libtransmission/libtransmission.a:"
+		sedcmd+="${EROOT}usr/$(get_libdir)/libtransmission.a:"
+		find . -name Makefile.in -exec sed -i -e "${sedcmd}" {} \; || die
+		sed -i -e '/libtransmission \\/d' Makefile.in || die
+		if _transmission_is qt4; then
+			sedcmd="s:\$\${TRANSMISSION_TOP}/libtransmission/libtransmission.a:"
+			sedcmd+="${EROOT}usr/$(get_libdir)/libtransmission.a:"
+			sed -i -e "${sedcmd}" qt/qtr.pro || die
+		fi
+	fi
+}
+
+_transmission_src_configure() {
+	_transmission_is "" && return
+
+	local econfargs=(
+		--enable-external-natpmp
+	)
+
+	if _transmission_is base; then
+		export ac_cv_header_xfs_xfs_h=$(usex xfs)
+		econfargs+=(
+			--disable-cli
+			--disable-daemon
+			--without-gtk
+			$(use_enable lightweight)
+		)
+	elif _transmission_is cli; then
+		econfargs+=(
+			--enable-cli
+			--disable-daemon
+			--without-gtk
+		)
+	elif _transmission_is daemon; then
+		econfargs+=(
+			--disable-cli
+			--enable-daemon
+			--without-gtk
+			$(use_with systemd systemd-daemon)
+		)
+	elif _transmission_is gtk; then
+		econfargs+=(
+			--disable-cli
+			--disable-daemon
+			--with-gtk
+		)
+	elif _transmission_is qt4; then
+		econfargs+=(
+			--disable-cli
+			--disable-daemon
+			--without-gtk
+		)
+	else
+		die "Something is wrong... (E_TRANSM_TAIL=$E_TRANSM_TAIL)"
+	fi
+
+	econf "${econfargs[@]}"
+	if _transmission_is qt4; then
+		pushd qt >/dev/null
+		eqmake4 qtr.pro
+		popd >/dev/null
+	fi
+}
+
+_transmission_src_compile() {
+	_transmission_is "" && return
+
+	emake
+	if _transmission_is qt4; then
+		pushd qt >/dev/null
+		emake
+		lrelease translations/*.ts
+		popd >/dev/null
+	fi
+}
+
+
+# Note: not providing src_install. Too many differences and too much code
+# which would only clutter this pretty eclass.
+
+_transmission_pkg_preinst() {
+	_transmission_is gtk && gnome2_icon_savelist
+}
+
+_transmission_pkg_postinst() {
+	if _transmission_is gtk || _transmission_is qt4; then
+		fdo-mime_desktop_database_update
+	fi
+
+	_transmission_is gtk && gnome2_icon_cache_update
+
+	if _transmission_is daemon; then
+		elog "If you use ${MY_PN}-daemon, please, set 'rpc-username' and"
+		elog "'rpc-password' (in plain text, ${MY_PN}-daemon will hash it on"
+		elog "start) in settings.json file located at /var/${MY_PN}/config or"
+		elog "any other appropriate config directory."
+	fi
+
+	if _transmission_is gtk; then
+		# in -gtk only?
+		elog
+		elog "To enable sound emerge media-libs/libcanberra and check that at least"
+		elog "some sound them is selected. For this go:"
+		elog "Gnome/system/preferences/sound themes tab and 'sound theme: default'"
+		elog
+	fi
+
+	if _transmission_is base; then
+		elog "Since µTP is enabled by default, ${MY_PN} needs large kernel buffers for"
+		elog "the UDP socket. You can append following lines into /etc/sysctl.conf:"
+		elog " net.core.rmem_max = 4194304"
+		elog " net.core.wmem_max = 1048576"
+		elog "and run sysctl -p"
+	fi
+}
+
+_transmission_pkg_postrm() {
+	if _transmission_is gtk || _transmission_is qt4; then
+		fdo-mime_desktop_database_update
+	fi
+
+	_transmission_is gtk && gnome2_icon_cache_update
+}
diff --git a/eclass/transmission-2.84.eclass b/eclass/transmission-2.84.eclass
new file mode 100644
index 00000000..94f21620
--- /dev/null
+++ b/eclass/transmission-2.84.eclass
@@ -0,0 +1,291 @@
+# Copyright 1999-2014 Sabayon
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# @ECLASS: transmission-2.xx.eclass
+# @MAINTAINER:
+# slawomir.nizio@sabayon.org
+# @AUTHOR:
+# Sławomir Nizio <slawomir.nizio@sabayon.org>
+# @BLURB: eclass to ease managing of Sabayon split net-p2p/transmission
+# @DESCRIPTION:
+# This eclass is to ease managing of split net-p2p/transmission for Sabayon.
+# Its name contains a version that corresponds to net-p2p/transmission one,
+# because the eclass will change often when needed to follow changes
+# in Gentoo ebuild.
+# Always call phase functions using their public names, such like:
+# transmission-2.83_src_configure, and never _transmission_src_configure.
+
+# @ECLASS-VARIABLE: TRANSMISSION_PATCHES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array that contains patches to apply just before eautoreconf.
+
+# @ECLASS-VARIABLE: TRANSMISSION_ECLASS_VERSION_OK
+# @DESCRIPTION:
+# Set this to x.y if you want to use transmission-x.y.eclass from ebuild
+# with ${PV} different than x.y. This is to catch bugs.
+: ${TRANSMISSION_ECLASS_VERSION_OK:=${PV}}
+
+# @ECLASS-VARIABLE: E_TRANSM_TAIL
+# @INTERNAL
+# @DESCRIPTION:
+# "Tail" of package name. Can take value gtk, qt4, etc. or can be empty.
+E_TRANSM_TAIL=${PN#transmission}
+E_TRANSM_TAIL=${E_TRANSM_TAIL#-}
+
+# @FUNCTION: _transmission_is
+# @INTERNAL
+# @DESCRIPTION:
+# Function used to check which variant of Transmission are we working on.
+# Argument should be one of these: (none), gtk, qt4, daemon, cli, base.
+# If argument is empty or omitted, true value means that it is
+# net-p2p/transmission (metapackage).
+_transmission_is() {
+	local what=$1
+	[[ ${what} = "${E_TRANSM_TAIL}" ]]
+}
+
+# @FUNCTION: _transmission_eclass_setup_functions
+# @INTERNAL
+# @DESCRIPTION:
+# Function to setup functions. The eval uses strictly controlled variables,
+# so it's OK.
+_transmission_eclass_setup_functions() {
+	local v=2.84
+	local func
+	for func in pkg_setup src_prepare src_configure src_compile \
+			pkg_preinst pkg_postinst pkg_postrm; do
+		eval "transmission-${v}_${func}() { _transmission_${func}; }"
+	done
+}
+
+_transmission_eclass_setup_functions
+
+MY_ECLASSES=""
+_transmission_is gtk && MY_ECLASSES+="fdo-mime gnome2-utils"
+_transmission_is qt4 && MY_ECLASSES+="fdo-mime qt4-r2"
+_transmission_is "" || MY_ECLASSES+=" autotools"
+_transmission_is base && MY_ECLASSES+=" user"
+
+inherit eutils multilib ${MY_ECLASSES}
+
+unset MY_ECLASSES
+
+case ${EAPI:-0} in
+	4|5) EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile \
+		pkg_preinst pkg_postinst pkg_postrm ;;
+	*) die "EAPI=${EAPI} is not supported" ;;
+esac
+
+[[ ${PN} = transmission* ]] || \
+	die "This eclass can only be used with net-p2p/transmission* ebuilds!"
+# Bug catcher!
+if ! [[ ${PV} = *9999* ]] && [[ ${TRANSMISSION_ECLASS_VERSION_OK} != ${ECLASS#*-} ]]; then
+	eerror "used eclass ${ECLASS}"
+	eerror "TRANSMISSION_ECLASS_VERSION_OK=${TRANSMISSION_ECLASS_VERSION_OK}"
+	die "ebuild version ${PV} doesn't match with the eclass"
+fi
+
+MY_PN="transmission"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client"
+HOMEPAGE="http://www.transmissionbt.com/"
+SRC_URI="http://download.transmissionbt.com/${MY_PN}/files/${MY_P}.tar.xz"
+
+# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
+# transmission in licenses/ is for mentioning OpenSSL linking exception
+# MIT is in several libtransmission/ headers
+LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
+SLOT="0"
+IUSE=""
+
+# only common dependencies plus blockers
+RDEPEND=""
+_transmission_is base || RDEPEND+="~net-p2p/transmission-base-${PV}"
+if ! _transmission_is ""; then
+	RDEPEND+="
+	>=dev-libs/libevent-2.0.10:=
+	dev-libs/openssl:0=
+	net-libs/libnatpmp:=
+	>=net-libs/miniupnpc-1.7:=
+	>=net-misc/curl-7.16.3:=[ssl]
+	sys-libs/zlib:="
+fi
+
+DEPEND="${RDEPEND}"
+if _transmission_is base; then
+	RDEPEND+=" !<net-p2p/transmission-gtk-${PV}
+	!<net-p2p/transmission-qt4-${PV}
+	!<net-p2p/transmission-daemon-${PV}
+	!<net-p2p/transmission-cli-${PV}"
+fi
+if ! _transmission_is ""; then
+	DEPEND+=" >=dev-libs/glib-2.32
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+	virtual/os-headers"
+fi
+
+S="${WORKDIR}/${MY_P}"
+_transmission_is "" && S="${WORKDIR}"
+
+_transmission_pkg_setup() {
+	if _transmission_is base; then
+		enewgroup transmission
+		enewuser transmission -1 -1 -1 transmission
+	fi
+}
+
+_transmission_src_prepare() {
+	_transmission_is "" && return
+
+	sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die
+
+	if ! use_if_iuse ayatana; then
+		# Trick to avoid automagic dependency
+		sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die
+	fi
+
+	# Pass our configuration dir to systemd unit file
+	sed -i '/ExecStart/ s|$| -g /var/lib/transmission/config|' daemon/${MY_PN}-daemon.service || die
+
+	# http://trac.transmissionbt.com/ticket/4324
+	sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' lib${MY_PN}/Makefile.am || die
+
+	if [[ ${#TRANSMISSION_PATCHES[@]} -gt 0 ]]; then
+		epatch "${TRANSMISSION_PATCHES[@]}"
+	fi
+
+	# http://trac.transmissionbt.com/ticket/5700
+	sed -i -e '1iQMAKE_CXXFLAGS += -std=c++11' qt/qtr.pro || die
+
+	epatch_user
+	eautoreconf
+
+	if ! _transmission_is base; then
+		local sedcmd="s:\$(top_builddir)/libtransmission/libtransmission.a:"
+		sedcmd+="${EROOT}usr/$(get_libdir)/libtransmission.a:"
+		find . -name Makefile.in -exec sed -i -e "${sedcmd}" {} \; || die
+		sed -i -e '/libtransmission \\/d' Makefile.in || die
+		if _transmission_is qt4; then
+			sedcmd="s:\$\${TRANSMISSION_TOP}/libtransmission/libtransmission.a:"
+			sedcmd+="${EROOT}usr/$(get_libdir)/libtransmission.a:"
+			sed -i -e "${sedcmd}" qt/qtr.pro || die
+		fi
+	fi
+}
+
+_transmission_src_configure() {
+	_transmission_is "" && return
+
+	local econfargs=(
+		--enable-external-natpmp
+	)
+
+	if _transmission_is base; then
+		export ac_cv_header_xfs_xfs_h=$(usex xfs)
+		econfargs+=(
+			--disable-cli
+			--disable-daemon
+			--without-gtk
+			$(use_enable lightweight)
+		)
+	elif _transmission_is cli; then
+		econfargs+=(
+			--enable-cli
+			--disable-daemon
+			--without-gtk
+		)
+	elif _transmission_is daemon; then
+		econfargs+=(
+			--disable-cli
+			--enable-daemon
+			--without-gtk
+			$(use_with systemd systemd-daemon)
+		)
+	elif _transmission_is gtk; then
+		econfargs+=(
+			--disable-cli
+			--disable-daemon
+			--with-gtk
+		)
+	elif _transmission_is qt4; then
+		econfargs+=(
+			--disable-cli
+			--disable-daemon
+			--without-gtk
+		)
+	else
+		die "Something is wrong... (E_TRANSM_TAIL=$E_TRANSM_TAIL)"
+	fi
+
+	econf "${econfargs[@]}"
+	if _transmission_is qt4; then
+		pushd qt >/dev/null
+		eqmake4 qtr.pro
+		popd >/dev/null
+	fi
+}
+
+_transmission_src_compile() {
+	_transmission_is "" && return
+
+	emake
+	if _transmission_is qt4; then
+		pushd qt >/dev/null
+		emake
+		lrelease translations/*.ts
+		popd >/dev/null
+	fi
+}
+
+
+# Note: not providing src_install. Too many differences and too much code
+# which would only clutter this pretty eclass.
+
+_transmission_pkg_preinst() {
+	_transmission_is gtk && gnome2_icon_savelist
+}
+
+_transmission_pkg_postinst() {
+	if _transmission_is gtk || _transmission_is qt4; then
+		fdo-mime_desktop_database_update
+	fi
+
+	_transmission_is gtk && gnome2_icon_cache_update
+
+	if _transmission_is daemon; then
+		elog "If you use ${MY_PN}-daemon, please, set 'rpc-username' and"
+		elog "'rpc-password' (in plain text, ${MY_PN}-daemon will hash it on"
+		elog "start) in settings.json file located at /var/${MY_PN}/config or"
+		elog "any other appropriate config directory."
+	fi
+
+	if _transmission_is gtk; then
+		# in -gtk only?
+		elog
+		elog "To enable sound emerge media-libs/libcanberra and check that at least"
+		elog "some sound them is selected. For this go:"
+		elog "Gnome/system/preferences/sound themes tab and 'sound theme: default'"
+		elog
+	fi
+
+	if _transmission_is base; then
+		elog "Since µTP is enabled by default, ${MY_PN} needs large kernel buffers for"
+		elog "the UDP socket. You can append following lines into /etc/sysctl.conf:"
+		elog " net.core.rmem_max = 4194304"
+		elog " net.core.wmem_max = 1048576"
+		elog "and run sysctl -p"
+	fi
+}
+
+_transmission_pkg_postrm() {
+	if _transmission_is gtk || _transmission_is qt4; then
+		fdo-mime_desktop_database_update
+	fi
+
+	_transmission_is gtk && gnome2_icon_cache_update
+}
diff --git a/net-p2p/gnunet-gtk/Manifest b/net-p2p/gnunet-gtk/Manifest
index ee21bace..46d7bac5 100644
--- a/net-p2p/gnunet-gtk/Manifest
+++ b/net-p2p/gnunet-gtk/Manifest
@@ -7,14 +7,3 @@ DIST gnunet-gtk-0.8.0pre1.tar.bz2 792185 SHA256 dc629d7cedb0910aeb031d0619210fc8
 DIST gnunet-gtk-0.8.1.tar.gz 1090644 SHA256 b4eec2c2f06a5893172d7d344466c56325ec17040552289d8853abdf5650be43
 DIST gnunet-gtk-0.8.1a.tar.gz 1091669 SHA256 0e9d317352ad991c6e66ad7619a3df3f1b24637f50ccaf3df2acb54c9d13736f
 DIST gnunet-gtk-0.9.0pre1.tar.gz 703337 SHA256 1a9e20d7ddb5aeed253924988f5f4172b6cb86f6f3573a600168b15cd534bdc3
-EBUILD gnunet-gtk-0.7.3.ebuild 703 SHA256 ef112666e8760d277d9125e0694dd46fd51988fefa53e109ec437ad3d8b0e9d8 SHA512 10585daf73ec418d1d46b1747d516c4787c3e26a19fcd77612b8f660b96f56c6fb030e2fccecb06e858eb6dde5c5a4f796b8e8ab89ae5f0505242a08ac9d2bd0 WHIRLPOOL 215b781e6e7e8cf1ef86ac273a5d7b56e01a5f4160c877e1f19cdc49e128517b6e8c32a64c5b7604d0305d9cad8ac7d41ec1b8707010bdb7483bd682790fb543
-EBUILD gnunet-gtk-0.8.0.ebuild 910 SHA256 35d0bd4e192eaa1a481375f3cbebfafac99c9d2dd1fd9a3a148475426e01257e SHA512 fe6264d73de271f523b229e0b9fd1bce62363b925fd72da36c4e1c2d684415cc9b91af2741f6475e7f2647feb0f2e9a904c563b628e5ab26cbca1ba56fc4137a WHIRLPOOL d657163830f2efc90b01a3d5facb60449409e85a1ca027b001b7f942eb5131e048744d2f8bcd20989f4576a689f48665403e9afd20ab2e9f054d847fc8485e8b
-EBUILD gnunet-gtk-0.8.0_pre0.ebuild 909 SHA256 bb5da372e29626bcd701659fd0d8e13b72e8e498004b43a743369b96502cddf5 SHA512 0788cf74e0ea92f6597d6105495285cfa6a6ad925a0006a3f851c2e195368f6ba6913c5502777a422873b7bd218def8fd75f0f37c1ff630052c16e25c77e8c05 WHIRLPOOL 974a2634a790dc7b869ecd2ca7d1551e8dcf2bcd58135b7d601181dde3621870666720ba85f9aa269f57f3b037bd11ad5011259dbf65f17c504ff7e72f62efcb
-EBUILD gnunet-gtk-0.8.0_pre1.ebuild 910 SHA256 35d0bd4e192eaa1a481375f3cbebfafac99c9d2dd1fd9a3a148475426e01257e SHA512 fe6264d73de271f523b229e0b9fd1bce62363b925fd72da36c4e1c2d684415cc9b91af2741f6475e7f2647feb0f2e9a904c563b628e5ab26cbca1ba56fc4137a WHIRLPOOL d657163830f2efc90b01a3d5facb60449409e85a1ca027b001b7f942eb5131e048744d2f8bcd20989f4576a689f48665403e9afd20ab2e9f054d847fc8485e8b
-EBUILD gnunet-gtk-0.8.0a.ebuild 910 SHA256 35d0bd4e192eaa1a481375f3cbebfafac99c9d2dd1fd9a3a148475426e01257e SHA512 fe6264d73de271f523b229e0b9fd1bce62363b925fd72da36c4e1c2d684415cc9b91af2741f6475e7f2647feb0f2e9a904c563b628e5ab26cbca1ba56fc4137a WHIRLPOOL d657163830f2efc90b01a3d5facb60449409e85a1ca027b001b7f942eb5131e048744d2f8bcd20989f4576a689f48665403e9afd20ab2e9f054d847fc8485e8b
-EBUILD gnunet-gtk-0.8.0c.ebuild 910 SHA256 35d0bd4e192eaa1a481375f3cbebfafac99c9d2dd1fd9a3a148475426e01257e SHA512 fe6264d73de271f523b229e0b9fd1bce62363b925fd72da36c4e1c2d684415cc9b91af2741f6475e7f2647feb0f2e9a904c563b628e5ab26cbca1ba56fc4137a WHIRLPOOL d657163830f2efc90b01a3d5facb60449409e85a1ca027b001b7f942eb5131e048744d2f8bcd20989f4576a689f48665403e9afd20ab2e9f054d847fc8485e8b
-EBUILD gnunet-gtk-0.8.1.ebuild 909 SHA256 b9d88de0dc1af34fc0cd47847fab2e1df62e9a3fe31f6d2fa2fa32416a388586 SHA512 b4c7eb35f5ae1da5e566a490d0c9b84a7894748d3b116c344b930c37917e38483f3e74c21092ded12612ae2cca14aabcbe278a0188e26588fbdc4a967ea9f2ef WHIRLPOOL 31d8e8bd2620b152fafaf2ac10e0206dc60e10a7d71b2f3862d8aaeb3a9467b15ffcc9918889bc72ee1a2f59fca971b3d05f27bddb07090c8ec1ac8ca31c0b9d
-EBUILD gnunet-gtk-0.8.1a.ebuild 909 SHA256 b9d88de0dc1af34fc0cd47847fab2e1df62e9a3fe31f6d2fa2fa32416a388586 SHA512 b4c7eb35f5ae1da5e566a490d0c9b84a7894748d3b116c344b930c37917e38483f3e74c21092ded12612ae2cca14aabcbe278a0188e26588fbdc4a967ea9f2ef WHIRLPOOL 31d8e8bd2620b152fafaf2ac10e0206dc60e10a7d71b2f3862d8aaeb3a9467b15ffcc9918889bc72ee1a2f59fca971b3d05f27bddb07090c8ec1ac8ca31c0b9d
-EBUILD gnunet-gtk-0.9.0_pre1.ebuild 912 SHA256 b6f8cf03cf71cb449bebf831065273fb25178d1aec856bf04daf9ec9c8bbd591 SHA512 014af2573294b32c867fe03fc8043e43dc76495870169510d92d0e309b223d53fc0507add6836363ed4172f75c6ac996b9e1ede941388434059d0175f79919ab WHIRLPOOL f17aa88455b8c12d4f0ceb00c5088cd66f57a566f497f1942f879937d60808c4e0071fdb88354d576522699d3aa05d3610e55fe7709fd20835ce3fbdf8a351a3
-MISC ChangeLog 576 SHA256 a8838089da74c07a47df7c67194e5ccd870755212283d11b4cc1754323598c64 SHA512 ef34beb888d24805abba5f9a1674b74df356160f3d8075f34f61bae2003089e4274e82ed17c502b45f5575fab37948ce240109f8c2b326585215897b9909084e WHIRLPOOL 44142754327a8278e5ceadbf288de1e8b7eb69b1548b86fbc6a714ccc38772701128962e5791f777bb55461e413db2c676f6b487f358fe0f49fb35605aaa0b78
-MISC metadata.xml 464 SHA256 9c68dcb88251ff20fafcc013030550607c1dcf6448ab8966b5f331137127650b SHA512 5c0f3270f7b6f90e2ac81013957c23fb77c8a3634acc742041a961a3a0b88b80e3af0c6d317841489e2e045d5dd90f6a5f18d6d2bc7cba47ee082eb90558c0fc WHIRLPOOL c4b7adf608b8bce81d58bdab84349c8ae3fa956337f7abea3010bf9ba27ab4937874bc0ab133d78521a8ae36a887ef3eb7a61d8f51be3ffc29dc67011b389974
diff --git a/net-p2p/gnunet-qt/Manifest b/net-p2p/gnunet-qt/Manifest
index bb554cd9..95075318 100644
--- a/net-p2p/gnunet-qt/Manifest
+++ b/net-p2p/gnunet-qt/Manifest
@@ -1,5 +1,2 @@
 DIST gnunet-qt-0.8.1.tar.gz 459492 SHA256 e646be6837efee4b701d86f15331e35cec20fe4ad4e0be9065b3043b9db579da
 DIST gnunet-qt-0.8.1a.tar.gz 459571 SHA256 e7ff781e3b7d41b2db11dabcee0bc1f81fbccf87e220f12fa738ca78e091ba17
-EBUILD gnunet-qt-0.8.1.ebuild 1094 SHA256 51eea3cbfe4578cce71bec8a5bef6ef24d3735ae0c1119bba4fe8f761318acc6 SHA512 6da8ddf07595ed249a3c5c31ff16d427cd32a4155cd9518f6b09c4482c7747e793348fa298969e983a4ca0bb7bb2f71effee110fdd2c88e4f2405e8a3b84eeba WHIRLPOOL 0753f98a4799e7173091454a792d362c18de3e6528df3dc4d556bfc8670eaac868ff448284e020d7cf6a11f8a0f3bcb899b39b2cdbbe8bef8436090d548b9567
-EBUILD gnunet-qt-0.8.1a.ebuild 663 SHA256 af33626271fff0bc348d481d5cfc0d0a446a43c60ef175c9a1b5268b93f93f71 SHA512 112c0c040d9b99431b588094e992159bbc6beca28f641ed357ca22427751f41c1d783e45bdb53aff1d636d5febab1e296c4e72fd26b377204f117783b665bcea WHIRLPOOL 6400e6a77f7366e27a5d00f3ce7d91d02705fd043814bd30005e73034c9dc9efdb462d259ec039e99104bb7c1da36baebeeca83ff00cbdc2d521d5d69c28fb55
-MISC ChangeLog 361 SHA256 56a36820afe2c8c7140b2f0b26cfd902e8185c7048afc86784d238e4adbec4d4 SHA512 9b2ce2f34709391d3825c468b88597dbcb6d06851f46d75bc47c146e41d7fa96bd9c21603de87c2818cb54436007a2bd582b391c78425e1429bc789543804f81 WHIRLPOOL 127462471d54a95617b7b7e9a901a04d20c1c031d009cf2caf6f2c014ef2a69c7a9beac786fbd9e7845952939b6f0c0edb3d9c2a10724f379343d869ba4a7edc
diff --git a/net-p2p/gnunet/Manifest b/net-p2p/gnunet/Manifest
index 0556159f..4bd6118f 100644
--- a/net-p2p/gnunet/Manifest
+++ b/net-p2p/gnunet/Manifest
@@ -1,12 +1,3 @@
-AUX config-daemon.in.patch 243 SHA256 83a708781f79c2b7a64b1f6e27460082d251e9886a4f940ac6e229c430971cba SHA512 a8aa998e5a24321cadba412b29900f92204c698ab1d35b3fbb76af1c2e872048e7e15e5e0671f355353664a7104b38b21f92539a6d6bf6670f544fe6ff48e166 WHIRLPOOL b3e6bb901df1f146bc7d99d23eee92091e723d8371ad2b4c1d3c400940de7d0f074d15c45f10329214d28ce6a33a836a46f6a26695b4134b2701cce08d4a05cd
-AUX gnunet 805 SHA256 657e8add8f4118f6e6cb5dd32a3e43b7965ef9f465d834a971ce1d7a32282a5f SHA512 57175229d7334c3d8dd1bb850e4c9dcce0ed4af2f3fc6101e4cd39d414ad7eb0d64a98b3060b218060ca87b4e5c34a2dc6f2544ddb4877037fd8fc4b58847822 WHIRLPOOL cba332a1cedc639576f15cb47a70294eda84683015f516d19f9a6b96d156ed7bfafc531a56cdfe96e72a67141783843e9c60a88ecbe943cba2047da351cd9b73
-AUX gnunet-0.9.0_pre0-gentoo.patch 595 SHA256 39e90168adccab4e0e1aa47b53d54c0fb0144b0405f2e676e1548863c6ca27cf SHA512 e661b294cdc2d589859391d735741630dcb6c5843a7b6c51ca8b77cf19dfa5583f8b2c45d60e9814237fb3164458345bbe37f566a5e0bcbbfc430235ef2a8403 WHIRLPOOL 2a56b2c19200041d7afb9ca3073645518cd4f8826a6ec914c5fcc5a414f9b9546b04516e1c088e045742fd6decfbe68e64ee62e74f74ed6169f39fa144146087
-AUX gnunet-0.9.0_pre2-gentoo.patch 703 SHA256 a88bb3fd10f738cd0eccc88f6b8d25d5814ec3f8cef373a70c6967b3ebeeb58f SHA512 fcfffe868bee2de9d741898c6563e922046c81f7c8e2fbb3668365b03b459a9f4c9fbfd4483064e57e869a9be17da2f1ffc170b8d76f02f59650222d7e30b294 WHIRLPOOL fd01db7ff172281bd423bf162947210b838ac87d6a6183af4485000e1515e52c49576a48f77abfa98b8797297c6d067fe81a1fb64157f87809af47d25e93ecfa
-AUX gnunet-2 643 SHA256 a7f43c1a05240593cb828aef66a2ea5fb14aa1d93a4f6cd709054eae1cebe919 SHA512 32e7cef9a85d5a0c255d18b834b66283a5bc20628899af48f4eec5efbc477ba4e3f3b09d0287efcddcf3db077729596fb7f1516e4916bfba5514409a8dd7c999 WHIRLPOOL 75291e845e3330bd357d11e54733176d915bdd7b4a5aa76b5aede6fef2bc9b181abc595b600c2b7a951ebfa799fd2b73c2fba80e8d28c288f48351cdd0c5e6ef
-AUX gnunet-download-manager.scm 13338 SHA256 a49047daf991597c869e43d300808990e3edfdf4f814a3e18b08d763fa84d7aa SHA512 ad8b963035bd8004c4b31059773cbd147c30737542847b53a033ea08a69bfc55afa2c239fc5e27804fce63bbad72b8770eb95d8dc07ab51ab21daeec9f7174cf WHIRLPOOL 30daaa9db0d6bb45831e7075d87fd6ad501b524cf738710fe3c61360fbb0e30a6220059f92c2a2c1764929d31a1f80703f4398560278551393b5a2c9a274df14
-AUX gnunet.initd 643 SHA256 c6748f137d7c808685a741617e1449024bcb37dcfc11e883d859f5e0134744a6 SHA512 37d3e759bd294675c4f0c758700f27af6ac4b6a931e513364a44fa2ac09ba334134f64f83d7d5cd3143e031b5674e297ba9d8df3b419fad3bcc6a0ce34f8e0c8 WHIRLPOOL f156f0663759eed035699dd99e422fd9ea94bd8d0e8074d11e228f5b9ab6968009a1f082b96845c6d38ff247367f78df82d9a0b9fc9fb7f2aef3204ffba8ea9d
-AUX gnunet.initd-0.9.0 1008 SHA256 23c2143d88d57cb892bc9dedab28646c8e87d0ca31995deccec4aa2e1bb80256 SHA512 69ce1d54fd8358afcb4efcc1f79c67b046abe99b69983c8f8b702c3d2ab0525bd3ecfbb2bad61caad9e4a142f844c80fc5f4e4342a99614efdc55a737ff5c801 WHIRLPOOL d6dd498efe93f8978d7491c9b3b88bbdb98719ee1fd227cf611429514f3e3d01d666a4efd4608566d1b5035dabd9e006ddce61a4970243d794726e8abd838db7
-AUX gnunet.initd-0.9.0v2 821 SHA256 32d2027be0cb32459526e18dd1319aef4ec2cc361b4835278b7a97aedd64412a SHA512 44f32fba0f2875c05090381a530994b5704095c317ac5d22a44d798a63c5c3fd348785692e2e04ddcef78d933953e4973462d6b6af47382e9f8d71f6c918e34e WHIRLPOOL 6ff9fe2475c4e01838fe4c36573d948a29dae21bb90c47c9ae4395381d887c89f224fd3e1d2ae6bcdf9c24fb0d38c5e6bcf40f467f5873cad9946d1c429181e6
 DIST GNUnet-0.7.0b.tar.bz2 1307550 SHA256 39c493c18dd86ce957bb29a949cb724c018c72b74507dc00d65e2fd8fe9f8eaa
 DIST GNUnet-0.7.0e.tar.bz2 1405884 SHA256 eea28505a825ce7404300c9dae25a7ebefbc681fc32082db0f92191ab7e14f18
 DIST GNUnet-0.7.1.tar.bz2 1375082 SHA256 e94158a942cfe557974964acb658c35cfeccc09bf9db7f572d1ff39faafdefd8
@@ -33,32 +24,3 @@ DIST gnunet-0.9.1.tar.gz 6084089 SHA256 f83a4a45e96832c01e4b720f0f694df5e70f2071
 DIST gnunet-0.9.2.tar.gz 6239795 SHA256 24f5f1cb93782c22bd61ffdc9d99b7cfb2532dc4b6fb7d3468931e5a10eb47e9
 DIST gnunet-0.9.3.tar.gz 6520875 SHA256 0f7aa283f53e083e4e38b0c05e41083ee07953e3f7c831ffaab56f4f1a99d6d4 SHA512 e63d78453c9a731c60b79c2cf478bf92776f998a28f3255799f87015e6f7cb736fa4cf65c68898bb197550a59e0fe388ec0b893f7e1855edfe827aadaac58c88 WHIRLPOOL 91200e262e03a9140c6af245c36b8944d00dc50ec6bb92a0467b54d74909af2a6266d6bcde909f7110d1b8f765c3cdd7c7f896caa6f31a28fa5666d69fbaf3fb
 DIST gnunet-0.9.5a.tar.gz 7997840 SHA256 1d600717eee1f952e23d192288850a67948e92e0b1dee5d950d111b2670cbed7 SHA512 a47d76455687269a8ae91bc91f12946740dc5f678466268f1d16f5aea90a2b86e71f9085dc713f0d7aaf0633d72837c322f0410d51723b5067dae5fe7205cfbd WHIRLPOOL 976c02da3cf7754ae88ef148c6b265b87357507f6a08f4876e13700547072529d66cb3450503438d0a5ac6d116bb345bd4fcf1bdc0a63f6e95c99938ad2ffdb7
-EBUILD gnunet-0.7.0b.ebuild 3149 SHA256 a18912fda522d67168f28e4cf07dafd0160f3f910e2394fc75a031e94d634cf1 SHA512 6d2b66b8257ea78d80c0c2865aa888992b4a294fd3183ecab8be079c6f263182d9e08864056f38e2a178ae6eba332f3f31542520fcd96a55d2ac5e5ea4cdfc70 WHIRLPOOL 15b75b04ade2c1bdb4d322197ca637f056f7a99c789d342de741d09bd69e69295d4ef4127032cedf18da702dea0f5dc9c550f9eb9014d0c1166d364834aadd2d
-EBUILD gnunet-0.7.0e.ebuild 3210 SHA256 39027b6064e7d4fe8ca36875010ac31026265e528a62cd92af2158e5deb840d7 SHA512 7a93b40f3613f8acc79914268db92259aa286baf4a496580298ce87db731b8ba1dfc6f89808b2cf78b9066269bd8b7a582f931fbfca2998647f8e6107c6c7432 WHIRLPOOL 1e5f5cb5eeae9d122b1fd7ea02806644f77d00b5f6529742beba52dcbab53058ff46dcccc53a6aa14cb724e23d3309eb1922ba901559eb5ac9e88d3e636a252f
-EBUILD gnunet-0.7.1.ebuild 3227 SHA256 290bc9a04483e677a3a8210660791d7686c5e7978594c9f4dcfd79e30229a9f7 SHA512 f4cfffc6f12cfc408fdeb30b0e52c4e2914fe96757c6729f55b3f1be35754ab6dd9a984edb7d41283bece05c3780ad933914c093f610d0e95ae3f0a1e5cc20f6 WHIRLPOOL b407b0eb7534bf1e962ff9b384e60fa33729dac7f396a49d61488ccefa263b77b7d1af9f076451972ca9531ec9fc4adcab6f44689cdf4ad2cb0f44739de989f9
-EBUILD gnunet-0.7.1_pre0.ebuild 3227 SHA256 290bc9a04483e677a3a8210660791d7686c5e7978594c9f4dcfd79e30229a9f7 SHA512 f4cfffc6f12cfc408fdeb30b0e52c4e2914fe96757c6729f55b3f1be35754ab6dd9a984edb7d41283bece05c3780ad933914c093f610d0e95ae3f0a1e5cc20f6 WHIRLPOOL b407b0eb7534bf1e962ff9b384e60fa33729dac7f396a49d61488ccefa263b77b7d1af9f076451972ca9531ec9fc4adcab6f44689cdf4ad2cb0f44739de989f9
-EBUILD gnunet-0.7.1a.ebuild 3227 SHA256 290bc9a04483e677a3a8210660791d7686c5e7978594c9f4dcfd79e30229a9f7 SHA512 f4cfffc6f12cfc408fdeb30b0e52c4e2914fe96757c6729f55b3f1be35754ab6dd9a984edb7d41283bece05c3780ad933914c093f610d0e95ae3f0a1e5cc20f6 WHIRLPOOL b407b0eb7534bf1e962ff9b384e60fa33729dac7f396a49d61488ccefa263b77b7d1af9f076451972ca9531ec9fc4adcab6f44689cdf4ad2cb0f44739de989f9
-EBUILD gnunet-0.7.1b.ebuild 3227 SHA256 290bc9a04483e677a3a8210660791d7686c5e7978594c9f4dcfd79e30229a9f7 SHA512 f4cfffc6f12cfc408fdeb30b0e52c4e2914fe96757c6729f55b3f1be35754ab6dd9a984edb7d41283bece05c3780ad933914c093f610d0e95ae3f0a1e5cc20f6 WHIRLPOOL b407b0eb7534bf1e962ff9b384e60fa33729dac7f396a49d61488ccefa263b77b7d1af9f076451972ca9531ec9fc4adcab6f44689cdf4ad2cb0f44739de989f9
-EBUILD gnunet-0.7.2b.ebuild 3149 SHA256 bce0d68517d429fba04dcc60768462c18cfa18dec3229851ab7d84e4349ac53b SHA512 830cf664b9625e448caf9ccb991f77b122a89d8d9fb3bec81b6a3167c6f0da0b1278df21d40fcf950b8591f04584e9797a618b0ab673d54cc8398b4260e64b96 WHIRLPOOL e0d2c97c26f542f8eefeedfb33c44fd1c8a062e6878727f9647ebc02baffc6d1c8958a52b77f24a754e5222752613efba8fbfefc4f515b15b9d023c53ecc6c11
-EBUILD gnunet-0.7.2c.ebuild 3173 SHA256 80bc8bf5a8fddc759c19f8fe71a061f7fe7bdf7d3519ca1bd9737a0eed6e2939 SHA512 5d647cd21c0f0025abd7093880d79c9e8333e9e035e2dc476db0e3f65caee8269326431bcb56b9dda3e55d5532a3d8bf282b27e700c6656f5aa5de8c34cdd1a9 WHIRLPOOL aba52d190287f74c20c958c8127c4622b20f003f13d15abde8e5916e79a0cbcd6b9aca1ba4ac21bc22e2aa070d7cc79056d4751856ee1225bbde7b8f1f76bf65
-EBUILD gnunet-0.7.3.ebuild 2982 SHA256 85af5e248999ff4ab3585b5cc01c7bab9daf365dc30e094f59244f963612f2d6 SHA512 096fa4d54a7c33fbbb4aa21f01fad7ef0f96258f1bb1f9a83a3ce0dda31f626f96426aac5086b66d57ae56c5475784e7f121403320692a53a7cf94700bbd465a WHIRLPOOL e8a2171da90d19c7aaa80ee7025d7dc6a29803361dd7971eeba1692d2d3efc2c5ea0a6810144e5e270795db400c4bf07aee96a7699b88836266255a1f8142214
-EBUILD gnunet-0.8.0.ebuild 2821 SHA256 ae2c15fee5b7cc8a114e9f3879f82ed3e643f312d99e7eb7f017818fa6ae0f2b SHA512 401687d518b4b2846c5ad2492e9b21a55f61b5023c4494e79a0f8bbff57dfc4f2330d9008e570bf8b37aefb2dbd1798759f2f3aa102fb4d6a8fc8df624854e63 WHIRLPOOL cae2663ac31c174de6082a86a5a3ae91ed1b558332fe355309695cf71ec00ebd7e4939581433617425d5a5785b0f3537b7c86c9e967e05529dfe77be9f37d114
-EBUILD gnunet-0.8.0_pre0.ebuild 2821 SHA256 ae2c15fee5b7cc8a114e9f3879f82ed3e643f312d99e7eb7f017818fa6ae0f2b SHA512 401687d518b4b2846c5ad2492e9b21a55f61b5023c4494e79a0f8bbff57dfc4f2330d9008e570bf8b37aefb2dbd1798759f2f3aa102fb4d6a8fc8df624854e63 WHIRLPOOL cae2663ac31c174de6082a86a5a3ae91ed1b558332fe355309695cf71ec00ebd7e4939581433617425d5a5785b0f3537b7c86c9e967e05529dfe77be9f37d114
-EBUILD gnunet-0.8.0_pre1.ebuild 2821 SHA256 ae2c15fee5b7cc8a114e9f3879f82ed3e643f312d99e7eb7f017818fa6ae0f2b SHA512 401687d518b4b2846c5ad2492e9b21a55f61b5023c4494e79a0f8bbff57dfc4f2330d9008e570bf8b37aefb2dbd1798759f2f3aa102fb4d6a8fc8df624854e63 WHIRLPOOL cae2663ac31c174de6082a86a5a3ae91ed1b558332fe355309695cf71ec00ebd7e4939581433617425d5a5785b0f3537b7c86c9e967e05529dfe77be9f37d114
-EBUILD gnunet-0.8.0a.ebuild 2794 SHA256 dda5221a2d6adf9425812c0fd567f7fb133e22e7341bf52d173034307b2e895f SHA512 27bedcb276072115dbbb72f33dddbbb918eb8eef3aee9fa1130388e8b78449494fb77f55699a283b19bc2efa443b30049694d3f88e3dca4d2ed1b55868227380 WHIRLPOOL e1ddaaabed809770856475a2d2b135fa00cf814ac12a19191488be4818f3e0461c4db0375adb631e57cd3459fd1c0990d62d603d1e9a2bdf4f9c1c57e4ed8254
-EBUILD gnunet-0.8.0b.ebuild 2821 SHA256 76f18bedacf1a5fe1335ec1a91bac203d07a4be8be5a94586372e9ab5473b978 SHA512 b0e3348e2c7a5883391f54a1fc47478f82de3d69b14c70d87db61d8e69c34ba5b0d98e60d482046f80280986f5649912afe844c39c66cf62905ec3797529aa56 WHIRLPOOL 8f0c5498eea8c854467871793f1cc486c9ca162cb5d4fb79e8e0425226394c471ff1b7afa7382bc452195a2cc57ab480dc543d16f3f461d60bc97fb943717993
-EBUILD gnunet-0.8.0c.ebuild 2840 SHA256 e359044dc7c710a10f51d50dd014cccb12811c4a270d981724b73ad93522c7da SHA512 efaac8d168b6d143be41fd5f211173870e541b002111aa1e7e5816095d3b68417abd4b172413a7dcbad5f3a76e58a3d511c3f671b8b5c43d14129dd4bbf05d2a WHIRLPOOL c8014b2e14e1feb174e7f5ef4105dbacb4013b2e71e97fa31cee7e7a475aff1a71a1586cb5549259a85022d695e231c2296408d835020d6fc371b90ece58fdb3
-EBUILD gnunet-0.8.1-r1.ebuild 2721 SHA256 e287618fb46f5b8504c3968ae53c7adad0bbb85353b5a55b739098e7e7f89b37 SHA512 19acb2729a51f15071d9085b4d48d34c9f17a60343937ddac0e77ad08319e8c53e078f36e961056d49ae348e169a41194b3b197dc404d934573813e73bb1179d WHIRLPOOL 9b49b3f8d1d426c8ecb427c09d06dd9af1fbc6a376893425fd4195ce496edd7f684c8e52f3f23d8f1739a15513edddb43b84929d04a8757956b4afda6f47ef8e
-EBUILD gnunet-0.8.1.ebuild 2839 SHA256 c96e68e4c4b2034903582b1c5a6e6942959b6c2bd4e81817c93cfc2431f5e73b SHA512 823e5ca1312bc16704bb8d9047db1e456566bc0f7d338096a5a188dd45e0d477c434d1427698b019c7f0896e8d3faae69668bafa702d064696bd9098c7a5a50b WHIRLPOOL a0edae149ece789f04d1eedfc27da47d2f8fde0138e236f3bcf3f090987552814879cafc9e49b5e816006dec60c50e07c88fa89d211a38dc76e50cf5bad1d1eb
-EBUILD gnunet-0.8.1a.ebuild 2653 SHA256 1c29b1adf4ef3fae461d2112a66d32d0b95eed966078104379b545fa44bb5f01 SHA512 77b4afc6166a705b891bd194ea028614a3d3f68ce366930d31c575b1fc914d0939e561fba9583aea1bcc4f0bb32b6b75564f1991939bfb29059de785c9a30bd6 WHIRLPOOL cab8f9d531e3648642b40965d51f58844cf5f8bf03fca6902024c505ba1003457d8fa78e4e2850fc3723e21f2e812ae82720cf733cb7ee6b5159e500a176ff3e
-EBUILD gnunet-0.8.1b.ebuild 2651 SHA256 891afa18b6da3be2a759f5d898effa2e8ef58470e2d08b2c51f641190bc2b209 SHA512 98a031ab19e14f14aa79cbcad7e7cf665c7aa2693482791acde9c24019ddd28ce9f57eed029cffef85aaab415fa21aefc84f5fd04e4a4af2c1d2e1e178bdc3c9 WHIRLPOOL 15e76e49b1bd60338399ed307fcf5a5803ca99a43422c8136c9b756746fc02d5ec111f93530dc82f833fe35ea6e31ce92960414ece6b8dd3e5524885cc13da29
-EBUILD gnunet-0.9.0.ebuild 1812 SHA256 7336ea4de3e802f980913ee374cb48c9757b8893435ab6fb832bb3a926ed8086 SHA512 c55526a4b03b95b04da924cd38a1123008f0241ebcd9f35233b6f11bd787c3c674450a1807131813dab793edd05ab323815821da5d8a987e8f3cacb2f18539c9 WHIRLPOOL 4ac19f81a6d550b40661369e2be858afb59e299cb4d6dc3baa50a55b86a9c21b62e14c08f35955e5e35c321beba333e5e8bfab2d6758a5b32142046991bcc335
-EBUILD gnunet-0.9.0_pre0.ebuild 2080 SHA256 4b01b22d23159984d8cfb6455e4e32f31f27d6e58445a5fac8278ba62fba02de SHA512 2c3fc86308abd6c33d518a239b13e537ba4f349165800d8ab97682fb0b87510a6f086df0b9ec85b8052440ef537f61b7ef8610e09fb1f573b5fc69bf9d7ad5eb WHIRLPOOL 360a2daae16c69019a8bab8f78673487f46e2b0376325b6715c02b370e4a5c033ace671afdda876a5694e3a60f05e4da9304cfb80b728f4141701ed755cfbce3
-EBUILD gnunet-0.9.0_pre1.ebuild 2094 SHA256 81e3b3af1d9ca4d03b608dded9783a9efc7db3d60d858dfcc1b616bb390aa25c SHA512 d6bc224b0046bf33c4de241272a5a1630be4b230dfa97d347069c07dc0fd9f16b49ccc375baf739ea81f9a4f296a96f8693d1254de49914972aea6edef7117fb WHIRLPOOL 815020334cef5ed9d35114b6d8990e1c0d340d29fbe8fe6f3aa524a9118966e603ced96e75f8c6b2cf98e41e9306e3fcf901a4c3eeede701fc4259bea98e7aec
-EBUILD gnunet-0.9.0_pre2.ebuild 2061 SHA256 c747bebcddc157f69527ddeb09465ee1528091ff354ed82389abb28312b465fb SHA512 d53c8003ec0b2b9f951047884eb674528217234555d342a9fb4906513217066a224a0248b6ce9e30ba50ba0c09339a3ed04f6cb5562af240dc9cbc80a20ede8f WHIRLPOOL 1e1292661b00593f6eb5c73a38a181758b5025e62342533eb4b79596a53cfb1b780aff58633ea633baa44e9d364fafcd91888b341bd2252c385d7af50c8ca8df
-EBUILD gnunet-0.9.1.ebuild 1812 SHA256 7336ea4de3e802f980913ee374cb48c9757b8893435ab6fb832bb3a926ed8086 SHA512 c55526a4b03b95b04da924cd38a1123008f0241ebcd9f35233b6f11bd787c3c674450a1807131813dab793edd05ab323815821da5d8a987e8f3cacb2f18539c9 WHIRLPOOL 4ac19f81a6d550b40661369e2be858afb59e299cb4d6dc3baa50a55b86a9c21b62e14c08f35955e5e35c321beba333e5e8bfab2d6758a5b32142046991bcc335
-EBUILD gnunet-0.9.2.ebuild 1835 SHA256 7d21591925afb359e8dc366b54f4c9cd2b1f16bfa2a8df81fc89d5f1999a9634 SHA512 9bbd726555f4ca24fe08bfd8f13cc104c4cc0a14e4cc2854b6a553f9598e7c5a2d6fffc8f5f52c090533a8afb373d06bf0c075b3c6e2734e0873a80807c6c8c4 WHIRLPOOL 3714d2c716d52607659f434845c99e3de35c6f300051c89bda9c9540b82617ef4033f26f6f53a7377283647c6813b31cad16690988317778023ed5de7b229ba0
-EBUILD gnunet-0.9.3.ebuild 1922 SHA256 a43177b3051e91096af18f0fee1812124c275193e6a6022c6fc43167a4ed0090 SHA512 946fcf64de3f727b874241200257a213b409518dd102d3c19329d423adad30cf2619530f8890e9c51c75ad7fa96dcbd2b303fef3dc50e991f50852d7aef4e2c5 WHIRLPOOL dfc3912f95c790aa1593f63b6880cc725acad868423c364af542dee6a39f6aac513809e3211e4b0870508d71a1bbc16b2fd76a3bbadfa45e86a8659932af94d5
-EBUILD gnunet-0.9.5a.ebuild 1975 SHA256 9873a1896981dca41915ee9398b0a0e5a3aa1fc5cf0203d376f3fcde2139b878 SHA512 cd16c2ff042a960cb89c3c32243a11666fcc56a572632ae9f1c3b402a05e19309f7ac56ced8329cb70ab51fe2b9157b221795b72bc8d73fac03103ef7e8d92d4 WHIRLPOOL b1ee475ce7fe1320dad1e89944402ef7665daebb1698c35caac05736c0ab3f94a2469acf32e2847f8794863e145718e5f3e6ef0c43cae800685cf6789150487e
-MISC ChangeLog 900 SHA256 a44bd2d2db1e0ff5062ee7b7db9b16b65f752274bc372ce1c0a61f2f3fe09a63 SHA512 bdbaafb6ee48b77e2c0cc9e442a1a9c84641ed06663525b6786098b6722a44bc6eb296323e00582dd8a8807a58269600075b9aa047303cb11f8704f2e7e26734 WHIRLPOOL 9e76921124ac796c9f4c4ae395c0cd9c9c3e2aec192a5dc18e4eae16664c74d94775010b299f1f125ff42e8c539f09a4831f8e2efac9509ab0de52d2112bc26e
-MISC metadata.xml 248 SHA256 4b2054d5a81c4bb0803bb3bb477d63e698ef1c8257d1611917a9ec2eae53079d SHA512 6e079d3fa210525ac15080bd95d8e099eea7c57887d7e1de6a895339212ad76a8e05d87562ae714a82395919538c09149c343065a8b81bb7081023cf3ea28a0b WHIRLPOOL e97467c959e15882b807e80eb97c62806c308302dcdd174f4ed3f6c3732e1a3b9ec79a381322f5c6a6f322f6faf7096d74fe435f600266fb51994e7e19f13bc1
diff --git a/net-p2p/kamailio/Manifest b/net-p2p/kamailio/Manifest
deleted file mode 100644
index e3add046..00000000
--- a/net-p2p/kamailio/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD kamailio-9999.ebuild 584 SHA256 19871cbeb6403a5404166eb8b3760543a927f0238e521bc59f24f2e6bc4a0f8e SHA512 530b49431db877fbff5f4ba36624514d232d596667ee03999b5f9d071180efb3dccfc7ea4ad3ddbea0209d6fc2a6dda01a775b90a778cd5669bc577f9601971d WHIRLPOOL d2656c768546e7d300055c10c3d9c44bb20c2beafa8332da98ae6919b7e5d8fdae17ea32b4b5c766ab3e0e6becf3c1ebaf7665daa06cdc48c852a3ba3bf84376
diff --git a/net-p2p/transmission-base/Manifest b/net-p2p/transmission-base/Manifest
new file mode 100644
index 00000000..507ab281
--- /dev/null
+++ b/net-p2p/transmission-base/Manifest
@@ -0,0 +1,2 @@
+DIST transmission-2.83.tar.xz 3136752 SHA256 b0e1b050167e7f71b68e01a8d55b984a828fe880df9abfbc6281cb2a0d7d1433 SHA512 a3f56c434282d70d9d373d99410de738f15a350f394c0984150b7d9ea2eda1c0485bf26ab740f433d0271f882edabe5609266e704e55792a7015225da0186fda WHIRLPOOL 2dfeae51acf6a14dbd6374336cc0d4cc09a7387e72a63683785d1bdba36693f68770af7826af36e2be1e7e8e3d4920d77a5b582b801f4997721557161e31959c
+DIST transmission-2.84.tar.xz 3077836 SHA256 a9fc1936b4ee414acc732ada04e84339d6755cd0d097bcbd11ba2cfc540db9eb SHA512 d6c2b17e7f8180a41ac70f5b503dfdb0353c6419db25df1b393b18c987c56fda9e2fd4c3f4cda7f08c301877bd0b4711842c28121ceaaaae87f5792cc6c29a3d WHIRLPOOL 375f9c981d9d2ac308896e8b7d66d3643796c8e97d64a1e0d6fd2bffaafa55988b90ddb4eb98330edf062e835c0c5ce76749e7e66bf6806333673beb7569f342
diff --git a/net-p2p/transmission-base/metadata.xml b/net-p2p/transmission-base/metadata.xml
new file mode 100644
index 00000000..bd4c7ae8
--- /dev/null
+++ b/net-p2p/transmission-base/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slawomir.nizio@sabayon.org</email>
+    <description>maintainer for split Transmission ebuilds based on Gentoo one</description>
+  </maintainer>	
+  <use>
+    <flag name='lightweight'>Optimize transmission for low-resource systems (smaller cache size, prefer unencrypted peer connections, etc.)</flag>
+    <flag name='xfs'>Enable XFS filesystem capabilities by using <pkg>sys-fs/xfsprogs</pkg> headers (in building of fdlimit(.c))</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-p2p/transmission-base/transmission-base-2.83.ebuild b/net-p2p/transmission-base/transmission-base-2.83.ebuild
new file mode 100644
index 00000000..0bea92bb
--- /dev/null
+++ b/net-p2p/transmission-base/transmission-base-2.83.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit transmission-2.83
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client - base files"
+KEYWORDS="~amd64 ~x86"
+IUSE="lightweight xfs"
+
+DEPEND="xfs? ( sys-fs/xfsprogs )"
+
+DOCS="AUTHORS NEWS"
+
+src_install() {
+	default
+	rm "${ED}"/usr/share/${MY_PN}/web/LICENSE || die
+
+	keepdir /var/{lib/${MY_PN}/{config,downloads},log/${MY_PN}}
+	fowners -R ${MY_PN}:${MY_PN} /var/{lib/${MY_PN}/{,config,downloads},log/${MY_PN}}
+	dolib.a "${S}/libtransmission/libtransmission.a"
+}
diff --git a/net-p2p/transmission-base/transmission-base-2.84.ebuild b/net-p2p/transmission-base/transmission-base-2.84.ebuild
new file mode 100644
index 00000000..6adf5928
--- /dev/null
+++ b/net-p2p/transmission-base/transmission-base-2.84.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit transmission-2.84
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client - base files"
+KEYWORDS="~amd64 ~x86"
+IUSE="lightweight xfs"
+
+DEPEND="xfs? ( sys-fs/xfsprogs )"
+
+DOCS="AUTHORS NEWS"
+
+src_install() {
+	default
+	rm "${ED}"/usr/share/${MY_PN}/web/LICENSE || die
+
+	keepdir /var/{lib/${MY_PN}/{config,downloads},log/${MY_PN}}
+	fowners -R ${MY_PN}:${MY_PN} /var/{lib/${MY_PN}/{,config,downloads},log/${MY_PN}}
+	dolib.a "${S}/libtransmission/libtransmission.a"
+}
diff --git a/net-p2p/transmission-cli/Manifest b/net-p2p/transmission-cli/Manifest
new file mode 100644
index 00000000..507ab281
--- /dev/null
+++ b/net-p2p/transmission-cli/Manifest
@@ -0,0 +1,2 @@
+DIST transmission-2.83.tar.xz 3136752 SHA256 b0e1b050167e7f71b68e01a8d55b984a828fe880df9abfbc6281cb2a0d7d1433 SHA512 a3f56c434282d70d9d373d99410de738f15a350f394c0984150b7d9ea2eda1c0485bf26ab740f433d0271f882edabe5609266e704e55792a7015225da0186fda WHIRLPOOL 2dfeae51acf6a14dbd6374336cc0d4cc09a7387e72a63683785d1bdba36693f68770af7826af36e2be1e7e8e3d4920d77a5b582b801f4997721557161e31959c
+DIST transmission-2.84.tar.xz 3077836 SHA256 a9fc1936b4ee414acc732ada04e84339d6755cd0d097bcbd11ba2cfc540db9eb SHA512 d6c2b17e7f8180a41ac70f5b503dfdb0353c6419db25df1b393b18c987c56fda9e2fd4c3f4cda7f08c301877bd0b4711842c28121ceaaaae87f5792cc6c29a3d WHIRLPOOL 375f9c981d9d2ac308896e8b7d66d3643796c8e97d64a1e0d6fd2bffaafa55988b90ddb4eb98330edf062e835c0c5ce76749e7e66bf6806333673beb7569f342
diff --git a/net-p2p/transmission-cli/metadata.xml b/net-p2p/transmission-cli/metadata.xml
new file mode 100644
index 00000000..d55995ce
--- /dev/null
+++ b/net-p2p/transmission-cli/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slawomir.nizio@sabayon.org</email>
+    <description>maintainer for split Transmission ebuilds based on Gentoo one</description>
+  </maintainer>	
+</pkgmetadata>
diff --git a/net-p2p/transmission-cli/transmission-cli-2.83.ebuild b/net-p2p/transmission-cli/transmission-cli-2.83.ebuild
new file mode 100644
index 00000000..3aedd0c0
--- /dev/null
+++ b/net-p2p/transmission-cli/transmission-cli-2.83.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit eutils transmission-2.83
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client - command line (CLI) version"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+	dobin cli/transmission-cli
+	doman cli/transmission-cli.1
+}
diff --git a/net-p2p/transmission-cli/transmission-cli-2.84.ebuild b/net-p2p/transmission-cli/transmission-cli-2.84.ebuild
new file mode 100644
index 00000000..f8aec4e7
--- /dev/null
+++ b/net-p2p/transmission-cli/transmission-cli-2.84.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit eutils transmission-2.84
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client - command line (CLI) version"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+	dobin cli/transmission-cli
+	doman cli/transmission-cli.1
+}
diff --git a/net-p2p/transmission-daemon/Manifest b/net-p2p/transmission-daemon/Manifest
new file mode 100644
index 00000000..507ab281
--- /dev/null
+++ b/net-p2p/transmission-daemon/Manifest
@@ -0,0 +1,2 @@
+DIST transmission-2.83.tar.xz 3136752 SHA256 b0e1b050167e7f71b68e01a8d55b984a828fe880df9abfbc6281cb2a0d7d1433 SHA512 a3f56c434282d70d9d373d99410de738f15a350f394c0984150b7d9ea2eda1c0485bf26ab740f433d0271f882edabe5609266e704e55792a7015225da0186fda WHIRLPOOL 2dfeae51acf6a14dbd6374336cc0d4cc09a7387e72a63683785d1bdba36693f68770af7826af36e2be1e7e8e3d4920d77a5b582b801f4997721557161e31959c
+DIST transmission-2.84.tar.xz 3077836 SHA256 a9fc1936b4ee414acc732ada04e84339d6755cd0d097bcbd11ba2cfc540db9eb SHA512 d6c2b17e7f8180a41ac70f5b503dfdb0353c6419db25df1b393b18c987c56fda9e2fd4c3f4cda7f08c301877bd0b4711842c28121ceaaaae87f5792cc6c29a3d WHIRLPOOL 375f9c981d9d2ac308896e8b7d66d3643796c8e97d64a1e0d6fd2bffaafa55988b90ddb4eb98330edf062e835c0c5ce76749e7e66bf6806333673beb7569f342
diff --git a/net-p2p/transmission-daemon/files/transmission-daemon.confd.4 b/net-p2p/transmission-daemon/files/transmission-daemon.confd.4
new file mode 100644
index 00000000..8f3b1317
--- /dev/null
+++ b/net-p2p/transmission-daemon/files/transmission-daemon.confd.4
@@ -0,0 +1,14 @@
+# This is the transmission-daemon configuration file. For other options and
+# better explanation, take a look at transmission-daemon manual page Note: it's
+# better to configure some settings (like username/password) in
+# /var/lib/transmission/config/settings.json to avoid other users see it with `ps`
+
+TRANSMISSION_OPTIONS="--encryption-preferred"
+
+# Run daemon as another user (username or username:groupname)
+# If you change this setting, chown -R /var/lib/transmission/config <and download directory, check web settings>
+#runas_user=transmission
+
+# Location of logfile (should be writeable for runas_user user)
+# Set logfile=syslog to use syslog for logging
+#logfile=/var/log/transmission/transmission.log
diff --git a/net-p2p/transmission-daemon/files/transmission-daemon.initd.9 b/net-p2p/transmission-daemon/files/transmission-daemon.initd.9
new file mode 100644
index 00000000..3c4914c5
--- /dev/null
+++ b/net-p2p/transmission-daemon/files/transmission-daemon.initd.9
@@ -0,0 +1,73 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/files/transmission-daemon.initd.9,v 1.1 2013/09/07 12:10:01 ssuominen Exp $
+
+extra_started_commands="reload"
+description="Transmission is a fast, easy and free bittorrent client"
+description_start="Start transmission-daemon server and web interface"
+description_stop="Stop transmission-daemon server and web interface"
+description_reload="Reload transmission-daemon settings"
+
+rundir=${rundir:-/var/run/transmission}
+pidfile=${pidfile:-${rundir}/transmission.pid}
+config_dir=${config_dir:-/var/lib/transmission/config}
+download_dir=${download_dir:-/var/lib/transmission/downloads}
+logfile=${logfile:-/var/log/transmission/transmission.log}
+runas_user=${runas_user:-transmission:transmission}
+
+SSD_OPTIONS=""
+
+depend() {
+	need net
+}
+
+check_config() {
+	if [ ! -d "${rundir}" ]; then
+		mkdir "${rundir}"
+		if [ -n "${runas_user}" ]; then
+			chown -R ${runas_user} "${rundir}"
+		fi
+	fi
+
+	# In case no config directory option passed use default
+	if ! $(echo ${TRANSMISSION_OPTIONS} | grep -q -e '\B-g' -e '\B--config-dir'); then
+		TRANSMISSION_OPTIONS="${TRANSMISSION_OPTIONS} --config-dir ${config_dir}"
+		# put download dir location on first run (and take it from config later)
+		if [ ! -f ${config_dir}/settings.json ]; then
+			TRANSMISSION_OPTIONS="${TRANSMISSION_OPTIONS} --download-dir ${download_dir}"
+		fi
+	fi
+
+	if [ -n "${runas_user}" ]; then
+		if [ -f /etc/init.d/sysfs ]; then
+			SSD_OPTIONS="${SSD_OPTIONS} --user ${runas_user}"
+		else
+			SSD_OPTIONS="${SSD_OPTIONS} --chuid ${runas_user}"
+		fi
+	fi
+}
+
+start() {
+	check_config
+
+	ebegin "Starting transmission daemon"
+	start-stop-daemon --start --quiet --pidfile ${pidfile} ${SSD_OPTIONS} \
+		--exec /usr/bin/transmission-daemon -- --pid-file ${pidfile} \
+		$(test ${logfile} != "syslog" && echo --logfile ${logfile}) \
+		${TRANSMISSION_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping transmission daemon"
+	start-stop-daemon --stop --quiet --retry TERM/45/QUIT/15 --pidfile ${pidfile}
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading transmission configuration"
+	start-stop-daemon --signal HUP --pidfile ${pidfile}
+	eend $?
+}
+
diff --git a/net-p2p/transmission-daemon/metadata.xml b/net-p2p/transmission-daemon/metadata.xml
new file mode 100644
index 00000000..d55995ce
--- /dev/null
+++ b/net-p2p/transmission-daemon/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slawomir.nizio@sabayon.org</email>
+    <description>maintainer for split Transmission ebuilds based on Gentoo one</description>
+  </maintainer>	
+</pkgmetadata>
diff --git a/net-p2p/transmission-daemon/transmission-daemon-2.83.ebuild b/net-p2p/transmission-daemon/transmission-daemon-2.83.ebuild
new file mode 100644
index 00000000..fb41d025
--- /dev/null
+++ b/net-p2p/transmission-daemon/transmission-daemon-2.83.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit systemd transmission-2.83
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client - daemon"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd"
+
+RDEPEND="systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	dobin daemon/transmission-daemon
+	dobin daemon/transmission-remote
+
+	doman daemon/transmission-daemon.1
+	doman daemon/transmission-remote.1
+
+	newinitd "${FILESDIR}"/${MY_PN}-daemon.initd.9 ${MY_PN}-daemon
+	newconfd "${FILESDIR}"/${MY_PN}-daemon.confd.4 ${MY_PN}-daemon
+	systemd_dounit daemon/${MY_PN}-daemon.service
+}
diff --git a/net-p2p/transmission-daemon/transmission-daemon-2.84.ebuild b/net-p2p/transmission-daemon/transmission-daemon-2.84.ebuild
new file mode 100644
index 00000000..36d7dee4
--- /dev/null
+++ b/net-p2p/transmission-daemon/transmission-daemon-2.84.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit systemd transmission-2.84
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client - daemon"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd"
+
+RDEPEND="systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	dobin daemon/transmission-daemon
+	dobin daemon/transmission-remote
+
+	doman daemon/transmission-daemon.1
+	doman daemon/transmission-remote.1
+
+	newinitd "${FILESDIR}"/${MY_PN}-daemon.initd.9 ${MY_PN}-daemon
+	newconfd "${FILESDIR}"/${MY_PN}-daemon.confd.4 ${MY_PN}-daemon
+	systemd_dounit daemon/${MY_PN}-daemon.service
+}
diff --git a/net-p2p/transmission-gtk/Manifest b/net-p2p/transmission-gtk/Manifest
new file mode 100644
index 00000000..507ab281
--- /dev/null
+++ b/net-p2p/transmission-gtk/Manifest
@@ -0,0 +1,2 @@
+DIST transmission-2.83.tar.xz 3136752 SHA256 b0e1b050167e7f71b68e01a8d55b984a828fe880df9abfbc6281cb2a0d7d1433 SHA512 a3f56c434282d70d9d373d99410de738f15a350f394c0984150b7d9ea2eda1c0485bf26ab740f433d0271f882edabe5609266e704e55792a7015225da0186fda WHIRLPOOL 2dfeae51acf6a14dbd6374336cc0d4cc09a7387e72a63683785d1bdba36693f68770af7826af36e2be1e7e8e3d4920d77a5b582b801f4997721557161e31959c
+DIST transmission-2.84.tar.xz 3077836 SHA256 a9fc1936b4ee414acc732ada04e84339d6755cd0d097bcbd11ba2cfc540db9eb SHA512 d6c2b17e7f8180a41ac70f5b503dfdb0353c6419db25df1b393b18c987c56fda9e2fd4c3f4cda7f08c301877bd0b4711842c28121ceaaaae87f5792cc6c29a3d WHIRLPOOL 375f9c981d9d2ac308896e8b7d66d3643796c8e97d64a1e0d6fd2bffaafa55988b90ddb4eb98330edf062e835c0c5ce76749e7e66bf6806333673beb7569f342
diff --git a/net-p2p/transmission-gtk/metadata.xml b/net-p2p/transmission-gtk/metadata.xml
new file mode 100644
index 00000000..d55995ce
--- /dev/null
+++ b/net-p2p/transmission-gtk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slawomir.nizio@sabayon.org</email>
+    <description>maintainer for split Transmission ebuilds based on Gentoo one</description>
+  </maintainer>	
+</pkgmetadata>
diff --git a/net-p2p/transmission-gtk/transmission-gtk-2.83.ebuild b/net-p2p/transmission-gtk/transmission-gtk-2.83.ebuild
new file mode 100644
index 00000000..4a6b9615
--- /dev/null
+++ b/net-p2p/transmission-gtk/transmission-gtk-2.83.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit eutils transmission-2.83
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client - Gtk+ UI"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.100:=
+	>=dev-libs/glib-2.32:2=
+	>=x11-libs/gtk+-3.4:3=
+	ayatana? ( >=dev-libs/libappindicator-0.4.90:3= )
+	!net-p2p/transmission-gtk+
+"
+
+src_install() {
+	# avoid file conflicts with transmission-base
+	# this way gives the corrent layout of /usr/share/icon/... icon files
+	emake DESTDIR="${T}" install
+
+	cd "${T}"
+	dobin usr/bin/transmission-gtk
+	doman usr/share/man/man1/transmission-gtk.1
+	doicon usr/share/pixmaps/transmission.png
+
+	insinto /usr/share/applications
+	doins usr/share/applications/transmission-gtk.desktop
+
+	local mypath
+	# locale
+	for mypath in usr/share/locale/*/LC_MESSAGES/transmission-gtk.mo; do
+		if [ -f "$mypath" ]; then
+			insinto "${mypath%/*}"
+			doins "$mypath"
+		fi
+	done
+
+	# and finally icons directory
+	for mypath in usr/share/icons/hicolor/*/apps/transmission.{png,svg}; do
+		if [ -f "$mypath" ]; then
+			insinto "${mypath%/*}"
+			doins "$mypath"
+		fi
+	done
+}
diff --git a/net-p2p/transmission-gtk/transmission-gtk-2.84.ebuild b/net-p2p/transmission-gtk/transmission-gtk-2.84.ebuild
new file mode 100644
index 00000000..394b9853
--- /dev/null
+++ b/net-p2p/transmission-gtk/transmission-gtk-2.84.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit eutils transmission-2.84
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client - Gtk+ UI"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.100:=
+	>=dev-libs/glib-2.32:2=
+	>=x11-libs/gtk+-3.4:3=
+	ayatana? ( >=dev-libs/libappindicator-0.4.90:3= )
+	!net-p2p/transmission-gtk+
+"
+
+src_install() {
+	# avoid file conflicts with transmission-base
+	# this way gives the corrent layout of /usr/share/icon/... icon files
+	emake DESTDIR="${T}" install
+
+	cd "${T}"
+	dobin usr/bin/transmission-gtk
+	doman usr/share/man/man1/transmission-gtk.1
+	doicon usr/share/pixmaps/transmission.png
+
+	insinto /usr/share/applications
+	doins usr/share/applications/transmission-gtk.desktop
+
+	local mypath
+	# locale
+	for mypath in usr/share/locale/*/LC_MESSAGES/transmission-gtk.mo; do
+		if [ -f "$mypath" ]; then
+			insinto "${mypath%/*}"
+			doins "$mypath"
+		fi
+	done
+
+	# and finally icons directory
+	for mypath in usr/share/icons/hicolor/*/apps/transmission.{png,svg}; do
+		if [ -f "$mypath" ]; then
+			insinto "${mypath%/*}"
+			doins "$mypath"
+		fi
+	done
+}
diff --git a/net-p2p/transmission-qt4/Manifest b/net-p2p/transmission-qt4/Manifest
new file mode 100644
index 00000000..507ab281
--- /dev/null
+++ b/net-p2p/transmission-qt4/Manifest
@@ -0,0 +1,2 @@
+DIST transmission-2.83.tar.xz 3136752 SHA256 b0e1b050167e7f71b68e01a8d55b984a828fe880df9abfbc6281cb2a0d7d1433 SHA512 a3f56c434282d70d9d373d99410de738f15a350f394c0984150b7d9ea2eda1c0485bf26ab740f433d0271f882edabe5609266e704e55792a7015225da0186fda WHIRLPOOL 2dfeae51acf6a14dbd6374336cc0d4cc09a7387e72a63683785d1bdba36693f68770af7826af36e2be1e7e8e3d4920d77a5b582b801f4997721557161e31959c
+DIST transmission-2.84.tar.xz 3077836 SHA256 a9fc1936b4ee414acc732ada04e84339d6755cd0d097bcbd11ba2cfc540db9eb SHA512 d6c2b17e7f8180a41ac70f5b503dfdb0353c6419db25df1b393b18c987c56fda9e2fd4c3f4cda7f08c301877bd0b4711842c28121ceaaaae87f5792cc6c29a3d WHIRLPOOL 375f9c981d9d2ac308896e8b7d66d3643796c8e97d64a1e0d6fd2bffaafa55988b90ddb4eb98330edf062e835c0c5ce76749e7e66bf6806333673beb7569f342
diff --git a/net-p2p/transmission-qt4/files/transmission-qt4-2.80-translations-path-fix.patch b/net-p2p/transmission-qt4/files/transmission-qt4-2.80-translations-path-fix.patch
new file mode 100644
index 00000000..48638010
--- /dev/null
+++ b/net-p2p/transmission-qt4/files/transmission-qt4-2.80-translations-path-fix.patch
@@ -0,0 +1,17 @@
+This patch was adapted from -2.77-transmations-path-fix.patch for 2.80
+
+Fix path for finding locale-specific files:
+QCoreApplication::applicationDirPath() transforms to '/usr/bin'
+and locale files are in '/usr/share/qt4/translations'
+
+--- qt/app.cc
++++ qt/app.cc
+@@ -98,7 +98,7 @@
+   installTranslator (&qtTranslator);
+ 
+   // install the transmission translator
+-  appTranslator.load (QString (MY_CONFIG_NAME) + "_" + QLocale::system ().name (), QCoreApplication::applicationDirPath () + "/translations");
++  appTranslator.load (QString (MY_CONFIG_NAME) + "_" + QLocale::system ().name (), QLibraryInfo::location(QLibraryInfo::TranslationsPath) );
+   installTranslator (&appTranslator);
+ 
+   Formatter::initUnits ();
diff --git a/net-p2p/transmission-qt4/metadata.xml b/net-p2p/transmission-qt4/metadata.xml
new file mode 100644
index 00000000..d55995ce
--- /dev/null
+++ b/net-p2p/transmission-qt4/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slawomir.nizio@sabayon.org</email>
+    <description>maintainer for split Transmission ebuilds based on Gentoo one</description>
+  </maintainer>	
+</pkgmetadata>
diff --git a/net-p2p/transmission-qt4/transmission-qt4-2.83.ebuild b/net-p2p/transmission-qt4/transmission-qt4-2.83.ebuild
new file mode 100644
index 00000000..17154818
--- /dev/null
+++ b/net-p2p/transmission-qt4/transmission-qt4-2.83.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+TRANSMISSION_PATCHES=(
+	# Fix for broken translations path
+	"${FILESDIR}"/${PN}-2.80-translations-path-fix.patch
+)
+inherit eutils transmission-2.83
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client - Qt4 UI"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-qt/qtcore:4=
+	dev-qt/qtgui:4=
+	dev-qt/qtdbus:4=
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	pushd qt >/dev/null
+	dodoc README.txt
+
+	dobin transmission-qt
+	doman transmission-qt.1
+
+	domenu ${MY_PN}-qt.desktop || die
+
+	local res
+	for res in 16 22 24 32 48 64 72 96 128 192 256; do
+		doicon -s ${res} icons/hicolor/${res}x${res}/${MY_PN}-qt.png
+	done
+	doicon -s scalable icons/hicolor/scalable/${MY_PN}-qt.svg
+
+	insinto /usr/share/qt4/translations
+	doins translations/*.qm
+	popd >/dev/null
+}
diff --git a/net-p2p/transmission-qt4/transmission-qt4-2.84.ebuild b/net-p2p/transmission-qt4/transmission-qt4-2.84.ebuild
new file mode 100644
index 00000000..008ba988
--- /dev/null
+++ b/net-p2p/transmission-qt4/transmission-qt4-2.84.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+TRANSMISSION_PATCHES=(
+	# Fix for broken translations path
+	"${FILESDIR}"/${PN}-2.80-translations-path-fix.patch
+)
+inherit eutils transmission-2.84
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client - Qt4 UI"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-qt/qtcore:4=
+	dev-qt/qtgui:4=
+	dev-qt/qtdbus:4=
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	pushd qt >/dev/null
+	dodoc README.txt
+
+	dobin transmission-qt
+	doman transmission-qt.1
+
+	domenu ${MY_PN}-qt.desktop || die
+
+	local res
+	for res in 16 22 24 32 48 64 72 96 128 192 256; do
+		doicon -s ${res} icons/hicolor/${res}x${res}/${MY_PN}-qt.png
+	done
+	doicon -s scalable icons/hicolor/scalable/${MY_PN}-qt.svg
+
+	insinto /usr/share/qt4/translations
+	doins translations/*.qm
+	popd >/dev/null
+}
diff --git a/net-p2p/transmission/metadata.xml b/net-p2p/transmission/metadata.xml
new file mode 100644
index 00000000..bd4c7ae8
--- /dev/null
+++ b/net-p2p/transmission/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>slawomir.nizio@sabayon.org</email>
+    <description>maintainer for split Transmission ebuilds based on Gentoo one</description>
+  </maintainer>	
+  <use>
+    <flag name='lightweight'>Optimize transmission for low-resource systems (smaller cache size, prefer unencrypted peer connections, etc.)</flag>
+    <flag name='xfs'>Enable XFS filesystem capabilities by using <pkg>sys-fs/xfsprogs</pkg> headers (in building of fdlimit(.c))</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-p2p/transmission/transmission-2.83.ebuild b/net-p2p/transmission/transmission-2.83.ebuild
new file mode 100644
index 00000000..3363f4b2
--- /dev/null
+++ b/net-p2p/transmission/transmission-2.83.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit transmission-2.83
+
+DESCRIPTION="A BitTorrent client (meta package)"
+#HOMEPAGE="http://www.transmissionbt.com/"
+SRC_URI=""
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana gtk lightweight systemd qt4 xfs"
+
+RDEPEND="
+	~net-p2p/transmission-base-${PV}[lightweight=,xfs=]
+	gtk? (
+		~net-p2p/transmission-gtk-${PV}[ayatana=]
+	)
+	!gtk? (
+		~net-p2p/transmission-cli-${PV}
+	)"
diff --git a/net-p2p/transmission/transmission-2.84.ebuild b/net-p2p/transmission/transmission-2.84.ebuild
new file mode 100644
index 00000000..2e83db75
--- /dev/null
+++ b/net-p2p/transmission/transmission-2.84.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit transmission-2.84
+
+DESCRIPTION="A BitTorrent client (meta package)"
+#HOMEPAGE="http://www.transmissionbt.com/"
+SRC_URI=""
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana gtk lightweight systemd qt4 xfs"
+
+RDEPEND="
+	~net-p2p/transmission-base-${PV}[lightweight=,xfs=]
+	gtk? (
+		~net-p2p/transmission-gtk-${PV}[ayatana=]
+	)
+	!gtk? (
+		~net-p2p/transmission-cli-${PV}
+	)"
diff --git a/net-p2p/wuala/Manifest b/net-p2p/wuala/Manifest
index 1779c9ac..ad5d0457 100644
--- a/net-p2p/wuala/Manifest
+++ b/net-p2p/wuala/Manifest
@@ -1,2 +1 @@
 DIST wuala.tar.gz 321761 SHA256 c4f8b763db67670505a54d2b227891fd2ed4a73717b473d0c3b201de51afdedc SHA512 130f77843fc835e2a2b3b70bccdbf74439e5008f03c92a3ccc934be0aabdace145f02165f27fc49809849eabc9cc66b18d05921669475350bf58f02d828dd91d WHIRLPOOL c3a7ac54885109df869434ecdafc782c8b25fc01aea85ea67148cb1bf9d7a6d0f3f900943450cad4220a4adb522d3dfb584eb9b8b68fce57372ed470b56e6f3d
-EBUILD wuala-0_pre20120716.ebuild 757 SHA256 d09d26b719e08077c491ebe249fec118f0a8ea6192e33c533770c28a899b2e42 SHA512 cb64141db9538a417d77325b6940084951385d79790c65748a718b24240fdafe2b4dd3f0111d8b8366981908ca2f9687e1c276e74acf48f52f8fde917e7d4e4a WHIRLPOOL 039ef7a6bd03dc7b10a9aad500856b45eac47db072f95593dba528643e08980ea07b8fceee2f300ba0566c2a25e60def8c1c9a5966524cd5af2dcc69e38654fe