diff --git a/app-admin/equo/Manifest b/app-admin/equo/Manifest
index a3e342f21..f1e8934ec 100644
--- a/app-admin/equo/Manifest
+++ b/app-admin/equo/Manifest
@@ -5,6 +5,7 @@ DIST entropy-1.0_alpha13.tar.bz2 17574540 RMD160 eeb89f7be82610ccffa6f2c03ea1ee3
 DIST entropy-1.0_alpha14.tar.bz2 17574913 RMD160 0024a31ad45ee765dce11fdaa8ffaf14857c6ea0 SHA1 d663c54d8a7082ccddc8f71bfc4181ae99750716 SHA256 6bc2e9dc306d5da97747e75bd1028b45c392d26455cd36198199ad3a524d8cf6
 DIST entropy-1.0_alpha15.tar.bz2 17589079 RMD160 26baa57077bb33b85ef80ddbc36c3966baaf5c99 SHA1 9ec6020b597abc9f607afeb7ba03cb6f0205af37 SHA256 a737effc2c9a93bd5f5394355d06419442dc502524595e4dfd4e20d18f92d679
 DIST entropy-1.0_alpha16.tar.bz2 17592157 RMD160 89cc75ca43bbd8a7534f815da1fce92d3a3faf58 SHA1 fb75fd3180357b381329dc13db66a9493390347e SHA256 e9906ab93ae9ecb8d05181a23e73633de935a538aff4316baba54d985493f805
+DIST entropy-1.0_alpha18.tar.bz2 17594372 RMD160 a467581bdfb41cdf1c6b2fced5e1f3c4e0c8d473 SHA1 e5532f2401bbcfbf16923b62e251d3054a63c731 SHA256 cb1cbc9d76243b7525ddb784cfd36ae16df769aceef55ca28562af4e71f3a0d1
 DIST entropy-1.0_alpha2.tar.bz2 17547380 RMD160 9656b6ff2f27a338329ba1d7bfe66b16a800094e SHA1 a3c274f78cdddbef4d05e7b2ed49d8184d44b52e SHA256 432bbc615dbd57ee2b3c1173b95011a1bc7c77fb88f971f820f18c5fb41ea5b1
 DIST entropy-1.0_alpha3.tar.bz2 17545398 RMD160 615a6003093413ef85d1226b247678b9d4057469 SHA1 ee1a75d47420facc61d8ded735fdf48000969e3a SHA256 06b1863f3789d66629df9030b08ca7079ec194659af00b503e221d8d0da00b7a
 DIST entropy-1.0_alpha4.tar.bz2 17545031 RMD160 004167d0779d8458efe13472aeb6ce8bd8726aff SHA1 57ac466e517cf6818c50657733acc0ce90bda146 SHA256 9ea2f7afe9b37da2d6cafcc94eacc3350f73fc7df155bff6c5db002c948a6180
@@ -20,6 +21,7 @@ EBUILD equo-1.0_alpha13.ebuild 1088 RMD160 c98372fcb8c4aa9360dbd56300f856821d5ec
 EBUILD equo-1.0_alpha14.ebuild 1088 RMD160 c98372fcb8c4aa9360dbd56300f856821d5ec237 SHA1 2f01789d13c55fe1503aaa0df22e1a3b3c37b1ae SHA256 93870940ace235eae878e2a7099d8e06be2a910c4b1056054753b9d4197a1077
 EBUILD equo-1.0_alpha15.ebuild 1088 RMD160 c98372fcb8c4aa9360dbd56300f856821d5ec237 SHA1 2f01789d13c55fe1503aaa0df22e1a3b3c37b1ae SHA256 93870940ace235eae878e2a7099d8e06be2a910c4b1056054753b9d4197a1077
 EBUILD equo-1.0_alpha16.ebuild 1088 RMD160 c98372fcb8c4aa9360dbd56300f856821d5ec237 SHA1 2f01789d13c55fe1503aaa0df22e1a3b3c37b1ae SHA256 93870940ace235eae878e2a7099d8e06be2a910c4b1056054753b9d4197a1077
+EBUILD equo-1.0_alpha18.ebuild 1088 RMD160 c98372fcb8c4aa9360dbd56300f856821d5ec237 SHA1 2f01789d13c55fe1503aaa0df22e1a3b3c37b1ae SHA256 93870940ace235eae878e2a7099d8e06be2a910c4b1056054753b9d4197a1077
 EBUILD equo-1.0_alpha2.ebuild 1088 RMD160 c98372fcb8c4aa9360dbd56300f856821d5ec237 SHA1 2f01789d13c55fe1503aaa0df22e1a3b3c37b1ae SHA256 93870940ace235eae878e2a7099d8e06be2a910c4b1056054753b9d4197a1077
 EBUILD equo-1.0_alpha3.ebuild 1088 RMD160 c98372fcb8c4aa9360dbd56300f856821d5ec237 SHA1 2f01789d13c55fe1503aaa0df22e1a3b3c37b1ae SHA256 93870940ace235eae878e2a7099d8e06be2a910c4b1056054753b9d4197a1077
 EBUILD equo-1.0_alpha4.ebuild 1088 RMD160 c98372fcb8c4aa9360dbd56300f856821d5ec237 SHA1 2f01789d13c55fe1503aaa0df22e1a3b3c37b1ae SHA256 93870940ace235eae878e2a7099d8e06be2a910c4b1056054753b9d4197a1077
diff --git a/app-admin/equo/equo-1.0_alpha18.ebuild b/app-admin/equo/equo-1.0_alpha18.ebuild
new file mode 100644
index 000000000..8b0467a79
--- /dev/null
+++ b/app-admin/equo/equo-1.0_alpha18.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2004-2009 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+inherit eutils multilib python bash-completion
+
+DESCRIPTION="Official Sabayon Linux Package Manager Client"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+RESTRICT="mirror"
+S="${WORKDIR}/entropy-${PV}"
+
+DEPEND="~sys-apps/entropy-${PV}"
+RDEPEND="${DEPEND} sys-apps/file[python]"
+
+src_compile() {
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="usr/$(get_libdir)" equo-install || die "make install failed"
+	dobashcompletion "${S}/misc/equo-completion.bash" equo
+}
+
+pkg_postinst() {
+	python_mod_optimize "/usr/$(get_libdir)/entropy/client"
+	bash-completion_pkg_postinst
+	echo
+	elog "If you would like to allow users in the 'entropy' group"
+	elog "to update available package repositories, please consider"
+	elog "to install sys-apps/entropy-client-services"
+	echo
+}
+
+pkg_postrm() {
+        python_mod_cleanup "/usr/$(get_libdir)/entropy/client"
+}
+
diff --git a/app-admin/sulfur/Manifest b/app-admin/sulfur/Manifest
index b6c91f858..cf892fd84 100644
--- a/app-admin/sulfur/Manifest
+++ b/app-admin/sulfur/Manifest
@@ -7,6 +7,7 @@ DIST entropy-1.0_alpha13.tar.bz2 17574540 RMD160 eeb89f7be82610ccffa6f2c03ea1ee3
 DIST entropy-1.0_alpha14.tar.bz2 17574913 RMD160 0024a31ad45ee765dce11fdaa8ffaf14857c6ea0 SHA1 d663c54d8a7082ccddc8f71bfc4181ae99750716 SHA256 6bc2e9dc306d5da97747e75bd1028b45c392d26455cd36198199ad3a524d8cf6
 DIST entropy-1.0_alpha15.tar.bz2 17589079 RMD160 26baa57077bb33b85ef80ddbc36c3966baaf5c99 SHA1 9ec6020b597abc9f607afeb7ba03cb6f0205af37 SHA256 a737effc2c9a93bd5f5394355d06419442dc502524595e4dfd4e20d18f92d679
 DIST entropy-1.0_alpha16.tar.bz2 17592157 RMD160 89cc75ca43bbd8a7534f815da1fce92d3a3faf58 SHA1 fb75fd3180357b381329dc13db66a9493390347e SHA256 e9906ab93ae9ecb8d05181a23e73633de935a538aff4316baba54d985493f805
