From ae7513bd1db11ee3c4bca5b9c0cb4db545ee71bc Mon Sep 17 00:00:00 2001 From: Andreas Hüttel Date: Thu, 7 Jun 2012 19:42:52 +0000 Subject: Fix bashism in install-sh, bug 419735 Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64 --- net-print/cups/ChangeLog | 7 +- net-print/cups/Manifest | 28 ++-- net-print/cups/cups-1.5.2-r21.ebuild | 313 ----------------------------------- net-print/cups/cups-1.5.3.ebuild | 5 +- net-print/cups/cups-1.6_beta1.ebuild | 5 +- net-print/cups/cups-9999.ebuild | 5 +- 6 files changed, 36 insertions(+), 327 deletions(-) delete mode 100644 net-print/cups/cups-1.5.2-r21.ebuild (limited to 'net-print/cups') diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index 0456c385b84f..721ab3b358e3 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-print/cups # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.489 2012/06/05 23:23:54 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.490 2012/06/07 19:42:52 dilfridge Exp $ + + 07 Jun 2012; Andreas K. Huettel + -cups-1.5.2-r21.ebuild, cups-1.5.3.ebuild, cups-1.6_beta1.ebuild, + cups-9999.ebuild: + Fix bashism in install-sh, bug 419735 05 Jun 2012; Anthony G. Basile cups-1.5.3.ebuild: Keyword ~mips, bug #401067 diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index f510d747fdc9..d296d9379867 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX cups-1.4.0-backend-https.patch 483 RMD160 b338f67ebf0719b5e12eaa8490affbd7a1bb8c0e SHA1 bfeadba67792203d654a64bdec16f3d2a31aeca6 SHA256 9060a5d848d6655db4629822d01fd772a3fbe1a5107109c50cb0ecb4de7a9526 AUX cups-1.4.2-str3200.patch 1654 RMD160 cc40d26f7e9dbe5a12d9426535d09de10254da26 SHA1 b330108bcfb8ca3ab5d6dd3b48dc3d2937c7bca1 SHA256 8a64f5c72d64ecd95d330fd90630eb02a67865c07921ecb0c010e84b49b537e0 @@ -25,24 +25,32 @@ AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SH DIST cups-1.4.8-source.tar.bz2 4547162 RMD160 ee80e8d0b56dc0e2edf2a9aa9a43c4b92619f741 SHA1 9167f556e78e0bc075f1eb2f695d79cc1f334007 SHA256 6bd27e1213c139ed0bbadc5c29f97cf1e8f7f8f5b0bb29b227ecaff32aafa9a6 DIST cups-1.5.2-avahi.patch.bz2 17252 RMD160 40c7165de7f23e01aa3edf3968406e69fd0280f7 SHA1 e69c9b62b2773431dd7bb86573255d7c39fc2012 SHA256 6100029c6eec05729b6ef49f743876b9bf4d67f7b20b624be98372f4fb3e1ede DIST cups-1.5.2-ipp-r8950.patch.bz2 19525 RMD160 346a3141ae445dc9f17c7fbc0a467aea4910f10b SHA1 4bc3b40771261c37b63cbe4f65213b5db6c66534 SHA256 1a2d36136fc66b5f53e7cfb3e5d815e62cc3a6b4cc61d678f29d8a0bb748572a -DIST cups-1.5.2-locales.patch.xz 313616 RMD160 2346f911910c19364fc67c67c22b4d7583efe616 SHA1 b3f2660affd00d6a505beeccfb1280275197bd49 SHA256 273f3583882533ce995a0d3380d6db1b5aedb88790def799c38a3454c84357eb DIST cups-1.5.2-source.tar.bz2 9595665 RMD160 98181e2ee8c6e574fb6d405f688f52c9b61a2355 SHA1 56fdb4f58e676607845321c0296c1e90e416883f SHA256 b150aa108c631f4f07e92cb13c01263a67170e5ac8383c5548ef8f8473a187fb DIST cups-1.5.3-avahi.patch.bz2 17298 RMD160 fb2856801c08ddd73eb2677211cc0bba3f74cc57 SHA1 2d15bd82350806a4dfbedc6b3c48da08b3a7efcb SHA256 daed1232c56ff7a3cb293c7eedbb669f3200ac36120a4d2fec09bd91631038ef DIST cups-1.5.3-source.tar.bz2 9580485 RMD160 3516c1a0909921c9ae6f33eed9e06c9d9c475e3f SHA1 f7c4fc7d115da20dbbb6a3a568259df6702a7caa SHA256 9d716a8ffcefdaff1c37f4a4b590f1d74ff9ff72383a18f3c883c9235907f93d DIST cups-1.6b1-source.tar.bz2 8144645 RMD160 2cd340359661776361cc8d91d3514b0cd0d1f96c SHA1 ef3d67a49cb4c61207f66c9d5f792f04ef65fdf4 SHA256 ab2bd150635bfd84b710c92a942cdbff98fd74702d4aba04dd720064ccaa1fa1 EBUILD cups-1.4.8-r1.ebuild 7244 RMD160 a1c15926b837ec497fe496a7f0f9051a0de8d923 SHA1 4068757755bb1b9d7e5a7057e041238232d458c7 SHA256 36ab04f13134fdc205b2ca137473e9489fd4dfd1cd0046362d94fbeecffa920a EBUILD cups-1.4.8-r23.ebuild 8854 RMD160 b84a4dbe91f91f012f457d2436e44a69c1f78727 SHA1 7bf8931ed2731b5600aeb70f78dd06dbdace0dbc SHA256 901288e3a86de7a3f2d797c63e20086da01c01141f63ac4b531281c3273ee587 -EBUILD cups-1.5.2-r21.ebuild 8826 RMD160 5f18a992b36f0eabc3e644f96cbff42a2adf5228 SHA1 e3f3732d6a29b03131d878bb162abb437c1829c5 SHA256 f0c8b7b022b1989845f7cb3b7b412ffbdeff4006332d25fb9bf120b5c01c9487 EBUILD cups-1.5.2-r4.ebuild 8331 RMD160 90cfea788dea3d15ae896fe7cb79a2d6de47b267 SHA1 e3b70a5022f02593781112cb54f15fc9d226ce69 SHA256 073f73dd2344da4affcb8bc190a40aa019a69794d35787797c5890266004cc28 -EBUILD cups-1.5.3.ebuild 8464 RMD160 2ee8e00da56095e9c8cc686bce46accf4c38e9ab SHA1 0eed8ba94a5403da2d04d48002954fae7031c429 SHA256 728f99974499d75d521f19b364282420e785fdb9f7f59a4cfcad98c11881d6d1 -EBUILD cups-1.6_beta1.ebuild 7574 RMD160 a921e32acfb54c590dd7da28631f5b1e2909e82f SHA1 3314cb407bc78abfe1a773844dfb404b97d64c60 SHA256 9aa8effec91748e21346c9420bf68465324dd420e7d7c006cbbbce4d477c28aa -EBUILD cups-9999.ebuild 7652 RMD160 678e15d2e0ae3c1aa4faf59794980bd808256c45 SHA1 5a85dd99db2d129e8884f7c3e3ff34d80d8101eb SHA256 8734ae1251dadda257ce3ef959de41f984585df650e0cdd43db70b68a809779b -MISC ChangeLog 74473 RMD160 83ebb3a69d051705c9edfec82f9aab3b22e21ad2 SHA1 cf905e0db8576d024624b2990505e7efc6c53806 SHA256 17e5d591fc1a438cc3811523a6bea3e06b9943b113ab9bdf3ab2875747d93915 +EBUILD cups-1.5.3.ebuild 8577 RMD160 ee636a9c10c416aeff4ad335e2044ce4bf2c128e SHA1 008e3c495db5aa339bf37709ac4aaac39f0245eb SHA256 798edcb04d8d2236c9874a194c228e75a186503c28030d4e7d170e2bde00f325 +EBUILD cups-1.6_beta1.ebuild 7686 RMD160 055ee5a5d441d9942aea5e2e77753eaaaaecf26c SHA1 a3674ad6fbd6b891cd98b45ad9e201b6384373ae SHA256 00f1142957b94b053dcae6e0d177d4766d04ca4aa48bcee0f31a233ca200645f +EBUILD cups-9999.ebuild 7764 RMD160 86138fae4f908c755affbf47fbfd44c2b3476dbb SHA1 b777f517c12578aeae878690c7b52564ace54ac6 SHA256 19fef5aa9f2db95a611107f8830a34c271c9bb3e40c7d4b7e0143890635fc089 +MISC ChangeLog 74660 RMD160 5d5085e0b006eb171a49b728b2bd9643c91a3061 SHA1 834d0341d5002eb35686fcdb8010bea842de4f6a SHA256 55d1d0539d015e02c7c75dda60af3afa76a6a1f1cae3dd93b25a8e56b638766b MISC metadata.xml 778 RMD160 39d95458b469079b683adf4f2e79eb0b803ce0b9 SHA1 62b298bb9c5435716ce81550213ccd086ec065aa SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEAREIAAYFAk/OlRYACgkQl5yvQNBFVTVDGACgnXIOIF4MXvLWHMwiDL7Ah5iM -9B4AnRyT0lsrClFjHxoKo8mL13nhy89v -=i2qt +iQIcBAEBCgAGBQJP0QSBAAoJENwGBM22xfferF0P/1pxtXT/4R9FTZBpvTRUwRCJ +GEedTiags+Tm8h9Cx2RFOohpY50RpW7jnM9EFsE9zENOfnMcoe9VkU6CU5ec+xab +nHMXIcgsWojaZzt4WlflR1/aYjZB9i5sQh41CaBz2ICj2RK74Y7zPLohigWs/xSV +rW/CJJ7jyJdWp9KwzkWgf6IrxXvDp56PaWYgeRulVME6Y9EesteqIyKsfa3RYD5r +u5jR8G/TB2hUmEFSq5Yv24DSXMH93PLIB4G8GmpJCxci6O/63mNDrFp5gvwDcCs5 +RenreNc4QihEI/TLqYjvUpq+5H7PpAvlHJPU9TT3+DrpRGUi5k3N234ungVaTIMw +SzXL/bn6kcyyCMTq91gjrRcZR2KUC2psFISd/8C85k1HGifajwv83k3uwx7kzZqQ +ls2LGr6SH3S0jLeTQayLsPUVlN3RW4YRAHVpIozfH3U9fTk8M5WVEK/2iuP5hnTt +GlKhnQL5LU/KISw9SZwLrZMeKC1t5g0BkhpPmwWdZ+R5DPUZn3Hi9wUVXWUWdhB5 ++gD25CbbH+gzVNSKm+OGBmBn3YnoGzG727oIYQg3pcE92rB1nSYNT7ILjPmyHV15 +iv1sSrHGQCu3qgW7qgZKLZAc/kurlp0Jo+ElQ+78RHiCnvfkECWPF4s2AvAtiita +YGmyS0pPoi1Sgi439lyl +=+S8p -----END PGP SIGNATURE----- diff --git a/net-print/cups/cups-1.5.2-r21.ebuild b/net-print/cups/cups-1.5.2-r21.ebuild deleted file mode 100644 index 06d69fb8c515..000000000000 --- a/net-print/cups/cups-1.5.2-r21.ebuild +++ /dev/null @@ -1,313 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r21.ebuild,v 1.5 2012/06/01 04:19:51 zmedico Exp $ - -EAPI=4 - -PYTHON_DEPEND="python? 2:2.5" - -inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2 systemd - -MY_P=${P/_} -MY_PV=${PV/_} - -if [[ "${PV}" != "9999" ]]; then - SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2 - http://dev.gentoo.org/~dilfridge/distfiles/${P}-ipp-r8950.patch.bz2 - http://dev.gentoo.org/~dilfridge/distfiles/${P}-avahi.patch.bz2 - http://dev.gentoo.org/~dilfridge/distfiles/${P}-locales.patch.xz - " - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-fbsd" -else - inherit subversion - ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk" - KEYWORDS="" -fi - -DESCRIPTION="The Common Unix Printing System" -HOMEPAGE="http://www.cups.org/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="acl avahi dbus debug +filters gnutls java +jpeg kerberos ldap pam perl - +png python slp +ssl static-libs systemd +threads +tiff usb X xinetd" - -LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW" -for X in ${LANGS} ; do - IUSE="${IUSE} linguas_${X}" -done - -RDEPEND=" - app-text/libpaper - acl? ( - kernel_linux? ( - sys-apps/acl - sys-apps/attr - ) - ) - avahi? ( net-dns/avahi ) - dbus? ( sys-apps/dbus ) - java? ( >=virtual/jre-1.6 ) - jpeg? ( virtual/jpeg:0 ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap[ssl?,gnutls?] ) - pam? ( virtual/pam ) - perl? ( dev-lang/perl ) - png? ( >=media-libs/libpng-1.4.3:0 ) - slp? ( >=net-libs/openslp-1.0.4 ) - ssl? ( - gnutls? ( - dev-libs/libgcrypt - net-libs/gnutls - ) - !gnutls? ( >=dev-libs/openssl-0.9.8g ) - ) - systemd? ( sys-apps/systemd ) - tiff? ( >=media-libs/tiff-3.5.5:0 ) - usb? ( virtual/libusb:0 ) - X? ( x11-misc/xdg-utils ) - xinetd? ( sys-apps/xinetd ) -" - -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -PDEPEND=" - app-text/ghostscript-gpl[cups] - >=app-text/poppler-0.12.3-r3[utils] - filters? ( net-print/foomatic-filters ) -" - -REQUIRED_USE="gnutls? ( ssl )" - -# upstream includes an interactive test which is a nono for gentoo -RESTRICT="test" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch" - "${FILESDIR}/${PN}-1.4.4-fix-install-perms.patch" - "${FILESDIR}/${PN}-1.4.4-nostrip.patch" - "${FILESDIR}/${PN}-1.4.4-php-destdir.patch" - "${FILESDIR}/${PN}-1.4.4-perl-includes.patch" - "${FILESDIR}/${PN}-1.5.2-linkperl.patch" - "${FILESDIR}/${PN}-1.5.2-threads.patch" - "${FILESDIR}/${PN}-1.5.2-threads2.patch" - "${FILESDIR}/${PN}-1.5.0-systemd-socket.patch" # systemd support - "${WORKDIR}/${PN}-1.5.2-ipp-r8950.patch" # revert ipp backend to 1.4 state - "${WORKDIR}/${PN}-1.5.2-avahi.patch" # avahi support from debian - "${FILESDIR}/${PN}-1.5.2-browsing.patch" # browsing off by default - "${WORKDIR}/${PN}-1.5.2-locales.patch" # patch locales back into existence -) - -pkg_setup() { - enewgroup lp - enewuser lp -1 -1 -1 lp - enewgroup lpadmin 106 - - # python 3 is no-go - if use python; then - python_set_active_version 2 - python_pkg_setup - fi - - if use kernel_linux; then - linux-info_pkg_setup - if ! linux_config_exists; then - ewarn "Can't check the linux kernel configuration." - ewarn "You might have some incompatible options enabled." - else - # recheck that we don't have usblp to collide with libusb - if use usb; then - if linux_chkconfig_present USB_PRINTER; then - eerror "Your usb printers will be managed via libusb. In this case, " - eerror "${P} requires the USB_PRINTER support disabled." - eerror "Please disable it:" - eerror " CONFIG_USB_PRINTER=n" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " USB support --->" - eerror " [ ] USB Printer support" - eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)." - fi - else - #here we should warn user that he should enable it so he can print - if ! linux_chkconfig_present USB_PRINTER; then - ewarn "If you plan to use USB printers you should enable the USB_PRINTER" - ewarn "support in your kernel." - ewarn "Please enable it:" - ewarn " CONFIG_USB_PRINTER=y" - ewarn "in /usr/src/linux/.config or" - ewarn " Device Drivers --->" - ewarn " USB support --->" - ewarn " [*] USB Printer support" - ewarn "Alternatively, enable the usb useflag for cups and use the libusb code." - fi - fi - fi - fi -} - -src_prepare() { - base_src_prepare - AT_M4DIR=config-scripts eaclocal - eautoconf -} - -src_configure() { - export DSOFLAGS="${LDFLAGS}" - - # locale support - strip-linguas ${LANGS} - if [ -z "${LINGUAS}" ] ; then - export LINGUAS=none - fi - - local myconf - if use ssl ; then - myconf+=" - $(use_enable gnutls) - $(use_enable !gnutls openssl) - " - else - myconf+=" - --disable-gnutls - --disable-openssl - " - fi - - econf \ - --libdir=/usr/$(get_libdir) \ - --localstatedir=/var \ - --with-cups-user=lp \ - --with-cups-group=lp \ - --with-docdir=/usr/share/cups/html \ - --with-languages="${LINGUAS}" \ - --with-pdftops=/usr/bin/pdftops \ - --with-system-groups=lpadmin \ - $(use_enable acl) \ - $(use_enable avahi) \ - $(use_enable dbus) \ - $(use_enable debug) \ - $(use_enable debug debug-guards) \ - $(use_enable jpeg) \ - $(use_enable kerberos gssapi) \ - $(use_enable ldap) \ - $(use_enable pam) \ - $(use_enable png) \ - $(use_enable slp) \ - $(use_enable static-libs static) \ - $(use_enable threads) \ - $(use_enable tiff) \ - $(use_enable usb libusb) \ - $(use_with java) \ - $(use_with perl) \ - --without-php \ - $(use_with python) \ - $(use_with xinetd xinetd /etc/xinetd.d) \ - --enable-libpaper \ - --disable-dnssd \ - $(use_with systemd systemdsystemunitdir "$(systemd_get_unitdir)") \ - ${myconf} - - # install in /usr/libexec always, instead of using /usr/lib/cups, as that - # makes more sense when facing multilib support. - sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs || die - sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die - sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die -} - -src_compile() { - emake - - if use perl ; then - cd "${S}"/scripting/perl - perl-module_src_prep - perl-module_src_compile - fi -} - -src_install() { - emake BUILDROOT="${D}" install - dodoc {CHANGES,CREDITS,README}.txt - - if use perl ; then - pushd scripting/perl > /dev/null - perl-module_src_install - fixlocalpod - popd > /dev/null - fi - - # move the default config file to docs - dodoc "${ED}"/etc/cups/cupsd.conf.default - rm -f "${ED}"/etc/cups/cupsd.conf.default - - # clean out cups init scripts - rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} - - # install our init script - local neededservices - use avahi && neededservices+=" avahi-daemon" - use dbus && neededservices+=" dbus" - [[ -n ${neededservices} ]] && neededservices="need${neededservices}" - cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die - sed -i \ - -e "s/@neededservices@/$neededservices/" \ - "${T}"/cupsd || die - doinitd "${T}"/cupsd - - # install our pam script - pamd_mimic_system cups auth account - - if use xinetd ; then - # correct path - sed -i \ - -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \ - "${ED}"/etc/xinetd.d/cups-lpd || die - # it is safer to disable this by default, bug #137130 - grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \ - { sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; } - # write permission for file owner (root), bug #296221 - fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" - else - rm -rf "${ED}"/etc/xinetd.d - fi - - keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \ - /var/cache/cups /var/cache/cups/rss /var/log/cups \ - /var/spool/cups/tmp - - keepdir /etc/cups/{interfaces,ppd,ssl} - - use X || rm -r "${ED}"/usr/share/applications - - # create /etc/cups/client.conf, bug #196967 and #266678 - echo "ServerName /var/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - # Update desktop file database and gtk icon cache (bug 370059) - gnome2_icon_cache_update - fdo-mime_desktop_database_update - - echo - elog "For information about installing a printer and general cups setup" - elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml" - echo - elog "Network browsing for printers is now switched off by default in the config file." - elog "To (re-)enable it, edit /etc/cups/cupsd.conf and set \"Browsing On\", " - elog "afterwards re-start or reload cups." - echo -} - -pkg_postrm() { - # Update desktop file database and gtk icon cache (bug 370059) - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/net-print/cups/cups-1.5.3.ebuild b/net-print/cups/cups-1.5.3.ebuild index 43e211f3bed4..97d44f55a30b 100644 --- a/net-print/cups/cups-1.5.3.ebuild +++ b/net-print/cups/cups-1.5.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.3.ebuild,v 1.2 2012/06/05 23:23:54 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.3.ebuild,v 1.3 2012/06/07 19:42:52 dilfridge Exp $ EAPI=4 @@ -224,6 +224,9 @@ src_compile() { } src_install() { + # Fix install-sh, posix sh does not have 'function'. + sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh" + emake BUILDROOT="${D}" install dodoc {CHANGES,CREDITS,README}.txt diff --git a/net-print/cups/cups-1.6_beta1.ebuild b/net-print/cups/cups-1.6_beta1.ebuild index a54fdd945dc4..35dd1fd2acfa 100644 --- a/net-print/cups/cups-1.6_beta1.ebuild +++ b/net-print/cups/cups-1.6_beta1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6_beta1.ebuild,v 1.2 2012/06/02 19:49:55 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6_beta1.ebuild,v 1.3 2012/06/07 19:42:52 dilfridge Exp $ EAPI=4 @@ -198,6 +198,9 @@ src_configure() { } src_install() { + # Fix install-sh, posix sh does not have 'function'. + sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh" + emake BUILDROOT="${D}" install dodoc {CHANGES,CREDITS,README}.txt diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index cde8ec49c385..8c5f6dcf3026 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.10 2012/06/02 19:49:55 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.11 2012/06/07 19:42:52 dilfridge Exp $ EAPI=4 @@ -198,6 +198,9 @@ src_configure() { } src_install() { + # Fix install-sh, posix sh does not have 'function'. + sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh" + emake BUILDROOT="${D}" install dodoc {CHANGES,CREDITS,README}.txt -- cgit v1.2.3-65-gdbad