summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenry Gebhardt <hsggebhardt@googlemail.com>2011-11-10 21:50:16 +0100
committerHenry Gebhardt <hsggebhardt@googlemail.com>2011-11-10 22:00:22 +0100
commit037eab21bc0062fbdf6f3a19e31a74c41def3776 (patch)
tree687a9a691c42087d112c0788bd196a21b7111201
parentsys-apps/systemd-units: policykit-daemon.service use correct dbus name (diff)
downloadsystemd-037eab21bc0062fbdf6f3a19e31a74c41def3776.tar.gz
systemd-037eab21bc0062fbdf6f3a19e31a74c41def3776.tar.bz2
systemd-037eab21bc0062fbdf6f3a19e31a74c41def3776.zip
sys-apps/systemd-units-9999: remove sysv use flag
sysv is not properly supported under Gentoo.
-rw-r--r--sys-apps/systemd-units/Manifest5
-rw-r--r--sys-apps/systemd-units/files/services-sysv/openrc-init.service30
-rw-r--r--sys-apps/systemd-units/metadata.xml1
-rw-r--r--sys-apps/systemd-units/systemd-units-9999.ebuild6
4 files changed, 3 insertions, 39 deletions
diff --git a/sys-apps/systemd-units/Manifest b/sys-apps/systemd-units/Manifest
index 859c3f8..e20e4e1 100644
--- a/sys-apps/systemd-units/Manifest
+++ b/sys-apps/systemd-units/Manifest
@@ -29,10 +29,9 @@ AUX services-server/uptimed.service 318 RMD160 ec151b5044e5530f609e67ae15cd26821
AUX services-server/vsftpd.service 210 RMD160 5c900ed1811cf6d2f9a47abd23e3a433d4f1e3a0 SHA1 0a66aecf94fe6e239fc700662322ea7a5e2b1044 SHA256 78ccea56242fc20f89a07120d61cd87e4b80378418c1bc120f58b65617144b70
AUX services-server/vsftpd.socket 104 RMD160 527beec3b8fcf303aa74bd01864f03dc208f6bb8 SHA1 5b7a7a1e0c04acfcc2dba1346557f1193b9905ba SHA256 9fdbfd2ec0207170371ca3cf2b0ddca2dc2fe3d062e5792e0d3e51474c3198c9
AUX services-server/vsftpd@.service 171 RMD160 7d6802b920daee9ccc18343fcda8d9352aa16efb SHA1 d76e2e22ce8c28f8d89deda86b5485dcb04e0fb5 SHA256 a5eb377f4439ca57c7c7d016a367054cfbbd78e66db7d78cb3eff93974728bfd
-AUX services-sysv/openrc-init.service 1071 RMD160 215ade23686f4fa0aea6870ee615193135e272b6 SHA1 9bcd938c072d06b3c94f68645f8338b0aab5b300 SHA256 8deee726fb7985402b4b3fbd39d44e0a726e31c1ed347e7332c524b33da0b935
AUX tmpfiles-server/mysqld.conf 107 RMD160 bae9d6739af31d3f29573cd3982c48c0da5168bc SHA1 e64ab7ba5b0c25828e996d03e56a5b66e997f2b0 SHA256 190cba2f96a2d25ee9391c0005900d11bcbaf12122f15c06591188e25aaca180
DIST sshd.service 463 RMD160 2ca446597a331831789fc6b1f8a0d11a8b543f4d SHA1 7a61e7f7422a0c7879e22412ab3aacdfebd44733 SHA256 51fee725a34e957342c258c5cfae072b8002d405c3caa9dd99735def3c385aed
DIST sshd.socket 102 RMD160 fb40df88d7345dbb30d7b76e9e449b3ddd54b5a5 SHA1 313e04677de240a2279c9cfbdfdb5347ac6a9c3b SHA256 efc5cf5e700036acdae0602bc551f71adf9a29af8b85505db7195382fc475f03
DIST sshd@.service 125 RMD160 635b7139e531d391f4319b055bcc47b56f049201 SHA1 efcf3443df27a6f8354b39bbd8f2e6c42af7bbab SHA256 7a37e9240a7899cfcf8faedf4ebfa282bac86a738a37f38e68f8ed61c781e3fa
-EBUILD systemd-units-9999.ebuild 1078 RMD160 dab400b5429f84b524ddd7df74941f410a139d1e SHA1 c181cd1a4fa55b735fb5e37d61d25b8c9b481654 SHA256 ae225fc115b66101918c11e551869d040b119893b6fe16b5389153924dfc4573
-MISC metadata.xml 575 RMD160 01f0ebf6753cbeb7eaf96a39556abd9634f49774 SHA1 67b49280c5822d645fd3fb9e5fdc64ac3cf00400 SHA256 76667d1f3fe2b58325ea0b9b16c0da105e5bb2aac31955c09927f0904437231f
+EBUILD systemd-units-9999.ebuild 1002 RMD160 d5913616378a8772724ed73b601881c10ed14faf SHA1 896a4809cedede7109a60ce8d76681e141348c54 SHA256 77d8b07814e45286b6f9b7efa0704c6cc5eeb15dbf0fb222d064dd769c9cd454
+MISC metadata.xml 498 RMD160 1773ba75a6df311598aad48f42b8926e6c267a6a SHA1 bfcb8fb144fac3f695b958679107d1faa8437ecb SHA256 4d798e28f823b8af8d4f999a0a0626ec55927758cfe476f822ff52e9bb6b296b
diff --git a/sys-apps/systemd-units/files/services-sysv/openrc-init.service b/sys-apps/systemd-units/files/services-sysv/openrc-init.service
deleted file mode 100644
index 924b4ed..0000000
--- a/sys-apps/systemd-units/files/services-sysv/openrc-init.service
+++ /dev/null
@@ -1,30 +0,0 @@
-[Unit]
-Description=OpenRC Initialization
-DefaultDependencies=no
-After=remount-rootfs.service
-Before=local-fs.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-Environment=RC_LIBEXECDIR=/lib/rc
-ExecStartPre=-/lib/rc/sh/init.sh
-ExecStart=-/bin/mkdir -p /lib/rc/init.d/start
-ExecStart=-/bin/mkdir -p /lib/rc/init.d/starting
-ExecStart=-/bin/mkdir -p /lib/rc/init.d/started
-ExecStart=-/bin/mkdir -p /lib/rc/init.d/stop
-ExecStart=-/bin/mkdir -p /lib/rc/init.d/stopping
-ExecStart=-/bin/mkdir -p /lib/rc/init.d/options
-ExecStart=-/bin/mkdir -p /lib/rc/init.d/daemons
-ExecStart=-/bin/mkdir -p /lib/rc/init.d/tmp
-ExecStart=-/bin/mkdir -p /lib/rc/init.d/failed
-ExecStart=-/bin/mkdir -p /lib/rc/init.d/inactive
-ExecStart=-/bin/mkdir -p /lib/rc/init.d/wasinactive
-ExecStart=-/bin/mkdir -p /lib/rc/init.d/exclusive
-ExecStart=-/bin/mkdir -p /lib/rc/init.d/hotplugged
-ExecStart=-/bin/mkdir -p /lib/rc/init.d/scheduled
-ExecStart=-/bin/ln -s /etc/init.d/localmount /lib/rc/init.d/started
-ExecStart=-/bin/ln -s /etc/init.d/fsck /lib/rc/init.d/started
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-apps/systemd-units/metadata.xml b/sys-apps/systemd-units/metadata.xml
index 43c1341..7d664dd 100644
--- a/sys-apps/systemd-units/metadata.xml
+++ b/sys-apps/systemd-units/metadata.xml
@@ -10,6 +10,5 @@
<flag name='basic'>installs basic systemd files (used on desktop and on server)</flag>
<flag name='server'>installs server-related systemd files</flag>
<flag name='desktop'>installs desktop-related systemd files</flag>
- <flag name='sysv'>installs sysv-compatibility related systemd files</flag>
</use>
</pkgmetadata>
diff --git a/sys-apps/systemd-units/systemd-units-9999.ebuild b/sys-apps/systemd-units/systemd-units-9999.ebuild
index e1eceba..268e9e9 100644
--- a/sys-apps/systemd-units/systemd-units-9999.ebuild
+++ b/sys-apps/systemd-units/systemd-units-9999.ebuild
@@ -14,7 +14,7 @@ SRC_URI="basic? ( http://0pointer.de/public/systemd-units/sshd.service
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+basic +desktop server sysv"
+IUSE="+basic +desktop server"
RDEPEND=""
DEPEND=""
@@ -35,8 +35,4 @@ src_install() {
if use desktop; then
systemd_dounit "${FILESDIR}"/services-desktop/*
fi
-
- if use sysv; then
- systemd_dounit "${FILESDIR}"/services-sysv/*
- fi
}