Cleanup of the main two ebuilds per dberkholz commit review.

Package-Manager: portage-2.1.3.7

4 files changed, 35 insertions, 30 deletions

diff --git a/sys-cluster/keepalived/ChangeLog b/sys-cluster/keepalived/ChangeLog
index 43057e8aafcc..32b935cb260e 100644
--- a/sys-cluster/keepalived/ChangeLog
+++ b/sys-cluster/keepalived/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/keepalived
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.46 2007/09/22 19:12:34 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.47 2007/09/23 00:39:51 robbat2 Exp $
+
+  23 Sep 2007; Robin H. Johnson <robbat2@gentoo.org>
+  keepalived-1.1.13-r1.ebuild, keepalived-1.1.15.ebuild:
+  Cleanup of the main two ebuilds per dberkholz commit review.
 
   22 Sep 2007; nixnut <nixnut@gentoo.org> keepalived-1.1.13-r1.ebuild:
   Stable on ppc wrt bug 181763
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 929ac637eebd..f33df59e6f5e 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -22,22 +22,22 @@ EBUILD keepalived-1.1.12.ebuild 1461 RMD160 337a3184faa94404fe92e846836c77b11698
 MD5 0d363ce8bc8b21e3812caf45d491ef92 keepalived-1.1.12.ebuild 1461
 RMD160 337a3184faa94404fe92e846836c77b11698b40f keepalived-1.1.12.ebuild 1461
 SHA256 673146c182f96dfb17fe91be355538f468301cc4c84fa476ac9d4e0360a59765 keepalived-1.1.12.ebuild 1461
-EBUILD keepalived-1.1.13-r1.ebuild 2376 RMD160 c62cd3f75372498113159e4017398c416d567a84 SHA1 599d4fd1b268881c8c6a8c3b6c107e8bb7dc0f45 SHA256 6be21942d0baad7bdeb76dea6fd8f6c1c6064a764d1d71652c679cf89abe7f27
-MD5 59d840ba09f3e1bb23be3d1d08a5880b keepalived-1.1.13-r1.ebuild 2376
-RMD160 c62cd3f75372498113159e4017398c416d567a84 keepalived-1.1.13-r1.ebuild 2376
-SHA256 6be21942d0baad7bdeb76dea6fd8f6c1c6064a764d1d71652c679cf89abe7f27 keepalived-1.1.13-r1.ebuild 2376
+EBUILD keepalived-1.1.13-r1.ebuild 2391 RMD160 f2a68e3afd78a23b60732e1b9f56d7927648938f SHA1 214019878db7a5bb98c5470f7e9107c58076c681 SHA256 db37c32d6c6216b1f5221d71e4007340ba35fdb3d1af21af0e96c4b9bb18b673
+MD5 7f041ee998e0709f945be0227e6e61a0 keepalived-1.1.13-r1.ebuild 2391
+RMD160 f2a68e3afd78a23b60732e1b9f56d7927648938f keepalived-1.1.13-r1.ebuild 2391
+SHA256 db37c32d6c6216b1f5221d71e4007340ba35fdb3d1af21af0e96c4b9bb18b673 keepalived-1.1.13-r1.ebuild 2391
 EBUILD keepalived-1.1.13.ebuild 1460 RMD160 4aa2c2f739e2a3e499590053985b184a186ad35b SHA1 86ba3d84d897d769459a3f0bdc7f6247e31a22db SHA256 5ceddd3725c2488ab0822aa419c0611974ef2e6572998acc8fb771995179a0e6
 MD5 5decff00153b896fc38573460e489cb7 keepalived-1.1.13.ebuild 1460
 RMD160 4aa2c2f739e2a3e499590053985b184a186ad35b keepalived-1.1.13.ebuild 1460
 SHA256 5ceddd3725c2488ab0822aa419c0611974ef2e6572998acc8fb771995179a0e6 keepalived-1.1.13.ebuild 1460
