Version bump

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 109 insertions, 18 deletions

diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index f268a88f3997..1c1dabc28f64 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.24 2012/07/31 09:16:22 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.25 2012/07/31 21:20:10 dilfridge Exp $
+
+*cups-filters-1.0.20 (31 Jul 2012)
+
+  31 Jul 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +cups-filters-1.0.20.ebuild, cups-filters-9999.ebuild:
+  Version bump
 
   31 Jul 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   cups-filters-1.0.19-r1.ebuild, cups-filters-9999.ebuild:
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 6b2aa4855e96..23f31d14fd71 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -5,24 +5,26 @@ AUX cups-filters-1.0.11-makefiles.patch 7582 SHA256 9a25decdb0033eb1a1910c3787ea
 AUX cups-filters-1.0.19-libdl.patch 1011 SHA256 65548de08de68ca114691385acf0dc44072661aadc3f5077b31877021e5b0d6e SHA512 8c98d3e4c60be5c956f8b0d5d5abc5f0225c60056e8c6bc9035fde5262ca18f3fe701f1fdc169c824655a5deba0f4428e11e289a5f0def852d7dd0b3d96c9525 WHIRLPOOL e83c54c0b253872f77454529a0461530cc5666918c2e97c9ee65645ad6032ad27625a816ea3bda6f78b4a12c7dc801cc411aed4dbc4a45eca434f45a4b3506dd
 AUX cups-filters-1.0.19-poppler020.patch 8289 SHA256 29c03711eb6d8ae04c8e4d401358126d2c82f7fc2f0008cc0d433c86ade9eb9d SHA512 b89da29740a7742cee4d77a1bec174677d7373fb7b91d5fb88f72c0cd67b69133ec33eade5371cba7e802128879c79a1a046ae8b1bf1e4a81c8f4d08191bc300 WHIRLPOOL 69062c1f94aad41d5638ec07df54ad21ee78926d045a04d3dd0835bc76113c4f6f6c59cc423be52f6d6d47b9bb93fa53b6aea051444c9870cf47c54c51938b58
 DIST cups-filters-1.0.19.tar.xz 1012400 SHA256 45774c604df90db30474d049557d6b683e02dfabb5b9c30ddf8b0152daec8781 SHA512 272d7b6a0065b379f4ec39f931fe35e1ed92f046090ecd3ef3a7b06e6d158c4ba7f5e0c78a3edea6c351aed9f94391de653418b727fa58ec6237071c9a61d3eb WHIRLPOOL e90dd2e274eff995e52cc014195130786bfed4a0e6b47cf14d774dcff884b31054a8260b1ab26649e3da2cd30c9041d512b00723c6c428ce643595eabb6e107c
+DIST cups-filters-1.0.20.tar.xz 1014800 SHA256 9036ca5a2e2aa01696a83ca9f70a5164d1a079413c459f23beab41799385d515 SHA512 921860d9bacff1353b25051905f4c8306c196ed870292bbd26a83560a6ccea167f0320b735969fdcfcd73e8a2050d9554a44c81e6e159ac31791648261e6280f WHIRLPOOL 56e16a7b7397610d5073d747a62aea9438c9f70f10d4a630f0248accb2971f22a31fef56a8b6a590aa8987c9872c7a99554081d64b4070006037867b7fbf5e49
 EBUILD cups-filters-1.0.19-r1.ebuild 1837 SHA256 ec1df55b4881ecd81b14d72277357e4a293dd278c721f7fbcc58a9e20a99b498 SHA512 384939d5396699cf5e448e1a0afb8310222664a36de145ea6db3b8d4ebf36bc38ffb49a1bca7bf4e95806b8999f00c2deba4df01ec4c010e49f4f1610bedd8f5 WHIRLPOOL 72bf14135128c97daed25400e5681cd0451d817b0386e352eec05e1272254495c710e0801271ad014a52c261c411b21e6c1b6197f95d062a670da932dce72548
