Improved ebuild, added quotes on some variables and ROOT support.

Package-Manager: portage-2.1.2.2

5 files changed, 96 insertions, 85 deletions

diff --git a/sys-cluster/csync2/ChangeLog b/sys-cluster/csync2/ChangeLog
index fc7bf6710c2d..d260a8867dc5 100644
--- a/sys-cluster/csync2/ChangeLog
+++ b/sys-cluster/csync2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/csync2
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/csync2/ChangeLog,v 1.22 2007/09/20 08:49:25 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/csync2/ChangeLog,v 1.23 2007/09/20 20:59:17 xmerlin Exp $
+
+  20 Sep 2007; Christian Zoffoli <xmerlin@gentoo.org> csync2-1.32.ebuild,
+  csync2-1.33.ebuild, csync2-1.34.ebuild:
+  Improved ebuild, added quotes on some variables and ROOT support as
+  suggested by Donnie.
 
 *csync2-1.34 (20 Sep 2007)
 
diff --git a/sys-cluster/csync2/Manifest b/sys-cluster/csync2/Manifest
index 3a95d0280723..2ab5ee1fdadf 100644
--- a/sys-cluster/csync2/Manifest
+++ b/sys-cluster/csync2/Manifest
@@ -8,22 +8,22 @@ SHA256 c281d7e494088abd84ef09b5487482cfa886f12aa0ab717f4cb579b729cc7ee9 files/cs
 DIST csync2-1.32.tar.gz 218053 RMD160 7901c2f0515ee5dc4dcf086a0f090bfdab47208a SHA1 3aa4e673e4bee4a160b3f5926e0b6765cff701ab SHA256 3144c987fd4cdffa9c2d461dc1315aaa0685f33d8668db8aa42085c97c232c31
 DIST csync2-1.33.tar.gz 218065 RMD160 3c06cff1adb6df03108670eccce4889e3913cfba SHA1 8d94eb0c7ff997598be7b1cfc444bb74eae6712d SHA256 2214adb04358b5d351cac7e13055e1c90f7897b7c0600b922de02ca6b0820651
 DIST csync2-1.34.tar.gz 222765 RMD160 d79ddf0e608934d40f0095dde8aa5785c6094d84 SHA1 59b95388d378b659d64d17f7b736068dec7bf7ed SHA256 32b250dd4a0353f71015c5c3961174b975dd5e799e4a084e8f6d00792bd8c833
