Version bump; remove old

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

5 files changed, 47 insertions, 99 deletions

diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index 33a2a5dd5102..3e6d60236846 100644
--- a/net-print/cups-filters/ChangeLog
+++ b/net-print/cups-filters/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/cups-filters
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.56 2013/05/11 10:31:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.57 2013/05/11 11:47:47 dilfridge Exp $
+
+*cups-filters-1.0.34 (11 May 2013)
+
+  11 May 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/cups-filters-1.0.29-poppler-0.22.patch, -cups-filters-1.0.30.ebuild,
+  +cups-filters-1.0.34.ebuild, cups-filters-9999-r1.ebuild:
+  Version bump; remove old
 
 *cups-filters-1.0.30-r1 (11 May 2013)
 
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index bd924e376035..a0474d1a69e3 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,11 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX cups-browsed.init.d 399 SHA256 d4d27c920ab062532755b553544ff3ef4d561d03bda0728d21e71c83d0e904bd SHA512 3762f18e57e317e4e2b40b1f42da79e383de4f4a360cd7317ae1780edd44ffde007b0ced88bac6b24d082d0fab19425360eec891ba86fe46d9e201e1081a2beb WHIRLPOOL 38782d813df3be20f1d6a15c2aecc94a1409bd8e90b0a2f65f73f512b3ff37afc06c57dbd6be24abd1dead189ea1c75292bc45e68303de4141ef748e9ca58577
 AUX cups-browsed.service 225 SHA256 f4cd6ac0da207deb3b9991264fcb8d3468ae7c5c4fcd1957d296d344fd9e3d44 SHA512 16d7a8b0c95827582706764ca6f96720561e8c314929f6d53c98dccb68b6df21d5928949b0aaf7c2f738ab5c07ee2678d643b9acb6b581bb77a67db950082cdb WHIRLPOOL d1606f5ebfc84398502282e9c1e42bed6701f2d4e284f1214ef924aa94fe2be3e169d83f9d9fdd34a817514df35e680f38b3e91fb7e965510621e3fad8002f14
 AUX cups-filters-1.0.29-openrc.patch 1287 SHA256 5849051486df2a66e93335a7716026370053e577b2d458e93cac36bc43f4bc5a SHA512 432cdca199f01d57910e260c3eda57615dfa3608b7484c18c29b3c00a815aeb280369ae8192ac3f38f43082356bbaa697b9ae7f867cae2cd2bcf604b55206774 WHIRLPOOL 850396b3d6db72ed98a74c1462404f4b5c484ed49b2739a7b53e6458190ae5405930b04c930a6786d8723b50f9c6c171547542a4bcb77ae156d9cd3c826bf273
-AUX cups-filters-1.0.29-poppler-0.22.patch 2402 SHA256 a21ea426f26fb8149e9e1972514053a86cf5958c732857f451d3123a2c7e6c1e SHA512 da5c3a1d5b5f28e51544c81210d3fb557216f848a290699e5c500601a64ba91428d6ff3aaa406e970c3f8e401ae9d62cf18ff1645640bb3dd880ac446a2b8384 WHIRLPOOL 17167112e503aaf45ec41b2aefca97e914988ac9af67ba67774554604e9ee1c86e9046ca629284d62d32644a925e55463522d10a7ee6c37092a47400728e88f2
 AUX cups-filters-1.0.30-noavahi.patch 1083 SHA256 b29d3d7cda682a99ba5368514b6f08bdb6c89caa38c71ba2ea6817fd383fba8a SHA512 0e4c904bbdc3ff35e76d378a37c79023ad3162a155c8cf259d6c860d1e9e02877c3de992b6fa0b6375848c27cdd656478be54c495c0a8721e9c479825d02982c WHIRLPOOL 329bb267e99b777cd697a124397ba336d6ce9e4965632e8375a821d33b8b71c244e5f95a22716c9fac5ad05b6b7628ef71876a51f7998a84c49f283ec5f1fb1b
 DIST cups-filters-1.0.30.tar.xz 1014756 SHA256 2b4f4cdd9bebb7c1db4cedcd5084c2243affbacc5fa8b94506caa67d70bd5531 SHA512 a9bdfa7251427e0a11a17b27aa60f85ac4a737e6e0faafb74718e5e50df4a9772d5997ee3b24b795af9700f1805694e9d58d93aa7c92fad04e3ed3df6ca5adbc WHIRLPOOL f917d6696b1af184124a86cd4942235982a95b642c234a0bb9b87f88d29d34f083df8b5ee8c80cc585bab527c1a00fbf002d377bbae9175956fee248a30d8849
