Use versionator for the PV/DEB_PV manipulations; Use die properly; Use neconfd/newinitd for #174266; Properly quote variables.

Package-Manager: portage-2.1.2.4

4 files changed, 47 insertions, 44 deletions

diff --git a/app-crypt/cfs/ChangeLog b/app-crypt/cfs/ChangeLog
index a3f32ea36d26..9b9afcd6f61e 100644
--- a/app-crypt/cfs/ChangeLog
+++ b/app-crypt/cfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/cfs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/cfs/ChangeLog,v 1.8 2007/03/19 11:50:06 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/cfs/ChangeLog,v 1.9 2007/04/22 15:13:57 phreak Exp $
+
+  22 Apr 2007; Christian Heim <phreak@gentoo.org> cfs-1.4.1.14.ebuild,
+  cfs-1.4.1.17.ebuild:
+  Use versionator for the PV/DEB_PV manipulations; Use die properly; Use
+  neconfd/newinitd for #174266; Properly quote variables.
 
   19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove mkennedy from metadata.xml due to retirement.
diff --git a/app-crypt/cfs/Manifest b/app-crypt/cfs/Manifest
index 5975951acca0..9b3d9fcd9d6f 100644
--- a/app-crypt/cfs/Manifest
+++ b/app-crypt/cfs/Manifest
@@ -16,18 +16,18 @@ SHA256 1344bbdb6ebca144bde0347f41328728cbc158ae0d2aedeeda617fac41edd8fa files/cf
 DIST cfs_1.4.1-14.diff.gz 17787 RMD160 6b26105f7fa7c34f40be4b6b881599b36bcefb35 SHA1 0edb8290903f77853747735f9aa13f48c4297fda SHA256 eefe6a9a4c7782c33eda14b93ab000eb7a5cc405a9af113284f93cdfd5564f7e
 DIST cfs_1.4.1-17.diff.gz 18581 RMD160 9fcd6c905f29de64e538c2fbc76c2894e57f14b6 SHA1 427924e1ab9cd92b2118b62164344922de19f13a SHA256 c0938cd88dd603b6ade9dc3cd3073dcd8e3a08e8a16685e62e383681a9506ade
 DIST cfs_1.4.1.orig.tar.gz 98376 RMD160 c78b17d920a4c2c3b9382da533a87ca7bea9d8d5 SHA1 ef3dcebcd21071cb04634ce0b3214e7967dde188 SHA256 86b52891c2cff4c80e4c3779337e690c54a6b8e132611269576c3d8d31ec4e74