-EBUILD keepalived-1.1.15.ebuild 2451 RMD160 86a22223db655c0efb335d5983dbf3c8dacf8304 SHA1 d37d300ffef4078075b00e35e36c030ac7d05992 SHA256 a3957e5beb2ed7a1aafc428e6773ea70b5ca9d15c3566acaf56391fecd63a3a5
-MD5 16796a15e83c0f00d17026d6f73db6dd keepalived-1.1.15.ebuild 2451
-RMD160 86a22223db655c0efb335d5983dbf3c8dacf8304 keepalived-1.1.15.ebuild 2451
-SHA256 a3957e5beb2ed7a1aafc428e6773ea70b5ca9d15c3566acaf56391fecd63a3a5 keepalived-1.1.15.ebuild 2451
-MISC ChangeLog 7215 RMD160 bcd20b491070b3f90f8dc6f46e0bb8407ee1d135 SHA1 72feb65d009933ef1a289b04efe467394c9f87d8 SHA256 33640e41d05442b86d85d4e0748f0450d4344de61ca10bb687d7010ea1cae03c
-MD5 dedfc337bf7a640acc5c256dfc2cc34a ChangeLog 7215
-RMD160 bcd20b491070b3f90f8dc6f46e0bb8407ee1d135 ChangeLog 7215
-SHA256 33640e41d05442b86d85d4e0748f0450d4344de61ca10bb687d7010ea1cae03c ChangeLog 7215
+EBUILD keepalived-1.1.15.ebuild 2496 RMD160 7700c5f919560209ff9e366b7a71cff7565ac74e SHA1 64135f4af481acd72f6d1b65776de7ea00a50955 SHA256 7ddaba540986fbfe4c94d49a8a5c7f700c305d348a0b0f2fab6fa515c3b44e14
+MD5 7b400a27c09a4bd695d8df4b1ba9f405 keepalived-1.1.15.ebuild 2496
+RMD160 7700c5f919560209ff9e366b7a71cff7565ac74e keepalived-1.1.15.ebuild 2496
+SHA256 7ddaba540986fbfe4c94d49a8a5c7f700c305d348a0b0f2fab6fa515c3b44e14 keepalived-1.1.15.ebuild 2496
+MISC ChangeLog 7390 RMD160 4e7679917d1a44a5908cbc91178396ae01377494 SHA1 48d14f5680be4917677f731ea48ef66a0bf055f6 SHA256 245538b05bd5ec4f1103a8459650c7da4d504a5b225734a7f773e27be190a787
+MD5 409d5334b86eccfb635a0f8f0350da91 ChangeLog 7390
+RMD160 4e7679917d1a44a5908cbc91178396ae01377494 ChangeLog 7390
+SHA256 245538b05bd5ec4f1103a8459650c7da4d504a5b225734a7f773e27be190a787 ChangeLog 7390
 MISC metadata.xml 353 RMD160 bb97ddf008d2b8ec626960d0ef5509963d055993 SHA1 32027c725e0627c88081228eb9b09e1fa001c42c SHA256 4336bfedf26cb9bfbaf200475b8d1d598f972d12e52a50744eb034ece4cf3042
 MD5 31db27806ba9d5a1d0d3ddea439f2c16 metadata.xml 353
 RMD160 bb97ddf008d2b8ec626960d0ef5509963d055993 metadata.xml 353
diff --git a/sys-cluster/keepalived/keepalived-1.1.13-r1.ebuild b/sys-cluster/keepalived/keepalived-1.1.13-r1.ebuild
index f89453937690..57cb5199bee3 100644
--- a/sys-cluster/keepalived/keepalived-1.1.13-r1.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.1.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.13-r1.ebuild,v 1.5 2007/09/22 19:12:34 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.13-r1.ebuild,v 1.6 2007/09/23 00:39:51 robbat2 Exp $
 
 inherit flag-o-matic autotools
 
