diff options
| author |   Daniel Gryniewicz <dang@gentoo.org> | 2007-05-02 16:16:34 +0000 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@gentoo.org> | 2007-05-02 16:16:34 +0000 |
| commit | 396b5cb41f72fd766b12ae9b5350f8186e15e231 (patch) | |
| tree | d1ed59f2f69b6a833939533b146b7a1e623d8ba7 /net-print | |
| parent | Stable for HPPA (bug #176464). (diff) | |
| download | gentoo-2-396b5cb41f72fd766b12ae9b5350f8186e15e231.tar.gz gentoo-2-396b5cb41f72fd766b12ae9b5350f8186e15e231.tar.bz2 gentoo-2-396b5cb41f72fd766b12ae9b5350f8186e15e231.zip | |
Fix building if /bin/sh isn't bash. Bug #176799
(Portage version: 2.1.2.5)
Diffstat (limited to 'net-print')
3 files changed, 66 insertions, 2 deletions
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/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() { |