Remove oldest. Revision bump to fix typo in initscript wrt bug#457076. Update live ebuild to eapi5.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

7 files changed, 38 insertions, 130 deletions

diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index 9f27d3e78f0d..47f09275c60c 100644
--- a/net-print/cups-filters/ChangeLog
+++ b/net-print/cups-filters/ChangeLog
@@ -1,6 +1,17 @@
 # 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.50 2013/02/06 12:57:25 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.51 2013/02/21 11:41:20 scarabeus Exp $
+
+*cups-filters-1.0.29-r1 (21 Feb 2013)
+*cups-filters-9999-r1 (21 Feb 2013)
+
+  21 Feb 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  +cups-filters-1.0.29-r1.ebuild, +cups-filters-9999-r1.ebuild,
+  -cups-filters-1.0.25.ebuild, -cups-filters-1.0.29.ebuild,
+  -cups-filters-9999.ebuild, -files/cups-filters-1.0.24-rev7009.diff,
+  files/cups-browsed.init.d:
+  Remove oldest. Revision bump to fix typo in initscript wrt bug#457076. Update
+  live ebuild to eapi5.
 
   06 Feb 2013; Mark Wright <gienah@gentoo.org>
   +files/cups-filters-1.0.29-poppler-0.22.patch, cups-filters-1.0.29.ebuild:
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 32cc16bc634e..4bfe5046a497 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,21 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX cups-browsed.init.d 285 SHA256 df6b6282d073f074c1491cee5b343532d1cdf32dd7c5d9f8bd9ba058f630808a SHA512 799db5b57018ef66de954aa48820f794ff7b77d60c4ea056c8d8554e39b0b09b54fbe9e5d9fbc3258c25f8a3a94269a8318f2c992c67bcc6bdc935e910d0d9ab WHIRLPOOL 95eacb79e0c0467bc276e668ab5093eb6c287a31ade6f10cc3b73efc82f84c8ed9fd494821b849ffefa54b57d543c0f47f234d60a253c2ce833b68972810b4a6
-AUX cups-filters-1.0.24-rev7009.diff 623 SHA256 020b8140c96f548f4c8de6189fa4d61ea4bdc54c59759167d2ba697a97ea2262 SHA512 32279ce2d9b787bc5d3f8ca378c998749f1fba6bf3fb1384fd5f2f752cb753c780aa19777c759f29e46a7e92cc0085c47cdabb510d6090852446d4c2fa9c412d WHIRLPOOL 179d8712a5b1be5f73286b50bbb1902c9709ab4c4de0f41c7b1a8b31cae3c826911a7b96c27429b9157e722149f36697d12ba6c63fba903914c5fb5a1a61fa49
+AUX cups-browsed.init.d 286 SHA256 9e9724ceefdd07b5e6344dbd3604c5f1a05a5d5349820345f4c3f44d5a28d8fb SHA512 cdf0bc47c0c3c9c3927ea069fcae798e95244394efaa8b662d316d3715003b9387672b99abf57b4fa4a7d7ae5b68f46081b2b62a490cf2377b28fdd9ec121399 WHIRLPOOL b485e410475fa3beee18113776c886fa102552ccb488241d00797ba66871b0df0eb67f4d63819c5541b63edca419d4a452b4054a9a1f044d2bb0ffde0e2b12d1
 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
-DIST cups-filters-1.0.25.tar.xz 997012 SHA256 900cd31c5daa343ae247209cc748bb6c6d411de591ce703d2fb8dd95cf9c8ed5 SHA512 26f33d56ca7603ef776635bf9eebfb1abbb4d8cb1fd7cf0abc31f171597e4d5a37ce7a3e29dd5ffd00a3693ada251f86dad8575137affce38735c0e1a1b04d79 WHIRLPOOL a7cee77f3722ac37a8c3b227a745d61bacbf043dc44a53f23ffe8035345eed6229ba37f14a9e809a48953a28d64c4758bf0faf9e22d52089a7309552a5f5c964
 DIST cups-filters-1.0.29.tar.xz 1007112 SHA256 71e5c0cc23ffb200773ee8043f9e7dfee06378b03547d9da843d587c5d07f3c1 SHA512 a53ea0a4cc1673e0a4ec7da1273f3a750f006eb418cef708eea19ddcd66d134cd8c1e304b44b0c1d8ef7dd293f163947c5c8a7e9a890d1bd1f4a91d9508a0c4a WHIRLPOOL 76775c9d0fa779b9e09ca372292cfe4976bea4c390611b5560d0a09f17db8cf2982b0f55e9d1db14f73cf6f816c76b701b7a77d599f595bcdef62e0fc4c93b62
