From 4e5c81d1a1ac9423bdc1ef5ec7bb128023868199 Mon Sep 17 00:00:00 2001 From: Henry Gebhardt Date: Wed, 15 May 2013 18:20:55 -0400 Subject: sys-apps/systemd/units-13: nginx.service is included in main tree --- .../files/services-server/nginx.service | 15 ------ sys-apps/systemd-units/systemd-units-12.ebuild | 53 ---------------------- sys-apps/systemd-units/systemd-units-13.ebuild | 53 ++++++++++++++++++++++ 3 files changed, 53 insertions(+), 68 deletions(-) delete mode 100644 sys-apps/systemd-units/files/services-server/nginx.service delete mode 100644 sys-apps/systemd-units/systemd-units-12.ebuild create mode 100644 sys-apps/systemd-units/systemd-units-13.ebuild diff --git a/sys-apps/systemd-units/files/services-server/nginx.service b/sys-apps/systemd-units/files/services-server/nginx.service deleted file mode 100644 index f03a19a..0000000 --- a/sys-apps/systemd-units/files/services-server/nginx.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=nginx HTTP daemon -After=networking.target -After=syslog.target - -[Service] -Type=forking -ExecStart=/usr/sbin/nginx -c /etc/nginx/nginx.conf -StandardOutput=syslog -StandardError=syslog -#Restart=always - -[Install] -WantedBy=multi-user.target -WantedBy=http-daemon.target diff --git a/sys-apps/systemd-units/systemd-units-12.ebuild b/sys-apps/systemd-units/systemd-units-12.ebuild deleted file mode 100644 index 0ef9f2d..0000000 --- a/sys-apps/systemd-units/systemd-units-12.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 -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="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+basic +desktop server ingnome3" - -RDEPEND="" -DEPEND="" - -src_install() { - if use basic; then - systemd_dounit "${FILESDIR}"/services-basic/* - fi - - if use server; then - systemd_dounit "${FILESDIR}"/services-server/* - systemd_dotmpfilesd "${FILESDIR}"/tmpfiles-server/* - ( - insinto /etc/kernel/postinst.d/ - doins "${FILESDIR}"/90_kexec - ) - fi - - if use desktop; then - systemd_dounit "${FILESDIR}"/services-desktop/* - - if ! use ingnome3; then - rm -f "${D}/$(systemd_get_unitdir)"/gdm.service - fi - fi - - # Files in portage cannot contain a literal '@' character. Therfore, - # convert the code string "_at" into an '@' before installing. - rename '_at' '@' "${D}/$(systemd_get_unitdir)"/* -} - -pkg_postinst() { - if use server; then - elog "The file '${ROOT}etc/kernel/postinst.d/90_kexec' has been" - elog "installed for you. If you use kexec, you may want to enable it by" - elog "making it exectuable." - fi -} diff --git a/sys-apps/systemd-units/systemd-units-13.ebuild b/sys-apps/systemd-units/systemd-units-13.ebuild new file mode 100644 index 0000000..0ef9f2d --- /dev/null +++ b/sys-apps/systemd-units/systemd-units-13.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3 +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="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+basic +desktop server ingnome3" + +RDEPEND="" +DEPEND="" + +src_install() { + if use basic; then + systemd_dounit "${FILESDIR}"/services-basic/* + fi + + if use server; then + systemd_dounit "${FILESDIR}"/services-server/* + systemd_dotmpfilesd "${FILESDIR}"/tmpfiles-server/* + ( + insinto /etc/kernel/postinst.d/ + doins "${FILESDIR}"/90_kexec + ) + fi + + if use desktop; then + systemd_dounit "${FILESDIR}"/services-desktop/* + + if ! use ingnome3; then + rm -f "${D}/$(systemd_get_unitdir)"/gdm.service + fi + fi + + # Files in portage cannot contain a literal '@' character. Therfore, + # convert the code string "_at" into an '@' before installing. + rename '_at' '@' "${D}/$(systemd_get_unitdir)"/* +} + +pkg_postinst() { + if use server; then + elog "The file '${ROOT}etc/kernel/postinst.d/90_kexec' has been" + elog "installed for you. If you use kexec, you may want to enable it by" + elog "making it exectuable." + fi +} -- cgit v1.2.3-65-gdbad