summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenry Gebhardt <hsggebhardt@googlemail.com>2012-04-21 23:44:46 +0200
committerHenry Gebhardt <hsggebhardt@googlemail.com>2012-04-21 23:44:46 +0200
commit0b4ac9ec63e799a74de53f4097019102dad742d9 (patch)
treee276125479cdd5f461b2db8e51ada3125db1a174
parentnet-dns/avahi: Remove (diff)
downloadsystemd-0b4ac9ec63e799a74de53f4097019102dad742d9.tar.gz
systemd-0b4ac9ec63e799a74de53f4097019102dad742d9.tar.bz2
systemd-0b4ac9ec63e799a74de53f4097019102dad742d9.zip
sys-apps/systemd-units-9999: cups and sshd service files removed
They are in their respective packages in the main tree now.
-rw-r--r--sys-apps/systemd-units/files/services-desktop/cups.service8
-rw-r--r--sys-apps/systemd-units/files/sshd_at.patch12
-rw-r--r--sys-apps/systemd-units/systemd-units-9999.ebuild16
3 files changed, 1 insertions, 35 deletions
diff --git a/sys-apps/systemd-units/files/services-desktop/cups.service b/sys-apps/systemd-units/files/services-desktop/cups.service
deleted file mode 100644
index de3edcd..0000000
--- a/sys-apps/systemd-units/files/services-desktop/cups.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=CUPS Printing Service
-
-[Service]
-ExecStart=/usr/sbin/cupsd -f
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-apps/systemd-units/files/sshd_at.patch b/sys-apps/systemd-units/files/sshd_at.patch
deleted file mode 100644
index 42131bc..0000000
--- a/sys-apps/systemd-units/files/sshd_at.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-See http://lists.freedesktop.org/archives/systemd-devel/2011-February/001359.html
----
-diff -Naur ./sshd@.service ./sshd@.service
---- ./sshd@.service 2011-11-10 22:11:55.372138953 +0100
-+++ ./sshd@.service 2011-11-10 22:12:43.709534651 +0100
-@@ -3,5 +3,5 @@
- After=syslog.target
-
- [Service]
--ExecStart=/usr/sbin/sshd -i
-+ExecStart=-/usr/sbin/sshd -i
- StandardInput=socket
diff --git a/sys-apps/systemd-units/systemd-units-9999.ebuild b/sys-apps/systemd-units/systemd-units-9999.ebuild
index de181e2..e1651c8 100644
--- a/sys-apps/systemd-units/systemd-units-9999.ebuild
+++ b/sys-apps/systemd-units/systemd-units-9999.ebuild
@@ -7,9 +7,7 @@ inherit eutils systemd
DESCRIPTION="Service files for sys-apps/systemd"
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd http://en.gentoo-wiki.com/wiki/Systemd"
-SRC_URI="basic? ( http://0pointer.de/public/systemd-units/sshd.service
- http://0pointer.de/public/systemd-units/sshd.socket
- http://0pointer.de/public/systemd-units/sshd@.service )"
+SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
@@ -19,21 +17,9 @@ IUSE="+basic +desktop server ingnome3"
RDEPEND=""
DEPEND=""
-src_prepare() {
- if use basic; then
- cp "${DISTDIR}/sshd.service" . || die
- cp "${DISTDIR}/sshd.socket" . || die
- cp "${DISTDIR}/sshd@.service" . || die
- epatch "${FILESDIR}"/sshd_at.patch || die
- fi
-}
-
src_install() {
if use basic; then
systemd_dounit "${FILESDIR}"/services-basic/*
- systemd_dounit "sshd.service"
- systemd_dounit "sshd.socket"
- systemd_dounit "sshd@.service"
fi
if use server; then