-EBUILD cups-filters-1.0.25.ebuild 1918 SHA256 75b97fb99d64f49ec61542178e56aa71d752f6e0f923c59f0a0ac6b8a9fceb37 SHA512 f9ac6c518e3ae534e139f01d631d20d32cf6e5c719845084b081405470841bd50cce501c822dc65d3bac71167f7cdd27c931bfc670a248ec9be8c4740b1d6a47 WHIRLPOOL 373e4873d6757cc7838615faf70022ccc11d4b960f6b5808fbecc75b1343a409be71048d809b0f613690346f9ae045094cc8af8804726a9940b5d1a2dd4fdaeb
-EBUILD cups-filters-1.0.29.ebuild 2615 SHA256 38f08eaaef9ae7266c54337f57a94f7e5860e26bcb98ceb9735f308d49ab596d SHA512 83e1ec6c08b125ef1927889ab2f3c61d9e2deb523e6f1ff98d7de2b5618121d0cfa223381916aab94c0311cb4b15923b1b542cea1ef55b07c0bb0fc494822599 WHIRLPOOL 5d171ca69c04086a1cf24746b903ee5f367be1f9c4b1466fe063b7e4c947af108d03c133a1835247655a3ded95eaad9da3c67e177b23afcd98a99533a1d4f779
-EBUILD cups-filters-9999.ebuild 2571 SHA256 9b31ad0587c87a71e8bb4b69dd1fcbccd21c7c06485fb15dede60bcdcbef9778 SHA512 fbdc35d38a198d166e771567bcefe864fbb44abafa84ec17df876534539c6f51ede2e13eddd3bba3f12e4c824688059ea0ac78d59819c66d3846956b8e00fd93 WHIRLPOOL 3c1c1a54fbd0b7f479b1faf42f0152244508c56fae0b32c8deaf1fe577fa105ce8a0077751b7ea26511fa8da28a0d3b90962761f758cb998c91f215adb2add46
-MISC ChangeLog 8687 SHA256 4c54170dd7159b552e6fc58825e739258bc2fd0eee3cf41233e99f30e9fc365a SHA512 bb9b299c79cbc954dd10cd610ce33a040dbee51a4ba07e0f20920bd0e63a68b5b8ac5823afd849526e4cc59220b156f7d6d9e48239d51539e23e839a2afcc507 WHIRLPOOL 13bf0fe87910ca0a9c9b6b26147e2a27dc744c03b966dd8d8ba3dad47cbb1332911b53d7ab23df3fb8344f1bd8f64b915642bd4efc6a3fe165e8e4bc4beb612f
+EBUILD cups-filters-1.0.29-r1.ebuild 2621 SHA256 2178d3812177a5e045b3f629e489a0e2df511743ce66370faa7acc9709e2ab9b SHA512 9e58422d76906ed0f63bda0e2032fd5abe0bfbdbb62ea5d1796190faf3456a6f3f0b3b4314a50791a06b2a5cec8c04d0e4e2c2faf9ab5430afb2f2a734173cec WHIRLPOOL 6b0466c74be7f02b199b5151608e112ef7dbb910b83b9aa5427fabdd2ec62503bb18bcbf9d542af04b719f59ccda49b24ca835fb6ed6c55a1b50b6978d37d0bc
+EBUILD cups-filters-9999-r1.ebuild 2481 SHA256 e513a0282ae667fc9d1b40a1ad1c8eec56e292e2aa3d3aae57a80c9a238a4470 SHA512 582c55c874b43db2e69a398b880671c03b386ef48dda08cdc4120ecca9491fb4fc27833bf27e0ad9a3cbbe5a3973a7d6b6e96b61a5932aaaf83a8cbc6f0af7e9 WHIRLPOOL 82d54e42a56b1804e756ae18e2e8f0bc64185fe4b87ae126518274f85733bf904cf3e5412e4f1fa398651897d681ae6161719ffcbfbf69b5fa2bc83086b1f0ea
+MISC ChangeLog 9148 SHA256 89ec3f1fcb2b24864c476a0e624627dc99ed01739472ca19df9e3ea7e574d428 SHA512 9c73b020826ea0b9f30321fc531a5e3343907547e1a60996f7039eead4dd724f06b3a8036a6c5a65025439eee1e776fb8d41aad150bdad223c664daf9c1515cd WHIRLPOOL cbd0b7a24196e74f0e624885ceca0b941be071f71046e87df9f625292de4143a6e8012507f82cab46568017285c09e52e4a75803b267f6143058ef82a437ba7f
 MISC metadata.xml 162 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051 SHA512 ff7cd6e9d088c1ce0107a86a693abddb12d1385e8f9abb2614aa5cb8ed0c046a1387ccab1643fe711e84df1fa23659ce490f68f0504bbb908b7662a0ac490a03 WHIRLPOOL ccbf59144f058b49de3d54bbe6d92e2d2e8b605df10d5143ccfd7e4a021069ca025e87b4179179a60091c03d8bf1e371207c35f1102c2c1f848bf6697e9c2bb2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlESU0gACgkQoBEVQmGOlx/5wwEAvN1Rc3MNRGF8grLZOuEoCX0r