-EBUILD cfs-1.4.1.14.ebuild 2125 RMD160 275b2cf20ab91d4409a179621d3b2ae3252d0661 SHA1 6c61d4b3f19d70ffeede39fc75d7a76e9870b2f1 SHA256 3a75b34f46917465a6a0cc3ee1eced5980775e76d743a240c780b404f441c238
-MD5 119052d4a482664bec8a42c778588ff0 cfs-1.4.1.14.ebuild 2125
-RMD160 275b2cf20ab91d4409a179621d3b2ae3252d0661 cfs-1.4.1.14.ebuild 2125
-SHA256 3a75b34f46917465a6a0cc3ee1eced5980775e76d743a240c780b404f441c238 cfs-1.4.1.14.ebuild 2125
-EBUILD cfs-1.4.1.17.ebuild 2125 RMD160 578dad1b3da74c0adb3176c645fa1d3c27b97e99 SHA1 c42a9161122b4991b97e590c4a7ef5cffd51f303 SHA256 15dd9c1f570efae17a69b813140812561b6e4d6c78d8106028c263bdc68b75a6
-MD5 1ae1ec1e385fbd85ce427dab1293c744 cfs-1.4.1.17.ebuild 2125
-RMD160 578dad1b3da74c0adb3176c645fa1d3c27b97e99 cfs-1.4.1.17.ebuild 2125
-SHA256 15dd9c1f570efae17a69b813140812561b6e4d6c78d8106028c263bdc68b75a6 cfs-1.4.1.17.ebuild 2125
-MISC ChangeLog 1117 RMD160 0f02750d5ce4d8ffdfe10f902e39f5add4a22703 SHA1 04ba776cf572b549dc30c1cfb927f56f517f3f55 SHA256 dcadbf1de529f039d7223ac9d9e8de42cbd07e3a9def641392f51ff518428367
-MD5 de0afc8bf850573ccd0d555bc606bb95 ChangeLog 1117
-RMD160 0f02750d5ce4d8ffdfe10f902e39f5add4a22703 ChangeLog 1117
-SHA256 dcadbf1de529f039d7223ac9d9e8de42cbd07e3a9def641392f51ff518428367 ChangeLog 1117
+EBUILD cfs-1.4.1.14.ebuild 2223 RMD160 fafe2fe58d198473226852e5216e698f130df53d SHA1 5db1e3edca2f2faf67c083e6a4d02c46ad30bfc4 SHA256 34e1cd9890b359951670ef8a3086eff62bc2eb2870b22e028afc7a31e7168406
+MD5 b8a9ed37e32642bc3eeaf1ad18774bab cfs-1.4.1.14.ebuild 2223
+RMD160 fafe2fe58d198473226852e5216e698f130df53d cfs-1.4.1.14.ebuild 2223
+SHA256 34e1cd9890b359951670ef8a3086eff62bc2eb2870b22e028afc7a31e7168406 cfs-1.4.1.14.ebuild 2223
+EBUILD cfs-1.4.1.17.ebuild 2223 RMD160 a4196edc81bd34c05edee4d6c2ed6d860a653546 SHA1 416e4e21357eded738906857d513f7e2e35bd043 SHA256 84504983fc1ced989e2401dcda7b739fd8e9b0b7c6812c6b03c1b55c5c7da1b6
+MD5 23c7e3099445a7404be0396c0c67c441 cfs-1.4.1.17.ebuild 2223
+RMD160 a4196edc81bd34c05edee4d6c2ed6d860a653546 cfs-1.4.1.17.ebuild 2223
+SHA256 84504983fc1ced989e2401dcda7b739fd8e9b0b7c6812c6b03c1b55c5c7da1b6 cfs-1.4.1.17.ebuild 2223
+MISC ChangeLog 1343 RMD160 32c15e3d3b87dc472894ca0be3767b8aee41905f SHA1 3fd998cff883bc5a382b894cc22f8a439f10ca71 SHA256 7fb2c847cab865f8c78feb96787ceef80852b7df262e7fdde1aaea40d5ead470
+MD5 431ca2a5559baa466607be6872f32ab0 ChangeLog 1343
+RMD160 32c15e3d3b87dc472894ca0be3767b8aee41905f ChangeLog 1343
+SHA256 7fb2c847cab865f8c78feb96787ceef80852b7df262e7fdde1aaea40d5ead470 ChangeLog 1343
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
 MD5 4eda2fda81ea6a89d8f1f4a2dcd12a85 metadata.xml 233
 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 metadata.xml 233
@@ -41,7 +41,7 @@ SHA256 2a4c23c7d2e2eed74f7fa1fb5320da37d715e0e53c01c8371b62b415358c5dbd files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF/ni0ugEuf3OQ0akRAm3xAJ4vlYSC6rvU7VfUzjOyichwr/LY5wCdGCiO
-FCTYiQtQ+S85bLRQnCs/PuI=
-=krZ4
+iD8DBQFGK3u+yuNVb5qfaOYRAkM1AJ4sUaW6ENcq44lamRCRn+WpMrBHPgCeKs/r
+SsceZSv6QRKErANNh2pGp4A=
+=eWX3
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/cfs/cfs-1.4.1.14.ebuild b/app-crypt/cfs/cfs-1.4.1.14.ebuild
index 2ee5980fd7a6..e47e26d5e070 100644
--- a/app-crypt/cfs/cfs-1.4.1.14.ebuild
+++ b/app-crypt/cfs/cfs-1.4.1.14.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/cfs/cfs-1.4.1.14.ebuild,v 1.6 2007/02/04 19:16:12 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/cfs/cfs-1.4.1.14.ebuild,v 1.7 2007/04/22 15:13:57 phreak Exp $
 
-inherit eutils
+inherit eutils versionator
 
-MY_PV=${PV:0:5}
-DEB_PV=${PV:6:2}
+MY_PV="$(get_version_component_range 1-3)"
+DEB_PV="$(get_version_component_range 4)"
 
 # This is a port of the Debian port of CFS which includes several
 # useful patches.  Many thanks to the Debian developers.
@@ -29,7 +29,7 @@ do-debian-credits() {
 	docinto debian
 	for i in copyright README.Debian changelog; do
 		# be silent, since all files are not always present
-		dodoc ${S}/debian/${i} &>/dev/null || true
+		dodoc "${S}"/debian/${i} &>/dev/null || true
 	done
 	docinto .
 }
@@ -43,7 +43,7 @@ pkg_setup() {
 		eerror "It seems that the null directory or CFS root is currently in use."
 		eerror "You must shutdown CFS before merging this port or at least unmount"
 		eerror "the CFS root before using this port."
-		die
+		die "cfs is still running!"
 	fi
 }
 
