Version bump

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

4 files changed, 157 insertions, 20 deletions

diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index fb4add7403e8..9a25908f443e 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.127 2014/05/24 20:33:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.128 2014/06/06 22:43:10 dilfridge Exp $
+
+*cups-filters-1.0.54 (06 Jun 2014)
+
+  06 Jun 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  +cups-filters-1.0.54.ebuild, cups-filters-9999.ebuild:
+  Version bump
 
   24 May 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   -cups-filters-1.0.43-r1.ebuild:
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 2d0ed3757da8..699abba43f24 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -5,26 +5,28 @@ AUX cups-browsed.init.d 399 SHA256 d4d27c920ab062532755b553544ff3ef4d561d03bda07
 AUX cups-browsed.service 225 SHA256 f4cd6ac0da207deb3b9991264fcb8d3468ae7c5c4fcd1957d296d344fd9e3d44 SHA512 16d7a8b0c95827582706764ca6f96720561e8c314929f6d53c98dccb68b6df21d5928949b0aaf7c2f738ab5c07ee2678d643b9acb6b581bb77a67db950082cdb WHIRLPOOL d1606f5ebfc84398502282e9c1e42bed6701f2d4e284f1214ef924aa94fe2be3e169d83f9d9fdd34a817514df35e680f38b3e91fb7e965510621e3fad8002f14
 AUX cups-filters-1.0.53-uclibc.patch 445 SHA256 816b7f2b342ae97f0494344467a46b0cb7d8c3cf255f83ae04cfa934d55c3cde SHA512 9a729d4c775b5d4e0afae571286ac049db197d5f1b1b99237af557b4ee51f7d0d80a8629d7bb8f32e3fad914c38fdf106c6817245acc6dfcbb31d35a12cc4bf3 WHIRLPOOL 79dbaf986b3f6dc4b2f2e60de00c4766cf67246e78c67a4080424acb23504d8089a3de134fd28805db22a42bcdaa0a104ab81ea3ce95323e4642b492dcf86780
 DIST cups-filters-1.0.53.tar.xz 1312476 SHA256 a25b55228cc13549d6989a9f6319e4e313ce42fe88d8b645e02b0c17d02dc2bf SHA512 dc46195211615cd91ce4bd8a616a8f89bcfd5e601195d6a0ab9761aee964c424929dc0d30347947d742138f7dad29ce9259bac6209945cc4a1d475614db59d0e WHIRLPOOL 95a758b29418939f3dcd6f49d52b750756dc01e43eeccf0a7833925052f42d919106346fa4a0503532ab1e7321247fdbef8547755b3c2288ad91789f26bbb5b7
+DIST cups-filters-1.0.54.tar.xz 1314324 SHA256 f9a58cc9f02f2257727248a71b99a74e6ef79e2e8527ef58bcd81e6154bc0966 SHA512 eee17f9fbc82f70857123ad62683e7136408f6888b7b666b3a787863c855fc00436d222fa2996cacedcc7245b24d9f08e9110cad8a7d17ca8e37e2210f86aab2 WHIRLPOOL 23d9e51149b53ad153f8fa011a3fca6dff18a2f65d9bec1ef746b686e40774cbfba6462e0c2369a5aa567f3c5f4ab7b71ee6fe8d583d08ed86732f009d1813e6
 EBUILD cups-filters-1.0.53.ebuild 3654 SHA256 7aa94b03cec517e2b33d97bc83e6a91f238995756ee7357566bd947cde81f72f SHA512 2ef7a2701a6792a9478bd900af5d8d5f887f9a675cf779518f3b970bac51df3769d721c8a425b74609cc9aa61e78498d4147132fa28d2f7324ab179542509b11 WHIRLPOOL b6aa0f83be27b5662c3c369857e4263bb9e0eb2195287f5026af96fe9026c97827ebfac5501421cdf1c160874c8f8274712cdbc7ea673d05bcb078afaccd12c9
