Use newconfd/newinitd for #174266; Properly quote variables; Fix postinst note.

(Portage version: 2.1.2.4)

4 files changed, 34 insertions, 27 deletions

diff --git a/net-misc/oidentd/ChangeLog b/net-misc/oidentd/ChangeLog
index 9435bea77dde..d90ee0e55128 100644
--- a/net-misc/oidentd/ChangeLog
+++ b/net-misc/oidentd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/oidentd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/oidentd/ChangeLog,v 1.28 2007/02/21 22:36:35 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/oidentd/ChangeLog,v 1.29 2007/04/22 16:49:15 phreak Exp $
+
+  22 Apr 2007; Christian Heim <phreak@gentoo.org> metadata.xml,
+  oidentd-2.0.7-r1.ebuild, oidentd-2.0.8.ebuild:
+  Use newconfd/newinitd for #174266; Properly quote variables; Fix postinst note.
 
   21 Feb 2007; Charlie Shepherd <masterdriverz@gentoo.org> metadata.xml:
   avenj has retired - removing from metadata
diff --git a/net-misc/oidentd/metadata.xml b/net-misc/oidentd/metadata.xml
index cbc75614f72b..cf0700955092 100644
--- a/net-misc/oidentd/metadata.xml
+++ b/net-misc/oidentd/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>maintainer-needed@gentoo.org</email>
+	<email>maintainer-needed@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
 
diff --git a/net-misc/oidentd/oidentd-2.0.7-r1.ebuild b/net-misc/oidentd/oidentd-2.0.7-r1.ebuild
index 119ad55afd72..46ef2486c2be 100644
--- a/net-misc/oidentd/oidentd-2.0.7-r1.ebuild
+++ b/net-misc/oidentd/oidentd-2.0.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/oidentd/oidentd-2.0.7-r1.ebuild,v 1.12 2005/06/07 04:22:45 redhatter Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/oidentd/oidentd-2.0.7-r1.ebuild,v 1.13 2007/04/22 16:49:15 phreak Exp $
 
 DESCRIPTION="Another (RFC1413 compliant) ident daemon"
 HOMEPAGE="http://dev.ojnk.net/"
@@ -11,25 +11,26 @@ SLOT="0"
 KEYWORDS="x86 sparc alpha arm amd64 ia64 hppa ppc ~mips"
 IUSE="ipv6"
 
-DEPEND="virtual/libc"
+DEPEND=""
+RDEPEND=""
 
 src_compile() {
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		`use_enable ipv6` \
-		|| die
-	emake || die
+	econf $( use_enable ipv6 ) || die "econf failed!"
+	emake || die "emake failed!"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die "make install failed!"
+
 	dodoc AUTHORS ChangeLog README TODO NEWS \
-		${FILESDIR}/oidentd_masq.conf ${FILESDIR}/oidentd.conf
-	exeinto /etc/init.d ; newexe ${FILESDIR}/oidentd-${PV}-init oidentd
-	insinto /etc/conf.d ; newins ${FILESDIR}/oidentd-${PV}-confd oidentd
+		"${FILESDIR}"/${PN}_masq.conf "${FILESDIR}"/${PN}.conf
+
+	newinitd "${FILESDIR}"/oidentd-${PV}-init ${PN}
+	newconfd "${FILESDIR}"/oidentd-${PV}-confd ${PN}
 }
 
 pkg_postinst() {
-	einfo Example configuration files are in /usr/share/doc/${PF}
+	echo
+	elog "Example configuration files are in /usr/share/doc/${PF}"
+	echo
 }
diff --git a/net-misc/oidentd/oidentd-2.0.8.ebuild b/net-misc/oidentd/oidentd-2.0.8.ebuild
index d4e4b73a1d3b..07852aa66398 100644
--- a/net-misc/oidentd/oidentd-2.0.8.ebuild
+++ b/net-misc/oidentd/oidentd-2.0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/oidentd/oidentd-2.0.8.ebuild,v 1.2 2006/09/29 23:19:19 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/oidentd/oidentd-2.0.8.ebuild,v 1.3 2007/04/22 16:49:15 phreak Exp $
 
 DESCRIPTION="Another (RFC1413 compliant) ident daemon"
 HOMEPAGE="http://dev.ojnk.net/"
@@ -11,24 +11,26 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE="ipv6"
 
-DEPEND="virtual/libc"
+DEPEND=""
+RDEPEND=""
 
 src_compile() {
-	econf $(use_enable ipv6) || die "econf failed"
-	emake || die "emake failed"
+	econf $( use_enable ipv6 ) || die "econf failed!"
+	emake || die "emake failed!"
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "Install failed"
+	make DESTDIR="${D}" install || die "make install failed!"
 
 	dodoc AUTHORS ChangeLog README TODO NEWS \
-		${FILESDIR}/oidentd_masq.conf ${FILESDIR}/oidentd.conf
-
-	newinitd ${FILESDIR}/${PN}-2.0.7-init ${PN} || die "newinitd failed"
-	newconfd ${FILESDIR}/${PN}-2.0.7-confd ${PN} || die "newconfd failed"
+		"${FILESDIR}"/${PN}_masq.conf "${FILESDIR}"/${PN}.conf
 
+	newinitd "${FILESDIR}"/oidentd-${PV}-init ${PN}
+	newconfd "${FILESDIR}"/oidentd-${PV}-confd ${PN}
 }
 
 pkg_postinst() {
-	einfo "Example configuration files are in /usr/share/doc/${PF}"
+	echo
+	elog "Example configuration files are in /usr/share/doc/${PF}"
+	echo
 }