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

(Portage version: 2.1.3.16)

2 files changed, 21 insertions, 18 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/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