-EBUILD cups-filters-9999.ebuild 3609 SHA256 392911d592eb671dabd3b846ea0f6fe949dc455d9d2434e469108e6404caae76 SHA512 d9c8bd6b143f3390ffe3dbab493f62246958ff6990dd8c09260803b47c4052c0aec70f12f13f988b7a8119390501b4123d83a924fbbad32612ef49135c71ef0e WHIRLPOOL 854a2a4552bb2f7dea5f5560c0d349d53c902b223b334e69f9593851e6c788acd4094997ccd42b25a5bf79c740cf312b228c3af34a400c09254268833e874e5f
-MISC ChangeLog 20356 SHA256 4dd172286ff4c51c2549a68db3c5667baadad9b1c1b6bfc0a03bd26f261a52b4 SHA512 e09aa46c088874bbfa640141ef2f923aa0c4c4efed17fefce97e84ebfb64d56ce4d19fab24f704f543be5660a5f9083cc7275a234bfd3e52ecc868ada7d869a2 WHIRLPOOL a9755209cbf9a6bd13363a8ea4a10f1e34ae310ca8133468b6c79a5291d6847acb4e2fae71f7ae2e76f1bac7c63d7e09233ecf7b0866db57e83d2e662125c668
+EBUILD cups-filters-1.0.54.ebuild 3621 SHA256 0e7a44a7b683c4a7278f908fae93fb544aa07d99f28d0f48e81baefba3528cc7 SHA512 8a7b84fb160d861b9ccaea7ec0eaccf0b42508d5638ff6a3e3e423fef8fff013433da56744ddc63fa08399858d9e6f7930c3d5d2157f23f170eb2c92c31175fe WHIRLPOOL 3c62cd1dbc9937cfe4ce8f3c25eefb07908b33c668a78cab26132f7cf9dc8a0706da303b575e1d7cc6ceb48c4cbdc7ba98e3a4846524fa5e9109390c42f27273
+EBUILD cups-filters-9999.ebuild 3620 SHA256 96988be3030e117abecd7311c2c102a4d4081184e89b490c48a9f328b432b769 SHA512 eb2e3ec70228d82e812f70fc79c2ba342b8b5ece82583f834568091fcdba624d395f9c6819e2639e4ee122080605e29dfea7c0412b66d5d451b8f6c153de1d58 WHIRLPOOL 5557bb4f8a58afa1bd38a4f0e60fceb7f6db645c1a3779a4fc54446650f40360ab3ceac866c2e5ee158b5a4d732b61c37061fc66e226e067d37c6976ef9c75fd
+MISC ChangeLog 20522 SHA256 9d6a270670f5655df3a404d4758b9d73b02f21452200aa20e07736557585565b SHA512 276a91c7a90f679520105697fbb295dbf42d98aeb1a5ce20c1675ec9dbc73a4ddeb75fc3c1d81b20943a91d50515689f04bb360b006b8d2b26e02438ecd011f2 WHIRLPOOL 6264b53a6fdf598df0be574938582ea2c6bdd363efb0c0b6bd3d806b12c1596e4609ebe2d21e3ef02272986f143962b7978d51f9864b683e97e5798e371dc382
 MISC metadata.xml 290 SHA256 07d21bc9b73af41131dc35b0b30829bb124443a931df199fad5720fd0c6ecb82 SHA512 8614acef9fc5a0d78a7c65ce34d79189c2496946a4bccb215b9404abdc0c821ee89f3a89892e2c320359063fc43750c9e9581b7fb732d9d710ff7bb2dd6229db WHIRLPOOL a0ef99c415a6e3dea7f7c0f2349ea67ce76e8361f36d1f8c828d136ebf01e4d3a5b1038aba6aea92843ab67bed68c38a0a841f3620e7d46aa205360694e682ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTgQI4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTkkP/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcUhgP/jdDuXjslvqd1JBJvzR/aWkh
