Version bump to latest. Drop older overshadowed versions. Per bug #356697.

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

5 files changed, 33 insertions, 110 deletions

diff --git a/net-print/cups-pdf/ChangeLog b/net-print/cups-pdf/ChangeLog
index cfea4d396c19..e02a1e63e717 100644
--- a/net-print/cups-pdf/ChangeLog
+++ b/net-print/cups-pdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups-pdf
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-pdf/ChangeLog,v 1.44 2010/08/07 13:41:42 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-pdf/ChangeLog,v 1.45 2011/04/30 15:04:55 scarabeus Exp $
+
+*cups-pdf-2.5.1 (30 Apr 2011)
+
+  30 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -cups-pdf-2.4.2.ebuild,
+  -cups-pdf-2.4.5.ebuild, -cups-pdf-2.5.0-r1.ebuild, +cups-pdf-2.5.1.ebuild:
+  Version bump to latest. Drop older overshadowed versions.
 
 *cups-pdf-2.5.0-r1 (07 Aug 2010)
 
diff --git a/net-print/cups-pdf/Manifest b/net-print/cups-pdf/Manifest
index 6419d4de0f57..8f24a2ab32c0 100644
--- a/net-print/cups-pdf/Manifest
+++ b/net-print/cups-pdf/Manifest
@@ -1,10 +1,16 @@
-DIST cups-pdf_2.4.2.tar.gz 33523 RMD160 7631268e20a6ce6cc255011af9698650597f5b08 SHA1 3f45f170f851b04c2e8d5dd5cf5f4960aa5274ec SHA256 1c862019d0b81c4477b73c46f13613b7705bc7fc77b9f65cc47a2d9a0b898482
-DIST cups-pdf_2.4.5.tar.gz 33664 RMD160 65b963c77492a6662dd91110da579a78e53d8228 SHA1 5303c0ef0b6c07f067e6a69223657c60d7bc9553 SHA256 3bb61ed6715e24c31be13fdd3f1cae1e1e1984cc52285426cfc6adaf118aac11
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST cups-pdf_2.4.8.tar.gz 34254 RMD160 ceed244effd0c9e63ec0a376a2adabb98abd9a4f SHA1 7da47c61fef313e47fa6db9f1859499683fc72e8 SHA256 c77e4a538cf04512f6d712030d392a2a96bf06f72e5c3f31ec9eeabde5e3b135
-DIST cups-pdf_2.5.0.tar.gz 32352 RMD160 589decb377f00a571a9c3dedbec72eda40e04c01 SHA1 3fa7aa012fe7be15e840e810565135243560a053 SHA256 7fc1c5b699e9f6a5400a693fb495a1ac790fc0078bcb8071a03ca55d9b2cc339
-EBUILD cups-pdf-2.4.2.ebuild 1291 RMD160 f4530682dc0d1380d296cb1561a720da83b8ed09 SHA1 6998533ebc4fe209d0a7c7fa382ebc7c4eb472b1 SHA256 d63fdda18f760be1d00ee951651e2050686ec557773f3f8551794aeca3b9d97d
-EBUILD cups-pdf-2.4.5.ebuild 1292 RMD160 84dc8f49272ef5f695a6277084f5007eb7b8163b SHA1 0f18ba8bf1f1b56ff7f7fbf6bcaebb849b79bc0c SHA256 fb5cdead84a31f60e2d1fa63fb4c047c73898befd1bfd195e41ced9b18490cac
+DIST cups-pdf_2.5.1.tar.gz 32578 RMD160 b99fdff0e523470aaf3a99e1c446f79a63c123a7 SHA1 2b5fe4bb779afa8764c274d6e35e3f9c539fb582 SHA256 63c8bcf0ec12eaa2af9477267f8aecd0c1c1e03fa6b88ab47ca2a781a83c1f94
 EBUILD cups-pdf-2.4.8.ebuild 1224 RMD160 78f93664b3543b30f44dfc9aea0901aabb064551 SHA1 e4cd6df84550f3a448abc1be46e16836605602db SHA256 6d79e04f3d76eee4381692e62adc2cc006d5be54d5888c51695652172bd24ce1
