Version bump

Package-Manager: portage-2.2.19/cvs/Linux x86_64
Manifest-Sign-Key: 0x0B08240A96F66571

3 files changed, 144 insertions, 16 deletions

diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index 736fd1f85303..364aa1891939 100644
--- a/net-print/cups-filters/ChangeLog
+++ b/net-print/cups-filters/ChangeLog
@@ -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.147 2015/04/22 20:40:24 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.148 2015/05/18 20:44:49 dilfridge Exp $
+
+*cups-filters-1.0.68 (18 May 2015)
+
+  18 May 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +cups-filters-1.0.68.ebuild:
+  Version bump
 
   22 Apr 2015; Andreas K. Huettel <dilfridge@gentoo.org>
   -cups-filters-1.0.53.ebuild, -cups-filters-1.0.61.ebuild,
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 28e3c81b6c29..ff19e8d419f3 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -6,26 +6,28 @@ AUX cups-browsed.service 225 SHA256 f4cd6ac0da207deb3b9991264fcb8d3468ae7c5c4fcd
 AUX cups-filters-1.0.53-uclibc.patch 445 SHA256 816b7f2b342ae97f0494344467a46b0cb7d8c3cf255f83ae04cfa934d55c3cde SHA512 9a729d4c775b5d4e0afae571286ac049db197d5f1b1b99237af557b4ee51f7d0d80a8629d7bb8f32e3fad914c38fdf106c6817245acc6dfcbb31d35a12cc4bf3 WHIRLPOOL 79dbaf986b3f6dc4b2f2e60de00c4766cf67246e78c67a4080424acb23504d8089a3de134fd28805db22a42bcdaa0a104ab81ea3ce95323e4642b492dcf86780
 AUX cups-filters-1.0.65-poppler0310.patch 2124 SHA256 02c97c5915cb0c41dd47b9e1d0e4e3d6e6bd1a68fe2a19001a38b8bdaaf21607 SHA512 3197070128bff677cd7c7766cd881ba5c6b4750bce2cd9c98821ee31865423f52d9662d9931ce90670999410d8e3144b01dfac90772a303ebc1853b2fc0b8107 WHIRLPOOL 74d194d1594e93cad03e384796ae6731958751ef5537b8db317ba2d20e440f42794051427022aab9111c60b94f9e765a14e83be2d29e3dd4983c91b30156b3c6
 DIST cups-filters-1.0.66.tar.xz 1335740 SHA256 a46eea35d8c151f1f63c663c5dda290ba11a7f5951d48dba485a02f9146dfb1c SHA512 275d704a52889fd0f18b9c1ed5aad70efd0df3b0beac30fca5467135d9c9b0ccc0ea7e3d1274086cf475c4a569262edc85962b5076df3ba2e9d3fe4d2c376fa2 WHIRLPOOL 040fe61f197187913c90e42a26ada1957e9289854627af3cceff984027fb630417b9e8548e3ca7d713a74ad0074389459a41de3bc7579438335a84e30a694ba5
+DIST cups-filters-1.0.68.tar.xz 1336216 SHA256 d195cc321e65c0a0d208a9491b5869b6fffd7f3fbafc230906b1e18fb556a437 SHA512 5df5c11114a6f0641e4b064abe38b2b882965bbdb2736cb01c605eb4fa267c592ddd1d79767af477de1e66d4e2d3f4c86972dc448276dd04fcdccb80720892fc WHIRLPOOL caad3abe04ec78aca82a46660ebf76460ca9eb060ce2a6b15bbd61633b7aa7f86f96e53bce2e29cb3d33de41c4dde30168c07b70624f1e8db2b85cfb36115dc1
 EBUILD cups-filters-1.0.66.ebuild 3389 SHA256 a2ec6d62c893496bb0c0ea9bcc73241d31cef5a51c08f3970bd52515cde05950 SHA512 3b28cf5f223a58721f856874fdf579e1cf2af7ffdf6dd0f850912a777d3a82a307a591789e1afcd2531deafb6faa840f725af3704e760df17c9842b5534ad9ff WHIRLPOOL 83612ee1ed17de3f58000cebec7d45581cf363dcea88c3c0586441634b1ff986abcd098d754bb4b611f13f9ecc4ce50cbfaf09252019c52e7ef58cca12ef0ae6
+EBUILD cups-filters-1.0.68.ebuild 3358 SHA256 eaa9a2ec3e101dceaadeb71592ff116fa72e9bb287e90f9593efa8437e001640 SHA512 189890fdb5404932431915042a51979944bac2c3f833e2aa9bc0fcbbc9fcda8ec58319b006ae333b72c868a62c04d171f9be09d40d130fffec6e32f3105b4844 WHIRLPOOL 9f6c3d75c24a8ee9b0f13eedd2791f0ed374e212f53739a3aef71e49346c159884a28e4f70df31a1397ca5e9c7298b6bd46c1ccf574b1f71b0b9327afeed5209
 EBUILD cups-filters-9999.ebuild 3357 SHA256 727034332dfe920bbca2b5d44cfb1a05b00d018e9d696bb6fa5337849db64fe1 SHA512 cc4603568a5e0e32e9ba0d263b09f796146cac0be117de4c64f7d9568b29e958baafc72c0c5287b51c08c4af6ca2bccbde1e41eb9d2f3c443cac62133a680f80 WHIRLPOOL 5ae5a685ea457a86423726145e448e9200a5f1cbe694c1e9fadbd8179759591dac536b18cb29a37f037407fe1934283b0c511b81287fda30c1f6208b9739f788