+DIST entropy-1.0_alpha18.tar.bz2 17594372 RMD160 a467581bdfb41cdf1c6b2fced5e1f3c4e0c8d473 SHA1 e5532f2401bbcfbf16923b62e251d3054a63c731 SHA256 cb1cbc9d76243b7525ddb784cfd36ae16df769aceef55ca28562af4e71f3a0d1
 DIST entropy-1.0_alpha2.tar.bz2 17547380 RMD160 9656b6ff2f27a338329ba1d7bfe66b16a800094e SHA1 a3c274f78cdddbef4d05e7b2ed49d8184d44b52e SHA256 432bbc615dbd57ee2b3c1173b95011a1bc7c77fb88f971f820f18c5fb41ea5b1
 DIST entropy-1.0_alpha3.tar.bz2 17545398 RMD160 615a6003093413ef85d1226b247678b9d4057469 SHA1 ee1a75d47420facc61d8ded735fdf48000969e3a SHA256 06b1863f3789d66629df9030b08ca7079ec194659af00b503e221d8d0da00b7a
 DIST entropy-1.0_alpha4.tar.bz2 17545031 RMD160 004167d0779d8458efe13472aeb6ce8bd8726aff SHA1 57ac466e517cf6818c50657733acc0ce90bda146 SHA256 9ea2f7afe9b37da2d6cafcc94eacc3350f73fc7df155bff6c5db002c948a6180
@@ -22,6 +23,7 @@ EBUILD sulfur-1.0_alpha13.ebuild 1201 RMD160 e91770788bfcb1793fe18a2499b6b83fedb
 EBUILD sulfur-1.0_alpha14.ebuild 1184 RMD160 73a997214c7764d151498c5b779d3e695e242cc3 SHA1 5de6014732dd583681cbfe3466e6116842529dc7 SHA256 457c68b899a18cc6701e4292bf68b213d3b056e8c98e557889eb124de5339d63
 EBUILD sulfur-1.0_alpha15.ebuild 1184 RMD160 73a997214c7764d151498c5b779d3e695e242cc3 SHA1 5de6014732dd583681cbfe3466e6116842529dc7 SHA256 457c68b899a18cc6701e4292bf68b213d3b056e8c98e557889eb124de5339d63
 EBUILD sulfur-1.0_alpha16.ebuild 1184 RMD160 73a997214c7764d151498c5b779d3e695e242cc3 SHA1 5de6014732dd583681cbfe3466e6116842529dc7 SHA256 457c68b899a18cc6701e4292bf68b213d3b056e8c98e557889eb124de5339d63
+EBUILD sulfur-1.0_alpha18.ebuild 1184 RMD160 73a997214c7764d151498c5b779d3e695e242cc3 SHA1 5de6014732dd583681cbfe3466e6116842529dc7 SHA256 457c68b899a18cc6701e4292bf68b213d3b056e8c98e557889eb124de5339d63
 EBUILD sulfur-1.0_alpha2.ebuild 1201 RMD160 e91770788bfcb1793fe18a2499b6b83fedb789e8 SHA1 ee0b51cd9c0fd9c19a375f77ea69640bdbee6c02 SHA256 b933f44e1c83cc86d40c27888c32ffa0188a45f56626fd1f8382f3b755949cf8
 EBUILD sulfur-1.0_alpha3.ebuild 1201 RMD160 e91770788bfcb1793fe18a2499b6b83fedb789e8 SHA1 ee0b51cd9c0fd9c19a375f77ea69640bdbee6c02 SHA256 b933f44e1c83cc86d40c27888c32ffa0188a45f56626fd1f8382f3b755949cf8
 EBUILD sulfur-1.0_alpha4.ebuild 1201 RMD160 e91770788bfcb1793fe18a2499b6b83fedb789e8 SHA1 ee0b51cd9c0fd9c19a375f77ea69640bdbee6c02 SHA256 b933f44e1c83cc86d40c27888c32ffa0188a45f56626fd1f8382f3b755949cf8
diff --git a/app-admin/sulfur/sulfur-1.0_alpha18.ebuild b/app-admin/sulfur/sulfur-1.0_alpha18.ebuild
new file mode 100644
index 000000000..91cbad74c
--- /dev/null
+++ b/app-admin/sulfur/sulfur-1.0_alpha18.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2004-2007 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+inherit eutils gnome2-utils fdo-mime python
+
+DESCRIPTION="Sulfur, the Entropy Store (Sabayon Package Manager GUI)"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+RESTRICT="mirror"
+S="${WORKDIR}/entropy-${PV}/sulfur"
+
+RDEPEND="
+	!app-admin/spritz
+	>=dev-python/pygtk-2.12.1-r2
+	>=x11-libs/vte-0.12.2[python]
+	x11-misc/xdg-utils
+	~sys-apps/entropy-${PV}
+	sys-apps/file[python]"
+DEPEND="sys-devel/gettext"
+
+src_compile() {
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="usr/$(get_libdir)" -j1 install || die "make install failed"
+	dodir /etc/gconf/schemas
+	insinto /etc/gconf/schemas
+	doins "${S}/misc/entropy-handler.schemas"
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+	gnome2_gconf_savelist
+	gnome2_gconf_install
+	python_mod_optimize "/usr/$(get_libdir)/entropy/${PN}"
+}
+
+pkg_postrm() {
+        python_mod_cleanup "/usr/$(get_libdir)/entropy/${PN}"
+	gnome2_gconf_savelist
+	gnome2_gconf_uninstall
+}
+
diff --git a/app-misc/magneto-loader/Manifest b/app-misc/magneto-loader/Manifest
index a8eb8fb06..35f29a29f 100644
--- a/app-misc/magneto-loader/Manifest
+++ b/app-misc/magneto-loader/Manifest
@@ -6,6 +6,7 @@ DIST entropy-1.0_alpha13.tar.bz2 17574540 RMD160 eeb89f7be82610ccffa6f2c03ea1ee3
 DIST entropy-1.0_alpha14.tar.bz2 17574913 RMD160 0024a31ad45ee765dce11fdaa8ffaf14857c6ea0 SHA1 d663c54d8a7082ccddc8f71bfc4181ae99750716 SHA256 6bc2e9dc306d5da97747e75bd1028b45c392d26455cd36198199ad3a524d8cf6
 DIST entropy-1.0_alpha15.tar.bz2 17589079 RMD160 26baa57077bb33b85ef80ddbc36c3966baaf5c99 SHA1 9ec6020b597abc9f607afeb7ba03cb6f0205af37 SHA256 a737effc2c9a93bd5f5394355d06419442dc502524595e4dfd4e20d18f92d679
 DIST entropy-1.0_alpha16.tar.bz2 17592157 RMD160 89cc75ca43bbd8a7534f815da1fce92d3a3faf58 SHA1 fb75fd3180357b381329dc13db66a9493390347e SHA256 e9906ab93ae9ecb8d05181a23e73633de935a538aff4316baba54d985493f805
+DIST entropy-1.0_alpha18.tar.bz2 17594372 RMD160 a467581bdfb41cdf1c6b2fced5e1f3c4e0c8d473 SHA1 e5532f2401bbcfbf16923b62e251d3054a63c731 SHA256 cb1cbc9d76243b7525ddb784cfd36ae16df769aceef55ca28562af4e71f3a0d1
 DIST entropy-1.0_alpha2.tar.bz2 17547380 RMD160 9656b6ff2f27a338329ba1d7bfe66b16a800094e SHA1 a3c274f78cdddbef4d05e7b2ed49d8184d44b52e SHA256 432bbc615dbd57ee2b3c1173b95011a1bc7c77fb88f971f820f18c5fb41ea5b1
 DIST entropy-1.0_alpha3.tar.bz2 17545398 RMD160 615a6003093413ef85d1226b247678b9d4057469 SHA1 ee1a75d47420facc61d8ded735fdf48000969e3a SHA256 06b1863f3789d66629df9030b08ca7079ec194659af00b503e221d8d0da00b7a
 DIST entropy-1.0_alpha4.tar.bz2 17545031 RMD160 004167d0779d8458efe13472aeb6ce8bd8726aff SHA1 57ac466e517cf6818c50657733acc0ce90bda146 SHA256 9ea2f7afe9b37da2d6cafcc94eacc3350f73fc7df155bff6c5db002c948a6180