-EBUILD csync2-1.32.ebuild 2163 RMD160 23869c3c5f161c11fd104c1202361181c3988421 SHA1 44b80bce5cdcf970cb0282d89bb68a07113bdc2c SHA256 762fa77c4b093dd89d13080b24875ff926182c7170ea581f40e5522f078507ac
-MD5 72e828f5887ab4f0675394faea4b9c5f csync2-1.32.ebuild 2163
-RMD160 23869c3c5f161c11fd104c1202361181c3988421 csync2-1.32.ebuild 2163
-SHA256 762fa77c4b093dd89d13080b24875ff926182c7170ea581f40e5522f078507ac csync2-1.32.ebuild 2163
-EBUILD csync2-1.33.ebuild 2163 RMD160 3d85f67feee317bbc32aeea31ba366e7a6d60b06 SHA1 152ecebc3ad62715deadf3f5c9620ca031b25e8f SHA256 0a5163ad3297672ec46873a4bcf4fc3d5fde3023ff428a6bec424409443d16e7
-MD5 2a367f63ad1f51439dcf126a7b46d164 csync2-1.33.ebuild 2163
-RMD160 3d85f67feee317bbc32aeea31ba366e7a6d60b06 csync2-1.33.ebuild 2163
-SHA256 0a5163ad3297672ec46873a4bcf4fc3d5fde3023ff428a6bec424409443d16e7 csync2-1.33.ebuild 2163
-EBUILD csync2-1.34.ebuild 2164 RMD160 1bdd56269993d6cf5cff28f8289d849791eba6d6 SHA1 4003d6c5dc3cac4972dc000016cf5069a54b142c SHA256 44b4fb68d78f24456384fe5d5360de24c93a4077a3aa2f70541f3420d129687f
-MD5 289509aeeb53d56643f67803842b9ffd csync2-1.34.ebuild 2164
-RMD160 1bdd56269993d6cf5cff28f8289d849791eba6d6 csync2-1.34.ebuild 2164
-SHA256 44b4fb68d78f24456384fe5d5360de24c93a4077a3aa2f70541f3420d129687f csync2-1.34.ebuild 2164
-MISC ChangeLog 3328 RMD160 11250fab1fc3e8fcab6389c95b87d6f93e3a920f SHA1 40a2c5dd8d9f66bb02ae9fe845403c8d7c93c104 SHA256 9f718cd44ea86644229661ea1e99d89b292356969db4d51f35d0e6b84a24cf3b
-MD5 8470a2e80d90aff47f171fa1a35862b5 ChangeLog 3328
-RMD160 11250fab1fc3e8fcab6389c95b87d6f93e3a920f ChangeLog 3328
-SHA256 9f718cd44ea86644229661ea1e99d89b292356969db4d51f35d0e6b84a24cf3b ChangeLog 3328
+EBUILD csync2-1.32.ebuild 2365 RMD160 f90d91490f1a06e797738006d1e167595fd8dc95 SHA1 3e5d8f0ae23b9e7c45d372f84723608ba61387aa SHA256 424f305514feb2526b213d67eb9a1075b9eb8d464f0d24ffa35b335e813e5156
+MD5 e1b56dbb272290f04aeb4078b140c18c csync2-1.32.ebuild 2365
+RMD160 f90d91490f1a06e797738006d1e167595fd8dc95 csync2-1.32.ebuild 2365
+SHA256 424f305514feb2526b213d67eb9a1075b9eb8d464f0d24ffa35b335e813e5156 csync2-1.32.ebuild 2365
+EBUILD csync2-1.33.ebuild 2364 RMD160 d469f16eff0e8fbd220abe8b21f201accb191983 SHA1 cf6172aa7265a2220054b83146069b7b44e12014 SHA256 4e8a6d75def76d78c08a1b84ec255c42a9f37b9e32d0dbf39060fbce9cfdc056
+MD5 085d4d22fef1f65393cf34eb0a36747b csync2-1.33.ebuild 2364
+RMD160 d469f16eff0e8fbd220abe8b21f201accb191983 csync2-1.33.ebuild 2364
+SHA256 4e8a6d75def76d78c08a1b84ec255c42a9f37b9e32d0dbf39060fbce9cfdc056 csync2-1.33.ebuild 2364
+EBUILD csync2-1.34.ebuild 2365 RMD160 fcf6ea34e50ef6f997667aa1e9f757c493835e23 SHA1 0986352a115a9f84a6bcc82ae2222156273f5e53 SHA256 49a0c09eb64335c6c5c9d5e72595c4709a46f3998667b3ac34c4534408d5b125
+MD5 974e790d871090b80ec4bf6e63f3baf9 csync2-1.34.ebuild 2365
+RMD160 fcf6ea34e50ef6f997667aa1e9f757c493835e23 csync2-1.34.ebuild 2365
+SHA256 49a0c09eb64335c6c5c9d5e72595c4709a46f3998667b3ac34c4534408d5b125 csync2-1.34.ebuild 2365
+MISC ChangeLog 3538 RMD160 91f47bd887779a52ba6e193c3c7d14e7384687e1 SHA1 77f91aefe97acdc0da17e9b9f4396dbae2531624 SHA256 174ffdd4fdb49d5bc8860dc6cf1cf36db2da97bd91a10648d859418e020adb69
+MD5 82089933195e975f4eb2ceee9210f296 ChangeLog 3538
+RMD160 91f47bd887779a52ba6e193c3c7d14e7384687e1 ChangeLog 3538
+SHA256 174ffdd4fdb49d5bc8860dc6cf1cf36db2da97bd91a10648d859418e020adb69 ChangeLog 3538
 MISC metadata.xml 229 RMD160 4dcf17b88c5f4db2e817f473f3e8269b0bff2e6e SHA1 e6315be43241c55bdc0d12a42fa05632c5ff9b79 SHA256 49e13d2d49bef7298e3bb665ebeceeff9b0880fae5ff639cb8405993504f244f
 MD5 58f295ba7477091e41340647670f3231 metadata.xml 229
 RMD160 4dcf17b88c5f4db2e817f473f3e8269b0bff2e6e metadata.xml 229
