remove old sys-apps/systemd ebuilds

13 files changed, 0 insertions, 1312 deletions

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index f68ba64..3023ae9 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,26 +1,4 @@
-AUX 0001-Revert-Revert-Revert-fsck-add-new-l-switch-to-fsck-m.patch 1045 RMD160 f080497a39fb8d9c4a1afe46066bdba248373a72 SHA1 dfc7df7b5667a8cace130273e4137dd783966080 SHA256 55ac7ebe6f241261bd72e4d6c6eae1c8b7883cca2ef5c2d18ea7da6addbdba18
-AUX 01_all_allow-stable-libnotify.patch 2539 RMD160 bd77f00bc6987cde4b863816f0ee68749f7f4b86 SHA1 633eda3380dbf7c630cb1ba82fbafe0651a054f1 SHA256 501ccca743ea47005eaa98346ce64979e77238e48b40d97d0127e3729b18e247
-DIST systemd-15.tar.bz2 728063 RMD160 56c91ab8b014cbe0d66be691ace5b1a43da284c1 SHA1 b383d35b409a99d6929e7d1f2e508e3b97fef601 SHA256 1714887652467614e7930ebdae85459ce24f8691b3e27b0f08dc5f052fd07cd8
-DIST systemd-17.tar.bz2 755734 RMD160 cbc42573c00e0faf664c611a8101c59d71e102d4 SHA1 359ff64e80ed611471e5180c17802e36cf329e67 SHA256 ec1ce20d5363742ed9427b74d27a5a405837485f32207f85cd22eaf7505d4e94
-DIST systemd-18.tar.bz2 758860 RMD160 a6b3ab3498560dbb3e788dec0c83959e900adabf SHA1 34472024c8e29c62978880f2ce71c7aed41738b3 SHA256 9b9a2da1f11ccc36b3160c544a53c7d47177e27c0e69fc3455bc5e5b8d09201f
-DIST systemd-19.tar.bz2 767527 RMD160 2ab63609a8cc47e731180b1f2d79d997d0418411 SHA1 8c28ebc774e6f3604513d8abdba36b4b1e5b0fe9 SHA256 e50471e3ddc62c6498cff16513754cd7bdd0d7c52b158a1203d78f24d81cfed0
-DIST systemd-20.tar.bz2 769688 RMD160 a5204fef5ed41f6e61232d023c8c645f5d7db9c3 SHA1 89ebb9c96e8451b0e52ec0d20291aefd51d85f6f SHA256 0f6ee1a0342056f237c2d0afd984d26b3a0bccbbf805950a993ce2f5765c23d8
-DIST systemd-21.tar.bz2 756387 RMD160 fffbd49a958df6ca58031802806883d47b3c3833 SHA1 92182bf9d3e5dfb0ea86a9cdfa9c4f09bdb2c13e SHA256 8e2698c76fa5043317dfe79e493ff2f8bd9ea5c1bc75e47d4e56b13c6efc6628
-DIST systemd-22.tar.bz2 759149 RMD160 cfcb0502d9ab1bad8b2258fcb74b54362858925a SHA1 64c5347c79d5a1033b7c8fffd5fec0328a6a15e1 SHA256 b42b46b08e5ac8496e4bdb508a02ce9a8ec4d89532e1b740d40552e7a80ddcae
-DIST systemd-23.tar.bz2 764977 RMD160 c46394fe79c1d5ea2680e98752e858f39a0c638e SHA1 43942b27c26ae1f4424f6645de9f49d936488438 SHA256 14f842130661f0d086dd80bb3dc6315931de3bdc0eb2d921b5c044f0ae3dc5c7
-DIST systemd-24.tar.bz2 763671 RMD160 170bf702440cd9a3a454d05fd3a85e0eacdac3ad SHA1 6eb502ec8c9573fd769dab3ca8a2fc5ed8ce2680 SHA256 47c309cfe4c67114d98088f3b2210bf22465cdbbc751cb7a9b3d0741b8724651
-DIST systemd-25.tar.bz2 784742 RMD160 da63a9a28e844e74a1000a8ec32c3afaf7929924 SHA1 24981d944b52337741ed1144ded54dd06c18ea3b SHA256 626992eeb8636e81b87f190cb58e80fd82cb7e29cf335a119be425034e9a4d6c
 DIST systemd-26.tar.bz2 791117 RMD160 06836ca8daf0c5ebc113940357289348561dac56 SHA1 901486904aeb1d8a3ae20e5971afd9b42b847450 SHA256 d7a222c09cdb0a9eebe97c7c499c458cc29ef8b3b2d0ca79bb949b2fd3d077d3