-zVj4KfclfCU3PuXD2WkBANc0T9gDr/a4KaeFgknA/i3M+mAwCMC69FPJ0vGwd94L
-=T2eg
+iQIcBAEBCAAGBQJRJgihAAoJEOSiRoyO7jvoaPEQALNdujWAMwoPjvCwFfYNokq9
++/YhNtmE9pTv++/bQpku+1uPlE6zKo1mGrOxGGQoJ4gY5DBg+AmvuEicfRdjNV+1
+BvaykrBUQ/r4R0QSv1kmNRg7yaJyGvJka97td3KRfM/M14PdlioMOSAu0j/ifF9n
+rZ5O3/rEqSlaYRzj9O8FqwCUm0iAzxWCGpAahDT3lqnQc+HXTvGiM6kt1ox03VfK
+rUh02dsoFl0YMXtBrIM0ShKVfqFNtVfySPlrNscgrSOuBZOOqm3VnvLvPyqrMA8w
+e8JHNc5PPtVb+TEUhCnuqQMwWzPiBfqlicSs7Q0GbKnOfpcgHUwOZhGt6dqoS7p6
+BdUZP9VqX6/RYQWPE9Gh/ZCztPKLJ1jNlbFDn96QxTFAa4fK1Oikf060L//DQLP2
+cDRXp7OmzQI7Gt9AufizuSz4qknSaKKswkB4ofzJbTeRRvucAjzs1hYBEBzlW5G6
+ARQO+Z/XUcSknXHilGkX9RF8kObspMW4VATa4uUWvas1VvNXDJZ0kPj+QMGS7csA
+pq+HF2rvwhPDgXG4KBmTLRzB7Cea4hJb1zXglv0ruLN0HxsDPqgsAS4s81kmpfxm
+TwSWR37e42mczj+8ue/X2HqXgRP3ksgfMdDvPvx2r/6Xeyj1h1oAQMnYkzD/OttR
+6sRMW0pJn3s1e3TH3udY
+=kvXi
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups-filters/cups-filters-1.0.25.ebuild b/net-print/cups-filters/cups-filters-1.0.25.ebuild
deleted file mode 100644
index b0dd92dff76b..000000000000
--- a/net-print/cups-filters/cups-filters-1.0.25.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.25.ebuild,v 1.4 2013/01/06 10:05:15 ago Exp $
-
-EAPI=4
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit base perl-module
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit autotools 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 ~sparc ~x86 ~amd64-fbsd"
-fi
-DESCRIPTION="Cups PDF filters"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="jpeg perl png static-libs tiff"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	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.5.9999
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	jpeg? ( virtual/jpeg )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	base_src_prepare
-	if [[ "${PV}" == "9999" ]]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static) \
-		--with-fontdir="fonts/conf.avail" \
-		--with-pdftops=pdftops \
-		--enable-imagefilters \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff) \
-		--without-php
-}
-
-src_compile() {
-	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
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/net-print/cups-filters/cups-filters-1.0.29.ebuild b/net-print/cups-filters/cups-filters-1.0.29-r1.ebuild
index bd7294bbae8f..8c7d45e4316e 100644
--- a/net-print/cups-filters/cups-filters-1.0.29.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.29-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-1.0.29.ebuild,v 1.2 2013/02/06 12:57:25 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.29-r1.ebuild,v 1.1 2013/02/21 11:41:20 scarabeus Exp $
 
 EAPI=4
 
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999-r1.ebuild
index 8c1dd07ee9d4..eb8e71011bca 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999-r1.ebuild
@@ -1,15 +1,15 @@
 # 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.ebuild,v 1.33 2013/02/02 20:26:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999-r1.ebuild,v 1.1 2013/02/21 11:41:20 scarabeus Exp $
 
-EAPI=4
+EAPI=5
 
 GENTOO_DEPEND_ON_PERL=no
 
-inherit base perl-module autotools
+inherit base eutils perl-module autotools
 
 if [[ "${PV}" == "9999" ]] ; then
-	inherit autotools bzr
+	inherit bzr
 	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
 	KEYWORDS=""
 else
@@ -46,11 +46,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.0.29-openrc.patch" )
 
 src_prepare() {
 	base_src_prepare
-	if [[ "${PV}" == "9999" ]]; then
-		eautoreconf
-	else
-		eautoreconf
-	fi
+	eautoreconf
 }
 
 src_configure() {
@@ -88,11 +84,9 @@ src_install() {
 		popd > /dev/null
 	fi
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	prune_libtool_files --all
 
-	if use avahi; then
-		newinitd "${FILESDIR}"/cups-browsed.init.d cups-browsed
-	fi;
+	use avahi && newinitd "${FILESDIR}"/cups-browsed.init.d cups-browsed
 }
 
 pkg_postinst() {
diff --git a/net-print/cups-filters/files/cups-browsed.init.d b/net-print/cups-filters/files/cups-browsed.init.d
index 6ebac07dee9b..57fffbce0417 100644
--- a/net-print/cups-filters/files/cups-browsed.init.d
+++ b/net-print/cups-filters/files/cups-browsed.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 
 depend() {
-	need cups avahi-daemon
+	need cupsd avahi-daemon
 }
 
 start() {
diff --git a/net-print/cups-filters/files/cups-filters-1.0.24-rev7009.diff b/net-print/cups-filters/files/cups-filters-1.0.24-rev7009.diff
deleted file mode 100644
index 0759b9db2fbb..000000000000
--- a/net-print/cups-filters/files/cups-filters-1.0.24-rev7009.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-=== modified file 'filter/pdftopdf/qpdf_pdftopdf_processor.cc'
---- filter/pdftopdf/qpdf_pdftopdf_processor.cc	2012-09-06 21:13:06 +0000
-+++ filter/pdftopdf/qpdf_pdftopdf_processor.cc	2012-09-08 14:20:18 +0000
-@@ -464,9 +464,10 @@
- void QPDF_PDFTOPDF_Processor::setComments(const std::vector<std::string> &comments) // {{{
- {
-   extraheader.clear();
--  for (auto &it : comments) {
--    assert(it.at(0)=='%');
--    extraheader.append(it);
-+  const int len=comments.size();
-+  for (int iA=0;iA<len;iA++) {
-+    assert(comments[iA].at(0)=='%');
-+    extraheader.append(comments[iA]);
-     extraheader.push_back('\n');
-   }
- }
-