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

Package-Manager: portage-2.1.2.4

4 files changed, 40 insertions, 28 deletions

diff --git a/net-misc/ipx-utils/ChangeLog b/net-misc/ipx-utils/ChangeLog
index af6cea78d460..49302e11d3a4 100644
--- a/net-misc/ipx-utils/ChangeLog
+++ b/net-misc/ipx-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/ipx-utils
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/ChangeLog,v 1.13 2007/02/22 02:27:01 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/ChangeLog,v 1.14 2007/04/22 16:11:20 phreak Exp $
+
+  22 Apr 2007; Christian Heim <phreak@gentoo.org>
+  files/ipx-utils-1.1-makefile.patch, ipx-utils-1.1-r2.ebuild:
+  Use newconfd/newinitd for #174266; Properly quote variables.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/net-misc/ipx-utils/Manifest b/net-misc/ipx-utils/Manifest
index 8d5a8e6c734e..f952f6fbdcf9 100644
--- a/net-misc/ipx-utils/Manifest
+++ b/net-misc/ipx-utils/Manifest
@@ -1,7 +1,10 @@
-AUX ipx-utils-1.1-makefile.patch 822 RMD160 335dd896e0a2fd26376ada8a9af340be4ec7b929 SHA1 cfea9c51d1d6e27649a50fd22afcc51720395bd6 SHA256 e7b66c8d0f3c8d852c16cc9db770097e0c91246d9fcb2454fbd6499ff2aff21d
-MD5 621ddf456883c9bb8ff0f2a516c47c0d files/ipx-utils-1.1-makefile.patch 822
-RMD160 335dd896e0a2fd26376ada8a9af340be4ec7b929 files/ipx-utils-1.1-makefile.patch 822
-SHA256 e7b66c8d0f3c8d852c16cc9db770097e0c91246d9fcb2454fbd6499ff2aff21d files/ipx-utils-1.1-makefile.patch 822
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ipx-utils-1.1-makefile.patch 795 RMD160 b492798a88addc5c8d5495f909c4a55874a1e11f SHA1 07f9b654a05965839c5e5f764017615e05212ed3 SHA256 6ed677088c01aa21405e9b16571a2b0db2c62be0618d2d16370e9b75ce794321
+MD5 5142f79e7755e2ed73c10257cc06b5a0 files/ipx-utils-1.1-makefile.patch 795
+RMD160 b492798a88addc5c8d5495f909c4a55874a1e11f files/ipx-utils-1.1-makefile.patch 795
+SHA256 6ed677088c01aa21405e9b16571a2b0db2c62be0618d2d16370e9b75ce794321 files/ipx-utils-1.1-makefile.patch 795
 AUX ipx-utils-1.1-proc.patch 426 RMD160 919123a1f49b77ade79e2c4e0c70e5653540b3bb SHA1 7728987921fedd66324cafc94792b94d1ecf8aef SHA256 23847e45eebff117c4320448880c90022ad5e4c9d33935aa1e2a5ebf3654821d
 MD5 1f41f7a629f0b3a35e27d4c4173e0641 files/ipx-utils-1.1-proc.patch 426
 RMD160 919123a1f49b77ade79e2c4e0c70e5653540b3bb files/ipx-utils-1.1-proc.patch 426
@@ -15,14 +18,14 @@ MD5 12d5c69423f199bf025dfc6be9233d7a files/ipx.init 950
 RMD160 eb417f5aa89f337e0069e287d230edbd8fbd63e8 files/ipx.init 950
 SHA256 c0d4c499a47d1e15ba62289b3a8626f44dc8070c8e80182381c7d9a0887234af files/ipx.init 950
 DIST ipx-1.1.tar.gz 8177 RMD160 c9f0fad523787553fc8994184c9a9c4cdc5ac473 SHA1 7e29b6c3343236b66f76f642529f82e02ce8211a SHA256 c59c3dbb8cfb8ef5b3cb76a302d5f38254e9dbbbd99fae3f048e3751605d7fb8
