Version bump
authorAndreas Hüttel <dilfridge@gentoo.org>
Wed, 4 Mar 2015 17:41:40 +0000 (17:41 +0000)
committerAndreas Hüttel <dilfridge@gentoo.org>
Wed, 4 Mar 2015 17:41:40 +0000 (17:41 +0000)
Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

net-print/cups-filters/ChangeLog
net-print/cups-filters/Manifest
net-print/cups-filters/cups-filters-1.0.66.ebuild [new file with mode: 0644]
net-print/cups-filters/cups-filters-9999.ebuild

index 07d4f14060bf10ab601375f6df19328d1117df97..a82d9eda9a2141d27ce67e356122819871b0e541 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups-filters
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.136 2015/02/24 16:15:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.137 2015/03/04 17:41:31 dilfridge Exp $
+
+*cups-filters-1.0.66 (04 Mar 2015)
+
+  04 Mar 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +cups-filters-1.0.66.ebuild, cups-filters-9999.ebuild:
+  Version bump
 
   24 Feb 2015; Michał Górny <mgorny@gentoo.org> cups-filters-1.0.65.ebuild:
   Remove /usr/bin/foomatic-rip on USE=-foomatic as well.
index 805429c3dee16a0348eb28c3cd68bc534716181c..fa5ddcb921913d6b1960ecae3d7adf47265dfd58 100644 (file)
@@ -8,28 +8,30 @@ AUX cups-filters-1.0.65-poppler0310.patch 2124 SHA256 02c97c5915cb0c41dd47b9e1d0
 DIST cups-filters-1.0.53.tar.xz 1312476 SHA256 a25b55228cc13549d6989a9f6319e4e313ce42fe88d8b645e02b0c17d02dc2bf SHA512 dc46195211615cd91ce4bd8a616a8f89bcfd5e601195d6a0ab9761aee964c424929dc0d30347947d742138f7dad29ce9259bac6209945cc4a1d475614db59d0e WHIRLPOOL 95a758b29418939f3dcd6f49d52b750756dc01e43eeccf0a7833925052f42d919106346fa4a0503532ab1e7321247fdbef8547755b3c2288ad91789f26bbb5b7
 DIST cups-filters-1.0.61.tar.xz 1327904 SHA256 f5285e3ee436ea42f2986cddfb8020d240ca8b0d7f8dc4b0718b6695ad4504af SHA512 7d538d71e6c8342e521f4366c443e767b64e324ed1689bb56c15e70211c91ea89e819c7ae142a9f6d86a111c6a5a4d44ba7b8aa2e5d0d71247fc2d3771c1598d WHIRLPOOL 3690675f3b58f30614c0f4e6454e7056e3ff0786a5a79e9f869db7d0808bd879aeed30b19687ef9734d00882e884f5ebef8a681d41a415bd2878f9f04798927a
 DIST cups-filters-1.0.65.tar.xz 1333496 SHA256 f85c1ee22ba36eb689d8c98bef267663a30d715f8b49189f6e6c0c6f7e9726b2 SHA512 282a7a7538e737c20f2b91c165126ee8665052e5a33ab737a75664a6edee930022403ddb61f9c4130fcfea0167d253fb5816210baed0f408c5042edef9e107b8 WHIRLPOOL 8fd4dc832bfe5ce1c80c3d0dc5f68aa5798007416b7442ffe76c28bc56ca337dfbb7ecbee2f1520bf7cbec453f37ebb6171cad45380f44bbf5f8643f035e2fed
