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

Package-Manager: portage-2.1.2.4

5 files changed, 60 insertions, 43 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/Manifest b/net-misc/oidentd/Manifest
index fd39a7a7971c..c82eeae002c4 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX oidentd-2.0.7-confd 67 RMD160 a44ebfb81e75a66a9bb35578e0ffcd3df423545b SHA1 027668c43c36676a71f0863a1abee2a0f4a64594 SHA256 acdd88d817474e392e8f07b0f00579007a71340d00a5520d7a2661ecf4a7e5f4
 MD5 05a43d3987754f179f4e31bbe61ff315 files/oidentd-2.0.7-confd 67
 RMD160 a44ebfb81e75a66a9bb35578e0ffcd3df423545b files/oidentd-2.0.7-confd 67
@@ -16,25 +19,32 @@ RMD160 8da4104bff160102b647a2bc3444c885e4658f6d files/oidentd_masq.conf 429
 SHA256 16b94239221e63abdf38ce59e4b9231622f81bfeca643c8ac8be3a57b01ced28 files/oidentd_masq.conf 429
 DIST oidentd-2.0.7.tar.gz 196027 RMD160 91c2d24f8a1b37bd6feffd4243b0311f76e7aff3 SHA1 c973b436e6f8cab87b5e2f557e901722e27f1e79 SHA256 2f3d837c8134b71c6fce4d93c291d090b28efb961393094b93d6f0b7a6adb81d
 DIST oidentd-2.0.8.tar.gz 212354 RMD160 cca63799c01cf10d623f696238e8d0ac450230b1 SHA1 e14f72075612fc04b40119e3784740d9a2300d4b SHA256 a54cbed187281f8d5a301d1d8fd5cb0f30bfb13a5a8e9ab752ace76c1010fb6f