@@ -25,17 +25,17 @@ src_unpack() {
 	# This patch allows us to avoid needing kernel sources for the configure phase
 	EPATCH_OPTS="-p1 -d${S}" epatch \
 		${FILESDIR}/${PN}-1.1.13-do-not-need-kernel-sources.patch
-	cd ${S}
+	cd "${S}"
 	eautoreconf
 
 	# Prepare a suitable copy of the IPVS headers
 	# So that we don't need kernel sources at all!
-	mkdir -p ${S}/include/net || die "Failed to prepare ipvs header directory"
-	cp -f ${FILESDIR}/${PN}-1.1.13-linux-2.6.21-ip_vs.h \
-		${S}/include/net/ip_vs.h || die "Failed to add ipvs header"
+	mkdir -p "${S}"/include/net || die "Failed to prepare ipvs header directory"
+	cp -f "${FILESDIR}"/${PN}-1.1.13-linux-2.6.21-ip_vs.h \
+		"${S}"/include/net/ip_vs.h || die "Failed to add ipvs header"
 
 	# Ensure that keepalived can find the header that we are injecting
-	append-flags -I${S}/include
+	append-flags -I"${S}"/include
 }
 
 src_compile() {
@@ -63,7 +63,7 @@ src_install() {
 	# Not parallel safe
 	emake -j1 install DESTDIR="${D}" || die "emake install failed"
 
-	newinitd ${FILESDIR}/init-keepalived keepalived
+	newinitd "${FILESDIR}"/init-keepalived keepalived
 
 	dodoc doc/keepalived.conf.SYNOPSIS
 	dodoc README CONTRIBUTORS INSTALL VERSION ChangeLog AUTHOR TODO
@@ -74,7 +74,7 @@ src_install() {
 	newdoc INSTALL INSTALL+HOWTO
 
 	# Security risk to bundle SSL certs
-	rm -f ${D}/etc/keepalived/samples/*.pem
+	rm -f "${D}"/etc/keepalived/samples/*.pem
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/keepalived/keepalived-1.1.15.ebuild b/sys-cluster/keepalived/keepalived-1.1.15.ebuild
index c7b752de4687..c624ed9ec33d 100644
--- a/sys-cluster/keepalived/keepalived-1.1.15.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.15.ebuild,v 1.1 2007/09/22 09:12:36 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.15.ebuild,v 1.2 2007/09/23 00:39:51 robbat2 Exp $
 
 inherit flag-o-matic autotools
 
@@ -25,17 +25,17 @@ src_unpack() {
 	# This patch allows us to avoid needing kernel sources for the configure phase
 	EPATCH_OPTS="-p1 -d${S}" epatch \
 		${FILESDIR}/${PN}-1.1.13-do-not-need-kernel-sources.patch
-	cd ${S}
+	cd "${S}"
 	eautoreconf
 
 	# Prepare a suitable copy of the IPVS headers
 	# So that we don't need kernel sources at all!
-	mkdir -p ${S}/include/net || die "Failed to prepare ipvs header directory"
-	cp -f ${FILESDIR}/${PN}-1.1.13-linux-2.6.21-ip_vs.h \
-		${S}/include/net/ip_vs.h || die "Failed to add ipvs header"
+	mkdir -p "${S}"/include/net || die "Failed to prepare ipvs header directory"
+	cp -f "${FILESDIR}"/${PN}-1.1.13-linux-2.6.21-ip_vs.h \
+		"${S}"/include/net/ip_vs.h || die "Failed to add ipvs header"
 
 	# Ensure that keepalived can find the header that we are injecting
-	append-flags -I${S}/include
+	append-flags -I"${S}"/include
 }
 
 src_compile() {
@@ -63,7 +63,7 @@ src_install() {
 	# Not parallel safe
 	emake -j1 install DESTDIR="${D}" || die "emake install failed"
 
-	newinitd ${FILESDIR}/init-keepalived keepalived
+	newinitd "${FILESDIR}"/init-keepalived keepalived
 
 	dodoc doc/keepalived.conf.SYNOPSIS
 	dodoc README CONTRIBUTORS INSTALL VERSION ChangeLog AUTHOR TODO
@@ -74,8 +74,9 @@ src_install() {
 	newdoc INSTALL INSTALL+HOWTO
 
 	# Security risk to bundle SSL certs
-	rm -f ${D}/etc/keepalived/samples/*.pem
-	rm -rf ${D}/etc/sysconfig ${D}/etc/rc.d/
+	rm -f "${D}"/etc/keepalived/samples/*.pem
+	# Clean up sysvinit files
+	rm -rf "${D}"/etc/sysconfig "${D}"/etc/rc.d/
 }
 
 pkg_postinst() {