-EBUILD cups-filters-9999.ebuild 1770 SHA256 49f89fb811cad86b42f7cc486b9e424284e92df8315d796c4c6adc09cf29d5ef SHA512 e514f65718fc60f219a9ba4d7c22300351f9ce2fe09a2a298fef02d96393b4964dada2759b5a5c59413d902930271564a12d077cbda89375095748f092bf7f57 WHIRLPOOL ca37c64f19a267e29e93cee63ef8b30551f94ee5260ba8dcb6341bc66a3645b6a33d83cb7c10dd2389f222a0231aed93cad2934411dfcac875536d1bb362e572
-MISC ChangeLog 4615 SHA256 daf0084dde0c8fd7f8976b6bd08a0e87844a0ef938c6e83c79c30e4dbad76aa3 SHA512 3ae75439b22e9b6f53e686a3eeae83c7b9d8c9ef5f99d240d60ef06d62cb7bf6238d1312e3a8a70684b1a103a4285f5fd51eb111514b0d1a4bce39660192f276 WHIRLPOOL 2d92040131b6baee3df3452c5bc0ee232ec6ba6dd83cd3ec192e61fcd7d54c3a4fdcc5b40d60a167cbecfc4726f3522d67f9b5d46a04b4c5d48deba87fed43cc
+EBUILD cups-filters-1.0.20.ebuild 1772 SHA256 5392ea22275d64c90180aa0371b86631014c6d2f8071ef455aa0988cd37d1b11 SHA512 aa8ed3daf9c3259bc57b3ff37c1467d70496d7b758728175fc72121227a49f7abf0e83030a0c03c6a1c555b44efdc2b404b55daf90d45d8a80e7f2406c4fd555 WHIRLPOOL 2a911e30f2252e820ce67d31c504a09b607110e681dd1a32a85fdbf993d0dbd8c66dcd4f41c5165bf4d5512e837d4deb448226c1450c8bfc38a69ad9b863c3c6
+EBUILD cups-filters-9999.ebuild 1771 SHA256 68158fc39d05d5e6c5590de82fac6429fc0204925e1f608a8c3a58330b353a55 SHA512 d2aa92806b692a647bbb15ca7a1a2dea7d3d9c95fd1e0831673aa1990032a32f2930544ed42dc207b55d6bf7efa24c269c3687b6561b815ca8ada2ad1f024513 WHIRLPOOL eaa2c5911e52628f0d61af93cace765f6bee6afa19c94d48d23818d18681027bba63a06511412f696f9ab46981e87681a8680687b764501b21886af6ac8b0a00
+MISC ChangeLog 4781 SHA256 b8a4c0f318c2e0d1667c6608ac962a7d44db27ab7e1c078362aead3194421f92 SHA512 323612a1d8faa9d284ca4da47a5a6f56b071735c59da9393d2d30486a3f450eded79e5e9b07d06316de60ce2865e71957db9f4470c176ab022a03a4ebfe90263 WHIRLPOOL fe83a1894caeb0d78dc17621720e9b9986aeb51b407c276688b103cc3089442fa98e8724fe583098014afa4e6f2634d21696bf48b2cd854b3214e8f611e4ba2b
 MISC metadata.xml 162 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051 SHA512 ff7cd6e9d088c1ce0107a86a693abddb12d1385e8f9abb2614aa5cb8ed0c046a1387ccab1643fe711e84df1fa23659ce490f68f0504bbb908b7662a0ac490a03 WHIRLPOOL ccbf59144f058b49de3d54bbe6d92e2d2e8b605df10d5143ccfd7e4a021069ca025e87b4179179a60091c03d8bf1e371207c35f1102c2c1f848bf6697e9c2bb2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQF6LEAAoJEEb+UGWnxTyHf1AP/2kDL9HlB1PmiOaV9HAqKVak