-EBUILD oidentd-2.0.7-r1.ebuild 981 RMD160 4615474ac354d242d7d26e75dd24f2c3361cc74b SHA1 1f6ac8bb5d9f24e88b5413db7ae0cc0904a38353 SHA256 74d4cfa4efe8eaeb910f8fc74df78960e4661326618a6ee0dd2b93aa52169c26
-MD5 9ce74cdb65e66c00056ee701348672fb oidentd-2.0.7-r1.ebuild 981
-RMD160 4615474ac354d242d7d26e75dd24f2c3361cc74b oidentd-2.0.7-r1.ebuild 981
-SHA256 74d4cfa4efe8eaeb910f8fc74df78960e4661326618a6ee0dd2b93aa52169c26 oidentd-2.0.7-r1.ebuild 981
-EBUILD oidentd-2.0.8.ebuild 990 RMD160 4c95f46d70a37e8d5808e21829cd7967c60d890a SHA1 523cbf6c3fc29fa7944bbcc603c446cdee1ecc15 SHA256 a9b675d65cf62265a6e6aa207bd659cad42a046ca2b8592a47549d8e1f41d19f
-MD5 b8b3881dad68ae4233ff5d415574ae10 oidentd-2.0.8.ebuild 990
-RMD160 4c95f46d70a37e8d5808e21829cd7967c60d890a oidentd-2.0.8.ebuild 990
-SHA256 a9b675d65cf62265a6e6aa207bd659cad42a046ca2b8592a47549d8e1f41d19f oidentd-2.0.8.ebuild 990
-MISC ChangeLog 3132 RMD160 19dd5dd546ef2ea4ba6f70ee826ddf0f5ee03383 SHA1 a20bcf0819d74ed4f194521c813218076227e738 SHA256 ca8c846f86bee37066879ffa62e8ab20e365c259cf6cb8dd84d360f15421ec82
-MD5 bc2c4992d010f0e7d8a9033d54504178 ChangeLog 3132
-RMD160 19dd5dd546ef2ea4ba6f70ee826ddf0f5ee03383 ChangeLog 3132
-SHA256 ca8c846f86bee37066879ffa62e8ab20e365c259cf6cb8dd84d360f15421ec82 ChangeLog 3132
-MISC metadata.xml 234 RMD160 eba4806545de0d7dfd954fe889ac8e82f7be1484 SHA1 03dd609a4efde867c4b12eaae5eb5cc44f7ebd53 SHA256 5085e7eb7655a7c639d97404f04d8732cbf17e72688a61ecd2e0967ac2a5711d
-MD5 0b1b20822379b31df509f8d7aa516558 metadata.xml 234
-RMD160 eba4806545de0d7dfd954fe889ac8e82f7be1484 metadata.xml 234
-SHA256 5085e7eb7655a7c639d97404f04d8732cbf17e72688a61ecd2e0967ac2a5711d metadata.xml 234
+EBUILD oidentd-2.0.7-r1.ebuild 952 RMD160 dd313d06491cd3e6a586033c76ae3035ab421939 SHA1 6c535bf1bf2afb39cc2d8d2b59fce8e9b46ac1bf SHA256 75824d943fc041a1f24202d46c3a6ef5767ecc3cc5801d437010d01748618f85
+MD5 92c7f711ade06cac09f076d659205cbd oidentd-2.0.7-r1.ebuild 952
+RMD160 dd313d06491cd3e6a586033c76ae3035ab421939 oidentd-2.0.7-r1.ebuild 952
+SHA256 75824d943fc041a1f24202d46c3a6ef5767ecc3cc5801d437010d01748618f85 oidentd-2.0.7-r1.ebuild 952
+EBUILD oidentd-2.0.8.ebuild 966 RMD160 76234727aa0c4296acb58f9a38d85f60f6f1364c SHA1 c86cbde1d114d9ceb91b1eef0d19c36b7f07ab4c SHA256 a67e50dea7f4c8147587f3ebbb3a5c86560289a67fe24b13cb2b5abd23889e2e
+MD5 084096f05a5bf15c6c51c0e155848a7b oidentd-2.0.8.ebuild 966
+RMD160 76234727aa0c4296acb58f9a38d85f60f6f1364c oidentd-2.0.8.ebuild 966
+SHA256 a67e50dea7f4c8147587f3ebbb3a5c86560289a67fe24b13cb2b5abd23889e2e oidentd-2.0.8.ebuild 966
+MISC ChangeLog 3321 RMD160 cbf95d915d8a10c3dc431f07dff080b86e528bab SHA1 9718c8f349f112ea6b5ea5023543c312ac6d58e8 SHA256 3c94e2341f0d5a05d4383430e94d8351f5084c01ed0df4495d2951bb3b60d79b
+MD5 2ce6c8747f17fe0ddac3533e39ff5486 ChangeLog 3321
+RMD160 cbf95d915d8a10c3dc431f07dff080b86e528bab ChangeLog 3321
+SHA256 3c94e2341f0d5a05d4383430e94d8351f5084c01ed0df4495d2951bb3b60d79b ChangeLog 3321
+MISC metadata.xml 233 RMD160 1ad0d42950be7fb6dd7eca801b4ec172b1861f28 SHA1 d732d4251c95716017d6be0c983fca47d48fac9a SHA256 b5d28cfbdcac52f368308c29ecb0a26b6034ef0e9e338f72e99d1a8b9494a58a
+MD5 b87d8c6b2024ec0a9039a4893a123df4 metadata.xml 233
+RMD160 1ad0d42950be7fb6dd7eca801b4ec172b1861f28 metadata.xml 233
+SHA256 b5d28cfbdcac52f368308c29ecb0a26b6034ef0e9e338f72e99d1a8b9494a58a metadata.xml 233
 MD5 0dca28a2208c851a61dd19a6799ca474 files/digest-oidentd-2.0.7-r1 241
 RMD160 76ae7a45f2111900ad32e4db7ed69ff09b2fd08a files/digest-oidentd-2.0.7-r1 241
 SHA256 2e9512e85e90289bf998ea2974ee739d7c180052683d68680e3ba0c3e5582914 files/digest-oidentd-2.0.7-r1 241
 MD5 9bf278e58726133c6ab24b58d7acc742 files/digest-oidentd-2.0.8 241
 RMD160 0c4e601f6a4815cba7c005d23085b5a3880a252c files/digest-oidentd-2.0.8 241
 SHA256 08f7f7573f7583e0ef57ffd903c9ac2d35493ee591293ee54fae0cc50c74bf93 files/digest-oidentd-2.0.8 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGK5ITyuNVb5qfaOYRAkcRAKCXPTkM82/Eos36d+X+8KbqCvShXQCfYCCy
+0Bx6kHlBX1WEzZzZg51psuU=
+=4GQO
+-----END PGP SIGNATURE-----
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
 }