-omSBxXukIFHHqEvWBfpcJzAN7FQ8rzfQ2ZKkG/U1+buSSiP8LpACQllFGXsSIzTx
-NMBMaoauLkOjjC/I6unNB+fhSyajt7znuZJpeg1PY3TGm65vDyylta+zg7286WoG
-FqH87X53EbTchMS7GzlgoiTRpeD3+lA1BECF8LhTsNDPtRzuzorzAxWKWSTY+S4e
-qbbDlJgx0YuF5MAPNg4PffhNdbdbAsOtKZ/usux5uk2ifkJEAHxHsJT965KfybAU
-u57TomhpWVVmZsOernl8jIfXi10DXbOCLvLeTHvN0x+gCz3pmnk15sw0MKL9JPiD
-ZNv49agzqThsBhhk142k2qQHJ7clPCh8qhyDnoE2qjjHOTulagVpRehqfCINXIN6
-TVsVlFKBYu7jpXiCPlG2VsDCpP5pMjdDITaFAyJzAE07CLSJHlkWng5SZi1iLA8p
-MLYRpACQrrbqTA+yfT6QTyUT3JgeC71IP45LuYTLc8qjlcvc86TFes2/frhrGzkE
-Y+wyxOlrZbnMGSr0IH2d/NhG4peLRomiBq1ZbejJwGPmOG1DeF1d8XNAzI0vy4Bb
-aZDswn2LW7YeCm/JIUlDrckjnqDzMPe02RLhgmM8XpyplZRFD1WR8hbgnGLbw0Yq
-hMcvWmlGFfKhcaV8h68c
-=tRhR
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcGLEQAIYjXk+TgN6SOkNBzSK5HFFE
+bvk9lzodL1sanTWQO4UJzepaW+m/v//oECSkXyHF5yylb6IHRk7n3XHfip7/Yzyg
+KdE9r1xxTXLVP7SWVpFu3gqNSuWa+uUkR8/P+aI9gyVAuRyFSldhlqbt6rFv4PoJ
+3uFf1ayOtUdWmKxKmQ3axT0v+PUeS8XkzetrCGSzveVGFfQWhNMXwQxC7lBj9SXv
+B5dGKR40PxQGLrNy9f9n0YL6NUsOUSa2FUnCk8pR3Fvfih41wHgHbhBkNSpLmN+Z
+qURf1mVF+3jFLOO/EmeP9VwIstk7sbkzhVnLhIGMpIJumsPAmgmz091fPP3AO0gy
+GOmHIatr9jBEbEKIfENz2pvqSIkRwsnJVubw3TPetDecYBvbjN5fGmSG46SjF43I
+T9WtcTTDwvVEJp4ZAuPniQRrbMC2RIvtFWzr5i+DiLkFtPE4yeZ/n1J7SAulBLo/
+YDjtxe8TplPTFueagDyimkN6JeKVbMCzvQodEaL5fgXH/jIUZfI0nwicyJTHm+aA
+b5ZIRiAAvCqVGZFGNV2PvOSU7FXBy67SWMIe7PzK/Pie/pCorfr4glJYN3FgxSf5
+9+AiToG0l8K/7o8ul5EaXZNXRfU6STVcIUEWGB/vPs/BzQ0BJFgQwfIybDUwbHFQ
+l3NVzdh96T+B0+GRB3Oh
+=BNFS
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups-filters/cups-filters-1.0.54.ebuild b/net-print/cups-filters/cups-filters-1.0.54.ebuild
new file mode 100644
index 000000000000..149f6bde7e98
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.0.54.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2014 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.54.ebuild,v 1.1 2014/06/06 22:43:10 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 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-uclibc.patch"
+)
+
+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_prep
+		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
+		fixlocalpod
+		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/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() {
+	perl-module_pkg_postinst
+
+	elog "This version of cups-filters includes cups-browsed, a daemon that autodiscovers"
+	elog "remote queues via avahi or cups-1.5 browsing protocol and adds them to your cups"
+	elog "configuration. You may want to add it to your default runlevel."
+
+	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
+}
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index e1b0a20db45e..999c4ae8a23d 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.46 2014/05/11 19:12:35 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild,v 1.47 2014/06/06 22:43:10 dilfridge Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ RDEPEND="
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/lcms:2
-	>net-print/cups-1.5.9999
+	>=net-print/cups-1.7.3
 	!<=net-print/cups-1.5.9999
 	sys-devel/bc
 	sys-libs/zlib
@@ -72,7 +72,7 @@ src_configure() {
 }
 
 src_compile() {
-	default
+	MAKEOPTS=-j1 default
 
 	if use perl; then
 		pushd "${S}/scripting/perl" > /dev/null