Use libtirpc for USE=rpc support #370995 by Diego Elio Pettenò. Migrate away from --oknodo with newer openrc #377775 by Michael Mair-Keimberger. Convert opts to extra_started_commands #385633 by Martin von Gagern.

(Portage version: 2.2.0_alpha65/cvs/Linux x86_64)

4 files changed, 65 insertions, 5 deletions

diff --git a/sys-apps/xinetd/ChangeLog b/sys-apps/xinetd/ChangeLog
index ce7ab14a5596..133804fbe9a0 100644
--- a/sys-apps/xinetd/ChangeLog
+++ b/sys-apps/xinetd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/xinetd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/ChangeLog,v 1.51 2011/04/16 19:16:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/ChangeLog,v 1.52 2011/10/11 01:26:08 vapier Exp $
+
+*xinetd-2.3.14-r1 (11 Oct 2011)
+
+  11 Oct 2011; Mike Frysinger <vapier@gentoo.org> +xinetd-2.3.14-r1.ebuild,
+  files/xinetd.rc6, metadata.xml:
+  Use libtirpc for USE=rpc support #370995 by Diego Elio Pettenò. Migrate away
+  from --oknodo with newer openrc #377775 by Michael Mair-Keimberger. Convert
+  opts to extra_started_commands #385633 by Martin von Gagern.
 
   16 Apr 2011; Ulrich Mueller <ulm@gentoo.org> xinetd-2.3.14.ebuild:
   Don't PROVIDE virtual/inetd, bug 358831.
diff --git a/sys-apps/xinetd/files/xinetd.rc6 b/sys-apps/xinetd/files/xinetd.rc6
index 07a2a85ab014..2f90775c06db 100644
--- a/sys-apps/xinetd/files/xinetd.rc6
+++ b/sys-apps/xinetd/files/xinetd.rc6
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6,v 1.23 2009/10/11 00:45:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6,v 1.24 2011/10/11 01:26:08 vapier Exp $
 
-opts="reload dump check"
+extra_started_commands="reload dump check"
 
 depend() {
 	use net
@@ -25,7 +25,7 @@ stop() {
 do_sig() {
 	local sig=$1 ; shift
 	ebegin "$*"
-	start-stop-daemon --oknodo --stop --signal ${sig} --pidfile /var/run/xinetd.pid
+	start-stop-daemon --signal ${sig} --pidfile /var/run/xinetd.pid
 	eend $?
 }
 reload() { do_sig HUP  "Reloading configuration" ; }
diff --git a/sys-apps/xinetd/metadata.xml b/sys-apps/xinetd/metadata.xml
index 96a2d586367d..ec64a3227cf0 100644
--- a/sys-apps/xinetd/metadata.xml
+++ b/sys-apps/xinetd/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<use>
+ <flag name='rpc'>support RPC services</flag>
+</use>
 </pkgmetadata>
diff --git a/sys-apps/xinetd/xinetd-2.3.14-r1.ebuild b/sys-apps/xinetd/xinetd-2.3.14-r1.ebuild
new file mode 100644
index 000000000000..54ab7192d313
--- /dev/null
+++ b/sys-apps/xinetd/xinetd-2.3.14-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.3.14-r1.ebuild,v 1.1 2011/10/11 01:26:08 vapier Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="powerful replacement for inetd"
+HOMEPAGE="http://www.xinetd.org/"
+SRC_URI="http://www.xinetd.org/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="perl rpc tcpd"
+
+DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
+	rpc? ( net-libs/libtirpc )"
+RDEPEND="${DEPEND}
+	perl? ( dev-lang/perl )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-DESTDIR.patch
+	epatch "${FILESDIR}"/${P}-install-contrib.patch
+	epatch "${FILESDIR}"/${P}-config.patch
+}
+
+src_configure() {
+	if ! use rpc ; then
+		append-cppflags -DNO_RPC
+		export ac_cv_header_{rpc_{rpc,rpcent,pmap_clnt},netdb}_h=no
+	fi
+	LIBS=$($(tc-getPKG_CONFIG) --libs libtirpc) \
+	econf \
+		$(use_with tcpd libwrap) \
+		--with-loadavg
+}
+
+src_install() {
+	emake install install-contrib DESTDIR="${D}" || die
+	use perl || rm -f "${D}"/usr/sbin/xconv.pl
+
+	newinitd "${FILESDIR}"/xinetd.rc6 xinetd || die
+	newconfd "${FILESDIR}"/xinetd.confd xinetd || die
+
+	newdoc contrib/xinetd.conf xinetd.conf.dist.sample
+	dodoc AUDIT INSTALL README TODO CHANGELOG
+}