From 34371f66543711dff83091f395457d84fff74c1f Mon Sep 17 00:00:00 2001 From: Timo Gurr Date: Sat, 11 Sep 2010 12:10:19 +0000 Subject: Revbump, fixing bug #296221. (Portage version: 2.2_rc78/cvs/Linux x86_64) --- net-print/cups/ChangeLog | 11 +- net-print/cups/cups-1.4.4-r1.ebuild | 235 --------------------- net-print/cups/cups-1.4.4-r2.ebuild | 235 +++++++++++++++++++++ net-print/cups/cups-1.4.4.ebuild | 196 ----------------- .../files/cups-1.4.4-dont-compress-manpages.patch | 20 ++ .../cups/files/cups-1.4.4-fix-install-perms.patch | 22 ++ net-print/cups/files/cups-1.4.4-nostrip.patch | 14 ++ net-print/cups/files/cups-1.4.4-php-destdir.patch | 21 ++ 8 files changed, 322 insertions(+), 432 deletions(-) delete mode 100644 net-print/cups/cups-1.4.4-r1.ebuild create mode 100644 net-print/cups/cups-1.4.4-r2.ebuild delete mode 100644 net-print/cups/cups-1.4.4.ebuild create mode 100644 net-print/cups/files/cups-1.4.4-dont-compress-manpages.patch create mode 100644 net-print/cups/files/cups-1.4.4-fix-install-perms.patch create mode 100644 net-print/cups/files/cups-1.4.4-nostrip.patch create mode 100644 net-print/cups/files/cups-1.4.4-php-destdir.patch (limited to 'net-print/cups') diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index 53a2b1682145..25c24ce6baab 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-print/cups # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.397 2010/09/10 23:39:15 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.398 2010/09/11 12:10:19 tgurr Exp $ + +*cups-1.4.4-r2 (11 Sep 2010) + + 11 Sep 2010; Timo Gurr -cups-1.4.4.ebuild, + -cups-1.4.4-r1.ebuild, +cups-1.4.4-r2.ebuild, + +files/cups-1.4.4-dont-compress-manpages.patch, + +files/cups-1.4.4-fix-install-perms.patch, + +files/cups-1.4.4-nostrip.patch, +files/cups-1.4.4-php-destdir.patch: + Revbump, fixing bug #296221. 10 Sep 2010; Tomáš Chvátal cups-1.4.4-r1.ebuild: Revision bump again. This time with mimimalistic patches only altering diff --git a/net-print/cups/cups-1.4.4-r1.ebuild b/net-print/cups/cups-1.4.4-r1.ebuild deleted file mode 100644 index d12f3daabefb..000000000000 --- a/net-print/cups/cups-1.4.4-r1.ebuild +++ /dev/null @@ -1,235 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.4-r1.ebuild,v 1.3 2010/09/10 23:39:15 scarabeus Exp $ - -EAPI=3 - -PYTHON_DEPEND="python? 2:2.5" -RESTRICT_PYTHON_ABIS="3.*" - -MY_P=${P/_} -PATCH_VERSION=001 -SRC_PATCHES="http://gentoo.ccss.cz/${P}-gentoopatches-${PATCH_VERSION}.tar.bz2" - -inherit autotools eutils flag-o-matic multilib pam perl-module python versionator java-pkg-opt-2 - -DESCRIPTION="The Common Unix Printing System" -HOMEPAGE="http://www.cups.org/" -SRC_URI="mirror://easysw/${PN}/${PV}/${MY_P}-source.tar.bz2 - ${SRC_PATCHES}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="X acl dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static +threads +tiff +usb 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 - dev-libs/libgcrypt - X? ( x11-misc/xdg-utils ) - acl? ( - kernel_linux? ( - sys-apps/acl - sys-apps/attr - ) - ) - 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 ) - php? ( dev-lang/php ) - png? ( >=media-libs/libpng-1.4.3 ) - slp? ( >=net-libs/openslp-1.0.4 ) - ssl? ( - gnutls? ( net-libs/gnutls ) - !gnutls? ( >=dev-libs/openssl-0.9.8g ) - ) - tiff? ( >=media-libs/tiff-3.5.5 ) - usb? ( virtual/libusb:0 ) - xinetd? ( sys-apps/xinetd ) -" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - java? ( >=virtual/jdk-1.6 ) -" -PDEPEND=" - app-text/ghostscript-gpl[cups] - >=app-text/poppler-0.12.3-r3[utils] -" - -# upstream includes an interactive test which is a nono for gentoo. -RESTRICT="test" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup lp - enewuser lp -1 -1 -1 lp - enewgroup lpadmin 106 - - # python 3 is no-go - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - if [[ -n ${SRC_PATCHES} ]]; then - EPATCH_FORCE="yes" \ - EPATCH_SOURCE="${WORKDIR}/patches" \ - EPATCH_SUFFIX="patch" \ - epatch - fi - - 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 || use gnutls ; 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 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) \ - $(use_enable threads) \ - $(use_enable tiff) \ - $(use_enable usb libusb) \ - $(use_with java) \ - $(use_with perl) \ - $(use_with php) \ - $(use_with python) \ - $(use_with xinetd xinetd /etc/xinetd.d) \ - --enable-libpaper \ - ${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 || die "emake failed" - - # perl - if use perl; then - cd "${S}"/scripting/perl - perl-module_src_prep - perl-module_src_compile - fi - - # php - if use php; then - cd "${S}"/scripting/php - emake || die "emake php failed" - fi -} - -src_install() { - emake BUILDROOT="${D}" install || die "emake install failed" - dodoc {CHANGES,CREDITS,README}.txt || die "dodoc install failed" - - # perl - if use perl; then - cd "${S}"/scripting/perl - perl-module_src_install - fixlocalpod - fi - - # php - if use php; then - cd "${S}"/scripting/php - emake DESTDIR="${D}" install || die "emake install for php bindings failed" - fi - - # clean out cups init scripts - rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups} - - # install our init script - local neededservices - 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 || die "doinitd failed" - - # 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:" \ - "${D}"/etc/xinetd.d/cups-lpd || die - # 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 || die ; } - else - rm -rf "${D}"/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/run/cups/certs \ - /var/spool/cups/tmp - - keepdir /etc/cups/{interfaces,ppd,ssl} - - use X || rm -r "${D}"/usr/share/applications - - # create /etc/cups/client.conf, bug #196967 and #266678 - echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf -} - -pkg_postinst() { - 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 -} diff --git a/net-print/cups/cups-1.4.4-r2.ebuild b/net-print/cups/cups-1.4.4-r2.ebuild new file mode 100644 index 000000000000..d8ac38b7580a --- /dev/null +++ b/net-print/cups/cups-1.4.4-r2.ebuild @@ -0,0 +1,235 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.4-r2.ebuild,v 1.1 2010/09/11 12:10:19 tgurr Exp $ + +EAPI=3 + +PYTHON_DEPEND="python? 2:2.5" +RESTRICT_PYTHON_ABIS="3.*" + +inherit autotools eutils flag-o-matic multilib pam perl-module python versionator java-pkg-opt-2 + +MY_P=${P/_} + +DESCRIPTION="The Common Unix Printing System" +HOMEPAGE="http://www.cups.org/" +SRC_URI="mirror://easysw/${PN}/${PV}/${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" +IUSE="acl dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static-libs +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 + dev-libs/libgcrypt + acl? ( + kernel_linux? ( + sys-apps/acl + sys-apps/attr + ) + ) + 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 ) + php? ( dev-lang/php ) + png? ( >=media-libs/libpng-1.4.3 ) + slp? ( >=net-libs/openslp-1.0.4 ) + ssl? ( + gnutls? ( net-libs/gnutls ) + !gnutls? ( >=dev-libs/openssl-0.9.8g ) + ) + tiff? ( >=media-libs/tiff-3.5.5 ) + usb? ( virtual/libusb:0 ) + X? ( x11-misc/xdg-utils ) + xinetd? ( sys-apps/xinetd ) + !net-print/cupsddk +" + +DEPEND="${RDEPEND} + dev-util/pkgconfig +" + +PDEPEND=" + app-text/ghostscript-gpl[cups] + >=app-text/poppler-0.12.3-r3[utils] +" + +PROVIDE="virtual/lpr" + +# upstream includes an interactive test which is a nono for gentoo. +RESTRICT="test" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + enewgroup lp + enewuser lp -1 -1 -1 lp + enewgroup lpadmin 106 + + # python 3 is no-go + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + # create a missing symlink to allow https printing via IPP, bug #217293 + epatch "${FILESDIR}/${PN}-1.4.0-backend-https.patch" + # various build time fixes + epatch "${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch" + epatch "${FILESDIR}/${PN}-1.4.4-fix-install-perms.patch" + epatch "${FILESDIR}/${PN}-1.4.4-nostrip.patch" + epatch "${FILESDIR}/${PN}-1.4.4-php-destdir.patch" + + 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 || use gnutls ; 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 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) \ + $(use_with php) \ + $(use_with python) \ + $(use_with xinetd xinetd /etc/xinetd.d) \ + --enable-libpaper \ + --disable-dnssd \ + ${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 || die "emake failed" + + if use perl ; then + cd "${S}"/scripting/perl + perl-module_src_prep + perl-module_src_compile + fi + + if use php ; then + cd "${S}"/scripting/php + emake || die "emake php failed" + fi +} + +src_install() { + emake BUILDROOT="${D}" install || die "emake install failed" + dodoc {CHANGES,CREDITS,README}.txt || die "dodoc install failed" + + if use perl ; then + cd "${S}"/scripting/perl + perl-module_src_install + fixlocalpod + fi + + if use php ; then + cd "${S}"/scripting/php + emake DESTDIR="${D}" install || die "emake install for php bindings failed" + fi + + # clean out cups init scripts + rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups} + + # install our init script + local neededservices + 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 || die "doinitd failed" + + # 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:" \ + "${D}"/etc/xinetd.d/cups-lpd || die + # 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 || die ; } + # write permission for file owner (root), bug #296221 + fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" + else + rm -rf "${D}"/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/run/cups/certs \ + /var/spool/cups/tmp + + keepdir /etc/cups/{interfaces,ppd,ssl} + + use X || rm -r "${D}"/usr/share/applications + + # create /etc/cups/client.conf, bug #196967 and #266678 + echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf +} + +pkg_postinst() { + 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 +} diff --git a/net-print/cups/cups-1.4.4.ebuild b/net-print/cups/cups-1.4.4.ebuild deleted file mode 100644 index 37f512eca4f5..000000000000 --- a/net-print/cups/cups-1.4.4.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.4.ebuild,v 1.3 2010/07/30 22:32:11 anarchy Exp $ - -EAPI="2" - -inherit autotools eutils flag-o-matic multilib pam versionator - -MY_P=${P/_} - -DESCRIPTION="The Common Unix Printing System" -HOMEPAGE="http://www.cups.org/" -SRC_URI="mirror://easysw/${PN}/${PV}/${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" -IUSE="acl dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static +threads +tiff +usb X xinetd" - -COMMON_DEPEND=" - app-text/libpaper - dev-libs/libgcrypt - acl? ( - kernel_linux? ( - sys-apps/acl - sys-apps/attr - ) - ) - dbus? ( sys-apps/dbus ) - gnutls? ( net-libs/gnutls ) - java? ( >=virtual/jre-1.4 ) - jpeg? ( >=media-libs/jpeg-6b:0 ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - pam? ( virtual/pam ) - perl? ( dev-lang/perl ) - php? ( dev-lang/php ) - png? ( >=media-libs/libpng-1.2.1 ) - python? ( dev-lang/python ) - slp? ( >=net-libs/openslp-1.0.4 ) - ssl? ( - !gnutls? ( >=dev-libs/openssl-0.9.8g ) - ) - tiff? ( >=media-libs/tiff-3.5.5 ) - usb? ( dev-libs/libusb ) - xinetd? ( sys-apps/xinetd ) -" -DEPEND="${COMMON_DEPEND}" - -RDEPEND="${COMMON_DEPEND} - !net-print/cupsddk - !virtual/lpr - X? ( x11-misc/xdg-utils ) -" -PDEPEND=" - app-text/ghostscript-gpl[cups] - >=app-text/poppler-0.12.3-r3[utils] -" - -PROVIDE="virtual/lpr" - -# upstream includes an interactive test which is a nono for gentoo. -# therefore, since the printing herd has bigger fish to fry, for now, -# we just leave it out, even if FEATURES=test -RESTRICT="test" - -S="${WORKDIR}/${MY_P}" - -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 - -pkg_setup() { - enewgroup lp - enewuser lp -1 -1 -1 lp - enewgroup lpadmin 106 -} - -src_prepare() { - # remove default optimizations and do not strip by default - sed -e 's:OPTIM="-Os -g":OPTIM="":' \ - -e 's:INSTALL_STRIP="-s":INSTALL_STRIP="":' \ - -i config-scripts/cups-compiler.m4 - - # create a missing symlink to allow https printing via IPP, bug #217293 - epatch "${FILESDIR}/${PN}-1.4.0-backend-https.patch" - - 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 || use gnutls ; then - myconf="${myconf} \ - $(use_enable gnutls) \ - $(use_enable !gnutls openssl)" - else - myconf="${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 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) \ - $(use_enable threads) \ - $(use_enable tiff) \ - $(use_enable usb libusb) \ - $(use_with java) \ - $(use_with perl) \ - $(use_with php) \ - $(use_with python) \ - $(use_with xinetd xinetd /etc/xinetd.d) \ - --enable-libpaper \ - --disable-dnssd \ - ${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 - sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h - sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config -} - -src_install() { - emake BUILDROOT="${D}" install || die "emake install failed" - dodoc {CHANGES,CREDITS,README}.txt || die "dodoc install failed" - - # clean out cups init scripts - rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups} - - # install our init script - local neededservices - use dbus && neededservices="$neededservices dbus" - [[ -n ${neededservices} ]] && neededservices="need${neededservices}" - sed -e "s/@neededservices@/$neededservices/" "${FILESDIR}"/cupsd.init.d > "${T}"/cupsd - doinitd "${T}"/cupsd || die "doinitd failed" - - # 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:" "${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 - else - rm -rf "${D}"/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/run/cups/certs \ - /var/spool/cups/tmp - - keepdir /etc/cups/{interfaces,ppd,ssl} - - use X || rm -r "${D}"/usr/share/applications - - # create /etc/cups/client.conf, bug #196967 and #266678 - echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf -} - -pkg_postinst() { - 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 -} diff --git a/net-print/cups/files/cups-1.4.4-dont-compress-manpages.patch b/net-print/cups/files/cups-1.4.4-dont-compress-manpages.patch new file mode 100644 index 000000000000..4a639c0223b9 --- /dev/null +++ b/net-print/cups/files/cups-1.4.4-dont-compress-manpages.patch @@ -0,0 +1,20 @@ +# Source: Fedora + +diff -up cups-1.4b2-svn8404/config-scripts/cups-manpages.m4.no-gzip-man cups-1.4b2-svn8404/config-scripts/cups-manpages.m4 +--- cups-1.4b2-svn8404/config-scripts/cups-manpages.m4.no-gzip-man 2009-01-16 08:58:42.000000000 +0000 ++++ cups-1.4b2-svn8404/config-scripts/cups-manpages.m4 2009-03-05 11:11:12.000000000 +0000 +@@ -69,10 +69,10 @@ case "$uname" in + ;; + Linux* | GNU* | Darwin*) + # Linux, GNU Hurd, and Mac OS X +- MAN1EXT=1.gz +- MAN5EXT=5.gz +- MAN7EXT=7.gz +- MAN8EXT=8.gz ++ MAN1EXT=1 ++ MAN5EXT=5 ++ MAN7EXT=7 ++ MAN8EXT=8 + MAN8DIR=8 + ;; + *) diff --git a/net-print/cups/files/cups-1.4.4-fix-install-perms.patch b/net-print/cups/files/cups-1.4.4-fix-install-perms.patch new file mode 100644 index 000000000000..726f030ac35e --- /dev/null +++ b/net-print/cups/files/cups-1.4.4-fix-install-perms.patch @@ -0,0 +1,22 @@ +# Source: Fedora + +diff -up cups-1.4.2/Makedefs.in.0755 cups-1.4.2/Makedefs.in +--- cups-1.4.2/Makedefs.in.0755 2010-01-13 17:06:48.507913044 +0000 ++++ cups-1.4.2/Makedefs.in 2010-01-13 17:07:10.049912905 +0000 +@@ -41,13 +41,13 @@ SHELL = /bin/sh + # Installation programs... + # + +-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ ++INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@ + INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@ + INSTALL_DATA = $(INSTALL) -c -m 444 + INSTALL_DIR = $(INSTALL) -d +-INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ ++INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@ + INSTALL_MAN = $(INSTALL) -c -m 444 +-INSTALL_SCRIPT = $(INSTALL) -c -m 555 ++INSTALL_SCRIPT = $(INSTALL) -c -m 755 + + # + # Default user, group, and system groups for the scheduler... diff --git a/net-print/cups/files/cups-1.4.4-nostrip.patch b/net-print/cups/files/cups-1.4.4-nostrip.patch new file mode 100644 index 000000000000..cd2b07042cec --- /dev/null +++ b/net-print/cups/files/cups-1.4.4-nostrip.patch @@ -0,0 +1,14 @@ +# Source: Gentoo + +diff -urN cups-1.4.4/config-scripts/cups-compiler.m4 cups-1.4.4.new/config-scripts/cups-compiler.m4 +--- cups-1.4.4/config-scripts/cups-compiler.m4 2009-05-17 02:13:47.000000000 +0200 ++++ cups-1.4.4.new/config-scripts/cups-compiler.m4 2010-08-12 19:19:45.937020635 +0200 +@@ -30,7 +30,7 @@ + if test x$enable_debug = xyes; then + OPTIM="-g" + else +- INSTALL_STRIP="-s" ++ INSTALL_STRIP="" + fi + + dnl Debug printfs can slow things down, so provide a separate option for that diff --git a/net-print/cups/files/cups-1.4.4-php-destdir.patch b/net-print/cups/files/cups-1.4.4-php-destdir.patch new file mode 100644 index 000000000000..01a64c83f797 --- /dev/null +++ b/net-print/cups/files/cups-1.4.4-php-destdir.patch @@ -0,0 +1,21 @@ +# Source: Gentoo + +diff -urN cups-1.4.4/scripting/php/Makefile cups-1.4.4.new//scripting/php/Makefile +--- cups-1.4.4/scripting/php/Makefile 2008-08-27 23:12:43.000000000 +0200 ++++ cups-1.4.4.new//scripting/php/Makefile 2010-08-13 10:32:35.764063909 +0200 +@@ -95,11 +95,11 @@ + + install-exec: + echo Installing $(PHPCUPS) in $(PHPDIR) +- $(INSTALL_DIR) $(PHPDIR) +- $(INSTALL_LIB) $(PHPCUPS) $(PHPDIR) ++ $(INSTALL_DIR) $(DESTDIR)/$(PHPDIR) ++ $(INSTALL_LIB) $(PHPCUPS) $(DESTDIR)/$(PHPDIR) + if test "x$(SYMROOT)" != x; then \ +- $(INSTALL_DIR) $(SYMROOT); \ +- cp $(PHPCUPS) $(SYMROOT); \ ++ $(INSTALL_DIR) $(DESTDIR)/$(SYMROOT); \ ++ cp $(PHPCUPS) $(DESTDIR)/$(SYMROOT); \ + fi + + -- cgit v1.2.3-65-gdbad