@@ -22,6 +23,7 @@ EBUILD magneto-loader-1.0_alpha14-r1.ebuild 723 RMD160 b258d129817c2617cfc1bcccb
 EBUILD magneto-loader-1.0_alpha14.ebuild 639 RMD160 80bf829e6c70bddceb7abbc3d183957c7d28b184 SHA1 d435b27b755177e0e3fc34aab8657b990a3acd39 SHA256 933fc8e73fadf46913e1630edd2ce1dfab18f7adcc23b6ed2c4d2b7bc4360c33
 EBUILD magneto-loader-1.0_alpha15.ebuild 639 RMD160 80bf829e6c70bddceb7abbc3d183957c7d28b184 SHA1 d435b27b755177e0e3fc34aab8657b990a3acd39 SHA256 933fc8e73fadf46913e1630edd2ce1dfab18f7adcc23b6ed2c4d2b7bc4360c33
 EBUILD magneto-loader-1.0_alpha16.ebuild 639 RMD160 80bf829e6c70bddceb7abbc3d183957c7d28b184 SHA1 d435b27b755177e0e3fc34aab8657b990a3acd39 SHA256 933fc8e73fadf46913e1630edd2ce1dfab18f7adcc23b6ed2c4d2b7bc4360c33
+EBUILD magneto-loader-1.0_alpha18.ebuild 639 RMD160 80bf829e6c70bddceb7abbc3d183957c7d28b184 SHA1 d435b27b755177e0e3fc34aab8657b990a3acd39 SHA256 933fc8e73fadf46913e1630edd2ce1dfab18f7adcc23b6ed2c4d2b7bc4360c33
 EBUILD magneto-loader-1.0_alpha2.ebuild 639 RMD160 80bf829e6c70bddceb7abbc3d183957c7d28b184 SHA1 d435b27b755177e0e3fc34aab8657b990a3acd39 SHA256 933fc8e73fadf46913e1630edd2ce1dfab18f7adcc23b6ed2c4d2b7bc4360c33
 EBUILD magneto-loader-1.0_alpha3.ebuild 639 RMD160 80bf829e6c70bddceb7abbc3d183957c7d28b184 SHA1 d435b27b755177e0e3fc34aab8657b990a3acd39 SHA256 933fc8e73fadf46913e1630edd2ce1dfab18f7adcc23b6ed2c4d2b7bc4360c33
 EBUILD magneto-loader-1.0_alpha4.ebuild 639 RMD160 80bf829e6c70bddceb7abbc3d183957c7d28b184 SHA1 d435b27b755177e0e3fc34aab8657b990a3acd39 SHA256 933fc8e73fadf46913e1630edd2ce1dfab18f7adcc23b6ed2c4d2b7bc4360c33
diff --git a/app-misc/magneto-loader/magneto-loader-1.0_alpha18.ebuild b/app-misc/magneto-loader/magneto-loader-1.0_alpha18.ebuild
new file mode 100644
index 000000000..2307dec48
--- /dev/null
+++ b/app-misc/magneto-loader/magneto-loader-1.0_alpha18.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2004-2007 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+inherit eutils multilib
+
+DESCRIPTION="Official Sabayon Linux Entropy Notification Applet Loader"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+RESTRICT="mirror"
+S="${WORKDIR}/entropy-${PV}/magneto"
+
+DEPEND="~sys-apps/magneto-core-${PV}"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="usr/$(get_libdir)" magneto-loader-install || die "make install failed"
+}
diff --git a/kde-misc/entropy-kioslaves/Manifest b/kde-misc/entropy-kioslaves/Manifest
index 2491007e7..d5dfed86b 100644
--- a/kde-misc/entropy-kioslaves/Manifest
+++ b/kde-misc/entropy-kioslaves/Manifest
@@ -5,6 +5,7 @@ DIST entropy-1.0_alpha13.tar.bz2 17574540 RMD160 eeb89f7be82610ccffa6f2c03ea1ee3
 DIST entropy-1.0_alpha14.tar.bz2 17574913 RMD160 0024a31ad45ee765dce11fdaa8ffaf14857c6ea0 SHA1 d663c54d8a7082ccddc8f71bfc4181ae99750716 SHA256 6bc2e9dc306d5da97747e75bd1028b45c392d26455cd36198199ad3a524d8cf6
 DIST entropy-1.0_alpha15.tar.bz2 17589079 RMD160 26baa57077bb33b85ef80ddbc36c3966baaf5c99 SHA1 9ec6020b597abc9f607afeb7ba03cb6f0205af37 SHA256 a737effc2c9a93bd5f5394355d06419442dc502524595e4dfd4e20d18f92d679
 DIST entropy-1.0_alpha16.tar.bz2 17592157 RMD160 89cc75ca43bbd8a7534f815da1fce92d3a3faf58 SHA1 fb75fd3180357b381329dc13db66a9493390347e SHA256 e9906ab93ae9ecb8d05181a23e73633de935a538aff4316baba54d985493f805
+DIST entropy-1.0_alpha18.tar.bz2 17594372 RMD160 a467581bdfb41cdf1c6b2fced5e1f3c4e0c8d473 SHA1 e5532f2401bbcfbf16923b62e251d3054a63c731 SHA256 cb1cbc9d76243b7525ddb784cfd36ae16df769aceef55ca28562af4e71f3a0d1
 DIST entropy-1.0_alpha2.tar.bz2 17547380 RMD160 9656b6ff2f27a338329ba1d7bfe66b16a800094e SHA1 a3c274f78cdddbef4d05e7b2ed49d8184d44b52e SHA256 432bbc615dbd57ee2b3c1173b95011a1bc7c77fb88f971f820f18c5fb41ea5b1
 DIST entropy-1.0_alpha3.tar.bz2 17545398 RMD160 615a6003093413ef85d1226b247678b9d4057469 SHA1 ee1a75d47420facc61d8ded735fdf48000969e3a SHA256 06b1863f3789d66629df9030b08ca7079ec194659af00b503e221d8d0da00b7a
 DIST entropy-1.0_alpha4.tar.bz2 17545031 RMD160 004167d0779d8458efe13472aeb6ce8bd8726aff SHA1 57ac466e517cf6818c50657733acc0ce90bda146 SHA256 9ea2f7afe9b37da2d6cafcc94eacc3350f73fc7df155bff6c5db002c948a6180
@@ -20,6 +21,7 @@ EBUILD entropy-kioslaves-1.0_alpha13.ebuild 857 RMD160 1b272d78ce9bf78160916e38d
 EBUILD entropy-kioslaves-1.0_alpha14.ebuild 857 RMD160 1b272d78ce9bf78160916e38dfa5a24d01fec54a SHA1 299971526869e8e3e18e9ba8523a502641c6b51d SHA256 f1e4d3ae631edbdf7969c7a5da3b3b3eace5851e6f5b2408d1f46fdb35b53e2e
 EBUILD entropy-kioslaves-1.0_alpha15.ebuild 857 RMD160 1b272d78ce9bf78160916e38dfa5a24d01fec54a SHA1 299971526869e8e3e18e9ba8523a502641c6b51d SHA256 f1e4d3ae631edbdf7969c7a5da3b3b3eace5851e6f5b2408d1f46fdb35b53e2e
 EBUILD entropy-kioslaves-1.0_alpha16.ebuild 857 RMD160 1b272d78ce9bf78160916e38dfa5a24d01fec54a SHA1 299971526869e8e3e18e9ba8523a502641c6b51d SHA256 f1e4d3ae631edbdf7969c7a5da3b3b3eace5851e6f5b2408d1f46fdb35b53e2e
+EBUILD entropy-kioslaves-1.0_alpha18.ebuild 857 RMD160 1b272d78ce9bf78160916e38dfa5a24d01fec54a SHA1 299971526869e8e3e18e9ba8523a502641c6b51d SHA256 f1e4d3ae631edbdf7969c7a5da3b3b3eace5851e6f5b2408d1f46fdb35b53e2e
 EBUILD entropy-kioslaves-1.0_alpha2.ebuild 857 RMD160 1b272d78ce9bf78160916e38dfa5a24d01fec54a SHA1 299971526869e8e3e18e9ba8523a502641c6b51d SHA256 f1e4d3ae631edbdf7969c7a5da3b3b3eace5851e6f5b2408d1f46fdb35b53e2e
 EBUILD entropy-kioslaves-1.0_alpha3.ebuild 857 RMD160 1b272d78ce9bf78160916e38dfa5a24d01fec54a SHA1 299971526869e8e3e18e9ba8523a502641c6b51d SHA256 f1e4d3ae631edbdf7969c7a5da3b3b3eace5851e6f5b2408d1f46fdb35b53e2e
 EBUILD entropy-kioslaves-1.0_alpha4.ebuild 857 RMD160 1b272d78ce9bf78160916e38dfa5a24d01fec54a SHA1 299971526869e8e3e18e9ba8523a502641c6b51d SHA256 f1e4d3ae631edbdf7969c7a5da3b3b3eace5851e6f5b2408d1f46fdb35b53e2e