@@ -53,25 +53,24 @@ src_unpack() {
 }
 
 src_compile() {
-	make cfs COPT="${CFLAGS} -DPROTOTYPES -g" || die
+	make cfs COPT="${CFLAGS} -DPROTOTYPES -g" || die "make failed!"
 }
 
 src_install() {
-	make install_cfs BINDIR=${D}/usr/bin ETCDIR=${D}/usr/sbin || die
-	insinto /etc/conf.d
-	newins ${FILESDIR}/cfsd.conf cfsd
+	make install_cfs BINDIR="${D}"/usr/bin ETCDIR="${D}"/usr/sbin || \
+		die "make install failed!"
+	newconfd "${FILESDIR}"/cfsd.conf cfsd
 #	exeinto /var/lib/cfs
 #	doexe debian/cfs_*mount.sh
 	keepdir /var/run/cfs
 	keepdir /var/cfs
 	keepdir /var/lib/cfs/.cfsfs
-	chmod 0 ${D}/var/lib/cfs/.cfsfs
+	chmod 0 "${D}"/var/lib/cfs/.cfsfs
 	doman *.[18]
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/cfsd.init cfsd
+	newinitd "${FILESDIR}"/cfsd.init cfsd
 	do-debian-credits
 	dodoc LEVELS README* VERSION
-	dodoc ${FILESDIR}/README.Gentoo
+	dodoc "${FILESDIR}"/README.Gentoo
 }
 
 pkg_postinst() {
diff --git a/app-crypt/cfs/cfs-1.4.1.17.ebuild b/app-crypt/cfs/cfs-1.4.1.17.ebuild
index ce2a5f92b357..9736eb8a2383 100644
--- a/app-crypt/cfs/cfs-1.4.1.17.ebuild
+++ b/app-crypt/cfs/cfs-1.4.1.17.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/cfs/cfs-1.4.1.17.ebuild,v 1.2 2007/02/04 19:16:12 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/cfs/cfs-1.4.1.17.ebuild,v 1.3 2007/04/22 15:13:57 phreak Exp $
 
-inherit eutils
+inherit eutils versionator
 
-MY_PV=${PV:0:5}
-DEB_PV=${PV:6:2}
+MY_PV="$(get_version_component_range 1-3)"
+DEB_PV="$(get_version_component_range 4)"
 
 # This is a port of the Debian port of CFS which includes several
 # useful patches.  Many thanks to the Debian developers.
@@ -29,7 +29,7 @@ do-debian-credits() {
 	docinto debian
 	for i in copyright README.Debian changelog; do
 		# be silent, since all files are not always present
-		dodoc ${S}/debian/${i} &>/dev/null || true
+		dodoc "${S}"/debian/${i} &>/dev/null || true
 	done
 	docinto .
 }
@@ -43,7 +43,7 @@ pkg_setup() {
 		eerror "It seems that the null directory or CFS root is currently in use."
 		eerror "You must shutdown CFS before merging this port or at least unmount"
 		eerror "the CFS root before using this port."
-		die
+		die "cfs is still running!"
 	fi
 }
 
@@ -53,25 +53,24 @@ src_unpack() {
 }
 
 src_compile() {
-	make cfs COPT="${CFLAGS} -DPROTOTYPES -g" || die
+	make cfs COPT="${CFLAGS} -DPROTOTYPES -g" || die "make failed!"
 }
 
 src_install() {
-	make install_cfs BINDIR=${D}/usr/bin ETCDIR=${D}/usr/sbin || die
-	insinto /etc/conf.d
-	newins ${FILESDIR}/cfsd.conf cfsd
+	make install_cfs BINDIR="${D}"/usr/bin ETCDIR="${D}"/usr/sbin || \
+		die "make install failed!"
+	newconfd "${FILESDIR}"/cfsd.conf cfsd
 #	exeinto /var/lib/cfs
 #	doexe debian/cfs_*mount.sh
 	keepdir /var/run/cfs
 	keepdir /var/cfs
 	keepdir /var/lib/cfs/.cfsfs
-	chmod 0 ${D}/var/lib/cfs/.cfsfs
+	chmod 0 "${D}"/var/lib/cfs/.cfsfs
 	doman *.[18]
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/cfsd.init cfsd
+	newinitd "${FILESDIR}"/cfsd.init cfsd
 	do-debian-credits
 	dodoc LEVELS README* VERSION
-	dodoc ${FILESDIR}/README.Gentoo
+	dodoc "${FILESDIR}"/README.Gentoo
 }
 
 pkg_postinst() {