diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index d933d4a..4d8de9a 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.344 2009/03/09 18:42:27 armin76 Exp $ + 02 May 2010; Mario Fetka -cups-1.3.9-r1.ebuild, + -cups-1.3.9-r2.ebuild, -cups-1.3.10.ebuild, -cups-1.3.10-r2.ebuild, + -cups-1.4.1.ebuild, -cups-1.4.2-r1.ebuild: + delete old + 02 May 2010; Mario Fetka +cups-1.4.3-r1.ebuild: bump diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 97893e2..77b3088 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -12,19 +12,9 @@ AUX cups-1.4.1-usb-function-decl.patch 767 RMD160 12c0bc2ff991f2c0edb4be92fde4db AUX cups-1.4.2-str3200.patch 1654 RMD160 cc40d26f7e9dbe5a12d9426535d09de10254da26 SHA1 b330108bcfb8ca3ab5d6dd3b48dc3d2937c7bca1 SHA256 8a64f5c72d64ecd95d330fd90630eb02a67865c07921ecb0c010e84b49b537e0 AUX cupsd.init.d 293 RMD160 19fbef21cee7e472e7028f3101b680baa0089c54 SHA1 e6b27b2638fec258fe2f55c926c2530e909ca3d2 SHA256 b4268a6bae95e96b6af21c3716ecc905073736ce7dc33be1489d574a447f3c48 AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1 -DIST cups-1.3.10-source.tar.bz2 3778970 RMD160 9c8f5366f84b5f9087f7a29bace677db309a933f SHA1 48689f07104106216d35198cc90ed56df33faf38 SHA256 9701a545a6a05a991beeb49b41fbb4d450c3bdbb4eb74b132b0d2988640bb566 DIST cups-1.3.11-source.tar.bz2 3799424 RMD160 aa263fe29350cee307bbd72ef2f5cb061c2476e0 SHA1 c8304ee8d631bb370fc10fc1fffbe8ebae413df2 SHA256 824b7fe5cefa981f2ce20f356983be182a551f716ccab8f5194fe645b1178303 -DIST cups-1.3.9-source.tar.bz2 3993875 RMD160 ec8bd9fc6ee45648b6eb22949f44fc4cf2defd4e SHA1 c1a596b355201320456b393446286fe3947bce16 SHA256 38856ab4b8bcf51be2bed1f554cd8089c1f2448a6979c055762b49eda82a6b6b -DIST cups-1.4.1-source.tar.bz2 4449577 RMD160 d6db8ff3c7b0e56e147d227dcac0c8ca92f190cf SHA1 e53cadf8d9fa5b52b224fc29364a879feb0f3508 SHA256 cff66f14ca2099c977d693136b8f1b4c5d2d66e4471d67fa4114653852c2d3ba -DIST cups-1.4.2-source.tar.bz2 4450466 RMD160 3848989e3e585e69def0b5ccc9645c1670b0a687 SHA1 84be13b1a83a981cf1f3f9f812d53f3a3ca247cf SHA256 646bc0dbac064d05c0a93735fb556299eda0ae32ce4568506654cb952c719314 DIST cups-1.4.3-source.tar.bz2 4461101 RMD160 6c5ab282405d6a1132163c727583f3a572307d88 SHA1 0dd9e3d709614d26cce77728b9263556c94c9559 SHA256 47a559b1c50192b94479ae7dab132ea0008727045d4993501cf0a6df0c64db97 -EBUILD cups-1.3.10-r2.ebuild 8429 RMD160 7fdbadc2774bd04df819ea98223a06eb32196c20 SHA1 f026a96451664de7bd7913932f7d9cef2ad7b455 SHA256 97e393257c0daf3441c2872010b41b858ea8443361bd4976cb0e616601a2238d -EBUILD cups-1.3.10.ebuild 8319 RMD160 6c2363efe252c52124ab37dc572be6b68bc8e5aa SHA1 6b71d8b4a7cc38cb689f74da88567de0eb0cf636 SHA256 3903dd4d66c18f0251495446cc686fdaa2b3a7f435a3faee9bf736f6cb61209b EBUILD cups-1.3.11.ebuild 8430 RMD160 24de5585670d0c815277e00080257ccb6a9c5304 SHA1 573503a30d53c8d4fdbb1e1b2aab7d3f71e8a916 SHA256 14562a09f3546cf8bfa7592efedc89b835c9485b2331b03717616a84da3de58a -EBUILD cups-1.3.9-r1.ebuild 8724 RMD160 2fadb7b929fa65fad0aab8df9e23a59f47843424 SHA1 9c3d039bb8941370f280915dded0c2467b573509 SHA256 823b083c2c1670f3dc069c70b07d408d96e92e567822106dac4e3613ed0b1588 -EBUILD cups-1.3.9-r2.ebuild 8724 RMD160 2fadb7b929fa65fad0aab8df9e23a59f47843424 SHA1 9c3d039bb8941370f280915dded0c2467b573509 SHA256 823b083c2c1670f3dc069c70b07d408d96e92e567822106dac4e3613ed0b1588 -EBUILD cups-1.4.1.ebuild 5228 RMD160 4fecb94344765ca29d0f12fc624ddd11b0a44aa7 SHA1 3cea580ca9e54c72b8643f36e613ca5a1ddec9ec SHA256 cc80002f6484e01713e5a4ed250573d5d212fa348bb7baff269f47a7b24038a7 -EBUILD cups-1.4.2-r1.ebuild 5418 RMD160 c855cdc6d3cb82242d62b7db011e52d2ef7619c8 SHA1 b0a18ad9c66a1f0a243cdd62319fbf93ebe5e36b SHA256 9ab2d4719b51b96af15c29649c3a6b2688be5ec865526e9d009b7d678caaa8fd EBUILD cups-1.4.3-r1.ebuild 5446 RMD160 a8f19657974ba89f02b2e2c8f49767f2cfbe9fae SHA1 2dcf671b8a289493843ff8f1ced712878948e261 SHA256 6cb8383862c8ef67b2d3bca54602dd04d7b92efdcb2a0ec8815599f9b54962b0 -MISC ChangeLog 51997 RMD160 21b96cbffd6b461ddd9188d35673a3d7fa2eb80e SHA1 8d105dbd77a1acf833f00a2b0b385d475de35467 SHA256 cbd07b2e7d1baa0016d78406cdebeea407a178ca2d4cd92ff009152091a4b925 +MISC ChangeLog 52200 RMD160 fbdfc15f42a17c26a4478b62024bf4366c9bbdac SHA1 8983fd82d83bec8c3291a38c63ad7f199b670e40 SHA256 800eb153a2f01a7c650e7e86dd7029e924869476a93415baba800b68f78a712f MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 diff --git a/net-print/cups/cups-1.3.10-r2.ebuild b/net-print/cups/cups-1.3.10-r2.ebuild deleted file mode 100644 index d329d30..0000000 --- a/net-print/cups/cups-1.3.10-r2.ebuild +++ /dev/null @@ -1,293 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.10-r2.ebuild,v 1.5 2009/06/30 21:12:30 fauli Exp $ - -inherit autotools eutils flag-o-matic multilib pam - -MY_P=${P/_} - -DESCRIPTION="The Common Unix Printing System" -HOMEPAGE="http://www.cups.org/" -SRC_URI="http://ftp.easysw.com/pub/cups/${PV}/${MY_P}-source.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="acl avahi dbus gnutls java jpeg kerberos ldap pam perl php png ppds python samba slp ssl static tiff X xinetd zeroconf" - -COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) - avahi? ( net-dns/avahi ) - dbus? ( sys-apps/dbus ) - gnutls? ( net-libs/gnutls ) - java? ( >=virtual/jre-1.4 ) - jpeg? ( >=media-libs/jpeg-6b ) - 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 ) - xinetd? ( sys-apps/xinetd ) - zeroconf? ( !avahi? ( net-misc/mDNSResponder ) ) - app-text/libpaper - dev-libs/libgcrypt" - -DEPEND="${COMMON_DEPEND} - ! "${T}"/cupsd - 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:" "${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/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \ - /var/run/cups/certs /var/cache/cups /var/spool/cups/tmp /etc/cups/ssl - - # .desktop handling. X useflag. xdg-open from freedesktop is preferred, upstream bug STR #2724. - if use X ; then - sed -i -e "s:htmlview:xdg-open:" "${D}"/usr/share/applications/cups.desktop - else - rm -r "${D}"/usr/share/applications - fi - - # fix a symlink collision, see bug #172341 - dodir /usr/share/ppd - dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds - - # create RSS feed directory - diropts -m 0740 -o lp -g lp - dodir /var/cache/cups/rss - - # create /etc/cups/client.conf, bug #196967 and #266678 - echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf -} - -pkg_preinst() { - # cleanups - [ -n "${PN}" ] && rm -fR "${ROOT}"/usr/share/doc/"${PN}"-* - has_version "=${CATEGORY}/${PN}-1.2*" - upgrade_from_1_2=$? -} - -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 - - local good_gs=false - for x in app-text/ghostscript-gpl app-text/ghostscript-gnu ; do - if has_version ${x} && built_with_use ${x} cups ; then - good_gs=true - break - fi - done - if ! ${good_gs} ; then - echo - ewarn "You need to emerge ghostscript with the \"cups\" USE flag turned on." - echo - fi - - if [[ $upgrade_from_1_2 = 0 ]] ; then - echo - ewarn "You have upgraded from an older cups version. Please make sure" - ewarn "to run \"etc-update\" and \"revdep-rebuild\" NOW." - echo - fi - - if [ -e "${ROOT}"/usr/lib/cups ] ; then - echo - 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:" - ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")" - echo - ewarn "FEATURES=-collision-protect is needed to overwrite the compatibility" - ewarn "symlinks installed by this package, it won't be needed on later merges." - ewarn "You should also run revdep-rebuild" - echo - - # place symlinks to make the update smoothless - 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 - done - fi -} diff --git a/net-print/cups/cups-1.3.10.ebuild b/net-print/cups/cups-1.3.10.ebuild deleted file mode 100644 index f2d591a..0000000 --- a/net-print/cups/cups-1.3.10.ebuild +++ /dev/null @@ -1,290 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.10.ebuild,v 1.1 2009/04/17 01:14:40 tgurr Exp $ - -inherit autotools eutils flag-o-matic multilib pam - -MY_P=${P/_} - -DESCRIPTION="The Common Unix Printing System" -HOMEPAGE="http://www.cups.org/" -SRC_URI="http://ftp.easysw.com/pub/cups/${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 avahi dbus gnutls java jpeg kerberos ldap pam perl php png ppds python samba slp ssl static tiff X xinetd zeroconf" - -COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) - avahi? ( net-dns/avahi ) - dbus? ( sys-apps/dbus ) - gnutls? ( net-libs/gnutls ) - java? ( >=virtual/jre-1.4 ) - jpeg? ( >=media-libs/jpeg-6b ) - 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 ) - xinetd? ( sys-apps/xinetd ) - zeroconf? ( !avahi? ( net-misc/mDNSResponder ) ) - app-text/libpaper - dev-libs/libgcrypt" - -DEPEND="${COMMON_DEPEND} - ! "${T}"/cupsd - 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:" "${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/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \ - /var/run/cups/certs /var/cache/cups /var/spool/cups/tmp /etc/cups/ssl - - # .desktop handling. X useflag. xdg-open from freedesktop is preferred, upstream bug STR #2724. - if use X ; then - sed -i -e "s:htmlview:xdg-open:" "${D}"/usr/share/applications/cups.desktop - else - rm -r "${D}"/usr/share/applications - fi - - # fix a symlink collision, see bug #172341 - dodir /usr/share/ppd - dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds - - # create RSS feed directory - diropts -m 0740 -o lp -g lp - dodir /var/cache/cups/rss - - # create /etc/cups/client.conf, bug #196967 - echo "ServerName localhost" >> "${D}"/etc/cups/client.conf -} - -pkg_preinst() { - # cleanups - [ -n "${PN}" ] && rm -fR "${ROOT}"/usr/share/doc/"${PN}"-* - has_version "=${CATEGORY}/${PN}-1.2*" - upgrade_from_1_2=$? -} - -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 - - local good_gs=false - for x in app-text/ghostscript-gpl app-text/ghostscript-gnu app-text/ghostscript-esp ; do - if has_version ${x} && built_with_use ${x} cups ; then - good_gs=true - break - fi - done - if ! ${good_gs} ; then - echo - ewarn "You need to emerge ghostscript with the \"cups\" USE flag turned on." - echo - fi - - if [[ $upgrade_from_1_2 = 0 ]] ; then - echo - ewarn "You have upgraded from an older cups version. Please make sure" - ewarn "to run \"etc-update\" and \"revdep-rebuild\" NOW." - echo - fi - - if [ -e "${ROOT}"/usr/lib/cups ] ; then - echo - 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:" - ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")" - echo - ewarn "FEATURES=-collision-protect is needed to overwrite the compatibility" - ewarn "symlinks installed by this package, it won't be needed on later merges." - ewarn "You should also run revdep-rebuild" - echo - - # place symlinks to make the update smoothless - 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 - done - fi -} diff --git a/net-print/cups/cups-1.3.9-r1.ebuild b/net-print/cups/cups-1.3.9-r1.ebuild deleted file mode 100644 index 1df8d70..0000000 --- a/net-print/cups/cups-1.3.9-r1.ebuild +++ /dev/null @@ -1,300 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.9-r1.ebuild,v 1.11 2009/03/09 18:42:27 armin76 Exp $ - -inherit autotools eutils flag-o-matic multilib pam - -MY_P=${P/_} - -DESCRIPTION="The Common Unix Printing System" -HOMEPAGE="http://www.cups.org/" -SRC_URI="http://ftp.easysw.com/pub/cups/${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 avahi dbus gnutls java jpeg kerberos ldap pam perl php png ppds python samba slp ssl static tiff X xinetd zeroconf" - -COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) - avahi? ( net-dns/avahi ) - dbus? ( sys-apps/dbus ) - gnutls? ( net-libs/gnutls ) - java? ( >=virtual/jre-1.4 ) - jpeg? ( >=media-libs/jpeg-6b ) - 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 ) - xinetd? ( sys-apps/xinetd ) - zeroconf? ( !avahi? ( net-misc/mDNSResponder ) ) - app-text/libpaper - dev-libs/libgcrypt" - -DEPEND="${COMMON_DEPEND} - ! "${T}"/cupsd - 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:" "${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 - - # install pdftops filter - exeinto /usr/libexec/cups/filter/ - newexe "${FILESDIR}"/pdftops-1.20.gentoo 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 - fi - - keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \ - /var/run/cups/certs /var/cache/cups /var/spool/cups/tmp /etc/cups/ssl - - # .desktop handling. X useflag. xdg-open from freedesktop is preferred, upstream bug STR #2724. - if use X ; then - sed -i -e "s:htmlview:xdg-open:" "${D}"/usr/share/applications/cups.desktop - else - rm -r "${D}"/usr/share/applications - fi - - # fix a symlink collision, see bug #172341 - dodir /usr/share/ppd - dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds - - # create RSS feed directory - diropts -m 0740 -o lp -g lp - dodir /var/cache/cups/rss - - # create /etc/cups/client.conf, bug #196967 - echo "ServerName localhost" >> "${D}"/etc/cups/client.conf -} - -pkg_preinst() { - # cleanups - [ -n "${PN}" ] && rm -fR "${ROOT}"/usr/share/doc/"${PN}"-* - has_version "=${CATEGORY}/${PN}-1.2*" - upgrade_from_1_2=$? -} - -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 - - local good_gs=false - for x in app-text/ghostscript-gpl app-text/ghostscript-gnu app-text/ghostscript-esp ; do - if has_version ${x} && built_with_use ${x} cups ; then - good_gs=true - break - fi - done - if ! ${good_gs} ; then - echo - ewarn "You need to emerge ghostscript with the \"cups\" USE flag turned on." - echo - fi - - if [[ $upgrade_from_1_2 = 0 ]] ; then - echo - ewarn "You have upgraded from an older cups version. Please make sure" - ewarn "to run \"etc-update\" and \"revdep-rebuild\" NOW." - echo - fi - - if [ -e "${ROOT}"/usr/lib/cups ] ; then - echo - 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:" - ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")" - echo - ewarn "FEATURES=-collision-protect is needed to overwrite the compatibility" - ewarn "symlinks installed by this package, it won't be needed on later merges." - ewarn "You should also run revdep-rebuild" - echo - - # place symlinks to make the update smoothless - 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 - done - fi -} diff --git a/net-print/cups/cups-1.3.9-r2.ebuild b/net-print/cups/cups-1.3.9-r2.ebuild deleted file mode 100644 index 1df8d70..0000000 --- a/net-print/cups/cups-1.3.9-r2.ebuild +++ /dev/null @@ -1,300 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.9-r1.ebuild,v 1.11 2009/03/09 18:42:27 armin76 Exp $ - -inherit autotools eutils flag-o-matic multilib pam - -MY_P=${P/_} - -DESCRIPTION="The Common Unix Printing System" -HOMEPAGE="http://www.cups.org/" -SRC_URI="http://ftp.easysw.com/pub/cups/${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 avahi dbus gnutls java jpeg kerberos ldap pam perl php png ppds python samba slp ssl static tiff X xinetd zeroconf" - -COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) - avahi? ( net-dns/avahi ) - dbus? ( sys-apps/dbus ) - gnutls? ( net-libs/gnutls ) - java? ( >=virtual/jre-1.4 ) - jpeg? ( >=media-libs/jpeg-6b ) - 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 ) - xinetd? ( sys-apps/xinetd ) - zeroconf? ( !avahi? ( net-misc/mDNSResponder ) ) - app-text/libpaper - dev-libs/libgcrypt" - -DEPEND="${COMMON_DEPEND} - ! "${T}"/cupsd - 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:" "${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 - - # install pdftops filter - exeinto /usr/libexec/cups/filter/ - newexe "${FILESDIR}"/pdftops-1.20.gentoo 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 - fi - - keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \ - /var/run/cups/certs /var/cache/cups /var/spool/cups/tmp /etc/cups/ssl - - # .desktop handling. X useflag. xdg-open from freedesktop is preferred, upstream bug STR #2724. - if use X ; then - sed -i -e "s:htmlview:xdg-open:" "${D}"/usr/share/applications/cups.desktop - else - rm -r "${D}"/usr/share/applications - fi - - # fix a symlink collision, see bug #172341 - dodir /usr/share/ppd - dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds - - # create RSS feed directory - diropts -m 0740 -o lp -g lp - dodir /var/cache/cups/rss - - # create /etc/cups/client.conf, bug #196967 - echo "ServerName localhost" >> "${D}"/etc/cups/client.conf -} - -pkg_preinst() { - # cleanups - [ -n "${PN}" ] && rm -fR "${ROOT}"/usr/share/doc/"${PN}"-* - has_version "=${CATEGORY}/${PN}-1.2*" - upgrade_from_1_2=$? -} - -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 - - local good_gs=false - for x in app-text/ghostscript-gpl app-text/ghostscript-gnu app-text/ghostscript-esp ; do - if has_version ${x} && built_with_use ${x} cups ; then - good_gs=true - break - fi - done - if ! ${good_gs} ; then - echo - ewarn "You need to emerge ghostscript with the \"cups\" USE flag turned on." - echo - fi - - if [[ $upgrade_from_1_2 = 0 ]] ; then - echo - ewarn "You have upgraded from an older cups version. Please make sure" - ewarn "to run \"etc-update\" and \"revdep-rebuild\" NOW." - echo - fi - - if [ -e "${ROOT}"/usr/lib/cups ] ; then - echo - 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:" - ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")" - echo - ewarn "FEATURES=-collision-protect is needed to overwrite the compatibility" - ewarn "symlinks installed by this package, it won't be needed on later merges." - ewarn "You should also run revdep-rebuild" - echo - - # place symlinks to make the update smoothless - 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 - done - fi -} diff --git a/net-print/cups/cups-1.4.1.ebuild b/net-print/cups/cups-1.4.1.ebuild deleted file mode 100644 index 6c40c8c..0000000 --- a/net-print/cups/cups-1.4.1.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.1.ebuild,v 1.2 2009/09/17 15:36:38 lack Exp $ - -EAPI="2" - -inherit 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 +tiff X xinetd zeroconf" - -COMMON_DEPEND="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 ) - 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 ) - xinetd? ( sys-apps/xinetd ) - zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) ) - app-text/libpaper - app-text/poppler-utils - dev-libs/libgcrypt - dev-libs/libusb - !net-print/cupsddk" - -DEPEND="${COMMON_DEPEND}" - -RDEPEND="${COMMON_DEPEND} - !virtual/lpr - X? ( x11-misc/xdg-utils )" - -PDEPEND="|| ( app-text/ghostscript-gpl[cups] app-text/ghostscript-gnu[cups] )" - -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}" - -pkg_setup() { - enewgroup lp - enewuser lp -1 -1 -1 lp - enewgroup lpadmin 106 -} - -src_prepare() { - # create a missing symlink to allow https printing via IPP, bug #217293 - epatch "${FILESDIR}/${PN}-1.4.0-backend-https.patch" - epatch "${FILESDIR}/${PN}-1.4.1-usb-function-decl.patch" - - # use the ldap schema of the ldap draft - epatch "${FILESDIR}/${PN}-1.4.1-ldap-draft-1.patch" -} - -src_configure() { - 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-pdftops=pdftops \ - --with-system-groups=lpadmin \ - --with-xinetd=/etc/xinetd.d \ - $(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 tiff) \ - $(use_enable zeroconf dnssd) \ - $(use_with java) \ - $(use_with perl) \ - $(use_with php) \ - $(use_with python) \ - --enable-libpaper \ - --enable-libusb \ - --enable-threads \ - --enable-pdftops \ - ${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 zeroconf && has_version 'net-dns/avahi' && neededservices="$neededservices avahi-daemon" - use zeroconf && has_version 'net-misc/mDNSResponder' && neededservices="$neededservices mDNSResponderPosix" - 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/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \ - /var/run/cups/certs /var/cache/cups /var/spool/cups/tmp /etc/cups/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.2-r1.ebuild b/net-print/cups/cups-1.4.2-r1.ebuild deleted file mode 100644 index b6c1b16..0000000 --- a/net-print/cups/cups-1.4.2-r1.ebuild +++ /dev/null @@ -1,185 +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.2-r1.ebuild,v 1.4 2010/02/10 19:46:08 ssuominen Exp $ - -EAPI="2" - -inherit 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 +tiff X xinetd" - -COMMON_DEPEND="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 ) - xinetd? ( sys-apps/xinetd ) - app-text/libpaper - dev-libs/libgcrypt - dev-libs/libusb - >=app-text/poppler-0.12.3-r3[utils] - !net-print/cupsddk" - -DEPEND="${COMMON_DEPEND}" - -RDEPEND="${COMMON_DEPEND} - !virtual/lpr - X? ( x11-misc/xdg-utils )" - -PDEPEND="|| ( app-text/ghostscript-gpl[cups] app-text/ghostscript-gnu[cups] )" - -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 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() { - # create a missing symlink to allow https printing via IPP, bug #217293 - epatch "${FILESDIR}/${PN}-1.4.0-backend-https.patch" - - # CVE-2009-3553: Use-after-free (crash) due improper reference counting - # in abstract file descriptors handling interface - # upstream bug STR #3200 - epatch "${FILESDIR}/${PN}-1.4.2-str3200.patch" - - # use the ldap schema of the ldap draft - epatch "${FILESDIR}/${PN}-1.4.1-ldap-draft-1.patch" -} - -src_configure() { - # 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=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 tiff) \ - $(use_enable xinetd xinetd /etc/xinetd.d) \ - $(use_with java) \ - $(use_with perl) \ - $(use_with php) \ - $(use_with python) \ - --enable-libpaper \ - --enable-libusb \ - --enable-threads \ - --enable-pdftops \ - --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 -}