diff --git a/kde-misc/entropy-kioslaves/entropy-kioslaves-1.0_alpha18.ebuild b/kde-misc/entropy-kioslaves/entropy-kioslaves-1.0_alpha18.ebuild
new file mode 100644
index 000000000..e9029dfc7
--- /dev/null
+++ b/kde-misc/entropy-kioslaves/entropy-kioslaves-1.0_alpha18.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2004-2007 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+KDE_MINIMAL="4.2"
+inherit eutils kde4-base
+
+DESCRIPTION="Official Sabayon Linux Entropy Package Manager KDE4 kioslaves (tagged release)"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+RESTRICT="mirror"
+S="${WORKDIR}/entropy-${PV}"
+
+RDEPEND=">=app-admin/sulfur-${PV}"
+
+src_prepare() {
+	einfo "nothing to prepare"
+}
+
+src_configure() {
+	einfo "nothing to configure"
+}
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+src_install() {
+	dodir "/${KDEDIR}/share/kde4/services/"
+	insinto "/${KDEDIR}/share/kde4/services/"
+	doins "${S}/sulfur/misc/entropy.protocol"
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+}
+
diff --git a/kde-misc/magneto-kde/Manifest b/kde-misc/magneto-kde/Manifest
index 9ae178aa1..588f3fa54 100644
--- a/kde-misc/magneto-kde/Manifest
+++ b/kde-misc/magneto-kde/Manifest
@@ -5,6 +5,7 @@ DIST entropy-1.0_alpha13.tar.bz2 17574540 RMD160 eeb89f7be82610ccffa6f2c03ea1ee3
 DIST entropy-1.0_alpha14.tar.bz2 17574913 RMD160 0024a31ad45ee765dce11fdaa8ffaf14857c6ea0 SHA1 d663c54d8a7082ccddc8f71bfc4181ae99750716 SHA256 6bc2e9dc306d5da97747e75bd1028b45c392d26455cd36198199ad3a524d8cf6
 DIST entropy-1.0_alpha15.tar.bz2 17589079 RMD160 26baa57077bb33b85ef80ddbc36c3966baaf5c99 SHA1 9ec6020b597abc9f607afeb7ba03cb6f0205af37 SHA256 a737effc2c9a93bd5f5394355d06419442dc502524595e4dfd4e20d18f92d679
 DIST entropy-1.0_alpha16.tar.bz2 17592157 RMD160 89cc75ca43bbd8a7534f815da1fce92d3a3faf58 SHA1 fb75fd3180357b381329dc13db66a9493390347e SHA256 e9906ab93ae9ecb8d05181a23e73633de935a538aff4316baba54d985493f805
+DIST entropy-1.0_alpha18.tar.bz2 17594372 RMD160 a467581bdfb41cdf1c6b2fced5e1f3c4e0c8d473 SHA1 e5532f2401bbcfbf16923b62e251d3054a63c731 SHA256 cb1cbc9d76243b7525ddb784cfd36ae16df769aceef55ca28562af4e71f3a0d1
 DIST entropy-1.0_alpha2.tar.bz2 17547380 RMD160 9656b6ff2f27a338329ba1d7bfe66b16a800094e SHA1 a3c274f78cdddbef4d05e7b2ed49d8184d44b52e SHA256 432bbc615dbd57ee2b3c1173b95011a1bc7c77fb88f971f820f18c5fb41ea5b1
 DIST entropy-1.0_alpha3.tar.bz2 17545398 RMD160 615a6003093413ef85d1226b247678b9d4057469 SHA1 ee1a75d47420facc61d8ded735fdf48000969e3a SHA256 06b1863f3789d66629df9030b08ca7079ec194659af00b503e221d8d0da00b7a
 DIST entropy-1.0_alpha4.tar.bz2 17545031 RMD160 004167d0779d8458efe13472aeb6ce8bd8726aff SHA1 57ac466e517cf6818c50657733acc0ce90bda146 SHA256 9ea2f7afe9b37da2d6cafcc94eacc3350f73fc7df155bff6c5db002c948a6180
@@ -20,6 +21,7 @@ EBUILD magneto-kde-1.0_alpha13.ebuild 881 RMD160 e7c5d4aad508774297e0092bc5ec09a
 EBUILD magneto-kde-1.0_alpha14.ebuild 881 RMD160 e7c5d4aad508774297e0092bc5ec09a5bab4aaf8 SHA1 3fb82eb1cb0ab6ceb8196bf9979356246de617ab SHA256 338707946d954967b9573ec593182eaa45eb5b2e7a141ab1055518d771828329
 EBUILD magneto-kde-1.0_alpha15.ebuild 881 RMD160 e7c5d4aad508774297e0092bc5ec09a5bab4aaf8 SHA1 3fb82eb1cb0ab6ceb8196bf9979356246de617ab SHA256 338707946d954967b9573ec593182eaa45eb5b2e7a141ab1055518d771828329
 EBUILD magneto-kde-1.0_alpha16.ebuild 881 RMD160 e7c5d4aad508774297e0092bc5ec09a5bab4aaf8 SHA1 3fb82eb1cb0ab6ceb8196bf9979356246de617ab SHA256 338707946d954967b9573ec593182eaa45eb5b2e7a141ab1055518d771828329
+EBUILD magneto-kde-1.0_alpha18.ebuild 881 RMD160 e7c5d4aad508774297e0092bc5ec09a5bab4aaf8 SHA1 3fb82eb1cb0ab6ceb8196bf9979356246de617ab SHA256 338707946d954967b9573ec593182eaa45eb5b2e7a141ab1055518d771828329
 EBUILD magneto-kde-1.0_alpha2.ebuild 881 RMD160 e7c5d4aad508774297e0092bc5ec09a5bab4aaf8 SHA1 3fb82eb1cb0ab6ceb8196bf9979356246de617ab SHA256 338707946d954967b9573ec593182eaa45eb5b2e7a141ab1055518d771828329
 EBUILD magneto-kde-1.0_alpha3.ebuild 881 RMD160 e7c5d4aad508774297e0092bc5ec09a5bab4aaf8 SHA1 3fb82eb1cb0ab6ceb8196bf9979356246de617ab SHA256 338707946d954967b9573ec593182eaa45eb5b2e7a141ab1055518d771828329
 EBUILD magneto-kde-1.0_alpha4.ebuild 881 RMD160 e7c5d4aad508774297e0092bc5ec09a5bab4aaf8 SHA1 3fb82eb1cb0ab6ceb8196bf9979356246de617ab SHA256 338707946d954967b9573ec593182eaa45eb5b2e7a141ab1055518d771828329
diff --git a/kde-misc/magneto-kde/magneto-kde-1.0_alpha18.ebuild b/kde-misc/magneto-kde/magneto-kde-1.0_alpha18.ebuild
new file mode 100644
index 000000000..a884ae1bf
--- /dev/null
+++ b/kde-misc/magneto-kde/magneto-kde-1.0_alpha18.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2004-2009 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+inherit eutils python multilib
+
+DESCRIPTION="Official Sabayon Linux Entropy Notification Applet (KDE/Qt version)"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+RESTRICT="mirror"
+S="${WORKDIR}/entropy-${PV}/magneto"
+
+DEPEND="~app-misc/magneto-loader-${PV}
+	kde-base/pykde4
+	dev-python/PyQt4[dbus]"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="usr/$(get_libdir)" magneto-kde-install || die "make install failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize "/usr/$(get_libdir)/entropy/magneto/magneto/kde"
+}
+
+pkg_postrm() {
+        python_mod_cleanup "/usr/$(get_libdir)/entropy/magneto/magneto/kde"
+}
+
diff --git a/sys-apps/entropy-client-services/Manifest b/sys-apps/entropy-client-services/Manifest
index 434fa523e..2de0b4c5f 100644
--- a/sys-apps/entropy-client-services/Manifest
+++ b/sys-apps/entropy-client-services/Manifest
@@ -5,6 +5,7 @@ DIST entropy-1.0_alpha13.tar.bz2 17574540 RMD160 eeb89f7be82610ccffa6f2c03ea1ee3
 DIST entropy-1.0_alpha14.tar.bz2 17574913 RMD160 0024a31ad45ee765dce11fdaa8ffaf14857c6ea0 SHA1 d663c54d8a7082ccddc8f71bfc4181ae99750716 SHA256 6bc2e9dc306d5da97747e75bd1028b45c392d26455cd36198199ad3a524d8cf6
 DIST entropy-1.0_alpha15.tar.bz2 17589079 RMD160 26baa57077bb33b85ef80ddbc36c3966baaf5c99 SHA1 9ec6020b597abc9f607afeb7ba03cb6f0205af37 SHA256 a737effc2c9a93bd5f5394355d06419442dc502524595e4dfd4e20d18f92d679
 DIST entropy-1.0_alpha16.tar.bz2 17592157 RMD160 89cc75ca43bbd8a7534f815da1fce92d3a3faf58 SHA1 fb75fd3180357b381329dc13db66a9493390347e SHA256 e9906ab93ae9ecb8d05181a23e73633de935a538aff4316baba54d985493f805