+DIST cups-filters-1.0.66.tar.xz 1335740 SHA256 a46eea35d8c151f1f63c663c5dda290ba11a7f5951d48dba485a02f9146dfb1c SHA512 275d704a52889fd0f18b9c1ed5aad70efd0df3b0beac30fca5467135d9c9b0ccc0ea7e3d1274086cf475c4a569262edc85962b5076df3ba2e9d3fe4d2c376fa2 WHIRLPOOL 040fe61f197187913c90e42a26ada1957e9289854627af3cceff984027fb630417b9e8548e3ca7d713a74ad0074389459a41de3bc7579438335a84e30a694ba5
 EBUILD cups-filters-1.0.53.ebuild 3655 SHA256 586b731e89d3c97ab1ba09d347e133a79bc9b18bd5ce8e34455d14838cce6f44 SHA512 27da1b3feb9e55511eae5325709e0b6371cc0eff68e426bb705809f8bd493e5ddba8c8156ae1bf6952e50c629f6315b16182a8b6fcf3e7b79453cd9ca2cf6499 WHIRLPOOL 88d75b06b368a4014b6ffb7ac394b74c0a3918e357fc3b81270fd8f7fcd61aaa00bfe65aa645d36869cb1cabe0d1dc93fe58a646ce01353e3b14f65ae42c8c58
 EBUILD cups-filters-1.0.61.ebuild 3320 SHA256 fd620dc5842b9f851717b861adaf2fedb29f2df81e30839594501b2f77bd8a88 SHA512 0993c498f3d36959c21bc1bc891f94f68c445625cec76f72fc4d7c56da9986d6acd841349ee988c1ad7fd1255e981db270886b091fbc52d2b34a27e7fe7bb463 WHIRLPOOL 32c99184b9fedbfd3e5b50ba03329b831e09f72944569941b1a1810522015c6c9b4fb2ed730143813fd8e930e13ebdf0dd77e78c938c312361aefd0c25381483
 EBUILD cups-filters-1.0.65.ebuild 3404 SHA256 ba4bc777b3ffa68fb8d4b484abbd2ba2530c1a4997082a92eefacda9eb145dea SHA512 2dc8c2dbdb6c7e00bfc572d8c32c49139f10ba6c965e77fea59bd99e3fbdf0d9d4126d0efee2c4a698936471aaf04bc63a8e85649159ca2ab64798303ad1e719 WHIRLPOOL 125933e3c42eb88f86b32ae7df98b3128c4b979d1fa587cdf75bcefad4eb855630bc46d78d084b47e9508cd0f1cfe9a179d33c0e6638b64af09dc6f8929b98d1