+DIST cups-filters-1.0.34.tar.xz 1015416 SHA256 24995edfd31fc58a0c5be09631650dfacea8664e0e0d2b61c3859bf992d9b371 SHA512 1cb8e0e5998f09512276bcca17d8635223ed3717573460b351fdd5a11bcb0fc4dd46771afc1ff9c2f87d007f8035c78704dea7afc2d67978d09c035ed58cebd6 WHIRLPOOL 855bb40d200d147b87ca602aa3fdb838ee47f8c692e5a4b91b085adda890b3b869a30993ad380a0c0f8038537bf0b4536e8feedfe153e52d4e65d031bb625ad9
 EBUILD cups-filters-1.0.30-r1.ebuild 2663 SHA256 1ba3a0a83275138681161daa73bc3680e3863fc4b65461fba041feb0d59a7af0 SHA512 734366fcb942e1445745fd288bcd9ed11a8c46159dbd4a52194af83b374bdcb3545c7cbb626f74ab1e0aba9872efa06e03545a6ed2fcca4f8398771c7fbe377e WHIRLPOOL 823fea5d49f59c1932197d11777faec31fccf262610b680316e89055b337171250bc84b663ba8710d2ae7a47d2160348dff6d873b9f085c813e17abf0818f70e
-EBUILD cups-filters-1.0.30.ebuild 2518 SHA256 1f192ec62fd5af225cbe0dadb535db29e4cd015ef48331e5e2a238ca08b38ba0 SHA512 e38efb89857bc9a18b7da07454761635bed0754aa46422a5391bf6a8e726272977a5f5c97a2793ca0158ebd62d5d3f049c5ec06df8e1321f4a77f5ff62ded302 WHIRLPOOL 2a88962f50e4eefa24a0e69cf9c4166397a8397347319ef3f4a4ab536c9fb81da848478a06ec35abdc90412d36a875332f2dd9822fc61593c62314f46c19f77e
-EBUILD cups-filters-9999-r1.ebuild 2661 SHA256 940138ef8d3a8a582269d141c037fa361144b33b505e2e0b041fb60c61b712c7 SHA512 b855c5f3301a17180200043fe06d0c88928c16c6a5828c854c694e7876f0efeb5fc445a5de72c1c8264305851ba7becb5ae91e1d270fcfbdcd893c5efbad6e7d WHIRLPOOL f9801ec869097afdf7aeb07a2403637c02e42e2d48f621e4e9904d006f2f111238f00f127d26ebf8b391d19dd9c98694ec25d0faa94fcade7fd180259081085b
-MISC ChangeLog 10177 SHA256 826515e84f8f03d2dc5dbf952ace730022d617d79bc461b7aa8d76aba3169601 SHA512 82040b0f1f17373c4b1c8c735fe7d31e7b1cde87993f4ba37e4d733343873f95185db3350059df98c85d09f63321efe1e27e5f1ee3211c3a580ca44a1ff750d4 WHIRLPOOL 7ee0ff0335e5f3c22d41064b840ae85f562eb200a5095933e63f0fe20ff3dfb6f8ac9da2af59c1b80fabc81d958b4565689291f84f5a5705d2bfcdee83950171
+EBUILD cups-filters-1.0.34.ebuild 2500 SHA256 63e7ed79dd09e27aeac40868619ac897b9ce78bfefc1e59fa919dd086bdd465e SHA512 5471513bc22bfef56586b5dd100354c3b1e032ad456bdd2f958ded0e9c134ac2dc0c0b038b3838cfb2fe5fa6c6e31430da30d85b1faa2c1ee0fd37bd78bed16a WHIRLPOOL d41503848d65e6bfea9903ed09f498e9f44108201abc77bdcd0eb787411b9f2d6880dde5207d2d02441f0f33dfa01f549b85cc10a7e5de172ad6ec8a66b74613
+EBUILD cups-filters-9999-r1.ebuild 2501 SHA256 6495a66617e964490c1c73d2abf7d570b0a65be8ccd495e808ccaab55a0c71ce SHA512 10827cbbed9bb9c8ae0e8f049b9ddee8bcf62db5084f82f7a05ee0451112074b3eab8c2507d109bc08f6be335e618fdc07f9531316a1b4508bbe1d4c60c8259d WHIRLPOOL 67ef583ec6fd6c037a0214897cefec68565e548eca6d704a187f27e169d6b1a09aa815bbf4217e563163edc39703c949682572d7978c978fdd73834208a08a80
+MISC ChangeLog 10436 SHA256 7acd56bbcfc05fb8a98190c8755fa2f34ea21d13b0a8d8748bec238fe8d35f03 SHA512 fb418b3443bf1cb14719d4983710dc7ba4c0b69e95e65bd0d0378d351105eceb6d0c2a2de61c78ac57399f2d08a0cd8bbf3628062013ae0c7fe68b608ebc1b56 WHIRLPOOL 450d98d27a23c02c1a07f27e2b0e3b48c23e5ad1a7d96cb809a604c6f5b5883d881f8c141b8543d11a3e7b72f3575698fe7af552e2eca2f5ccaed434526d659f
 MISC metadata.xml 162 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051 SHA512 ff7cd6e9d088c1ce0107a86a693abddb12d1385e8f9abb2614aa5cb8ed0c046a1387ccab1643fe711e84df1fa23659ce490f68f0504bbb908b7662a0ac490a03 WHIRLPOOL ccbf59144f058b49de3d54bbe6d92e2d2e8b605df10d5143ccfd7e4a021069ca025e87b4179179a60091c03d8bf1e371207c35f1102c2c1f848bf6697e9c2bb2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRjjClAAoJEJS/30SErRQvP5oP/3rOacGWHetjMS2P7yDAClLL