-EBUILD systemd-15.ebuild 2248 RMD160 5013a929d43f0078fdee05fc1cfbd55911223880 SHA1 795250d4ba2003b1cec9f216de8010f8be3049db SHA256 9b19c5fc1c22e908bdf72f147a832d11932c841f8cdc66e00e24a86d1522eed7
-EBUILD systemd-17.ebuild 2772 RMD160 dfa19fc199820b8863ea930308450ef615c95368 SHA1 ebf066512f15b013be88990217d8010562e80a13 SHA256 8cb6e55a462f3bafdebe0d43446d49096a2c1d19bdcbc308caef620d7996df53
-EBUILD systemd-18.ebuild 2640 RMD160 d09dd110131189e635dee8445ec2002b5f246e81 SHA1 290163a2414f1d712de62f7a792b3b1f2a92be46 SHA256 5c81c0912e77071d0b5e002d530118b94d9fba19f629ab92e7e1477ab4fcd8e6
-EBUILD systemd-19.ebuild 2646 RMD160 e1b02551cd85299f58f70b2f1c16d5f9d8a2728f SHA1 beeb50004f97e639792cd3f899852e01b3233c90 SHA256 c8d1013b71b96225a321be72a3670eb74fa3571353b1b3601f7bc4e47596649e
-EBUILD systemd-20.ebuild 3291 RMD160 b457429d86d532185e37da0b89c81586ba34a11b SHA1 4cd8603cb1422bfb07eff5df823c151b2d3737ae SHA256 f8a3be941a4d6e7c8b8862b47099994419c50ba521aef70ef2a1376db4570720
-EBUILD systemd-21.ebuild 3205 RMD160 563288125330aff9d1f1d904b47a309de45fb035 SHA1 449af7242d2bca8b766ada58c300cbd8db7e36e2 SHA256 36773b9b94d0bcfc07057c1ee38e29d719ffb4989c52bcba0ce299e81dfb381c
-EBUILD systemd-22.ebuild 3205 RMD160 563288125330aff9d1f1d904b47a309de45fb035 SHA1 449af7242d2bca8b766ada58c300cbd8db7e36e2 SHA256 36773b9b94d0bcfc07057c1ee38e29d719ffb4989c52bcba0ce299e81dfb381c
-EBUILD systemd-23.ebuild 3205 RMD160 563288125330aff9d1f1d904b47a309de45fb035 SHA1 449af7242d2bca8b766ada58c300cbd8db7e36e2 SHA256 36773b9b94d0bcfc07057c1ee38e29d719ffb4989c52bcba0ce299e81dfb381c
-EBUILD systemd-24.ebuild 3205 RMD160 563288125330aff9d1f1d904b47a309de45fb035 SHA1 449af7242d2bca8b766ada58c300cbd8db7e36e2 SHA256 36773b9b94d0bcfc07057c1ee38e29d719ffb4989c52bcba0ce299e81dfb381c
-EBUILD systemd-25.ebuild 3177 RMD160 f0d5b4a8d72695cbcf69dbaa21bde12520fc18e3 SHA1 a98b5b2ebb7362695ba10dd001bdd8bec09f2ea1 SHA256 f362ffe815671461265ae2c30aa87f18940a06a3aaa3162a02d7d38b7f363d35
 EBUILD systemd-26.ebuild 3585 RMD160 4a6fffd9623c298aad41982943ca8ddd49d78030 SHA1 f1ccf7b33c62e067e10b0e0d94cbfda9a78c03d9 SHA256 cc778e7ca0964c6dcc05a6e50945fe41144def77770fed19c391e2c7e7a68f1f
 EBUILD systemd-9999.ebuild 3077 RMD160 7d8f07f2aa567f4461c3b61eda0730c80e95e444 SHA1 93b84d98fac70f16b0f5d268426cc99c1705b5e6 SHA256 3841ecaa0200ff83d46a76e2ffb44ec8b2a4ea2e57638ebe53a720fe4d6f5d6c
 MISC metadata.xml 737 RMD160 cdd440f38c039bfa7967fd713ef238588c2e1fb4 SHA1 1dea5e1d1e388bf43131297667bb4dbba10e65dd SHA256 042b1b68c02c274920954280705e21c2ca2ef5eece3229aab03d8dd43e06422d