-EBUILD cups-pdf-2.5.0-r1.ebuild 1406 RMD160 836f3e4462e6d5a7819e875934c28ef3dccfea59 SHA1 cbc26f21c0c9a77806bfb611c15ab0ee2d7d4520 SHA256 b4304cb3dc8582b74404ac0378b2f4b2151c152f0eaf4afc2401735b5f6ccc95
-MISC ChangeLog 6112 RMD160 720b790c9bb17426d994720927175f81b2c9b2d0 SHA1 7c351950bdc54ffbc8139b646744ce91faec0599 SHA256 f53dcbdd0da787fd76e1f3e3aab5acd970d8ddf3e80ee53a7e536e57106fe9d0
+EBUILD cups-pdf-2.5.1.ebuild 1182 RMD160 2fc5c0bdc5758aee645da8ef569403eba1cb83e5 SHA1 244905c59198c1ad235101cc0d1ea3c753961d67 SHA256 dc5a73e9f7f9c3d69c21a00dd844a1acc4d243f528292e5f4f5a728b8b4b3ef6
+MISC ChangeLog 6361 RMD160 af3e5920bdcc20921f7252f94ada378471808ca4 SHA1 d70d126b1323a1585be7d77c371a6c94c73931c1 SHA256 897ac43d78c3bfd271024face9a3f510e3da05f5a40964d05258a36708f6b2f3
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk28JQkACgkQHB6c3gNBRYfuYACgtcrML/LbXOgUzVEMAjXII5/n
+K60AoLXr22qmFmey/fkFMH3pGjeZ07Gi
+=cPug
+-----END PGP SIGNATURE-----
diff --git a/net-print/cups-pdf/cups-pdf-2.4.5.ebuild b/net-print/cups-pdf/cups-pdf-2.4.5.ebuild
deleted file mode 100644
index 46dabd1c2cb7..000000000000
--- a/net-print/cups-pdf/cups-pdf-2.4.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-pdf/cups-pdf-2.4.5.ebuild,v 1.5 2009/12/26 17:42:38 pva Exp $
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="Provides a virtual printer for CUPS to produce PDF files."
-HOMEPAGE="http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/"
-SRC_URI="http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc ~x86"
-IUSE=""
-
-DEPEND="net-print/cups
-	app-text/ghostscript-gpl"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	cd src
-	$(tc-getCC) ${CFLAGS} -o cups-pdf cups-pdf.c || die "Compilation failed."
-}
-
-src_install () {
-	exeinto $(cups-config --serverbin)/backend
-	has_version '>=net-print/cups-1.2' && exeopts -m0700
-	doexe src/cups-pdf
-
-	insinto /usr/share/cups/model
-	doins extra/PostscriptColor.ppd
-
-	insinto /etc/cups
-	doins extra/cups-pdf.conf
-
-	dodoc ChangeLog README
-	newdoc contrib/Contents contrib_Contents
-}
-
-pkg_postinst () {
-	elog "Please view both the README and contrib_Contents files"
-	elog "as you may want to adjust some settings and/or use"
-	elog "contributed software. In the latter case you may need"
-	elog "to extract some files from the ${P} distfile."
-}
diff --git a/net-print/cups-pdf/cups-pdf-2.5.0-r1.ebuild b/net-print/cups-pdf/cups-pdf-2.5.0-r1.ebuild
deleted file mode 100644
index 22675c708500..000000000000
--- a/net-print/cups-pdf/cups-pdf-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-pdf/cups-pdf-2.5.0-r1.ebuild,v 1.1 2010/08/07 13:41:42 hwoarang Exp $
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="Provides a virtual printer for CUPS to produce PDF files."
-HOMEPAGE="http://www.cups-pdf.de/"
-SRC_URI="http://www.cups-pdf.de/src/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="net-print/cups
-	app-text/ghostscript-gpl"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	cd "${S}"/src
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o cups-pdf cups-pdf.c || die "Compilation failed."
-}
-
-src_install () {
-	exeinto $(cups-config --serverbin)/backend
-	has_version '>=net-print/cups-1.2' && exeopts -m0700
-	doexe src/cups-pdf || die "doexe cups-pdf failed."
-
-	insinto /usr/share/cups/model
-	doins extra/CUPS-PDF.ppd || die "doins CUPS-PDF.ppd failed."
-
-	insinto /etc/cups
-	doins extra/cups-pdf.conf || die "doins cups-pdf.conf failed."
-
-	dodoc ChangeLog README || die "dodoc failed."
-	newdoc contrib/Contents contrib_Contents || die "newdoc failed."
-}
-
-pkg_postinst () {
-	elog "Please view both the README and contrib_Contents files"
-	elog "as you may want to adjust some settings and/or use"
-	elog "contributed software. In the latter case you may need"
-	elog "to extract some files from the ${P} distfile."
-}
diff --git a/net-print/cups-pdf/cups-pdf-2.4.2.ebuild b/net-print/cups-pdf/cups-pdf-2.5.1.ebuild
index e3560bac6a04..d2f3b2335c15 100644
--- a/net-print/cups-pdf/cups-pdf-2.4.2.ebuild
+++ b/net-print/cups-pdf/cups-pdf-2.5.1.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-pdf/cups-pdf-2.4.2.ebuild,v 1.7 2009/12/26 17:42:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-pdf/cups-pdf-2.5.1.ebuild,v 1.1 2011/04/30 15:04:55 scarabeus Exp $
 
-inherit toolchain-funcs multilib
+EAPI=4
+
+inherit toolchain-funcs
 
 DESCRIPTION="Provides a virtual printer for CUPS to produce PDF files."
-HOMEPAGE="http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/"
-SRC_URI="http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/${PN}_${PV}.tar.gz"
+HOMEPAGE="http://www.cups-pdf.de/"
+SRC_URI="http://www.cups-pdf.de/src/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND="net-print/cups
@@ -18,17 +20,16 @@ DEPEND="net-print/cups
 RDEPEND="${DEPEND}"
 
 src_compile() {
-	cd src
-	$(tc-getCC) ${CFLAGS} -o cups-pdf cups-pdf.c || die "Compilation failed."
+	cd "${S}"/src
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} ${PN}.c || die "Compilation failed."
 }
 
 src_install () {
-	exeinto $(cups-config --serverbin)/backend
-	has_version '>=net-print/cups-1.2' && exeopts -m0700
+	exeinto /usr/libexec/cups/backend
 	doexe src/cups-pdf
 
 	insinto /usr/share/cups/model
-	doins extra/PostscriptColor.ppd
+	doins extra/CUPS-PDF.ppd
 
 	insinto /etc/cups
 	doins extra/cups-pdf.conf