+k3Ca5GFKbhTUmAA39EDrJs+0M6Vyh/cRIhM2aVB2N/sbKQ1b/SwuHhph+v3Ktp8A
+iwCz7fZ3OgNzL1K2z1RXv6uluNlS8O2uMbfYnWqZBN9GFNhmZJl3AdfQbMV2oo8i
+QNz3iG/cn0+271BXUeCU7tESR6R/n/ObDltoSfCmlcIR1ysMSXoC83dcC6F+gzhu
+GE62ZnUROB12U/d7q4E2nBjb7dr+Jak2ryuAMtM+IQGLYB02FduUiF4goFKHJcrH
+xTjDWGShnVh4DypF1duK0l5dDn7yZMRz7nxP9QOTjGy5RIqIEdrjEOfQUimeM/2z
+IBpq8y5y03jTOmR8Uv8cr6PWyVUosy/nyelLEzVXIAMdoTwgP1ELh1fvYVo3k82H
+LucXj07XLiN6DlSg6Jv7oHznYWw0I7/mxA8hq6jBnzgaxKihO8yvFwqnOJ1dhQRl
+l8SmGyYGPbKSlgYonG3d4EC5amTXt1ziA4RG3PCOSr4g+uYtQiJHzkRHmns3cS5Q
+3XRqwex/2mOk5Y1wS7x3Pi6qdam8pE1m05dAZAVHZOw2woJTRJRVEoemChZM9JdU
+AhRAcPXWUWMssCSXKM5LvjDqkoUgolqt+AIe2wDqZCiVy+zFOh8OO3pBzI1ZXNnZ
+XztpkMtLC1T7wjL7OzRE
+=l9R3
+-----END PGP SIGNATURE-----
diff --git a/net-print/cups-filters/cups-filters-1.0.30.ebuild b/net-print/cups-filters/cups-filters-1.0.34.ebuild
index 723e92c15b7f..6fe72b3da9c5 100644
--- a/net-print/cups-filters/cups-filters-1.0.30.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.34.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 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.30.ebuild,v 1.4 2013/04/25 09:47:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.34.ebuild,v 1.1 2013/05/11 11:47:47 dilfridge Exp $
 
 EAPI=5
 
 GENTOO_DEPEND_ON_PERL=no
 
-inherit base eutils perl-module autotools
+inherit base eutils perl-module autotools systemd
 
 if [[ "${PV}" == "9999" ]] ; then
 	inherit bzr