-MISC ChangeLog 23500 SHA256 966ce6cc8c21308a75e8c9497c21f057d89b055c916c14d897292558c20d73e6 SHA512 c74bbe72cb8debfef9752d8e2d58f6ce20d4912562f15d451064d6e813ff78fdd8fa94e53d0b098ade3fb30b472e0abf4eb0c0fbddc9da609f11785a649beb60 WHIRLPOOL dc6b120fb5cf55317afe4b7947531e4bf2804a9ae6dbd8adb692ea9acc4451db94fc240479392037f8b7d3fc8f22203863e1fc2be0007c16b164d0ee167a7346
+MISC ChangeLog 23640 SHA256 90dfdcf8712581b7572214e6411c35641a571e0c2bb789aef0b551716a56d95b SHA512 ff99fe1142c58d0bbb2024ec3e4337abecafc3b16f8a073fde0547e8c10c2d5ae64efd19fac9beae68351bb6bbe2b216ccb53d3fbd23cf7457659566ecc36fda WHIRLPOOL 4937e8d6aad88c91cb40f8d9c8b95d00f89b63e1c31590b2c300fd0b6d4989e9cf5a095af0c8c4d325519060ee4bc92c58a71a688a14ed4c9f0d408c1886fc9b
 MISC metadata.xml 290 SHA256 07d21bc9b73af41131dc35b0b30829bb124443a931df199fad5720fd0c6ecb82 SHA512 8614acef9fc5a0d78a7c65ce34d79189c2496946a4bccb215b9404abdc0c821ee89f3a89892e2c320359063fc43750c9e9581b7fb732d9d710ff7bb2dd6229db WHIRLPOOL a0ef99c415a6e3dea7f7c0f2349ea67ce76e8361f36d1f8c828d136ebf01e4d3a5b1038aba6aea92843ab67bed68c38a0a841f3620e7d46aa205360694e682ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVOAc5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVWk9OXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
-MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5vZQP/A+4pjZlzXDKHyDL6yg14hZy
-eyz0Z+yHyfmmyRZYMWE6esjYyaQFx1isdszTV4iwqUMRAAVwMMZCPRelLldLnhkG
-8D+Dkl25/kaY/8oEOSa6iNcJcZ1tW1DG9dy2m16/u9PCEIpCBCfMrNZaAzs4wokp
-AsDl17QvCKmuflEZ4zBgVFP6NOYRrL4A+pKfOqEYVkt4BBBChrAmuOIZb89pTOR4
-TCOxU3VVCiDKYYZny8Nx0cxZC5/wqJShG9KnGZtZ8JtTuSW+oj0nhgc5xFnnnyr6
-3Fr452iYXJ6mlv8mnwAq0PAGLAYKKmdtu9NkIDg/kazu3uFWAqgM2RvEFizMzsxw
-SPEhD7KGs6sAVHHSuxlP1TDJhLHZsoTiPu6W7GmweD2dG5ye3k6xWzXaYD7SOm0W
-aoACn6TURHYYkZUl4KfbAMdunAFR4kjHVRptvKOUYExOL8zOfQJZ+W2FsJ0bZOf4
-p/KpaYMFs9ShZ5kzK9tmPjTvjeZM6UCL0hkoFw44QsJBSkClNiNPzUw+2hVGCoH3
-YZyhhdtJEwIdZLfZgJ7KIsnLb1IeBx9M5Lqwsj/bhA+swXWp10exDhPh34DIUoLe
-5jt6t5sr11CPurB1iw5Jgr1jX70rDYqPSyJ7R7fb6kvY16+lpnwONaxZt/KONsJK
-y6u6PD27OVnqte9zrSLk
-=Ja+f
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5XR0P/RCJ9zuyULGZAfXHA2uNkI0j
+w3Z3jVQB8RxraQJCd8BhOH/8xlHg9WV73UNyL+PDyOKykSoeddlTwj1aDxFEkOAF
+yvFhE14wRvPSS5/XO615Pbhfq8/vNqbiUEDroR4DLwP+HR7ec0VWMJv1OqwhHYpC
+oPATZG3TmRmBp3yr4IHndy25ZQbyOGAE8rDdKq+xcBKtUKnGTLrG/Pc3VvOKra+U
+ymzCdcgbTQWJOJKiJmbv14WSjQ+IcG/B3cXFziFHU1NPgUsNgS96kvZ7X9k+wBu1
+AlT/Z6d0hHuVuhGbUH6jbz3H9CK9iDEOkJB0V3bjaKWT+cpqi7OuWgw5WFX8Ulwz
+ieY6vhySgvqA8aaTpg2x4xP0fFFElokC57l7dyBvXLfFj3YFQXlg167T/VWWAxUP
+Z3ZYJYpAeqnbGA3eiViV1sLjlqsQE7krjkxM1feH3bZBgwEXzX9aKlxQftJdS41G
+MkfiTCGE6LAoIYOBx1GaBKiMRiAfBU9LrpT5P8DYM9sraXlUmIh0r5G+O9B7S6p5
+DjxQFCD3b8kTGLQWvU5XKLEMp6J28zDG7LDbMxycOUnx281hmxvg8h0UKhdjwbSr
+LkFGXeRuJhC/vQI209JlZkKmayE/9qnUN6Ua7Np++5EsQRB8vobPNoT4GE5/7R6F
+OoJzEZiniISlnpXZJJQk
+=dVlF
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups-filters/cups-filters-1.0.68.ebuild b/net-print/cups-filters/cups-filters-1.0.68.ebuild
new file mode 100644
index 000000000000..945a62078852
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.0.68.ebuild
@@ -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.68.ebuild,v 1.1 2015/05/18 20:44:49 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
+}