@@ -40,7 +40,7 @@ SHA256 227d41eacbb87e08532284a1963c7268ce295989c0dab32f55a76c5330a2e800 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFG8jQdgMUyd/cdjWsRAthlAJ94SFEx2x+853tIFydZfyGoZl/MAACggYKo
-/mB3XhBo9S0m44KQ23MGwhM=
-=r+pg
+iD8DBQFG8t8vgMUyd/cdjWsRApjCAKCH1H/gKvoH8yyIHj2/ozXOrwymNgCfbVHp
+Prn4PkvEGyXRVIe24LUpvOw=
+=knoU
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/csync2/csync2-1.32.ebuild b/sys-cluster/csync2/csync2-1.32.ebuild
index 7b07280dbe6d..11caed21fcf6 100644
--- a/sys-cluster/csync2/csync2-1.32.ebuild
+++ b/sys-cluster/csync2/csync2-1.32.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/sys-cluster/csync2/csync2-1.32.ebuild,v 1.9 2006/06/12 19:05:12 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/csync2/csync2-1.32.ebuild,v 1.10 2007/09/20 20:59:17 xmerlin Exp $
 
 DESCRIPTION="Cluster synchronization tool."
 SRC_URI="http://oss.linbit.com/csync2/${P}.tar.gz"
@@ -24,14 +24,14 @@ src_compile() {
 	econf \
 		--localstatedir=/var \
 		--sysconfdir=/etc/csync2 \
-		|| die
+		|| die "configure problem"
 
-	emake || die
+	emake || die "compile problem"
 }
 
