Add unit file, drop old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 30 insertions, 18 deletions

diff --git a/net-nds/yp-tools/ChangeLog b/net-nds/yp-tools/ChangeLog
index 8dae6aec7b37..0317e20d7b75 100644
--- a/net-nds/yp-tools/ChangeLog
+++ b/net-nds/yp-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-nds/yp-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/yp-tools/ChangeLog,v 1.46 2013/09/08 13:55:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/yp-tools/ChangeLog,v 1.47 2013/12/22 10:15:41 pacho Exp $
+
+*yp-tools-2.12-r1 (22 Dec 2013)
+
+  22 Dec 2013; Pacho Ramos <pacho@gentoo.org> +files/domainname.service,
+  +files/domainname.service.conf, +yp-tools-2.12-r1.ebuild,
+  -yp-tools-2.10.ebuild:
+  Add unit file, drop old
 
   08 Sep 2013; Markus Meier <maekke@gentoo.org> yp-tools-2.12.ebuild:
   add ~arm, bug #372871
diff --git a/net-nds/yp-tools/files/domainname.service b/net-nds/yp-tools/files/domainname.service
new file mode 100644
index 000000000000..8f170adf794c
--- /dev/null
+++ b/net-nds/yp-tools/files/domainname.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=NIS Domainname
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/nisdomainname $NISDOMAINNAME
+RemainAfterExit=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-nds/yp-tools/files/domainname.service.conf b/net-nds/yp-tools/files/domainname.service.conf
new file mode 100644
index 000000000000..592de3b3d88a
--- /dev/null
+++ b/net-nds/yp-tools/files/domainname.service.conf
@@ -0,0 +1,3 @@
+# NIS domain to be set by domainname.service
+[Service]
+Environment="NISDOMAINNAME=local"
diff --git a/net-nds/yp-tools/yp-tools-2.10.ebuild b/net-nds/yp-tools/yp-tools-2.12-r1.ebuild
index 913255b7ac7f..a4127f0751f6 100644
--- a/net-nds/yp-tools/yp-tools-2.10.ebuild
+++ b/net-nds/yp-tools/yp-tools-2.12-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/yp-tools/yp-tools-2.10.ebuild,v 1.1 2009/11/18 03:06:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/yp-tools/yp-tools-2.12-r1.ebuild,v 1.1 2013/12/22 10:15:41 pacho Exp $
 
-EAPI="2"
+EAPI=5
 
-inherit eutils
+inherit eutils systemd
 
 DESCRIPTION="Network Information Service tools"
 HOMEPAGE="http://www.linux-nis.org/nis/"
@@ -12,13 +12,9 @@ SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="nls"
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.8-bsd.patch"
-}
-
 src_configure() {
 	local myconf="--sysconfdir=/etc/yp"
 	if ! use nls
@@ -35,16 +31,12 @@ src_configure() {
 				${i}.orig > ${i}
 		done
 	fi
-	econf ${myconf} || die "econf failed"
+	econf ${myconf}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	default
 	insinto /etc/yp ; doins etc/nicknames
-	# This messes up boot so we remove it
-	rm -f \
-		"${D}/bin/ypdomainname" \
-		"${D}/bin/nisdomainname" \
-		"${D}/bin/domainname"
+	systemd_dounit "${FILESDIR}/domainname.service"
+	systemd_install_serviced "${FILESDIR}"/domainname.service.conf
 }