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

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

4 files changed, 20 insertions, 103 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/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