From: Daniel Gryniewicz <dang@gentoo.org>
Date: Wed, 2 May 2007 16:16:34 +0000 (+0000)
Subject: Fix building if /bin/sh isn't bash.  Bug #176799
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9e20180fa9b6e06a98151fc4d427ab29c5c5ef62;p=gentoo.git

Fix building if /bin/sh isn't bash.  Bug #176799
Package-Manager: portage-2.1.2.5
---

diff --git a/net-print/foomatic-filters-ppds/ChangeLog b/net-print/foomatic-filters-ppds/ChangeLog
index 07c677f76b35..dc4ab0ecc234 100644
--- a/net-print/foomatic-filters-ppds/ChangeLog
+++ b/net-print/foomatic-filters-ppds/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/foomatic-filters-ppds
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters-ppds/ChangeLog,v 1.11 2007/05/01 12:07:01 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters-ppds/ChangeLog,v 1.12 2007/05/02 16:16:34 dang Exp $
+
+  02 May 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/foomatic-filters-ppds-20070501-remove-bashisms.patch,
+  foomatic-filters-ppds-20070501.ebuild:
+  Fix building if /bin/sh isn't bash.  Bug #176799
 
 *foomatic-filters-ppds-20070501 (01 May 2007)
 
diff --git a/net-print/foomatic-filters-ppds/Manifest b/net-print/foomatic-filters-ppds/Manifest
index 11efb3da5dcf..3e599e64a41b 100644
--- a/net-print/foomatic-filters-ppds/Manifest
+++ b/net-print/foomatic-filters-ppds/Manifest
@@ -1,17 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX foomatic-filters-ppds-20070501-remove-bashisms.patch 1833 RMD160 7a731bf782225ce35fbc9552a2d9b0278949412d SHA1 2742e209c85a9c9a0190e80c6d3c5e9c0816c3c6 SHA256 3ce1d7a43218dc1326947ba6ef61ac901cf5c918ea40bc089ef99c64b34fbe01
+MD5 432c0d53450dbb11d27f5c4bdcdbe97e files/foomatic-filters-ppds-20070501-remove-bashisms.patch 1833
+RMD160 7a731bf782225ce35fbc9552a2d9b0278949412d files/foomatic-filters-ppds-20070501-remove-bashisms.patch 1833
+SHA256 3ce1d7a43218dc1326947ba6ef61ac901cf5c918ea40bc089ef99c64b34fbe01 files/foomatic-filters-ppds-20070501-remove-bashisms.patch 1833
 DIST foomatic-filters-ppds-20060720.tar.gz 9563210 RMD160 19923da42e68ccc5114f1b7fda8c8c2d8423369a SHA1 22d05bfd3ce20fa641617477c9dff3bd42ecfd17 SHA256 26fe922bc042cff68d899e5023b4f268c5cf9ebf9ca9d5beb1081db81083e559
 DIST foomatic-filters-ppds-20070501.tar.gz 12434678 RMD160 eb118b62f9686bdcec6d2f3eff8d58aceeb18763 SHA1 8fba5baa0ab79ee98c0fedf4777e9c10833fadc7 SHA256 6c1b87c93b887b6ed1a95f5d99249abeaef286b927da37a6efe87bdd51187622
 EBUILD foomatic-filters-ppds-20060720.ebuild 971 RMD160 978fdc6bbbd4762f84257477332fde73750080b4 SHA1 c20382feb64f55dbb9f57beb247cd68fd299aa99 SHA256 a4e0c9eb9d9bcbe3932c76c3cb0fd5db5f1a2223457459e6b4dd43cbf3c94b68
 MD5 6e655246f9b4bc4e3dcca6b90ffe1400 foomatic-filters-ppds-20060720.ebuild 971
 RMD160 978fdc6bbbd4762f84257477332fde73750080b4 foomatic-filters-ppds-20060720.ebuild 971
 SHA256 a4e0c9eb9d9bcbe3932c76c3cb0fd5db5f1a2223457459e6b4dd43cbf3c94b68 foomatic-filters-ppds-20060720.ebuild 971