@@ -42,11 +42,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.29-openrc.patch"
-	"${FILESDIR}/${PN}-1.0.30-noavahi.patch"
-)
-
 src_prepare() {
 	base_src_prepare
 	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
@@ -64,6 +59,8 @@ src_configure() {
 		$(use_with jpeg) \
 		$(use_with png) \
 		$(use_with tiff) \
+		--with-rcdir=no \
+ 		--with-browseremoteprotocols=DNSSD,CUPS \
 		--without-php
 }
 
@@ -90,15 +87,14 @@ src_install() {
 
 	prune_libtool_files --all
 
-	use zeroconf && newinitd "${FILESDIR}"/cups-browsed.init.d cups-browsed
+	newinitd "${FILESDIR}"/cups-browsed.init.d cups-browsed
+	systemd_dounit "${FILESDIR}/cups-browsed.service"
 }
 
 pkg_postinst() {
 	perl-module_pkg_postinst
 
-	if use zeroconf; then
-		elog "This version of cups-filters includes cups-browsed, a daemon that autodiscovers"
-		elog "remote queues via avahi and adds them to your cups configuration. You may want"
-		elog "to add it to your default runlevel. Not much tested so far, though."
-	fi
+	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."
 }
diff --git a/net-print/cups-filters/cups-filters-9999-r1.ebuild b/net-print/cups-filters/cups-filters-9999-r1.ebuild
index 1f9d5afff58b..974ae20b943c 100644
--- a/net-print/cups-filters/cups-filters-9999-r1.ebuild
+++ b/net-print/cups-filters/cups-filters-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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-r1.ebuild,v 1.5 2013/05/11 10:31:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999-r1.ebuild,v 1.6 2013/05/11 11:47:47 dilfridge Exp $
 
 EAPI=5
 
@@ -42,11 +42,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.29-openrc.patch"
-	"${FILESDIR}/${PN}-1.0.30-noavahi.patch"
-)
-
 src_prepare() {
 	base_src_prepare
 	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
@@ -92,16 +87,14 @@ src_install() {
 
 	prune_libtool_files --all
 
-	use zeroconf && newinitd "${FILESDIR}"/cups-browsed.init.d cups-browsed
-	use zeroconf && systemd_dounit "${FILESDIR}/cups-browsed.service"
+	newinitd "${FILESDIR}"/cups-browsed.init.d cups-browsed
+	systemd_dounit "${FILESDIR}/cups-browsed.service"
 }
 
 pkg_postinst() {
 	perl-module_pkg_postinst
 
-	if use zeroconf; then
-		elog "This version of cups-filters includes cups-browsed, a daemon that autodiscovers"
-		elog "remote queues via avahi and adds them to your cups configuration. You may want"
-		elog "to add it to your default runlevel. Not much tested so far, though."
-	fi
+	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."
 }
diff --git a/net-print/cups-filters/files/cups-filters-1.0.29-poppler-0.22.patch b/net-print/cups-filters/files/cups-filters-1.0.29-poppler-0.22.patch
deleted file mode 100644
index 5e8d76e3f819..000000000000
--- a/net-print/cups-filters/files/cups-filters-1.0.29-poppler-0.22.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Submitted By:            Armin K. <krejzi at email dot com>
-Date:                    2013-01-10
-Initial Package Version: 1.0.29
-Upstream Status:         Fixed upstream
-Origin:                  Upstream
-Description:             Fixes building with Poppler >= 0.22.0
-
-=== modified file 'NEWS'
---- NEWS	2013-01-02 18:23:25 +0000
-+++ NEWS	2013-01-09 10:42:32 +0000
-@@ -1,6 +1,11 @@
- NEWS - OpenPrinting CUPS Filters v1.0.29 - 2013-01-02
- -----------------------------------------------------
-
-+CHANGES IN V1.0.30
-+
-+	- pdftoopvp: Let it build with Poppler 0.22.x. Thanks to Koji Otani
-+	  from BBR Inc. (Bug #1089).
-+
- CHANGES IN V1.0.29
-
-	- Fixed ./configure option "--with-rcdir=no". Thanks to Jiri
-
-=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx'
---- filter/pdftoopvp/OPVPOutputDev.cxx	2012-07-20 08:32:55 +0000
-+++ filter/pdftoopvp/OPVPOutputDev.cxx	2013-01-09 10:42:32 +0000
-@@ -1804,8 +1804,14 @@
-   maskSplash = new Splash(maskBitmap, gFalse);
-   maskColor[0] = 0;
-   maskSplash->clear(maskColor);
-+#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
-   maskSplash->drawImage(&imageSrc, &imgMaskData,
-			splashModeMono8, gFalse, maskWidth, maskHeight, mat);
-+#else
-+  maskSplash->drawImage(&imageSrc, &imgMaskData,
-+			splashModeMono8, gFalse, maskWidth, maskHeight,
-+                        mat,gFalse);
-+#endif
-   delete imgMaskData.imgStr;
-   maskStr->close();
-   gfree(imgMaskData.lookup);
-
-=== modified file 'filter/pdftoopvp/oprs/OPRS.cxx'
---- filter/pdftoopvp/oprs/OPRS.cxx	2012-09-10 19:56:59 +0000
-+++ filter/pdftoopvp/oprs/OPRS.cxx	2013-01-09 10:42:32 +0000
-@@ -5,6 +5,9 @@
- //========================================================================
-
- #include <config.h>
-+#ifdef HAVE_CPP_POPPLER_VERSION_H
-+#include "cpp/poppler-version.h"
-+#endif
-
- #ifdef USE_GCC_PRAGMAS
- #pragma implementation
-@@ -235,7 +238,11 @@
-			      SplashColorMode srcMode, GBool srcAlpha,
-			      int w, int h, SplashCoord *mat) {
-     if (rasterMode) {
-+#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
-	return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
-+#else
-+	return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
-+#endif
-     } else {
-	return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
-     }
-