-EBUILD ipx-utils-1.1-r2.ebuild 933 RMD160 23038b3de7d32ab7c0927baaf31491ba7901a120 SHA1 1d1da08897ec444fb98e74b3b069c78c3da433ce SHA256 ad58b7014b0795d9ca194ba5a9e131639893599d478b8272b922d08916cb4277
-MD5 4219aaa379b95c2dad17ff50a6d8918b ipx-utils-1.1-r2.ebuild 933
-RMD160 23038b3de7d32ab7c0927baaf31491ba7901a120 ipx-utils-1.1-r2.ebuild 933
-SHA256 ad58b7014b0795d9ca194ba5a9e131639893599d478b8272b922d08916cb4277 ipx-utils-1.1-r2.ebuild 933
-MISC ChangeLog 1433 RMD160 0b1ad7145f91effebe7bf8b874fd59d93608c0da SHA1 b12e70fac705028cbe1c4675634722b9d406fab3 SHA256 0fa7644327e21c7c07ae34cdafe91181e17c10c2661af2e1f617d975d042819e
-MD5 eea8c24e0ca200b15ffafc6e535d8307 ChangeLog 1433
-RMD160 0b1ad7145f91effebe7bf8b874fd59d93608c0da ChangeLog 1433
-SHA256 0fa7644327e21c7c07ae34cdafe91181e17c10c2661af2e1f617d975d042819e ChangeLog 1433
+EBUILD ipx-utils-1.1-r2.ebuild 928 RMD160 765e5d00ecf5ef824776036910249efcea5dd3c1 SHA1 4926ad0eb538df2b8e1da28edbed80ed24e88be4 SHA256 75518f9c86042956e1bea97b4c6f34477dd3452f94cb70f911a6b3fca2184f57
+MD5 217bdbc6da359cf21194b4d59c4e55db ipx-utils-1.1-r2.ebuild 928
+RMD160 765e5d00ecf5ef824776036910249efcea5dd3c1 ipx-utils-1.1-r2.ebuild 928
+SHA256 75518f9c86042956e1bea97b4c6f34477dd3452f94cb70f911a6b3fca2184f57 ipx-utils-1.1-r2.ebuild 928
+MISC ChangeLog 1611 RMD160 01ea04fe22f42e283f13b67cb925b918e0562f91 SHA1 8b148044da931a08e286dcd5a9e44318deef27c2 SHA256 79a6131d622f2908a68b2c428a3a239f9bc1d277454844b7cc23b822bdbf1c6f
+MD5 be64b06106b2f1a0aabd71ad9775701a ChangeLog 1611
+RMD160 01ea04fe22f42e283f13b67cb925b918e0562f91 ChangeLog 1611
+SHA256 79a6131d622f2908a68b2c428a3a239f9bc1d277454844b7cc23b822bdbf1c6f ChangeLog 1611
 MISC metadata.xml 232 RMD160 d5631c839d64b79ea7accc9a23ca30d64436b467 SHA1 b156ecba642bb171bc77738f32368a539c073343 SHA256 970b4473653d994ae8485ef08554a47b5751f4d644c3be72505ada89777441d1
 MD5 a0aedff056c6404a3996c7ce04fe2784 metadata.xml 232
 RMD160 d5631c839d64b79ea7accc9a23ca30d64436b467 metadata.xml 232
@@ -30,3 +33,10 @@ SHA256 970b4473653d994ae8485ef08554a47b5751f4d644c3be72505ada89777441d1 metadata
 MD5 d768069fda6af2b1191f9e1ae6545382 files/digest-ipx-utils-1.1-r2 217
 RMD160 0f358c01c025710c9d5e4fcff09cc2241dc6ec44 files/digest-ipx-utils-1.1-r2 217
 SHA256 73c697016dc4e8eaad69a1b4df28cd9cf933ce1812b9a19534d572501254e5a7 files/digest-ipx-utils-1.1-r2 217
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGK4kxyuNVb5qfaOYRAsIVAJ95kLrukT0Uek2UWylo16ROmEDbOACgq9cC
+RFtPQcOHdzqf6j4zMGGcmqs=
+=vsmk
+-----END PGP SIGNATURE-----
diff --git a/net-misc/ipx-utils/files/ipx-utils-1.1-makefile.patch b/net-misc/ipx-utils/files/ipx-utils-1.1-makefile.patch
index e609823134cc..5a596f818d19 100644
--- a/net-misc/ipx-utils/files/ipx-utils-1.1-makefile.patch
+++ b/net-misc/ipx-utils/files/ipx-utils-1.1-makefile.patch
@@ -1,6 +1,6 @@
---- Makefile.orig	Fri Jul 19 21:31:42 2002
-+++ Makefile	Fri Jul 19 21:33:05 2002
-@@ -10,17 +10,9 @@
+--- ipx-1.1.orig/Makefile
++++ ipx-1.1/Makefile
+@@ -10,17 +10,8 @@ clean:
  install: $(UTILS)
  	for i in $(UTILS); \
  	do \
@@ -19,6 +19,6 @@
 -	ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc5.d/S15ipx
 -	rm -f /etc/rc.d/rc6.d/K55ipx
 -	ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc6.d/K55ipx
+-
 +#	install init.ipx /etc/rc.d/init.d/ipx
 +#	install -m 0644 config.ipx /etc/sysconfig/ipx
- 
diff --git a/net-misc/ipx-utils/ipx-utils-1.1-r2.ebuild b/net-misc/ipx-utils/ipx-utils-1.1-r2.ebuild
index 22611cad98eb..efc76d4e1a33 100644
--- a/net-misc/ipx-utils/ipx-utils-1.1-r2.ebuild
+++ b/net-misc/ipx-utils/ipx-utils-1.1-r2.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/ipx-utils/ipx-utils-1.1-r2.ebuild,v 1.2 2006/07/27 19:24:54 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/ipx-utils-1.1-r2.ebuild,v 1.3 2007/04/22 16:11:20 phreak Exp $
 
 inherit eutils
 
@@ -20,18 +20,16 @@ S=${WORKDIR}/${P/-utils}
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	sed -i "s:-O2 -Wall:${CFLAGS}:" Makefile
-	epatch ${FILESDIR}/${P}-makefile.patch
-	epatch ${FILESDIR}/${P}-proc.patch #67642
+	sed -i "s:-O2 -Wall:${CFLAGS}:" "${S}"/Makefile
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-proc.patch #67642
 }
 
 src_install() {
 	dodir /sbin /usr/share/man/man8
-	make DESTDIR=${D} install || die
+	dodoc "${S}"/README
+	make DESTDIR="${D}" install || die "make install failed!"
 
-	insinto /etc/conf.d ; newins ${FILESDIR}/ipx.confd ipx
-	exeinto /etc/init.d ; newexe ${FILESDIR}/ipx.init ipx
-
-	dodoc README
+	newconfd "${FILESDIR}"/ipx.confd ipx
+	newinitd "${FILESDIR}"/ipx.init ipx
 }