+DIST entropy-1.0_alpha18.tar.bz2 17594372 RMD160 a467581bdfb41cdf1c6b2fced5e1f3c4e0c8d473 SHA1 e5532f2401bbcfbf16923b62e251d3054a63c731 SHA256 cb1cbc9d76243b7525ddb784cfd36ae16df769aceef55ca28562af4e71f3a0d1
 DIST entropy-1.0_alpha2.tar.bz2 17547380 RMD160 9656b6ff2f27a338329ba1d7bfe66b16a800094e SHA1 a3c274f78cdddbef4d05e7b2ed49d8184d44b52e SHA256 432bbc615dbd57ee2b3c1173b95011a1bc7c77fb88f971f820f18c5fb41ea5b1
 DIST entropy-1.0_alpha3.tar.bz2 17545398 RMD160 615a6003093413ef85d1226b247678b9d4057469 SHA1 ee1a75d47420facc61d8ded735fdf48000969e3a SHA256 06b1863f3789d66629df9030b08ca7079ec194659af00b503e221d8d0da00b7a
 DIST entropy-1.0_alpha4.tar.bz2 17545031 RMD160 004167d0779d8458efe13472aeb6ce8bd8726aff SHA1 57ac466e517cf6818c50657733acc0ce90bda146 SHA256 9ea2f7afe9b37da2d6cafcc94eacc3350f73fc7df155bff6c5db002c948a6180
@@ -20,6 +21,7 @@ EBUILD entropy-client-services-1.0_alpha13.ebuild 853 RMD160 a51d5eef752d4bd387f
 EBUILD entropy-client-services-1.0_alpha14.ebuild 853 RMD160 a51d5eef752d4bd387fd74c1f641312e73965849 SHA1 5efa78b05708a2ae28c3dbaa1b192b80007bf3f8 SHA256 0d31653e22c67ef5cb8de7b2c4f61501c5a97fcd14671d55f7bd189fd758aaa0
 EBUILD entropy-client-services-1.0_alpha15.ebuild 853 RMD160 a51d5eef752d4bd387fd74c1f641312e73965849 SHA1 5efa78b05708a2ae28c3dbaa1b192b80007bf3f8 SHA256 0d31653e22c67ef5cb8de7b2c4f61501c5a97fcd14671d55f7bd189fd758aaa0
 EBUILD entropy-client-services-1.0_alpha16.ebuild 853 RMD160 a51d5eef752d4bd387fd74c1f641312e73965849 SHA1 5efa78b05708a2ae28c3dbaa1b192b80007bf3f8 SHA256 0d31653e22c67ef5cb8de7b2c4f61501c5a97fcd14671d55f7bd189fd758aaa0
+EBUILD entropy-client-services-1.0_alpha18.ebuild 853 RMD160 a51d5eef752d4bd387fd74c1f641312e73965849 SHA1 5efa78b05708a2ae28c3dbaa1b192b80007bf3f8 SHA256 0d31653e22c67ef5cb8de7b2c4f61501c5a97fcd14671d55f7bd189fd758aaa0
 EBUILD entropy-client-services-1.0_alpha2.ebuild 853 RMD160 a51d5eef752d4bd387fd74c1f641312e73965849 SHA1 5efa78b05708a2ae28c3dbaa1b192b80007bf3f8 SHA256 0d31653e22c67ef5cb8de7b2c4f61501c5a97fcd14671d55f7bd189fd758aaa0
 EBUILD entropy-client-services-1.0_alpha3.ebuild 853 RMD160 a51d5eef752d4bd387fd74c1f641312e73965849 SHA1 5efa78b05708a2ae28c3dbaa1b192b80007bf3f8 SHA256 0d31653e22c67ef5cb8de7b2c4f61501c5a97fcd14671d55f7bd189fd758aaa0
 EBUILD entropy-client-services-1.0_alpha4.ebuild 853 RMD160 a51d5eef752d4bd387fd74c1f641312e73965849 SHA1 5efa78b05708a2ae28c3dbaa1b192b80007bf3f8 SHA256 0d31653e22c67ef5cb8de7b2c4f61501c5a97fcd14671d55f7bd189fd758aaa0
diff --git a/sys-apps/entropy-client-services/entropy-client-services-1.0_alpha18.ebuild b/sys-apps/entropy-client-services/entropy-client-services-1.0_alpha18.ebuild
new file mode 100644
index 000000000..6949d6a8a
--- /dev/null
+++ b/sys-apps/entropy-client-services/entropy-client-services-1.0_alpha18.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2004-2007 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+inherit eutils python
+
+DESCRIPTION="Official Sabayon Linux Package Manager library"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+RESTRICT="mirror"
+S="${WORKDIR}/entropy-${PV}"
+
+DEPEND="dev-python/dbus-python
+        >=sys-apps/dbus-1.2.6
+	dev-python/pygobject
+	~sys-apps/entropy-${PV}
+"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="usr/$(get_libdir)" updates-daemon-install || die "make install failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize "/usr/$(get_libdir)/entropy/services"
+}
+
+pkg_postrm() {
+        python_mod_cleanup "/usr/$(get_libdir)/entropy/services"
+}
+
diff --git a/sys-apps/entropy-server/Manifest b/sys-apps/entropy-server/Manifest
index 59fe26439..0cc6222ea 100644
--- a/sys-apps/entropy-server/Manifest
+++ b/sys-apps/entropy-server/Manifest
@@ -5,6 +5,7 @@ DIST entropy-1.0_alpha13.tar.bz2 17574540 RMD160 eeb89f7be82610ccffa6f2c03ea1ee3
 DIST entropy-1.0_alpha14.tar.bz2 17574913 RMD160 0024a31ad45ee765dce11fdaa8ffaf14857c6ea0 SHA1 d663c54d8a7082ccddc8f71bfc4181ae99750716 SHA256 6bc2e9dc306d5da97747e75bd1028b45c392d26455cd36198199ad3a524d8cf6
 DIST entropy-1.0_alpha15.tar.bz2 17589079 RMD160 26baa57077bb33b85ef80ddbc36c3966baaf5c99 SHA1 9ec6020b597abc9f607afeb7ba03cb6f0205af37 SHA256 a737effc2c9a93bd5f5394355d06419442dc502524595e4dfd4e20d18f92d679
 DIST entropy-1.0_alpha16.tar.bz2 17592157 RMD160 89cc75ca43bbd8a7534f815da1fce92d3a3faf58 SHA1 fb75fd3180357b381329dc13db66a9493390347e SHA256 e9906ab93ae9ecb8d05181a23e73633de935a538aff4316baba54d985493f805
+DIST entropy-1.0_alpha18.tar.bz2 17594372 RMD160 a467581bdfb41cdf1c6b2fced5e1f3c4e0c8d473 SHA1 e5532f2401bbcfbf16923b62e251d3054a63c731 SHA256 cb1cbc9d76243b7525ddb784cfd36ae16df769aceef55ca28562af4e71f3a0d1
 DIST entropy-1.0_alpha2.tar.bz2 17547380 RMD160 9656b6ff2f27a338329ba1d7bfe66b16a800094e SHA1 a3c274f78cdddbef4d05e7b2ed49d8184d44b52e SHA256 432bbc615dbd57ee2b3c1173b95011a1bc7c77fb88f971f820f18c5fb41ea5b1
 DIST entropy-1.0_alpha3.tar.bz2 17545398 RMD160 615a6003093413ef85d1226b247678b9d4057469 SHA1 ee1a75d47420facc61d8ded735fdf48000969e3a SHA256 06b1863f3789d66629df9030b08ca7079ec194659af00b503e221d8d0da00b7a
 DIST entropy-1.0_alpha4.tar.bz2 17545031 RMD160 004167d0779d8458efe13472aeb6ce8bd8726aff SHA1 57ac466e517cf6818c50657733acc0ce90bda146 SHA256 9ea2f7afe9b37da2d6cafcc94eacc3350f73fc7df155bff6c5db002c948a6180