-EBUILD cups-filters-9999.ebuild 3370 SHA256 4a273ae14a619b2f595000bec90242d3458d4cd2c6ae617d1189928b0d049965 SHA512 8722f50d3717640e6bfe90152d5a1553da4d4a15fa1ef8a4cc5e33404ef259c02ec3cac20f9fea3f2b62fc1c779d5a2e6ffdd7072e3c574e497707b37958d9d5 WHIRLPOOL 97ef4c424be511dc52497cc8109a30a52b0f35bced3ce9e58110318f2896a60aa5b897cea6e6f2e320b28690bdca5f88d93f41b984978ec093d48a880b107b06
-MISC ChangeLog 22164 SHA256 5ea6142352705f52523dece06ccc06551ca1b9458a885b695a457c528f79bcef SHA512 9bf9210c8bfa846770142a25ef64cbdc79b5995c3f6bf7856ed2345a90529c94e8173bac84a0ce4aaa64864c1eca65e0b1e68c1cc629a1e73a41b9d282567a43 WHIRLPOOL 8b7692e9f74f114695ec8c890d58989f8260f77564d0cfeaacea01a8ad93b800419ae4f1b647d26747cfc759d07f659d8cb6952bc88c482da6b77902e144247b
+EBUILD cups-filters-1.0.66.ebuild 3358 SHA256 bb0bd7f9c2057f200ea15234716b1378f55c3a9a8ea6074292f148f9a353142f SHA512 adea605ddd7a086a7419bad66d3e49336a64c9f22e21b07b2c162ad7ff4aa6ebc48dce368ab05aa78c34d26e8ca4afa59dd6d8df20f93ff6492a5b2c15b32176 WHIRLPOOL 6b4173a5eb826aeeef722784b39e9249802052815cd8ceb697d09c9e5953477ae317cee7a2f440b63b133cac754aa0f65857cb4242623937d4dbe6983bbecb84
+EBUILD cups-filters-9999.ebuild 3357 SHA256 727034332dfe920bbca2b5d44cfb1a05b00d018e9d696bb6fa5337849db64fe1 SHA512 cc4603568a5e0e32e9ba0d263b09f796146cac0be117de4c64f7d9568b29e958baafc72c0c5287b51c08c4af6ca2bccbde1e41eb9d2f3c443cac62133a680f80 WHIRLPOOL 5ae5a685ea457a86423726145e448e9200a5f1cbe694c1e9fadbd8179759591dac536b18cb29a37f037407fe1934283b0c511b81287fda30c1f6208b9739f788
+MISC ChangeLog 22333 SHA256 f3eb1acdddc7c88cc499556cf5466cef788e574f97f2a52e5849f088c99ebf0d SHA512 55e6f40b73098466ff1fe5a9abfa06eb53240de69b67e8672a913ce72ae46d798353b833af1f12af012a515724cd59f15bcb5a9c8e33fb9564b45fe93e23027c WHIRLPOOL 49161a131e255cd7592c1e673c3215938e2cd9482ad719c2d28d9ff9bf6b8728afd96f69c25e72cc0a9d2b3aa5e1c5d7548fd420796145a6c81737193ede0df0
 MISC metadata.xml 290 SHA256 07d21bc9b73af41131dc35b0b30829bb124443a931df199fad5720fd0c6ecb82 SHA512 8614acef9fc5a0d78a7c65ce34d79189c2496946a4bccb215b9404abdc0c821ee89f3a89892e2c320359063fc43750c9e9581b7fb732d9d710ff7bb2dd6229db WHIRLPOOL a0ef99c415a6e3dea7f7c0f2349ea67ce76e8361f36d1f8c828d136ebf01e4d3a5b1038aba6aea92843ab67bed68c38a0a841f3620e7d46aa205360694e682ba
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU7KOpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOFi0QALtFyZIVJFaKytbK3kkcE7vw
-wkaMC8qoZPMZa4NBXm3wu5L76OLwwUoGKaFLd5VsgSidKAUBKhMqHYDR3O0igVV7
-FabwYOUqwdoWqewe4ME6djdNlOIhB0wUPIO3ZVQU/mDQyBY4oCXnYALUaS3upcXP
-eMYm/mBg3fh6mpzgCnRwz+2eF7ovj3eLaThMdK53rnHDv7SESvcmpVl5Dg9qXuYp
-LGeKkQ7xRkIuTIBPrWSy568J0RapFV3dvZn7jTn78vjKUSAZ974kuRY9Ufa3snTe
-562ngNzi+iMFasGdEw5l88f+gik04fVfk14mryx76j2/C/o3QJjcUc4jh9E3sJP6
-87y+3eqJ0RdpMWAVbwRwLdJkDycwHLek5EUWFIv0R9FONQD5OVl5uzHt7fJDxvK1
-7M1Tv0pN0BosAVzVx9k74N3NV7F34lxi8l/TVa38axB3stAvQRbKgcCZIM3Y1lLR
-XWI61S3CiCoqDlrjTeYPtvVLLQG5bIUz9rr2Ef3wohj063EKSdcVcHvt22CeXqLQ
-UbKiWYXKy7S767KCziUayU9tE1QEHpv7rYszdHFYkk/PxXAHKyAIEJri4LHhfyKJ
-RB1PjCsDmh8uGPh0ogXwKQwRVPiUbBiELQBtKOJEzI3o7J6pTmSMqlQdE7nBuQ6b
-PTefJw/xRk3TmUSiarrD
-=bASW
+iQJ8BAEBCABmBQJU90PRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcPB4P/0nt0+fzeAfI7fzCpxjG+7hw
+DcQC7ieZeBJ8I+Kcg6A3rL3KwTsRN3SyvqArtY3Y3KoY3hZXvvGYy5wGjjtcvE1u
+EGGhPXcy4ZAOAxVI7tvl7R96FY9RAhny8wBIgLJ2iF0G7HOXEOICaC5vMXFoGEyZ
+8ff2ODqnEJ1LIPxqOjL5A7U4CMbvLm7DTNN180THsHEuSOkihNxwsuLDch5f+1Z8
+B96tEAGceGcwylZECz38sJk+SX/p1T+ii5UySqzI/aDbhvBrqysHGcgs32EppVLJ
+kLwKDp8O+vfptcIP3XsdJGLEUL43ADq3qKdHZM+8VDEOtsCUFQjSFdY/wXwQjqC8
+BOx1+RXrKJ9FJGcUNJPnjV89gJ7qTTJhaxoXmT2MkRPuCbTjes4H4uMAfUtI3b4c
+F1rEnyUeEbfk8YvOQYwzTV21aYG9gyGLDJGE9BETDlmgQNd+9uIgjvBoEaE8O686
+C//PO95MiMyDskO0HiwWdzguptUw0BIYdmF2UAhGoFyZsPROamSRtg/VC3p3aOD7
+fqAYs1mKJ9akOVZC3/VCHfcnKyMNhMgxCCQYK0/KMzGINNhid1+Uw21hkDA8+syj
+3E6YhQoX7rk4hQBHmC1pYq/lpeom5S1XRStkUG29fYXyQEge9ed5qmzXu0n2BulT
+NJa2cTqul1XHSY/xRZKl
+=IDii
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups-filters/cups-filters-1.0.66.ebuild b/net-print/cups-filters/cups-filters-1.0.66.ebuild
new file mode 100644 (file)
index 0000000..de80e01
--- /dev/null
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.66.ebuild,v 1.1 2015/03/04 17:41:31 dilfridge Exp $
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit base eutils perl-module autotools systemd
+
+if [[ "${PV}" == "9999" ]] ; then
+       inherit bzr
+       EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
+       KEYWORDS=""
+else
+       SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
+fi
+DESCRIPTION="Cups PDF filters"
+HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus +foomatic jpeg perl png static-libs tiff zeroconf"
+
+RDEPEND="
+       >=app-text/ghostscript-gpl-9.09
+       app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
+       >=app-text/qpdf-3.0.2:=
+       media-libs/fontconfig
+       media-libs/freetype:2
+       media-libs/lcms:2
+       >=net-print/cups-1.7.3
+       !<=net-print/cups-1.5.9999
+       sys-devel/bc
+       sys-libs/zlib
+       dbus? ( sys-apps/dbus )
+       foomatic? ( !net-print/foomatic-filters )
+       jpeg? ( virtual/jpeg:0 )
+       perl? ( dev-lang/perl:= )
+       png? ( media-libs/libpng:0= )
+       tiff? ( media-libs/tiff:0 )
+       zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+       base_src_prepare
+       sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+       eautoreconf
+}
+
+src_configure() {
+       econf \
+               --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+               $(use_enable dbus) \
+               $(use_enable zeroconf avahi) \
+               $(use_enable static-libs static) \
+               --with-fontdir="fonts/conf.avail" \
+               --with-pdftops=pdftops \
+               --enable-imagefilters \
+               $(use_with jpeg) \
+               $(use_with png) \
+               $(use_with tiff) \
+               --with-rcdir=no \
+               --with-browseremoteprotocols=DNSSD,CUPS \
+               --without-php
+}
+
+src_compile() {
+       MAKEOPTS=-j1 default
+
+       if use perl; then
+               pushd "${S}/scripting/perl" > /dev/null
+               perl-module_src_configure
+               perl-module_src_compile
+               popd > /dev/null
+       fi
+}
+
+src_install() {
+       default
+
+       if use perl; then
+               pushd "${S}/scripting/perl" > /dev/null
+               perl-module_src_install
+               perl_delete_localpod
+               popd > /dev/null
+       fi
+
+       # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+       dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
+       dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl
+
+       prune_libtool_files --all
+
+       cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die
+
+       if ! use zeroconf ; then
+               sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+               sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+       fi
+
+       if ! use foomatic ; then
+               # this needs an upstream solution / configure switch
+               rm -v "${ED}/usr/bin/foomatic-rip" || die
+               rm -v "${ED}/usr/libexec/cups/filter/foomatic-rip" || die
+               rm -v "${ED}/usr/share/man/man1/foomatic-rip.1" || die
+       fi
+
+       doinitd "${T}"/cups-browsed
+       systemd_dounit "${S}/utils/cups-browsed.service"
+}
+
+pkg_postinst() {
+       if ! use foomatic ; then
+               ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
+               ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
+       fi
+}
index 255f4d525dffee496caa9a5d8ffbe09b33b5ad27..9721374aaed988bbbc3ff55519f689abbcaedbc4 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild,v 1.53 2015/02/14 19:48:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild,v 1.54 2015/03/04 17:41:31 dilfridge Exp $
 
 EAPI=5
 
@@ -39,15 +39,11 @@ RDEPEND="
        jpeg? ( virtual/jpeg:0 )
        perl? ( dev-lang/perl:= )
        png? ( media-libs/libpng:0= )
-       tiff? ( media-libs/tiff )
+       tiff? ( media-libs/tiff:0 )
        zeroconf? ( net-dns/avahi[dbus] )
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-       "${FILESDIR}/${PN}-1.0.65-poppler0310.patch"
-)
-
 src_prepare() {
        base_src_prepare
        sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
@@ -107,6 +103,7 @@ src_install() {
 
        if ! use foomatic ; then
                # this needs an upstream solution / configure switch
+               rm -v "${ED}/usr/bin/foomatic-rip" || die
                rm -v "${ED}/usr/libexec/cups/filter/foomatic-rip" || die
                rm -v "${ED}/usr/share/man/man1/foomatic-rip.1" || die
        fi