-src_install() {
 
-	make DESTDIR=${D} \
+src_install() {
+	emake DESTDIR="${D}" \
 		localstatedir=/var \
 		sysconfdir=/etc/csync2 \
 		install || die "install problem"
@@ -45,6 +45,7 @@ src_install() {
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO csync2_locheck.sh
 }
 
+
 pkg_postinst() {
 	echo
 	einfo "After you setup your conf file, edit the xinetd"
@@ -61,31 +62,32 @@ pkg_postinst() {
 	echo
 }
 
+
 pkg_config() {
-	einfo "Updating /etc/services"
-	{ grep -v ^${PN} /etc/services;
+	einfo "Updating ${ROOT}/etc/services"
+	{ grep -v ^${PN} "${ROOT}"/etc/services;
 	echo "csync2  30865/tcp"
-	} > /etc/services.new
-	mv -f /etc/services.new /etc/services
+	} > "${ROOT}"/etc/services.new
+	mv -f "${ROOT}"/etc/services.new "${ROOT}"/etc/services
 
-	if [ ! -f /etc/${PN}/csync2_ssl_key.pem ]; then
-		einfo "Creating default certificate in /etc/${PN}"
+	if [ ! -f "${ROOT}"/etc/${PN}/csync2_ssl_key.pem ]; then
+		einfo "Creating default certificate in ${ROOT}/etc/${PN}"
 
-		openssl genrsa -out /etc/${PN}/csync2_ssl_key.pem 1024 &> /dev/null
+		openssl genrsa -out "${ROOT}"/etc/${PN}/csync2_ssl_key.pem 1024 &> /dev/null
 
 		yes '' | \
 		openssl req -new \
-			-key /etc/${PN}/csync2_ssl_key.pem \
-			-out /etc/${PN}/csync2_ssl_cert.csr \
-			&> /dev/null
+			-key "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \
+			-out "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \
+			&> "${ROOT}"/dev/null
 
 		openssl x509 -req -days 600 \
-			-in /etc/${PN}/csync2_ssl_cert.csr \
-			-signkey /etc/${PN}/csync2_ssl_key.pem \
-			-out /etc/${PN}/csync2_ssl_cert.pem \
-			&> /dev/null
+			-in "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \
+			-signkey "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \
+			-out "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem \
+			&> "${ROOT}"/dev/null
 
-		rm /etc/${PN}/csync2_ssl_cert.csr
-		chmod 400 /etc/${PN}/csync2_ssl_key.pem /etc/${PN}/csync2_ssl_cert.pem
+		rm "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr
+		chmod 400 "${ROOT}"/etc/${PN}/csync2_ssl_key.pem "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem
 	fi
 }
diff --git a/sys-cluster/csync2/csync2-1.33.ebuild b/sys-cluster/csync2/csync2-1.33.ebuild
index 7f5ee98ef4a0..750012f7db50 100644
--- a/sys-cluster/csync2/csync2-1.33.ebuild
+++ b/sys-cluster/csync2/csync2-1.33.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/sys-cluster/csync2/csync2-1.33.ebuild,v 1.2 2006/10/15 14:09:17 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/csync2/csync2-1.33.ebuild,v 1.3 2007/09/20 20:59:18 xmerlin Exp $
 
 DESCRIPTION="Cluster synchronization tool."
 SRC_URI="http://oss.linbit.com/csync2/${P}.tar.gz"
@@ -24,14 +24,14 @@ src_compile() {
 	econf \
 		--localstatedir=/var \
 		--sysconfdir=/etc/csync2 \
-		|| die
+		|| die "configure problem"
 
-	emake || die
+	emake || die "compile problem"
 }
 
-src_install() {
 
-	make DESTDIR=${D} \
+src_install() {
+	emake DESTDIR="${D}" \
 		localstatedir=/var \
 		sysconfdir=/etc/csync2 \
 		install || die "install problem"
@@ -45,6 +45,7 @@ src_install() {
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO csync2_locheck.sh
 }
 
+
 pkg_postinst() {
 	echo
 	einfo "After you setup your conf file, edit the xinetd"
@@ -61,31 +62,32 @@ pkg_postinst() {
 	echo
 }
 
+
 pkg_config() {
-	einfo "Updating /etc/services"
-	{ grep -v ^${PN} /etc/services;
+	einfo "Updating ${ROOT}/etc/services"
+	{ grep -v ^${PN} "${ROOT}"/etc/services;
 	echo "csync2  30865/tcp"
-	} > /etc/services.new
-	mv -f /etc/services.new /etc/services
+	} > "${ROOT}"/etc/services.new
+	mv -f "${ROOT}"/etc/services.new "${ROOT}"/etc/services
 
-	if [ ! -f /etc/${PN}/csync2_ssl_key.pem ]; then
-		einfo "Creating default certificate in /etc/${PN}"
+	if [ ! -f "${ROOT}"/etc/${PN}/csync2_ssl_key.pem ]; then
+		einfo "Creating default certificate in ${ROOT}/etc/${PN}"
 
-		openssl genrsa -out /etc/${PN}/csync2_ssl_key.pem 1024 &> /dev/null
+		openssl genrsa -out "${ROOT}"/etc/${PN}/csync2_ssl_key.pem 1024 &> /dev/null
 
 		yes '' | \
 		openssl req -new \
-			-key /etc/${PN}/csync2_ssl_key.pem \
-			-out /etc/${PN}/csync2_ssl_cert.csr \
-			&> /dev/null
+			-key "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \
+			-out "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \
+			&> "${ROOT}"/dev/null
 
 		openssl x509 -req -days 600 \
-			-in /etc/${PN}/csync2_ssl_cert.csr \
-			-signkey /etc/${PN}/csync2_ssl_key.pem \
-			-out /etc/${PN}/csync2_ssl_cert.pem \
-			&> /dev/null
+			-in "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \
+			-signkey "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \
+			-out "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem \
+			&> "${ROOT}"/dev/null
 
-		rm /etc/${PN}/csync2_ssl_cert.csr
-		chmod 400 /etc/${PN}/csync2_ssl_key.pem /etc/${PN}/csync2_ssl_cert.pem
+		rm "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr
+		chmod 400 "${ROOT}"/etc/${PN}/csync2_ssl_key.pem "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem
 	fi
 }
diff --git a/sys-cluster/csync2/csync2-1.34.ebuild b/sys-cluster/csync2/csync2-1.34.ebuild
index a1c11c96a5b6..f6067d481c6b 100644
--- a/sys-cluster/csync2/csync2-1.34.ebuild
+++ b/sys-cluster/csync2/csync2-1.34.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/csync2/csync2-1.34.ebuild,v 1.1 2007/09/20 08:49:25 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/csync2/csync2-1.34.ebuild,v 1.2 2007/09/20 20:59:18 xmerlin Exp $
 
 DESCRIPTION="Cluster synchronization tool."
 SRC_URI="http://oss.linbit.com/csync2/${P}.tar.gz"
@@ -24,14 +24,14 @@ src_compile() {
 	econf \
 		--localstatedir=/var \
 		--sysconfdir=/etc/csync2 \
-		|| die
+		|| die "configure problem"
 
-	emake || die
+	emake || die "compile problem"
 }
 
-src_install() {
 
-	make DESTDIR=${D} \
+src_install() {
+	emake DESTDIR="${D}" \
 		localstatedir=/var \
 		sysconfdir=/etc/csync2 \
 		install || die "install problem"
@@ -45,6 +45,7 @@ src_install() {
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO csync2_locheck.sh
 }
 
+
 pkg_postinst() {
 	echo
 	einfo "After you setup your conf file, edit the xinetd"
@@ -61,31 +62,32 @@ pkg_postinst() {
 	echo
 }
 
+
 pkg_config() {
-	einfo "Updating /etc/services"
-	{ grep -v ^${PN} /etc/services;
+	einfo "Updating ${ROOT}/etc/services"
+	{ grep -v ^${PN} "${ROOT}"/etc/services;
 	echo "csync2  30865/tcp"
-	} > /etc/services.new
-	mv -f /etc/services.new /etc/services
+	} > "${ROOT}"/etc/services.new
+	mv -f "${ROOT}"/etc/services.new "${ROOT}"/etc/services
 
-	if [ ! -f /etc/${PN}/csync2_ssl_key.pem ]; then
-		einfo "Creating default certificate in /etc/${PN}"
+	if [ ! -f "${ROOT}"/etc/${PN}/csync2_ssl_key.pem ]; then
+		einfo "Creating default certificate in ${ROOT}/etc/${PN}"
 
-		openssl genrsa -out /etc/${PN}/csync2_ssl_key.pem 1024 &> /dev/null
+		openssl genrsa -out "${ROOT}"/etc/${PN}/csync2_ssl_key.pem 1024 &> /dev/null
 
 		yes '' | \
 		openssl req -new \
-			-key /etc/${PN}/csync2_ssl_key.pem \
-			-out /etc/${PN}/csync2_ssl_cert.csr \
-			&> /dev/null
+			-key "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \
+			-out "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \
+			&> "${ROOT}"/dev/null
 
 		openssl x509 -req -days 600 \
-			-in /etc/${PN}/csync2_ssl_cert.csr \
-			-signkey /etc/${PN}/csync2_ssl_key.pem \
-			-out /etc/${PN}/csync2_ssl_cert.pem \
-			&> /dev/null
+			-in "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \
+			-signkey "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \
+			-out "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem \
+			&> "${ROOT}"/dev/null
 
-		rm /etc/${PN}/csync2_ssl_cert.csr
-		chmod 400 /etc/${PN}/csync2_ssl_key.pem /etc/${PN}/csync2_ssl_cert.pem
+		rm "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr
+		chmod 400 "${ROOT}"/etc/${PN}/csync2_ssl_key.pem "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem
 	fi
 }