@@ -20,6 +21,7 @@ EBUILD entropy-server-1.0_alpha13.ebuild 798 RMD160 2f6507264a75926fa0814f1b00dc
 EBUILD entropy-server-1.0_alpha14.ebuild 798 RMD160 2f6507264a75926fa0814f1b00dce82441413bbb SHA1 c4c54381e90c18d1529b241f1887df7c23d4731e SHA256 8e968dcbe8b737721b60117c4df8f1bcb9d70706d09c69918b9210ef9258e2ca
 EBUILD entropy-server-1.0_alpha15.ebuild 798 RMD160 2f6507264a75926fa0814f1b00dce82441413bbb SHA1 c4c54381e90c18d1529b241f1887df7c23d4731e SHA256 8e968dcbe8b737721b60117c4df8f1bcb9d70706d09c69918b9210ef9258e2ca
 EBUILD entropy-server-1.0_alpha16.ebuild 798 RMD160 2f6507264a75926fa0814f1b00dce82441413bbb SHA1 c4c54381e90c18d1529b241f1887df7c23d4731e SHA256 8e968dcbe8b737721b60117c4df8f1bcb9d70706d09c69918b9210ef9258e2ca
+EBUILD entropy-server-1.0_alpha18.ebuild 798 RMD160 2f6507264a75926fa0814f1b00dce82441413bbb SHA1 c4c54381e90c18d1529b241f1887df7c23d4731e SHA256 8e968dcbe8b737721b60117c4df8f1bcb9d70706d09c69918b9210ef9258e2ca
 EBUILD entropy-server-1.0_alpha2.ebuild 798 RMD160 2f6507264a75926fa0814f1b00dce82441413bbb SHA1 c4c54381e90c18d1529b241f1887df7c23d4731e SHA256 8e968dcbe8b737721b60117c4df8f1bcb9d70706d09c69918b9210ef9258e2ca
 EBUILD entropy-server-1.0_alpha3.ebuild 798 RMD160 2f6507264a75926fa0814f1b00dce82441413bbb SHA1 c4c54381e90c18d1529b241f1887df7c23d4731e SHA256 8e968dcbe8b737721b60117c4df8f1bcb9d70706d09c69918b9210ef9258e2ca
 EBUILD entropy-server-1.0_alpha4.ebuild 798 RMD160 2f6507264a75926fa0814f1b00dce82441413bbb SHA1 c4c54381e90c18d1529b241f1887df7c23d4731e SHA256 8e968dcbe8b737721b60117c4df8f1bcb9d70706d09c69918b9210ef9258e2ca
diff --git a/sys-apps/entropy-server/entropy-server-1.0_alpha18.ebuild b/sys-apps/entropy-server/entropy-server-1.0_alpha18.ebuild
new file mode 100644
index 000000000..a0fb33232
--- /dev/null
+++ b/sys-apps/entropy-server/entropy-server-1.0_alpha18.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2004-2007 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+inherit eutils python
+
+DESCRIPTION="Official Sabayon Linux Package Manager Server Interface (tagged release)"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+RESTRICT="mirror"
+S="${WORKDIR}/entropy-${PV}"
+
+DEPEND="~sys-apps/entropy-${PV}"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="usr/$(get_libdir)" entropy-server-install || die "make install failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize "/usr/$(get_libdir)/entropy/server"
+}
+
+pkg_postrm() {
+        python_mod_cleanup "/usr/$(get_libdir)/entropy/server"
+}
+
diff --git a/sys-apps/entropy/Manifest b/sys-apps/entropy/Manifest
index 50c459ff9..095d9d1f4 100644
--- a/sys-apps/entropy/Manifest
+++ b/sys-apps/entropy/Manifest
@@ -19,6 +19,7 @@ DIST entropy-1.0_alpha13.tar.bz2 17574540 RMD160 eeb89f7be82610ccffa6f2c03ea1ee3
 DIST entropy-1.0_alpha14.tar.bz2 17574913 RMD160 0024a31ad45ee765dce11fdaa8ffaf14857c6ea0 SHA1 d663c54d8a7082ccddc8f71bfc4181ae99750716 SHA256 6bc2e9dc306d5da97747e75bd1028b45c392d26455cd36198199ad3a524d8cf6
 DIST entropy-1.0_alpha15.tar.bz2 17589079 RMD160 26baa57077bb33b85ef80ddbc36c3966baaf5c99 SHA1 9ec6020b597abc9f607afeb7ba03cb6f0205af37 SHA256 a737effc2c9a93bd5f5394355d06419442dc502524595e4dfd4e20d18f92d679
 DIST entropy-1.0_alpha16.tar.bz2 17592157 RMD160 89cc75ca43bbd8a7534f815da1fce92d3a3faf58 SHA1 fb75fd3180357b381329dc13db66a9493390347e SHA256 e9906ab93ae9ecb8d05181a23e73633de935a538aff4316baba54d985493f805
+DIST entropy-1.0_alpha18.tar.bz2 17594372 RMD160 a467581bdfb41cdf1c6b2fced5e1f3c4e0c8d473 SHA1 e5532f2401bbcfbf16923b62e251d3054a63c731 SHA256 cb1cbc9d76243b7525ddb784cfd36ae16df769aceef55ca28562af4e71f3a0d1
 DIST entropy-1.0_alpha2.tar.bz2 17547380 RMD160 9656b6ff2f27a338329ba1d7bfe66b16a800094e SHA1 a3c274f78cdddbef4d05e7b2ed49d8184d44b52e SHA256 432bbc615dbd57ee2b3c1173b95011a1bc7c77fb88f971f820f18c5fb41ea5b1
 DIST entropy-1.0_alpha3.tar.bz2 17545398 RMD160 615a6003093413ef85d1226b247678b9d4057469 SHA1 ee1a75d47420facc61d8ded735fdf48000969e3a SHA256 06b1863f3789d66629df9030b08ca7079ec194659af00b503e221d8d0da00b7a
 DIST entropy-1.0_alpha4.tar.bz2 17545031 RMD160 004167d0779d8458efe13472aeb6ce8bd8726aff SHA1 57ac466e517cf6818c50657733acc0ce90bda146 SHA256 9ea2f7afe9b37da2d6cafcc94eacc3350f73fc7df155bff6c5db002c948a6180
@@ -34,6 +35,7 @@ EBUILD entropy-1.0_alpha13.ebuild 2712 RMD160 dcbba777e15849e9510e2433f6aa6a97b3
 EBUILD entropy-1.0_alpha14.ebuild 2712 RMD160 dcbba777e15849e9510e2433f6aa6a97b3e31e7e SHA1 60f73dd4cc46665ae4497202c226529a59983939 SHA256 f6c5bbb2820a660bdfd7131e0adfff97269b2e90b0e40f4facfe01755847c205
 EBUILD entropy-1.0_alpha15.ebuild 2712 RMD160 dcbba777e15849e9510e2433f6aa6a97b3e31e7e SHA1 60f73dd4cc46665ae4497202c226529a59983939 SHA256 f6c5bbb2820a660bdfd7131e0adfff97269b2e90b0e40f4facfe01755847c205
 EBUILD entropy-1.0_alpha16.ebuild 2712 RMD160 dcbba777e15849e9510e2433f6aa6a97b3e31e7e SHA1 60f73dd4cc46665ae4497202c226529a59983939 SHA256 f6c5bbb2820a660bdfd7131e0adfff97269b2e90b0e40f4facfe01755847c205
+EBUILD entropy-1.0_alpha18.ebuild 2712 RMD160 dcbba777e15849e9510e2433f6aa6a97b3e31e7e SHA1 60f73dd4cc46665ae4497202c226529a59983939 SHA256 f6c5bbb2820a660bdfd7131e0adfff97269b2e90b0e40f4facfe01755847c205
 EBUILD entropy-1.0_alpha2.ebuild 2699 RMD160 b2d6bcb2f635561800a7c8c0ffab41c36bec0001 SHA1 253297598689b265296f6f98c9517f250644df8b SHA256 d3243802569809f2c976b6843a9b7ecc267169940fb40a2edaa185b1a7c48621
 EBUILD entropy-1.0_alpha3.ebuild 2699 RMD160 b2d6bcb2f635561800a7c8c0ffab41c36bec0001 SHA1 253297598689b265296f6f98c9517f250644df8b SHA256 d3243802569809f2c976b6843a9b7ecc267169940fb40a2edaa185b1a7c48621
 EBUILD entropy-1.0_alpha4.ebuild 2699 RMD160 b2d6bcb2f635561800a7c8c0ffab41c36bec0001 SHA1 253297598689b265296f6f98c9517f250644df8b SHA256 d3243802569809f2c976b6843a9b7ecc267169940fb40a2edaa185b1a7c48621