-n5utrAD7RhxRZJAOwLe/c+g0+PwLWFxxKFXYVwrOLI99kXc5X/9+cFlCEK+zDVcT
-2dne1FnpIcsF2dR7aEJxkEspUJ7vJPIyCmUZmD4YFLXGc5xyLbvihAUW7O6e5smA
-ooG56tmTAfmBIOOn6h6FJHdCsLBzJGlgMG1YMOr83Cg8qfgxLaIpBj+3UvOFh6l0
-EuZo+dlWASTZrtaEYo9J6UX0As4f/UUZqL9FSTaIcaFea3zsnomuw5MAbMWejzoE
-F1hnuVBWg4WdnM29+A5fvWCbadM5TjqvBXSYMNoW91POrsAotUkqL2I5sYMWEIpM
-UbbICfYazep9LDIkMqSWwXf64x16Lm6cZcGGgrrz7BciFjGAIbR3199SxBDKEvTk
-IZ5oyh5HFMYrFUb7zu7Z8+SN4zEz18aZL69liyXJZxvWcXPziK3JpJfzKmYWQsRU
-IsG5E0IYLQpukiwBUh4fT6rBySZGUDUTjHgZWG2k3Hq1lPsnO5kMFalcjPxRK1CO
-LP/ngESKmRy6hhAnzbQn0HVoPj+BRZI4CfktLlNnymcurgf7ompeyxqK3mX4vEE/
-2pSN1M3lXwzUXrOM/ZP/+AOltM/bk90ZUdldYGfQRh6w1hT7t7ZHhyM3r+b1roRA
-SnxHrg9Q0y+7dESKMBh5
-=/pvf
+iQIcBAEBCAAGBQJQGEyRAAoJENwGBM22xffeA+AP/2XMQIN5kA3NB14qoeFIWwZe
+hgHczxsui86HMqqltr5yPRiN88dQ6XeFVuA7xYdKHADXr9R53BqRJMuZPqMDy1n3
+2HeYa8TM3Oe9G+h8v/yoISOwB1EVJkwJ1QhlgWPysF34sipeMcWYf+qGdTIn+NZE
+Nedsj6yCCND7GySuO2xyARn6E8j5xCRuEcqbXdvem8OMMU/wpgMQ4BGNGzBpviLf
+tX7ydphk/MMQ9YuxCSR+x/jeeYS8Jp13tOwdQLcswCwYs1Ha0LO3uJQum7NMDKsZ
+flHwtj70tlOuk54CjfWdsZjTwLC0yZUZXRLIBCACqntUkDZ/zTsH1dG6iyxr573e
+D8CY+5N7N6vZbm51X0F0CS87Ey1FkJnns9xLd/xzGrbozKfuAzAgBqhk1iSRxk+L
+66dG3VwHl6r51nE0ADZr8BS36S4gZ4YqCnxyJ8mu3D3qnTAvJOd0vv85lxrzr4jo
+zN7RR1yshoDK5iERUyykemDbZImb+905/6kqigpGNi5sKIZtaUU4jfMptOW7m/ia
+HJ9PN7gaKWcaMEaXzWFDL3QJJJi5+lk+Qq+/dukBITLVjqH+VSikrCEa7Lgf5eto
+sbm3JhFYJQ2oPVvwvME0aXBNHE0uhsko2vIhPj8FH/LcPweBMbt8O+HpN4TSOYMn
+WCZqUfdJ7It+JTrT0m/u
+=O7yw
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups-filters/cups-filters-1.0.20.ebuild b/net-print/cups-filters/cups-filters-1.0.20.ebuild
new file mode 100644
index 000000000000..cb8c94cf59a4
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.0.20.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 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.20.ebuild,v 1.1 2012/07/31 21:20:10 dilfridge 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="~amd64 ~mips ~x86"
+fi
+DESCRIPTION="Cups PDF filters"
+HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
+
+LICENSE="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]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>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 \
+		$(use_enable static-libs static) \
+		--with-fontdir="fonts/conf.avail" \
+		--enable-imagefilters \
+		$(use_with jpeg) \
+		$(use_with png) \
+		$(use_with tiff) \
+		--without-php \
+		--docdir=/usr/share/doc/${PF}
+}
+
+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-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index f078418bcc61..2099c9fe84b6 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-2012 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.19 2012/07/31 09:16:22 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild,v 1.20 2012/07/31 21:20:10 dilfridge Exp $
 
 EAPI=4
 
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
 	base_src_prepare
-	if [[ "${PV}"=="9999" ]] ; then
+	if [[ "${PV}" == "9999" ]]; then
 		eautoreconf
 	fi
 }