diff --git a/sys-apps/systemd/files/0001-Revert-Revert-Revert-fsck-add-new-l-switch-to-fsck-m.patch b/sys-apps/systemd/files/0001-Revert-Revert-Revert-fsck-add-new-l-switch-to-fsck-m.patch
deleted file mode 100644
index da961c0..0000000
--- a/sys-apps/systemd/files/0001-Revert-Revert-Revert-fsck-add-new-l-switch-to-fsck-m.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 48b2521b1894e09248a6e099c0cb1783015f66a8 Mon Sep 17 00:00:00 2001
-From: Henry Gebhardt <hsggebhardt@googlemail.com>
-Date: Thu, 25 Nov 2010 22:58:43 +0100
-Subject: [PATCH] Revert "Revert "Revert "fsck: add new -l switch to fsck mount options"""
-
-This reverts commit e9ecea880571e520c60fae2dd2f10fcfd7dd1ab8.
-
-Needs development version of util-linux.
----
- src/fsck.c |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/src/fsck.c b/src/fsck.c
-index fdcf6b4..dfaf221 100644
---- a/src/fsck.c
-+++ b/src/fsck.c
-@@ -142,7 +142,7 @@ static void test_files(void) {
- }
- 
- int main(int argc, char *argv[]) {
--        const char *cmdline[8];
-+        const char *cmdline[7];
-         int i = 0, r = EXIT_FAILURE, q;
-         pid_t pid;
-         siginfo_t status;
-@@ -213,7 +213,6 @@ int main(int argc, char *argv[]) {
-         cmdline[i++] = "/sbin/fsck";
-         cmdline[i++] = "-a";
-         cmdline[i++] = "-T";
--        cmdline[i++] = "-l";
- 
-         if (!root_directory)
-                 cmdline[i++] = "-M";
--- 
-1.7.3.2
-
diff --git a/sys-apps/systemd/files/01_all_allow-stable-libnotify.patch b/sys-apps/systemd/files/01_all_allow-stable-libnotify.patch
deleted file mode 100644
index 0060e89..0000000
--- a/sys-apps/systemd/files/01_all_allow-stable-libnotify.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 471954b..baf8271 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -962,7 +962,12 @@ systemd_gnome_ask_password_agent_VALAFLAGS = \
- 	--pkg=gtk+-2.0 \
- 	--pkg=linux \
- 	--pkg=gio-unix-2.0 \
--	--pkg=libnotify \
-+	--pkg=libnotify
-+if LIBNOTIFY07
-+systemd_gnome_ask_password_agent_VALAFLAGS += \
-+	-D LIBNOTIFY07
-+endif
-+systemd_gnome_ask_password_agent_VALAFLAGS += \
- 	-g
- 
- systemd_gnome_ask_password_agent_LDADD = \
-diff --git a/configure.ac b/configure.ac
-index 5a6f3c7..dfbce11 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -259,12 +259,15 @@ if test "$have_gtk" = "yes"; then
-         AC_SUBST(DBUSGLIB_CFLAGS)
-         AC_SUBST(DBUSGLIB_LIBS)
- 
--        PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify >= 0.7.0 ])
-+        PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ])
-+        PKG_CHECK_EXISTS([ libnotify >= 0.7.0 ], [ libnotify07=yes ])
-+
-         AC_SUBST(LIBNOTIFY_CFLAGS)
-         AC_SUBST(LIBNOTIFY_LIBS)
- fi
-+AM_CONDITIONAL(LIBNOTIFY07, [ test "$libnotify07" = "yes" ])
- 
--AM_PROG_VALAC([0.11])
-+AM_PROG_VALAC([0.10])
- AC_SUBST(VAPIDIR)
- AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x)
- 
-diff --git a/src/gnome-ask-password-agent.vala b/src/gnome-ask-password-agent.vala
-index 6cab6f9..61bbba0 100644
---- a/src/gnome-ask-password-agent.vala
-+++ b/src/gnome-ask-password-agent.vala
-@@ -38,8 +38,13 @@ public class PasswordDialog : Dialog {
-                 set_default_response(ResponseType.OK);
-                 set_icon_name(icon);
- 
-+#if LIBNOTIFY07
-                 add_button(Stock.CANCEL, ResponseType.CANCEL);
-                 add_button(Stock.OK, ResponseType.OK);
-+#else
-+                add_button(STOCK_CANCEL, ResponseType.CANCEL);
-+                add_button(STOCK_OK, ResponseType.OK);
-+#endif
- 
-                 Container content = (Container) get_content_area();
- 
-@@ -181,7 +186,12 @@ public class MyStatusIcon : StatusIcon {
- 
-                 set_visible(true);
- 
-+#if LIBNOTIFY07
-                 Notification n = new Notification(title, message, icon);
-+#else
-+                Notification n = new Notification(title, message, icon, null);
-+                n.attach_to_status_icon(this);
-+#endif
-                 n.set_timeout(5000);
-                 n.show();
- 
-@@ -225,7 +235,11 @@ public class MyStatusIcon : StatusIcon {
- 
-                 OutputStream stream = new UnixOutputStream(to_process, true);
- 
-+#if LIBNOTIFY07
-                 stream.write(password.data, null);
-+#else
-+                stream.write(password, password.length, null);
-+#endif
-         }
- }
- 
diff --git a/sys-apps/systemd/systemd-15.ebuild b/sys-apps/systemd/systemd-15.ebuild
deleted file mode 100644
index 3865499..0000000
--- a/sys-apps/systemd/systemd-15.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit autotools linux-info pam
-
-DESCRIPTION="systemd is a system and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="audit gtk pam +tcpwrap sysv selinux"
-
-RDEPEND="
-	>=sys-apps/dbus-1.4.0[systemd]
-	sys-libs/libcap
-	>=sys-fs/udev-163[systemd]
-	audit? ( sys-process/audit )
-	gtk? (	>=x11-libs/gtk+-2.20
-			x11-libs/libnotify
-			dev-libs/dbus-glib )
-	tcpwrap? ( sys-apps/tcp-wrappers )
-	pam? ( virtual/pam )
-	selinux? ( sys-libs/libselinux )
-	sys-apps/systemd-units
-"
-VALASLOT="0.10"
-DEPEND="${RDEPEND}
-	gtk? ( dev-lang/vala:$VALASLOT )
-	>=sys-kernel/linux-headers-2.6.32
-"
-
-CONFIG_CHECK="AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	enewgroup lock # used by var-lock.mount
-}
-
-src_prepare() {
-	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${FILESDIR}"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	if use sysv; then
-		myconf="${myconf} --with-sysvinit-path=/etc/init.d --with-sysvrcd-path=/etc"
-	else
-		myconf="${myconf} --with-sysvinit-path= --with-sysvrcd-path="
-	fi
-
-	if use gtk; then
-		export VALAC="$(type -p valac-$VALASLOT)"
-	fi
-
-	# econf sets localstatedir to /var/lib, but systemd expects /var, see
-	# comment #73 on bug #318365
-	econf --with-distro=gentoo \
-		--with-rootdir= \
-		--localstatedir=/var \
-		$(use_enable audit) \
-		$(use_enable gtk) \
-		$(use_enable pam) \
-		$(use_enable tcpwrap) \
-		$(use_enable selinux) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc "${D}/usr/share/doc/systemd"/* && \
-		rm -r "${D}/usr/share/doc/systemd/"
-
-	cd "${D}"/usr/share/man/man8/
-	for i in halt poweroff reboot runlevel shutdown telinit; do
-		mv ${i}.8 systemd.${i}.8
-	done
-}
-
-check_mtab_is_symlink() {
-	if test ! -L "${ROOT}"etc/mtab; then
-		ewarn "${ROOT}etc/mtab must be a symlink to ${ROOT}proc/self/mounts!"
-		ewarn "To correct that, execute"
-		ewarn "  ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
-	fi
-}
-
-pkg_postinst() {
-	check_mtab_is_symlink
-}
diff --git a/sys-apps/systemd/systemd-17.ebuild b/sys-apps/systemd/systemd-17.ebuild
deleted file mode 100644
index 577cd6a..0000000
--- a/sys-apps/systemd/systemd-17.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit linux-info pam
-
-DESCRIPTION="systemd is a system and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="audit gtk pam +tcpwrap sysv selinux"
-
-RDEPEND="
-	>=sys-apps/dbus-1.4.0[systemd]
-	sys-libs/libcap
-	>=sys-fs/udev-163[systemd]
-	audit? ( sys-process/audit )
-	gtk? (	>=x11-libs/gtk+-2.20
-			x11-libs/libnotify
-			dev-libs/dbus-glib )
-	tcpwrap? ( sys-apps/tcp-wrappers )
-	pam? ( virtual/pam )
-	selinux? ( sys-libs/libselinux )
-	sys-apps/systemd-units
-"
-# vala-0.10.2 segfaults, hopefully 0.10.3 will be in-tree soon.
-VALASLOT="0.10"
-DEPEND="${RDEPEND}
-	gtk? ( >=dev-lang/vala-0.10.3:$VALASLOT )
-	>=sys-kernel/linux-headers-2.6.32
-"
-
-CONFIG_CHECK="AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	enewgroup lock # used by var-lock.mount
-	enewgroup tty 5 # used by mount-setup for /dev/pts
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/0001-Revert-Revert-Revert-fsck-add-new-l-switch-to-fsck-m.patch
-
-	# Force rebuild of .c files, necessary for gnome-ask-password-agent.c
-	for i in src/*.vala; do
-		touch "${i}"
-	done
-}
-
-src_configure() {
-	local myconf=
-
-	if use sysv; then
-		myconf="${myconf} --with-sysvinit-path=/etc/init.d --with-sysvrcd-path=/etc"
-	else
-		myconf="${myconf} --with-sysvinit-path= --with-sysvrcd-path="
-	fi
-
-	if use gtk; then
-		export VALAC="$(type -p valac-$VALASLOT)"
-	fi
-
-	# econf sets localstatedir to /var/lib, but systemd expects /var, see
-	# comment #73 on bug #318365
-	econf --with-distro=gentoo \
-		--with-rootdir= \
-		--localstatedir=/var \
-		$(use_enable audit) \
-		$(use_enable gtk) \
-		$(use_enable pam) \
-		$(use_enable tcpwrap) \
-		$(use_enable selinux) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc "${D}/usr/share/doc/systemd"/* && \
-		rm -r "${D}/usr/share/doc/systemd/"
-
-	cd "${D}"/usr/share/man/man8/
-	for i in halt poweroff reboot runlevel shutdown telinit; do
-		mv ${i}.8 systemd.${i}.8
-	done
-}
-
-check_mtab_is_symlink() {
-	if test ! -L "${ROOT}"etc/mtab; then
-		ewarn "${ROOT}etc/mtab must be a symlink to ${ROOT}proc/self/mounts!"
-		ewarn "To correct that, execute"
-		ewarn "    $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
-	fi
-}
-
-pkg_postinst() {
-	check_mtab_is_symlink
-
-	# Inform user about extra configuration
-	elog "You may need to perform some additional configuration for some"
-	elog "programs to work, see the systemd manpages for loading modules and"
-	elog "handling tmpfiles:"
-	elog "    $ man modules-load.d"
-	elog "    $ man tmpfiles.d"
-}
diff --git a/sys-apps/systemd/systemd-18.ebuild b/sys-apps/systemd/systemd-18.ebuild
deleted file mode 100644
index 3fa988e..0000000
--- a/sys-apps/systemd/systemd-18.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit linux-info pam
-
-DESCRIPTION="systemd is a system and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="audit gtk pam +tcpwrap sysv selinux"
-
-RDEPEND="
-	>=sys-apps/dbus-1.4.0[systemd]
-	sys-libs/libcap
-	>=sys-fs/udev-163[systemd]
-	audit? ( sys-process/audit )
-	gtk? (	>=x11-libs/gtk+-2.20
-			x11-libs/libnotify
-			dev-libs/dbus-glib )
-	tcpwrap? ( sys-apps/tcp-wrappers )
-	pam? ( virtual/pam )
-	selinux? ( sys-libs/libselinux )
-	>=sys-apps/util-linux-2.19
-	sys-apps/systemd-units
-"
-VALASLOT="0.10"
-DEPEND="${RDEPEND}
-	gtk? ( dev-lang/vala:$VALASLOT )
-	>=sys-kernel/linux-headers-2.6.32
-"
-
-CONFIG_CHECK="AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	enewgroup lock # used by var-lock.mount
-	enewgroup tty 5 # used by mount-setup for /dev/pts
-}
-
-src_prepare() {
-	# Force rebuild of .c files, necessary for gnome-ask-password-agent.c
-	for i in src/*.vala; do
-		touch "${i}"
-	done
-}
-
-src_configure() {
-	local myconf=
-
-	if use sysv; then
-		myconf="${myconf} --with-sysvinit-path=/etc/init.d --with-sysvrcd-path=/etc"
-	else
-		myconf="${myconf} --with-sysvinit-path= --with-sysvrcd-path="
-	fi
-
-	if use gtk; then
-		export VALAC="$(type -p valac-$VALASLOT)"
-	fi
-
-	# econf sets localstatedir to /var/lib, but systemd expects /var, see
-	# comment #73 on bug #318365
-	econf --with-distro=gentoo \
-		--with-rootdir= \
-		--localstatedir=/var \
-		$(use_enable audit) \
-		$(use_enable gtk) \
-		$(use_enable pam) \
-		$(use_enable tcpwrap) \
-		$(use_enable selinux) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc "${D}/usr/share/doc/systemd"/* && \
-		rm -r "${D}/usr/share/doc/systemd/"
-
-	cd "${D}"/usr/share/man/man8/
-	for i in halt poweroff reboot runlevel shutdown telinit; do
-		mv ${i}.8 systemd.${i}.8
-	done
-}
-
-check_mtab_is_symlink() {
-	if test ! -L "${ROOT}"etc/mtab; then
-		ewarn "${ROOT}etc/mtab must be a symlink to ${ROOT}proc/self/mounts!"
-		ewarn "To correct that, execute"
-		ewarn "    $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
-	fi
-}
-
-pkg_postinst() {
-	check_mtab_is_symlink
-
-	# Inform user about extra configuration
-	elog "You may need to perform some additional configuration for some"
-	elog "programs to work, see the systemd manpages for loading modules and"
-	elog "handling tmpfiles:"
-	elog "    $ man modules-load.d"
-	elog "    $ man tmpfiles.d"
-}
diff --git a/sys-apps/systemd/systemd-19.ebuild b/sys-apps/systemd/systemd-19.ebuild
deleted file mode 100644
index e8c6f8a..0000000
--- a/sys-apps/systemd/systemd-19.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit linux-info pam
-
-DESCRIPTION="systemd is a system and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="audit gtk pam +tcpwrap sysv selinux"
-
-RDEPEND="
-	>=sys-apps/dbus-1.4.0[systemd]
-	sys-libs/libcap
-	>=sys-fs/udev-163[systemd]
-	audit? ( sys-process/audit )
-	gtk? (	>=x11-libs/gtk+-2.20
-			x11-libs/libnotify
-			dev-libs/dbus-glib )
-	tcpwrap? ( sys-apps/tcp-wrappers )
-	pam? ( virtual/pam )
-	selinux? ( sys-libs/libselinux )
-	>=sys-apps/util-linux-2.19
-	sys-apps/systemd-units
-"
-VALASLOT="0.10"
-DEPEND="${RDEPEND}
-	gtk? ( dev-lang/vala:$VALASLOT )
-	>=sys-kernel/linux-headers-2.6.32
-"
-
-CONFIG_CHECK="AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY ~IPV6"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	enewgroup lock # used by var-lock.mount
-	enewgroup tty 5 # used by mount-setup for /dev/pts
-}
-
-src_prepare() {
-	# Force rebuild of .c files, necessary for gnome-ask-password-agent.c
-	for i in src/*.vala; do
-		touch "${i}"
-	done
-}
-
-src_configure() {
-	local myconf=
-
-	if use sysv; then
-		myconf="${myconf} --with-sysvinit-path=/etc/init.d --with-sysvrcd-path=/etc"
-	else
-		myconf="${myconf} --with-sysvinit-path= --with-sysvrcd-path="
-	fi
-
-	if use gtk; then
-		export VALAC="$(type -p valac-$VALASLOT)"
-	fi
-
-	# econf sets localstatedir to /var/lib, but systemd expects /var, see
-	# comment #73 on bug #318365
-	econf --with-distro=gentoo \
-		--with-rootdir= \
-		--localstatedir=/var \
-		$(use_enable audit) \
-		$(use_enable gtk) \
-		$(use_enable pam) \
-		$(use_enable tcpwrap) \
-		$(use_enable selinux) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc "${D}/usr/share/doc/systemd"/* && \
-		rm -r "${D}/usr/share/doc/systemd/"
-
-	cd "${D}"/usr/share/man/man8/
-	for i in halt poweroff reboot runlevel shutdown telinit; do
-		mv ${i}.8 systemd.${i}.8
-	done
-}
-
-check_mtab_is_symlink() {
-	if test ! -L "${ROOT}"etc/mtab; then
-		ewarn "${ROOT}etc/mtab must be a symlink to ${ROOT}proc/self/mounts!"
-		ewarn "To correct that, execute"
-		ewarn "    $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
-	fi
-}
-
-pkg_postinst() {
-	check_mtab_is_symlink
-
-	# Inform user about extra configuration
-	elog "You may need to perform some additional configuration for some"
-	elog "programs to work, see the systemd manpages for loading modules and"
-	elog "handling tmpfiles:"
-	elog "    $ man modules-load.d"
-	elog "    $ man tmpfiles.d"
-}
diff --git a/sys-apps/systemd/systemd-20.ebuild b/sys-apps/systemd/systemd-20.ebuild
deleted file mode 100644
index c6e5f0a..0000000
--- a/sys-apps/systemd/systemd-20.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit linux-info pam
-
-DESCRIPTION="systemd is a system and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="audit gtk pam +tcpwrap sysv selinux"
-
-RDEPEND="
-	>=sys-apps/dbus-1.4.0[systemd]
-	sys-libs/libcap
-	>=sys-fs/udev-163[systemd]
-	audit? ( sys-process/audit )
-	gtk? (	>=x11-libs/gtk+-2.20
-			x11-libs/libnotify
-			dev-libs/dbus-glib )
-	tcpwrap? ( sys-apps/tcp-wrappers )
-	pam? ( virtual/pam )
-	selinux? ( sys-libs/libselinux )
-	>=sys-apps/util-linux-2.19
-	sys-apps/systemd-units
-"
-# Vala-0.10 doesn't work with libnotify 0.7.1
-VALASLOT="0.12"
-DEPEND="${RDEPEND}
-	gtk? ( dev-lang/vala:$VALASLOT )
-	>=sys-kernel/linux-headers-2.6.32
-"
-
-CONFIG_CHECK="AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY ~IPV6"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	enewgroup lock # used by var-lock.mount
-	enewgroup tty 5 # used by mount-setup for /dev/pts
-}
-
-src_prepare() {
-	# Force rebuild of .c files, necessary for gnome-ask-password-agent.c
-	for i in src/*.vala; do
-		touch "${i}"
-	done
-}
-
-src_configure() {
-	local myconf=
-
-	if use sysv; then
-		myconf="${myconf} --with-sysvinit-path=/etc/init.d --with-sysvrcd-path=/etc"
-	else
-		myconf="${myconf} --with-sysvinit-path= --with-sysvrcd-path="
-	fi
-
-	if use gtk; then
-		export VALAC="$(type -p valac-$VALASLOT)"
-	fi
-
-	# econf sets localstatedir to /var/lib, but systemd expects /var, see
-	# comment #73 on bug #318365
-	econf --with-distro=gentoo \
-		--with-rootdir= \
-		--localstatedir=/var \
-		$(use_enable audit) \
-		$(use_enable gtk) \
-		$(use_enable pam) \
-		$(use_enable tcpwrap) \
-		$(use_enable selinux) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc "${D}/usr/share/doc/systemd"/* && \
-		rm -r "${D}/usr/share/doc/systemd/"
-
-	cd "${D}"/usr/share/man/man8/
-	for i in halt poweroff reboot runlevel shutdown telinit; do
-		mv ${i}.8 systemd.${i}.8
-	done
-}
-
-check_mtab_is_symlink() {
-	if test ! -L "${ROOT}"etc/mtab; then
-		ewarn "${ROOT}etc/mtab must be a symlink to ${ROOT}proc/self/mounts!"
-		ewarn "To correct that, execute"
-		ewarn "    $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
-	fi
-}
-
-systemd_machine_id_setup() {
-	einfo "Setting up /etc/machine-id..."
-	"${ROOT}"bin/systemd-machine-id-setup
-	if test $? != 0; then
-		ewarn "Setting up /etc/machine-id failed, to fix it please see"
-		ewarn "  http://lists.freedesktop.org/archives/dbus/2011-March/014187.html"
-	elif test ! -L "${ROOT}"var/lib/dbus/machine-id; then
-		# This should be fixed in the dbus ebuild, but we warn about it here.
-		ewarn "${ROOT}var/lib/dbus/machine-id ideally should be a symlink to"
-		ewarn "${ROOT}etc/machine-id to make it clear that they have the same"
-		ewarn "content."
-	fi
-}
-
-pkg_postinst() {
-	check_mtab_is_symlink
-
-	systemd_machine_id_setup
-
-	# Inform user about extra configuration
-	elog "You may need to perform some additional configuration for some"
-	elog "programs to work, see the systemd manpages for loading modules and"
-	elog "handling tmpfiles:"
-	elog "    $ man modules-load.d"
-	elog "    $ man tmpfiles.d"
-}
diff --git a/sys-apps/systemd/systemd-21.ebuild b/sys-apps/systemd/systemd-21.ebuild
deleted file mode 100644
index f9b9361..0000000
--- a/sys-apps/systemd/systemd-21.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit linux-info pam
-
-DESCRIPTION="systemd is a system and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="audit gtk pam +tcpwrap sysv selinux"
-
-RDEPEND="
-	>=sys-apps/dbus-1.4.0[systemd]
-	sys-libs/libcap
-	>=sys-fs/udev-163[systemd]
-	audit? ( sys-process/audit )
-	gtk? (	>=x11-libs/gtk+-2.20
-			x11-libs/libnotify
-			dev-libs/dbus-glib )
-	tcpwrap? ( sys-apps/tcp-wrappers )
-	pam? ( virtual/pam )
-	selinux? ( sys-libs/libselinux )
-	>=sys-apps/util-linux-2.19
-	sys-apps/systemd-units
-"
-# Vala-0.10 doesn't work with libnotify 0.7.1
-VALASLOT="0.12"
-DEPEND="${RDEPEND}
-	gtk? ( dev-lang/vala:$VALASLOT )
-	>=sys-kernel/linux-headers-2.6.32
-"
-
-CONFIG_CHECK="AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY ~IPV6"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	enewgroup lock # used by var-lock.mount
-	enewgroup tty 5 # used by mount-setup for /dev/pts
-}
-
-src_prepare() {
-	# Force rebuild of .c files, necessary for gnome-ask-password-agent.c
-	for i in src/*.vala; do
-		touch "${i}"
-	done
-}
-
-src_configure() {
-	local myconf=
-
-	if use sysv; then
-		myconf="${myconf} --with-sysvinit-path=/etc/init.d --with-sysvrcd-path=/etc"
-	else
-		myconf="${myconf} --with-sysvinit-path= --with-sysvrcd-path="
-	fi
-
-	if use gtk; then
-		export VALAC="$(type -p valac-$VALASLOT)"
-	fi
-
-	econf --with-distro=gentoo \
-		--with-rootdir= \
-		--localstatedir=/var \
-		$(use_enable audit) \
-		$(use_enable gtk) \
-		$(use_enable pam) \
-		$(use_enable tcpwrap) \
-		$(use_enable selinux) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc "${D}/usr/share/doc/systemd"/* && \
-		rm -r "${D}/usr/share/doc/systemd/"
-
-	cd "${D}"/usr/share/man/man8/
-	for i in halt poweroff reboot runlevel shutdown telinit; do
-		mv ${i}.8 systemd.${i}.8
-	done
-
-	keepdir /run
-}
-
-check_mtab_is_symlink() {
-	if test ! -L "${ROOT}"etc/mtab; then
-		ewarn "${ROOT}etc/mtab must be a symlink to ${ROOT}proc/self/mounts!"
-		ewarn "To correct that, execute"
-		ewarn "    $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
-	fi
-}
-
-systemd_machine_id_setup() {
-	einfo "Setting up /etc/machine-id..."
-	"${ROOT}"bin/systemd-machine-id-setup
-	if test $? != 0; then
-		ewarn "Setting up /etc/machine-id failed, to fix it please see"
-		ewarn "  http://lists.freedesktop.org/archives/dbus/2011-March/014187.html"
-	elif test ! -L "${ROOT}"var/lib/dbus/machine-id; then
-		# This should be fixed in the dbus ebuild, but we warn about it here.
-		ewarn "${ROOT}var/lib/dbus/machine-id ideally should be a symlink to"
-		ewarn "${ROOT}etc/machine-id to make it clear that they have the same"
-		ewarn "content."
-	fi
-}
-
-pkg_postinst() {
-	check_mtab_is_symlink
-
-	systemd_machine_id_setup
-
-	# Inform user about extra configuration
-	elog "You may need to perform some additional configuration for some"
-	elog "programs to work, see the systemd manpages for loading modules and"
-	elog "handling tmpfiles:"
-	elog "    $ man modules-load.d"
-	elog "    $ man tmpfiles.d"
-}
diff --git a/sys-apps/systemd/systemd-22.ebuild b/sys-apps/systemd/systemd-22.ebuild
deleted file mode 100644
index f9b9361..0000000
--- a/sys-apps/systemd/systemd-22.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit linux-info pam
-
-DESCRIPTION="systemd is a system and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="audit gtk pam +tcpwrap sysv selinux"
-
-RDEPEND="
-	>=sys-apps/dbus-1.4.0[systemd]
-	sys-libs/libcap
-	>=sys-fs/udev-163[systemd]
-	audit? ( sys-process/audit )
-	gtk? (	>=x11-libs/gtk+-2.20
-			x11-libs/libnotify
-			dev-libs/dbus-glib )
-	tcpwrap? ( sys-apps/tcp-wrappers )
-	pam? ( virtual/pam )
-	selinux? ( sys-libs/libselinux )
-	>=sys-apps/util-linux-2.19
-	sys-apps/systemd-units
-"
-# Vala-0.10 doesn't work with libnotify 0.7.1
-VALASLOT="0.12"
-DEPEND="${RDEPEND}
-	gtk? ( dev-lang/vala:$VALASLOT )
-	>=sys-kernel/linux-headers-2.6.32
-"
-
-CONFIG_CHECK="AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY ~IPV6"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	enewgroup lock # used by var-lock.mount
-	enewgroup tty 5 # used by mount-setup for /dev/pts
-}
-
-src_prepare() {
-	# Force rebuild of .c files, necessary for gnome-ask-password-agent.c
-	for i in src/*.vala; do
-		touch "${i}"
-	done
-}
-
-src_configure() {
-	local myconf=
-
-	if use sysv; then
-		myconf="${myconf} --with-sysvinit-path=/etc/init.d --with-sysvrcd-path=/etc"
-	else
-		myconf="${myconf} --with-sysvinit-path= --with-sysvrcd-path="
-	fi
-
-	if use gtk; then
-		export VALAC="$(type -p valac-$VALASLOT)"
-	fi
-
-	econf --with-distro=gentoo \
-		--with-rootdir= \
-		--localstatedir=/var \
-		$(use_enable audit) \
-		$(use_enable gtk) \
-		$(use_enable pam) \
-		$(use_enable tcpwrap) \
-		$(use_enable selinux) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc "${D}/usr/share/doc/systemd"/* && \
-		rm -r "${D}/usr/share/doc/systemd/"
-
-	cd "${D}"/usr/share/man/man8/
-	for i in halt poweroff reboot runlevel shutdown telinit; do
-		mv ${i}.8 systemd.${i}.8
-	done
-
-	keepdir /run
-}
-
-check_mtab_is_symlink() {
-	if test ! -L "${ROOT}"etc/mtab; then
-		ewarn "${ROOT}etc/mtab must be a symlink to ${ROOT}proc/self/mounts!"
-		ewarn "To correct that, execute"
-		ewarn "    $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
-	fi
-}
-
-systemd_machine_id_setup() {
-	einfo "Setting up /etc/machine-id..."
-	"${ROOT}"bin/systemd-machine-id-setup
-	if test $? != 0; then
-		ewarn "Setting up /etc/machine-id failed, to fix it please see"
-		ewarn "  http://lists.freedesktop.org/archives/dbus/2011-March/014187.html"
-	elif test ! -L "${ROOT}"var/lib/dbus/machine-id; then
-		# This should be fixed in the dbus ebuild, but we warn about it here.
-		ewarn "${ROOT}var/lib/dbus/machine-id ideally should be a symlink to"
-		ewarn "${ROOT}etc/machine-id to make it clear that they have the same"
-		ewarn "content."
-	fi
-}
-
-pkg_postinst() {
-	check_mtab_is_symlink
-
-	systemd_machine_id_setup
-
-	# Inform user about extra configuration
-	elog "You may need to perform some additional configuration for some"
-	elog "programs to work, see the systemd manpages for loading modules and"
-	elog "handling tmpfiles:"
-	elog "    $ man modules-load.d"
-	elog "    $ man tmpfiles.d"
-}
diff --git a/sys-apps/systemd/systemd-23.ebuild b/sys-apps/systemd/systemd-23.ebuild
deleted file mode 100644
index f9b9361..0000000
--- a/sys-apps/systemd/systemd-23.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit linux-info pam
-
-DESCRIPTION="systemd is a system and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="audit gtk pam +tcpwrap sysv selinux"
-
-RDEPEND="
-	>=sys-apps/dbus-1.4.0[systemd]
-	sys-libs/libcap
-	>=sys-fs/udev-163[systemd]
-	audit? ( sys-process/audit )
-	gtk? (	>=x11-libs/gtk+-2.20
-			x11-libs/libnotify
-			dev-libs/dbus-glib )
-	tcpwrap? ( sys-apps/tcp-wrappers )
-	pam? ( virtual/pam )
-	selinux? ( sys-libs/libselinux )
-	>=sys-apps/util-linux-2.19
-	sys-apps/systemd-units
-"
-# Vala-0.10 doesn't work with libnotify 0.7.1
-VALASLOT="0.12"
-DEPEND="${RDEPEND}
-	gtk? ( dev-lang/vala:$VALASLOT )
-	>=sys-kernel/linux-headers-2.6.32
-"
-
-CONFIG_CHECK="AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY ~IPV6"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	enewgroup lock # used by var-lock.mount
-	enewgroup tty 5 # used by mount-setup for /dev/pts
-}
-
-src_prepare() {
-	# Force rebuild of .c files, necessary for gnome-ask-password-agent.c
-	for i in src/*.vala; do
-		touch "${i}"
-	done
-}
-
-src_configure() {
-	local myconf=
-
-	if use sysv; then
-		myconf="${myconf} --with-sysvinit-path=/etc/init.d --with-sysvrcd-path=/etc"
-	else
-		myconf="${myconf} --with-sysvinit-path= --with-sysvrcd-path="
-	fi
-
-	if use gtk; then
-		export VALAC="$(type -p valac-$VALASLOT)"
-	fi
-
-	econf --with-distro=gentoo \
-		--with-rootdir= \
-		--localstatedir=/var \
-		$(use_enable audit) \
-		$(use_enable gtk) \
-		$(use_enable pam) \
-		$(use_enable tcpwrap) \
-		$(use_enable selinux) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc "${D}/usr/share/doc/systemd"/* && \
-		rm -r "${D}/usr/share/doc/systemd/"
-
-	cd "${D}"/usr/share/man/man8/
-	for i in halt poweroff reboot runlevel shutdown telinit; do
-		mv ${i}.8 systemd.${i}.8
-	done
-
-	keepdir /run
-}
-
-check_mtab_is_symlink() {
-	if test ! -L "${ROOT}"etc/mtab; then
-		ewarn "${ROOT}etc/mtab must be a symlink to ${ROOT}proc/self/mounts!"
-		ewarn "To correct that, execute"
-		ewarn "    $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
-	fi
-}
-
-systemd_machine_id_setup() {
-	einfo "Setting up /etc/machine-id..."
-	"${ROOT}"bin/systemd-machine-id-setup
-	if test $? != 0; then
-		ewarn "Setting up /etc/machine-id failed, to fix it please see"
-		ewarn "  http://lists.freedesktop.org/archives/dbus/2011-March/014187.html"
-	elif test ! -L "${ROOT}"var/lib/dbus/machine-id; then
-		# This should be fixed in the dbus ebuild, but we warn about it here.
-		ewarn "${ROOT}var/lib/dbus/machine-id ideally should be a symlink to"
-		ewarn "${ROOT}etc/machine-id to make it clear that they have the same"
-		ewarn "content."
-	fi
-}
-
-pkg_postinst() {
-	check_mtab_is_symlink
-
-	systemd_machine_id_setup
-
-	# Inform user about extra configuration
-	elog "You may need to perform some additional configuration for some"
-	elog "programs to work, see the systemd manpages for loading modules and"
-	elog "handling tmpfiles:"
-	elog "    $ man modules-load.d"
-	elog "    $ man tmpfiles.d"
-}
diff --git a/sys-apps/systemd/systemd-24.ebuild b/sys-apps/systemd/systemd-24.ebuild
deleted file mode 100644
index f9b9361..0000000
--- a/sys-apps/systemd/systemd-24.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit linux-info pam
-
-DESCRIPTION="systemd is a system and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="audit gtk pam +tcpwrap sysv selinux"
-
-RDEPEND="
-	>=sys-apps/dbus-1.4.0[systemd]
-	sys-libs/libcap
-	>=sys-fs/udev-163[systemd]
-	audit? ( sys-process/audit )
-	gtk? (	>=x11-libs/gtk+-2.20
-			x11-libs/libnotify
-			dev-libs/dbus-glib )
-	tcpwrap? ( sys-apps/tcp-wrappers )
-	pam? ( virtual/pam )
-	selinux? ( sys-libs/libselinux )
-	>=sys-apps/util-linux-2.19
-	sys-apps/systemd-units
-"
-# Vala-0.10 doesn't work with libnotify 0.7.1
-VALASLOT="0.12"
-DEPEND="${RDEPEND}
-	gtk? ( dev-lang/vala:$VALASLOT )
-	>=sys-kernel/linux-headers-2.6.32
-"
-
-CONFIG_CHECK="AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY ~IPV6"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	enewgroup lock # used by var-lock.mount
-	enewgroup tty 5 # used by mount-setup for /dev/pts
-}
-
-src_prepare() {
-	# Force rebuild of .c files, necessary for gnome-ask-password-agent.c
-	for i in src/*.vala; do
-		touch "${i}"
-	done
-}
-
-src_configure() {
-	local myconf=
-
-	if use sysv; then
-		myconf="${myconf} --with-sysvinit-path=/etc/init.d --with-sysvrcd-path=/etc"
-	else
-		myconf="${myconf} --with-sysvinit-path= --with-sysvrcd-path="
-	fi
-
-	if use gtk; then
-		export VALAC="$(type -p valac-$VALASLOT)"
-	fi
-
-	econf --with-distro=gentoo \
-		--with-rootdir= \
-		--localstatedir=/var \
-		$(use_enable audit) \
-		$(use_enable gtk) \
-		$(use_enable pam) \
-		$(use_enable tcpwrap) \
-		$(use_enable selinux) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc "${D}/usr/share/doc/systemd"/* && \
-		rm -r "${D}/usr/share/doc/systemd/"
-
-	cd "${D}"/usr/share/man/man8/
-	for i in halt poweroff reboot runlevel shutdown telinit; do
-		mv ${i}.8 systemd.${i}.8
-	done
-
-	keepdir /run
-}
-
-check_mtab_is_symlink() {
-	if test ! -L "${ROOT}"etc/mtab; then
-		ewarn "${ROOT}etc/mtab must be a symlink to ${ROOT}proc/self/mounts!"
-		ewarn "To correct that, execute"
-		ewarn "    $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
-	fi
-}
-
-systemd_machine_id_setup() {
-	einfo "Setting up /etc/machine-id..."
-	"${ROOT}"bin/systemd-machine-id-setup
-	if test $? != 0; then
-		ewarn "Setting up /etc/machine-id failed, to fix it please see"
-		ewarn "  http://lists.freedesktop.org/archives/dbus/2011-March/014187.html"
-	elif test ! -L "${ROOT}"var/lib/dbus/machine-id; then
-		# This should be fixed in the dbus ebuild, but we warn about it here.
-		ewarn "${ROOT}var/lib/dbus/machine-id ideally should be a symlink to"
-		ewarn "${ROOT}etc/machine-id to make it clear that they have the same"
-		ewarn "content."
-	fi
-}
-
-pkg_postinst() {
-	check_mtab_is_symlink
-
-	systemd_machine_id_setup
-
-	# Inform user about extra configuration
-	elog "You may need to perform some additional configuration for some"
-	elog "programs to work, see the systemd manpages for loading modules and"
-	elog "handling tmpfiles:"
-	elog "    $ man modules-load.d"
-	elog "    $ man tmpfiles.d"
-}
diff --git a/sys-apps/systemd/systemd-25.ebuild b/sys-apps/systemd/systemd-25.ebuild
deleted file mode 100644
index 48fa806..0000000
--- a/sys-apps/systemd/systemd-25.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit linux-info pam
-
-DESCRIPTION="systemd is a system and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="audit gtk pam +tcpwrap sysv selinux"
-
-RDEPEND="
-	>=sys-apps/dbus-1.4.0[systemd]
-	sys-libs/libcap
-	>=sys-fs/udev-163[systemd]
-	audit? ( sys-process/audit )
-	gtk? (	>=x11-libs/gtk+-2.20
-			x11-libs/libnotify
-			dev-libs/dbus-glib )
-	tcpwrap? ( sys-apps/tcp-wrappers )
-	pam? ( virtual/pam )
-	selinux? ( sys-libs/libselinux )
-	>=sys-apps/util-linux-2.19
-	sys-apps/systemd-units
-"
-# Vala-0.10 doesn't work with libnotify 0.7.1
-VALASLOT="0.12"
-DEPEND="${RDEPEND}
-	gtk? ( dev-lang/vala:$VALASLOT )
-	>=sys-kernel/linux-headers-2.6.32
-"
-
-CONFIG_CHECK="AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY ~IPV6"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	enewgroup lock # used by var-lock.mount
-	enewgroup tty 5 # used by mount-setup for /dev/pts
-}
-
-src_prepare() {
-	# Force rebuild of .c files, necessary for gnome-ask-password-agent.c
-	touch src/*.vala
-}
-
-src_configure() {
-	local myconf=
-
-	if use sysv; then
-		myconf="${myconf} --with-sysvinit-path=/etc/init.d --with-sysvrcd-path=/etc"
-	else
-		myconf="${myconf} --with-sysvinit-path= --with-sysvrcd-path="
-	fi
-
-	if use gtk; then
-		export VALAC="$(type -p valac-$VALASLOT)"
-	fi
-
-	econf --with-distro=gentoo \
-		--with-rootdir= \
-		--localstatedir=/var \
-		$(use_enable audit) \
-		$(use_enable gtk) \
-		$(use_enable pam) \
-		$(use_enable tcpwrap) \
-		$(use_enable selinux) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc "${D}/usr/share/doc/systemd"/* && \
-		rm -r "${D}/usr/share/doc/systemd/"
-
-	cd "${D}"/usr/share/man/man8/
-	for i in halt poweroff reboot runlevel shutdown telinit; do
-		mv ${i}.8 systemd.${i}.8
-	done
-
-	keepdir /run
-}
-
-check_mtab_is_symlink() {
-	if test ! -L "${ROOT}"etc/mtab; then
-		ewarn "${ROOT}etc/mtab must be a symlink to ${ROOT}proc/self/mounts!"
-		ewarn "To correct that, execute"
-		ewarn "    $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
-	fi
-}
-
-systemd_machine_id_setup() {
-	einfo "Setting up /etc/machine-id..."
-	"${ROOT}"bin/systemd-machine-id-setup
-	if test $? != 0; then
-		ewarn "Setting up /etc/machine-id failed, to fix it please see"
-		ewarn "  http://lists.freedesktop.org/archives/dbus/2011-March/014187.html"
-	elif test ! -L "${ROOT}"var/lib/dbus/machine-id; then
-		# This should be fixed in the dbus ebuild, but we warn about it here.
-		ewarn "${ROOT}var/lib/dbus/machine-id ideally should be a symlink to"
-		ewarn "${ROOT}etc/machine-id to make it clear that they have the same"
-		ewarn "content."
-	fi
-}
-
-pkg_postinst() {
-	check_mtab_is_symlink
-
-	systemd_machine_id_setup
-
-	# Inform user about extra configuration
-	elog "You may need to perform some additional configuration for some"
-	elog "programs to work, see the systemd manpages for loading modules and"
-	elog "handling tmpfiles:"
-	elog "    $ man modules-load.d"
-	elog "    $ man tmpfiles.d"
-}