diff --git a/sys-apps/entropy/entropy-1.0_alpha18.ebuild b/sys-apps/entropy/entropy-1.0_alpha18.ebuild
new file mode 100644
index 000000000..19c0b9922
--- /dev/null
+++ b/sys-apps/entropy/entropy-1.0_alpha18.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2004-2007 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+inherit eutils python multilib
+
+DESCRIPTION="Official Sabayon Linux Package Manager library"
+HOMEPAGE="http://www.sabayon.org"
+REPO_CONFPATH="${ROOT}/etc/entropy/repositories.conf"
+ENTROPY_CACHEDIR="${ROOT}/var/lib/entropy/caches"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.bz2"
+RESTRICT="mirror"
+
+DEPEND="
+	dev-db/sqlite[soundex]
+	|| ( dev-lang/python:2.6[sqlite] )
+	dev-util/intltool
+	net-misc/rsync
+	sys-apps/sandbox
+	sys-devel/gettext
+	sys-apps/diffutils
+	>=sys-apps/portage-2.1.9"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	# Can:
+	# - update repos
+	# - update security advisories
+	# - handle on-disk cache (atm)
+	enewgroup entropy || die "failed to create entropy group"
+	# Create unprivileged entropy user
+	enewgroup entropy-nopriv || die "failed to create entropy-nopriv group"
+	enewuser entropy-nopriv -1 -1 -1 entropy-nopriv || die "failed to create entropy-nopriv user"
+}
+
+src_compile() {
+	# TODO: move to separate package
+	cd "${S}"/misc/po
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="usr/$(get_libdir)" entropy-install || die "make install failed"
+
+	# TODO: move to separate package
+	cd "${S}"/misc/po
+	emake DESTDIR="${D}" LIBDIR="usr/$(get_libdir)" install || die "make install failed"
+}
+
+pkg_preinst() {
+	# backup user repositories.conf
+	if [ -f "${REPO_CONFPATH}" ]; then
+		cp -p "${REPO_CONFPATH}" "${REPO_CONFPATH}.backup"
+	fi
+}
+
+pkg_postinst() {
+
+	# make sure than old entropy pyc files don't interfere (this is a workaround)
+	find /usr/$(get_libdir)/entropy -name "*.pyc" | xargs rm &> /dev/null
+
+	# Copy config file over
+	if [ -f "${REPO_CONFPATH}.backup" ]; then
+		cp ${REPO_CONFPATH}.backup ${REPO_CONFPATH} -p
+	else
+		if [ -f "${REPO_CONFPATH}.example" ] && [ ! -f "${REPO_CONFPATH}" ]; then
+			cp ${REPO_CONFPATH}.example ${REPO_CONFPATH} -p
+		fi
+	fi
+	if [ -d "${ENTROPY_CACHEDIR}" ]; then
+		einfo "Purging current Entropy cache"
+		rm -rf ${ENTROPY_CACHEDIR}/*
+	fi
+
+	python_mod_optimize "/usr/$(get_libdir)/entropy/libraries/entropy"
+
+	# force python 2.6/2.7 at least
+	eselect python update --ignore 2.7 --ignore 3.0 --ignore 3.1 --ignore 3.2 --ignore 3.3
+
+	echo
+	elog "Entropy packages cache has been moved to a more NFS-friendly location:"
+	elog "  /var/lib/entropy/client/packages/packages{-restricted,-nonfree,}"
+	elog "PLEASE make sure to update your mount points ASAP."
+	echo
+	elog "If you want to enable Entropy packages delta download support, please"
+	elog "install dev-util/bsdiff."
+	echo
+
+}
+
+pkg_postrm() {
+	python_mod_cleanup "/usr/$(get_libdir)/entropy/libraries/entropy"
+}
diff --git a/sys-apps/magneto-core/Manifest b/sys-apps/magneto-core/Manifest
index 61eafa9ce..cb468bb77 100644
--- a/sys-apps/magneto-core/Manifest
+++ b/sys-apps/magneto-core/Manifest
@@ -5,6 +5,7 @@ DIST entropy-1.0_alpha13.tar.bz2 17574540 RMD160 eeb89f7be82610ccffa6f2c03ea1ee3
 DIST entropy-1.0_alpha14.tar.bz2 17574913 RMD160 0024a31ad45ee765dce11fdaa8ffaf14857c6ea0 SHA1 d663c54d8a7082ccddc8f71bfc4181ae99750716 SHA256 6bc2e9dc306d5da97747e75bd1028b45c392d26455cd36198199ad3a524d8cf6
 DIST entropy-1.0_alpha15.tar.bz2 17589079 RMD160 26baa57077bb33b85ef80ddbc36c3966baaf5c99 SHA1 9ec6020b597abc9f607afeb7ba03cb6f0205af37 SHA256 a737effc2c9a93bd5f5394355d06419442dc502524595e4dfd4e20d18f92d679
 DIST entropy-1.0_alpha16.tar.bz2 17592157 RMD160 89cc75ca43bbd8a7534f815da1fce92d3a3faf58 SHA1 fb75fd3180357b381329dc13db66a9493390347e SHA256 e9906ab93ae9ecb8d05181a23e73633de935a538aff4316baba54d985493f805
+DIST entropy-1.0_alpha18.tar.bz2 17594372 RMD160 a467581bdfb41cdf1c6b2fced5e1f3c4e0c8d473 SHA1 e5532f2401bbcfbf16923b62e251d3054a63c731 SHA256 cb1cbc9d76243b7525ddb784cfd36ae16df769aceef55ca28562af4e71f3a0d1
 DIST entropy-1.0_alpha2.tar.bz2 17547380 RMD160 9656b6ff2f27a338329ba1d7bfe66b16a800094e SHA1 a3c274f78cdddbef4d05e7b2ed49d8184d44b52e SHA256 432bbc615dbd57ee2b3c1173b95011a1bc7c77fb88f971f820f18c5fb41ea5b1
 DIST entropy-1.0_alpha3.tar.bz2 17545398 RMD160 615a6003093413ef85d1226b247678b9d4057469 SHA1 ee1a75d47420facc61d8ded735fdf48000969e3a SHA256 06b1863f3789d66629df9030b08ca7079ec194659af00b503e221d8d0da00b7a
 DIST entropy-1.0_alpha4.tar.bz2 17545031 RMD160 004167d0779d8458efe13472aeb6ce8bd8726aff SHA1 57ac466e517cf6818c50657733acc0ce90bda146 SHA256 9ea2f7afe9b37da2d6cafcc94eacc3350f73fc7df155bff6c5db002c948a6180
@@ -20,6 +21,7 @@ EBUILD magneto-core-1.0_alpha13.ebuild 852 RMD160 67b741aef09f6d17c2b607c9e86fb0
 EBUILD magneto-core-1.0_alpha14.ebuild 852 RMD160 67b741aef09f6d17c2b607c9e86fb0049ccc5c05 SHA1 306e5b22c8eef9b44dd7f7e9f57b0cb5eb2cefd3 SHA256 4676d61300e85b84a93b253be9d91c73483e39ed6a268a0a0516419d54f90b8c
 EBUILD magneto-core-1.0_alpha15.ebuild 852 RMD160 67b741aef09f6d17c2b607c9e86fb0049ccc5c05 SHA1 306e5b22c8eef9b44dd7f7e9f57b0cb5eb2cefd3 SHA256 4676d61300e85b84a93b253be9d91c73483e39ed6a268a0a0516419d54f90b8c
 EBUILD magneto-core-1.0_alpha16.ebuild 852 RMD160 67b741aef09f6d17c2b607c9e86fb0049ccc5c05 SHA1 306e5b22c8eef9b44dd7f7e9f57b0cb5eb2cefd3 SHA256 4676d61300e85b84a93b253be9d91c73483e39ed6a268a0a0516419d54f90b8c
+EBUILD magneto-core-1.0_alpha18.ebuild 852 RMD160 67b741aef09f6d17c2b607c9e86fb0049ccc5c05 SHA1 306e5b22c8eef9b44dd7f7e9f57b0cb5eb2cefd3 SHA256 4676d61300e85b84a93b253be9d91c73483e39ed6a268a0a0516419d54f90b8c
 EBUILD magneto-core-1.0_alpha2.ebuild 852 RMD160 67b741aef09f6d17c2b607c9e86fb0049ccc5c05 SHA1 306e5b22c8eef9b44dd7f7e9f57b0cb5eb2cefd3 SHA256 4676d61300e85b84a93b253be9d91c73483e39ed6a268a0a0516419d54f90b8c
 EBUILD magneto-core-1.0_alpha3.ebuild 852 RMD160 67b741aef09f6d17c2b607c9e86fb0049ccc5c05 SHA1 306e5b22c8eef9b44dd7f7e9f57b0cb5eb2cefd3 SHA256 4676d61300e85b84a93b253be9d91c73483e39ed6a268a0a0516419d54f90b8c
 EBUILD magneto-core-1.0_alpha4.ebuild 852 RMD160 67b741aef09f6d17c2b607c9e86fb0049ccc5c05 SHA1 306e5b22c8eef9b44dd7f7e9f57b0cb5eb2cefd3 SHA256 4676d61300e85b84a93b253be9d91c73483e39ed6a268a0a0516419d54f90b8c
diff --git a/sys-apps/magneto-core/magneto-core-1.0_alpha18.ebuild b/sys-apps/magneto-core/magneto-core-1.0_alpha18.ebuild
new file mode 100644
index 000000000..1c0ee9107
--- /dev/null
+++ b/sys-apps/magneto-core/magneto-core-1.0_alpha18.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2004-2009 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+inherit eutils python multilib
+
+DESCRIPTION="Official Sabayon Linux Entropy Notification Applet Core library"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+RESTRICT="mirror"
+S="${WORKDIR}/entropy-${PV}/magneto"
+
+DEPEND="
+	>=sys-apps/entropy-client-services-${PV}
+        x11-misc/xdg-utils"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="usr/$(get_libdir)" magneto-core-install || die "make install failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize "/usr/$(get_libdir)/entropy/magneto"
+}
+
+pkg_postrm() {
+        python_mod_cleanup "/usr/$(get_libdir)/entropy/magneto"
+}
+
diff --git a/x11-misc/magneto-gtk/Manifest b/x11-misc/magneto-gtk/Manifest
index 04797c381..9e2a8dbf7 100644
--- a/x11-misc/magneto-gtk/Manifest
+++ b/x11-misc/magneto-gtk/Manifest
@@ -5,6 +5,7 @@ DIST entropy-1.0_alpha13.tar.bz2 17574540 RMD160 eeb89f7be82610ccffa6f2c03ea1ee3
 DIST entropy-1.0_alpha14.tar.bz2 17574913 RMD160 0024a31ad45ee765dce11fdaa8ffaf14857c6ea0 SHA1 d663c54d8a7082ccddc8f71bfc4181ae99750716 SHA256 6bc2e9dc306d5da97747e75bd1028b45c392d26455cd36198199ad3a524d8cf6
 DIST entropy-1.0_alpha15.tar.bz2 17589079 RMD160 26baa57077bb33b85ef80ddbc36c3966baaf5c99 SHA1 9ec6020b597abc9f607afeb7ba03cb6f0205af37 SHA256 a737effc2c9a93bd5f5394355d06419442dc502524595e4dfd4e20d18f92d679
 DIST entropy-1.0_alpha16.tar.bz2 17592157 RMD160 89cc75ca43bbd8a7534f815da1fce92d3a3faf58 SHA1 fb75fd3180357b381329dc13db66a9493390347e SHA256 e9906ab93ae9ecb8d05181a23e73633de935a538aff4316baba54d985493f805
+DIST entropy-1.0_alpha18.tar.bz2 17594372 RMD160 a467581bdfb41cdf1c6b2fced5e1f3c4e0c8d473 SHA1 e5532f2401bbcfbf16923b62e251d3054a63c731 SHA256 cb1cbc9d76243b7525ddb784cfd36ae16df769aceef55ca28562af4e71f3a0d1
 DIST entropy-1.0_alpha2.tar.bz2 17547380 RMD160 9656b6ff2f27a338329ba1d7bfe66b16a800094e SHA1 a3c274f78cdddbef4d05e7b2ed49d8184d44b52e SHA256 432bbc615dbd57ee2b3c1173b95011a1bc7c77fb88f971f820f18c5fb41ea5b1
 DIST entropy-1.0_alpha3.tar.bz2 17545398 RMD160 615a6003093413ef85d1226b247678b9d4057469 SHA1 ee1a75d47420facc61d8ded735fdf48000969e3a SHA256 06b1863f3789d66629df9030b08ca7079ec194659af00b503e221d8d0da00b7a
 DIST entropy-1.0_alpha4.tar.bz2 17545031 RMD160 004167d0779d8458efe13472aeb6ce8bd8726aff SHA1 57ac466e517cf6818c50657733acc0ce90bda146 SHA256 9ea2f7afe9b37da2d6cafcc94eacc3350f73fc7df155bff6c5db002c948a6180
@@ -20,6 +21,7 @@ EBUILD magneto-gtk-1.0_alpha13.ebuild 889 RMD160 909b04c818dd31c39c113d0418b81c7
 EBUILD magneto-gtk-1.0_alpha14.ebuild 889 RMD160 909b04c818dd31c39c113d0418b81c76550a529a SHA1 2682bf9c890875641c435c01be160f48acef8709 SHA256 3c3d1c43504a44cd9e9deaccf212f856966945bd2839890639a6ad539effc24e
 EBUILD magneto-gtk-1.0_alpha15.ebuild 889 RMD160 909b04c818dd31c39c113d0418b81c76550a529a SHA1 2682bf9c890875641c435c01be160f48acef8709 SHA256 3c3d1c43504a44cd9e9deaccf212f856966945bd2839890639a6ad539effc24e
 EBUILD magneto-gtk-1.0_alpha16.ebuild 889 RMD160 909b04c818dd31c39c113d0418b81c76550a529a SHA1 2682bf9c890875641c435c01be160f48acef8709 SHA256 3c3d1c43504a44cd9e9deaccf212f856966945bd2839890639a6ad539effc24e
+EBUILD magneto-gtk-1.0_alpha18.ebuild 889 RMD160 909b04c818dd31c39c113d0418b81c76550a529a SHA1 2682bf9c890875641c435c01be160f48acef8709 SHA256 3c3d1c43504a44cd9e9deaccf212f856966945bd2839890639a6ad539effc24e
 EBUILD magneto-gtk-1.0_alpha2.ebuild 889 RMD160 909b04c818dd31c39c113d0418b81c76550a529a SHA1 2682bf9c890875641c435c01be160f48acef8709 SHA256 3c3d1c43504a44cd9e9deaccf212f856966945bd2839890639a6ad539effc24e
 EBUILD magneto-gtk-1.0_alpha3.ebuild 889 RMD160 909b04c818dd31c39c113d0418b81c76550a529a SHA1 2682bf9c890875641c435c01be160f48acef8709 SHA256 3c3d1c43504a44cd9e9deaccf212f856966945bd2839890639a6ad539effc24e
 EBUILD magneto-gtk-1.0_alpha4.ebuild 889 RMD160 909b04c818dd31c39c113d0418b81c76550a529a SHA1 2682bf9c890875641c435c01be160f48acef8709 SHA256 3c3d1c43504a44cd9e9deaccf212f856966945bd2839890639a6ad539effc24e
diff --git a/x11-misc/magneto-gtk/magneto-gtk-1.0_alpha18.ebuild b/x11-misc/magneto-gtk/magneto-gtk-1.0_alpha18.ebuild
new file mode 100644
index 000000000..a3a2e8fdc
--- /dev/null
+++ b/x11-misc/magneto-gtk/magneto-gtk-1.0_alpha18.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2004-2009 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+inherit eutils python multilib
+
+DESCRIPTION="Official Sabayon Linux Entropy Notification Applet (GTK version)"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+RESTRICT="mirror"
+S="${WORKDIR}/entropy-${PV}/magneto"
+
+DEPEND="~app-misc/magneto-loader-${PV}
+        dev-python/notify-python
+	dev-python/pygtk
+"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="usr/$(get_libdir)" magneto-gtk-install || die "make install failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize "/usr/$(get_libdir)/entropy/magneto/magneto/gtk"
+}
+
+pkg_postrm() {
+        python_mod_cleanup "/usr/$(get_libdir)/entropy/magneto/magneto/gtk"
+}
+