Stable for HPPA (bug #195278). Fixed quoting issues.

Package-Manager: portage-2.1.3.16

3 files changed, 29 insertions, 36 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 1aadce610032..c3e4f9ee3c8a 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-print/cups
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.250 2007/10/22 20:09:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.251 2007/10/24 07:24:17 jer Exp $
+
+  24 Oct 2007; Jeroen Roovers <jer@gentoo.org> cups-1.2.12-r1.ebuild:
+  Stable for HPPA (bug #195278). Fixed quoting issues.
 
   22 Oct 2007; Markus Meier <maekke@gentoo.org> cups-1.2.12-r1.ebuild:
   x86 stable, bug #195278
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index c14a315c24e3..30d15c44f889 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cups-1.1.23-bindnow.patch 2087 RMD160 35c18c1bbeb7c79f9207ecbd69c004f2ddf68f80 SHA1 6f3c24500c50016c0bb2f1913b7c3cb6384c6b21 SHA256 fb932b7e9d04dfe7d52bd455f3514818a3bba1eaa3a3342b5c6b840bf957e67b
 MD5 b22c12cb42113ddc40988cfbe93e3519 files/cups-1.1.23-bindnow.patch 2087
 RMD160 35c18c1bbeb7c79f9207ecbd69c004f2ddf68f80 files/cups-1.1.23-bindnow.patch 2087
@@ -65,18 +62,18 @@ EBUILD cups-1.2.10-r1.ebuild 6316 RMD160 396839aec0fe91130450f8c4bdc5df0598a5ae2
 MD5 683374c073f1791ca3bfe1a3447b71f8 cups-1.2.10-r1.ebuild 6316
 RMD160 396839aec0fe91130450f8c4bdc5df0598a5ae29 cups-1.2.10-r1.ebuild 6316
 SHA256 b7dc3e71cd9fa05d9f51274e6c9158ccaf4ad5558de57dbf2b34f1c5cc0de95b cups-1.2.10-r1.ebuild 6316
-EBUILD cups-1.2.12-r1.ebuild 6867 RMD160 5890cb88c7fef4966808cd390c243afda7083089 SHA1 c186e2b26094e97664dc855a26a0afb68e057c52 SHA256 876e31c644198e5d43447fa782b628caad1e4cf16726dc004b63bd746dbeb7e1
-MD5 f8db98f1574adbfb49d40ab38e368fb9 cups-1.2.12-r1.ebuild 6867
-RMD160 5890cb88c7fef4966808cd390c243afda7083089 cups-1.2.12-r1.ebuild 6867
-SHA256 876e31c644198e5d43447fa782b628caad1e4cf16726dc004b63bd746dbeb7e1 cups-1.2.12-r1.ebuild 6867
+EBUILD cups-1.2.12-r1.ebuild 6893 RMD160 252670f4d3c1c3da6b9ac8082059afb37240c191 SHA1 217aa35cb1aca2812362851b910413f106fa8c51 SHA256 093d44bfb877f388830738d704a780f47cea1e5299375d5ff4d658fb047504ac
+MD5 3571c4006b5f11129868f502b22e7b53 cups-1.2.12-r1.ebuild 6893
+RMD160 252670f4d3c1c3da6b9ac8082059afb37240c191 cups-1.2.12-r1.ebuild 6893
+SHA256 093d44bfb877f388830738d704a780f47cea1e5299375d5ff4d658fb047504ac cups-1.2.12-r1.ebuild 6893
 EBUILD cups-1.3.3.ebuild 7065 RMD160 7dc21c2204f5beabc976cc594601b9b7c34b914d SHA1 3c980bd0581c1e26ac0e4902c6185200d0869a54 SHA256 86ee784e761f91b0da95374e3135c8fbca806a2130c58deaec40286e6f49e192
 MD5 074404a4c77a7c03fd986c7e66ff98b8 cups-1.3.3.ebuild 7065
 RMD160 7dc21c2204f5beabc976cc594601b9b7c34b914d cups-1.3.3.ebuild 7065
 SHA256 86ee784e761f91b0da95374e3135c8fbca806a2130c58deaec40286e6f49e192 cups-1.3.3.ebuild 7065
-MISC ChangeLog 34971 RMD160 35dda6e093e2ec9334ed3f6df808692da4e8bb85 SHA1 8a298ffc18f02bcfba04f0a16b08d58073a3ea3b SHA256 77cfd97c58cf094fe528c64a38406341d7ea1c9dccb9a3ec62a5e9bbd8413a2a
-MD5 ba4c18fbf7f2c8c50c8f817496e28bf1 ChangeLog 34971
-RMD160 35dda6e093e2ec9334ed3f6df808692da4e8bb85 ChangeLog 34971
-SHA256 77cfd97c58cf094fe528c64a38406341d7ea1c9dccb9a3ec62a5e9bbd8413a2a ChangeLog 34971
+MISC ChangeLog 35094 RMD160 b8dd89d5a512e7a072a6b60a9b276eacc27dfb78 SHA1 d5609046ff5efe744ee9218e17edf90015c0611b SHA256 94676011be122efc12d52cfbf9e33b6c2bfc617d36215c1aa1faabbbd8936170
+MD5 9ee012179da1f33dade891db0a5289d0 ChangeLog 35094
+RMD160 b8dd89d5a512e7a072a6b60a9b276eacc27dfb78 ChangeLog 35094
+SHA256 94676011be122efc12d52cfbf9e33b6c2bfc617d36215c1aa1faabbbd8936170 ChangeLog 35094
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -93,10 +90,3 @@ SHA256 1ed8553b6b83c34074f536128d9794fdbd11070a6091353722bb0cc5d4e625df files/di
 MD5 38e377d61f8024d0e2bb12ef22276f7d files/digest-cups-1.3.3 259
 RMD160 88c379a5b7e3f0b95d8006c9e2b8caf09c49595b files/digest-cups-1.3.3 259
 SHA256 e8be44eb403e98a8993e178f9a3aa8ef0b32ce69a436404c53613318e4e67df3 files/digest-cups-1.3.3 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHHQONkKaRLQcq0GIRAhUsAKCcIOwzIeLBJGtnmV0fzeghvFMwfgCfazd4
-wR6hw2ZVQpl4A54uVA4YhkE=
-=Znup
------END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.2.12-r1.ebuild b/net-print/cups/cups-1.2.12-r1.ebuild
index 7ac0a85734ff..741cd934f45e 100644
--- a/net-print/cups/cups-1.2.12-r1.ebuild
+++ b/net-print/cups/cups-1.2.12-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/net-print/cups/cups-1.2.12-r1.ebuild,v 1.2 2007/10/22 20:09:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.12-r1.ebuild,v 1.3 2007/10/24 07:24:17 jer Exp $
 
 WANT_AUTOMAKE=latest
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/cups/${MY_P}-source.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="ldap ssl slp pam php samba nls dbus tiff png ppds jpeg X"
 
 DEP="pam? ( virtual/pam )
@@ -81,10 +81,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# upstream does not acknowledge bindnow as a solution
-	epatch ${FILESDIR}/cups-1.2.0-bindnow.patch
+	epatch "${FILESDIR}"/cups-1.2.0-bindnow.patch
 
 	# cups does not use autotools "the usual way" and ship a static config.h.in
 	eaclocal
@@ -127,29 +127,29 @@ src_compile() {
 }
 
 src_install() {
-	emake BUILDROOT=${D} install || die "emake install failed"
+	emake BUILDROOT="${D}" install || die "emake install failed"
 	dodoc {CHANGES{,-1.{0,1}},CREDITS,LICENSE,README}.txt
 
 	# clean out cups init scripts
-	rm -rf ${D}/etc/{init.d/cups,rc*,pam.d/cups}
+	rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups}
 	# install our init scripts
-	newinitd ${FILESDIR}/cupsd.init cupsd
+	newinitd "${FILESDIR}"/cupsd.init cupsd
 	# install our pam script
 	pamd_mimic_system cups auth account
 
 	# correct path
-	sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" ${D}/etc/xinetd.d/cups-lpd
+	sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" "${D}"/etc/xinetd.d/cups-lpd
 	# it is safer to disable this by default, bug 137130
-	grep -w 'disable' ${D}/etc/xinetd.d/cups-lpd || \
-		sed -i -e "s:}:\tdisable = yes\n}:" ${D}/etc/xinetd.d/cups-lpd
+	grep -w 'disable' "${D}"/etc/xinetd.d/cups-lpd || \
+		sed -i -e "s:}:\tdisable = yes\n}:" "${D}"/etc/xinetd.d/cups-lpd
 
 	# install pdftops filter
 	exeinto /usr/libexec/cups/filter/
-	newexe ${FILESDIR}/pdftops.pl pdftops
+	newexe "${FILESDIR}"/pdftops.pl pdftops
 
 	# only for gs-esp this is correct, see bug 163897
 	if has_version app-text/ghostscript-gpl || has_version app-text/ghostscript-gnu; then
-		sed -i -e "s:#application/vnd.cups-postscript:application/vnd.cups-postscript:" ${D}/etc/cups/mime.convs
+		sed -i -e "s:#application/vnd.cups-postscript:application/vnd.cups-postscript:" "${D}"/etc/cups/mime.convs
 	fi
 
 	keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \
@@ -157,9 +157,9 @@ src_install() {
 
 	# .desktop handling. X useflag. xdg-open from freedesktop is preferred
 	if use X; then
-		sed -i -e "s:htmlview:xdg-open:" ${D}/usr/share/applications/cups.desktop
+		sed -i -e "s:htmlview:xdg-open:" "${D}"/usr/share/applications/cups.desktop
 	else
-		rm -r ${D}/usr/share/applications
+		rm -r "${D}"/usr/share/applications
 	fi
 
 	# Fix a symlink collision, see bug #172341
@@ -169,7 +169,7 @@ src_install() {
 
 pkg_preinst() {
 	# cleanups
-	[ -n "${PN}" ] && rm -fR ${ROOT}/usr/share/doc/${PN}-*
+	[ -n "${PN}" ] && rm -fR "${ROOT}"/usr/share/doc/${PN}-*
 }
 
 pkg_postinst() {
@@ -201,7 +201,7 @@ pkg_postinst() {
 		ewarn
 		ewarn "You need to rebuild kdelibs for kdeprinter to work with cups-1.2"
 	fi
-	if [ -e ${ROOT}/usr/lib/cups ]; then
+	if [ -e "${ROOT}"/usr/lib/cups ]; then
 		ewarn
 		ewarn "/usr/lib/cups exists - You need to remerge every ebuild that"
 		ewarn "installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:"
@@ -212,7 +212,7 @@ pkg_postinst() {
 		ewarn "You should also run revdep-rebuild"
 
 		# place symlinks to make the update smoothless
-		for i in ${ROOT}/usr/lib/cups/{backend,filter}/*; do
+		for i in "${ROOT}"/usr/lib/cups/{backend,filter}/*; do
 			if [ "${i/\*}" == "${i}" ] && ! [ -e ${i/lib/libexec} ]; then
 				ln -s ${i} ${i/lib/libexec}
 			fi