-EBUILD foomatic-filters-ppds-20070501.ebuild 1150 RMD160 b5d38a339e496429ab1d948c15a7d25d79c6ae4f SHA1 6ca7898a440f6402bbc646108c75be8fd35b8597 SHA256 6583cdffa68faafd7860acc740ca825a79b1228fa6971b682e807af1022e86cb
-MD5 faf880bbaf345962a9cf3ff36bb847cc foomatic-filters-ppds-20070501.ebuild 1150
-RMD160 b5d38a339e496429ab1d948c15a7d25d79c6ae4f foomatic-filters-ppds-20070501.ebuild 1150
-SHA256 6583cdffa68faafd7860acc740ca825a79b1228fa6971b682e807af1022e86cb foomatic-filters-ppds-20070501.ebuild 1150
-MISC ChangeLog 1694 RMD160 5adb3bbb991b4dd19a5384100dae1ab8a5a1b219 SHA1 e5c2ed126477001492fb894213d728bbcdac1777 SHA256 985003065fdd9cc849ccdd5d4056868c0560a9526f1e7fa37deb9fa2a6d10ded
-MD5 3684983c3206f8d7d8b61e575f269313 ChangeLog 1694
-RMD160 5adb3bbb991b4dd19a5384100dae1ab8a5a1b219 ChangeLog 1694
-SHA256 985003065fdd9cc849ccdd5d4056868c0560a9526f1e7fa37deb9fa2a6d10ded ChangeLog 1694
+EBUILD foomatic-filters-ppds-20070501.ebuild 1264 RMD160 2adbcf51121b212ba757e73fb16c01ab5513459c SHA1 7a272c9ba0992478398bba562978f0049d9907bf SHA256 386529efae02aa7d80711bf6f5220cbd972e4f49fb7da73ec2176d9f64ef59f4
+MD5 e4cb77e5aa982fda1dc8dabd76eae9df foomatic-filters-ppds-20070501.ebuild 1264
+RMD160 2adbcf51121b212ba757e73fb16c01ab5513459c foomatic-filters-ppds-20070501.ebuild 1264
+SHA256 386529efae02aa7d80711bf6f5220cbd972e4f49fb7da73ec2176d9f64ef59f4 foomatic-filters-ppds-20070501.ebuild 1264
+MISC ChangeLog 1898 RMD160 80bada19617e29db23df72c0eb4b2e45b7d3b16f SHA1 1501f479cbf574ca58e72c163dc7ea8675a8a4f6 SHA256 aad268e39e205fea5df3fb11de95e7845f25cb25e9812bb20d662d51a770c57e
+MD5 65f4a9976924088bce025a2aee253aca ChangeLog 1898
+RMD160 80bada19617e29db23df72c0eb4b2e45b7d3b16f ChangeLog 1898
+SHA256 aad268e39e205fea5df3fb11de95e7845f25cb25e9812bb20d662d51a770c57e ChangeLog 1898
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -22,3 +29,10 @@ SHA256 988c75cdb994e994bcf3f92a4b84a54dc401b7216cc58198ec8bc92d2796ddf6 files/di
 MD5 94120cb3dc8661d76e945f8b22e47ee2 files/digest-foomatic-filters-ppds-20070501 298
 RMD160 a30192a0aa0e2d89222f1d431169391474cd6624 files/digest-foomatic-filters-ppds-20070501 298
 SHA256 92afc9bd9d7e5ec2dfb235ab44e67b2c4fc16e8a43393a94155ffe1d495c5ac1 files/digest-foomatic-filters-ppds-20070501 298
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGOLl6omPajV0RnrERAilZAJ4nMqbtN74xGXI2xLmGT2T6r40jKACeO2dh
+/JPpzMQ2ee0AzUyJRpIWZIk=
+=Ef/4
+-----END PGP SIGNATURE-----
diff --git a/net-print/foomatic-filters-ppds/files/foomatic-filters-ppds-20070501-remove-bashisms.patch b/net-print/foomatic-filters-ppds/files/foomatic-filters-ppds-20070501-remove-bashisms.patch
new file mode 100644
index 000000000000..87cbab8e8c15
--- /dev/null
+++ b/net-print/foomatic-filters-ppds/files/foomatic-filters-ppds-20070501-remove-bashisms.patch
@@ -0,0 +1,55 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN foomatic-filters-ppds-20070501.orig/install foomatic-filters-ppds-20070501/install
+--- foomatic-filters-ppds-20070501.orig/install	2007-05-01 03:50:46.000000000 -0400
++++ foomatic-filters-ppds-20070501/install	2007-05-02 12:04:55.000000000 -0400
+@@ -9,7 +9,7 @@
+ prefix=/usr/local
+ gzip=0
+ moreoptions=1
+-while [ $moreoptions == 1 ]
++while [ $moreoptions = 1 ]
+   do
+   case $1 in
+       -p|--prefix)
+@@ -46,10 +46,10 @@ done
+ # Copy files
+ echo "Copying files ..."
+ mkdir -p $destdir$prefix
+-cp -ax bin share $destdir$prefix
++cp -RPp bin share $destdir$prefix
+ 
+ # Compress files
+-if [ $gzip == 1 ]; then
++if [ $gzip = 1 ]; then
+   echo "Compressing PPD files ..."
+   gzip -rf $destdir$prefix/share/ppd
+ fi
+@@ -57,9 +57,9 @@ fi
+ # Link for CUPS (do only if we have a CUPS daemon, PPD link to
+ # /usr/share/cups/model not needed on pure CUPS clients)
+ cups=0
+-if ( which cupsd > /dev/null 2>&1 ); then
++if type cupsd > /dev/null 2> /dev/null; then
+   echo "Setting link for CUPS ..."
+-  if ( which cups-config > /dev/null 2>&1 ); then
++  if type cups-config > /dev/null 2> /dev/null; then
+     # CUPS installed from source or "devel" package installed
+     ppddir=`cups-config --datadir`/model
+   else
+@@ -74,7 +74,7 @@ if ( which cupsd > /dev/null 2>&1 ); the
+ fi
+ 
+ # Do we have PPR installed
+-if ( which ppad > /dev/null 2>&1 ); then
++if type ppad > /dev/null 2>/dev/null; then
+   echo "Setting link for PPR ..."
+   if [ -d $destdir/usr/share/ppr/PPDFiles/ ]; then
+     rm -f $destdir/usr/share/ppr/PPDFiles/foomatic-ppds
+@@ -93,7 +93,7 @@ fi
+ echo "Installation finished"
+ echo ""
+ 
+-if [ $cups == 1 ]; then
++if [ $cups = 1 ]; then
+     echo "Please restart the CUPS daemon. Note that the CUPS daemon"
+     echo "needs some minutes to register all PPD files."
+     echo
diff --git a/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20070501.ebuild b/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20070501.ebuild
index 67797cc8bb24..007b7f22bfaa 100644
--- a/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20070501.ebuild
+++ b/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20070501.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20070501.ebuild,v 1.1 2007/05/01 12:07:01 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20070501.ebuild,v 1.2 2007/05/02 16:16:34 dang Exp $
+
+inherit eutils
 
 DESCRIPTION="linuxprinting.org PPD files for non-postscript printers"
 HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
@@ -18,6 +20,8 @@ src_unpack() {
 	unpack "${A}"
 	# Fix a symlink collision, see bug #172341
 	sed -i -e '/ln -s \$prefix\/share\/ppd \$destdir\$ppddir\/foomatic-ppds/d' "${S}"/install
+	# Fix building if /bin/sh isn't bash.  Bug #176799
+	epatch "${FILESDIR}"/${P}-remove-bashisms.patch
 }
 
 src_compile() {