Version bump to the latest using my autotools system, yay.

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

5 files changed, 92 insertions, 97 deletions

diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index e450b6a9210b..fb5253c32e67 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.14 2012/06/26 20:19:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.15 2012/07/18 18:20:42 scarabeus Exp $
+
+*cups-filters-1.0.19 (18 Jul 2012)
+
+  18 Jul 2012; Tomáš Chvátal <scarabeus@gentoo.org> +cups-filters-1.0.19.ebuild,
+  -cups-filters-1.0.17.ebuild, -cups-filters-1.0.18.ebuild,
+  cups-filters-9999.ebuild:
+  Version bump to the latest using my autotools system, yay.
 
   26 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   cups-filters-9999.ebuild:
@@ -69,4 +76,3 @@
   +files/cups-filters-1.0.11-makefiles.patch, +metadata.xml:
   Initial commit of cups-filters that provide cups-pdf backend that is already
   in use by debian and ubuntu folks.
-
diff --git a/net-print/cups-filters/cups-filters-1.0.17.ebuild b/net-print/cups-filters/cups-filters-1.0.17.ebuild
deleted file mode 100644
index 8dd8cc4666fe..000000000000
--- a/net-print/cups-filters/cups-filters-1.0.17.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.17.ebuild,v 1.3 2012/06/02 19:47:16 dilfridge Exp $
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="Cups PDF filters"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
-SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="jpeg lcms png tiff zlib"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	app-text/poppler[jpeg?,lcms?]
-	media-libs/freetype:2
-	>net-print/cups-1.5.9999
-	jpeg? ( virtual/jpeg )
-	lcms? ( media-libs/lcms:2 )
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.11-makefiles.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-php \
-		--with-optim="${CFLAGS}" \
-		$(use_enable jpeg) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable lcms cms) \
-		$(use_enable png) \
-		$(use_enable tiff) \
-		$(use_enable zlib)
-}
diff --git a/net-print/cups-filters/cups-filters-1.0.18.ebuild b/net-print/cups-filters/cups-filters-1.0.18.ebuild
deleted file mode 100644
index 7571ffd765d2..000000000000
--- a/net-print/cups-filters/cups-filters-1.0.18.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.18.ebuild,v 1.1 2012/06/02 19:47:17 dilfridge Exp $
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="Cups PDF filters"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
-SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="jpeg lcms png tiff zlib"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	app-text/poppler[jpeg?,lcms?]
-	media-libs/freetype:2
-	>net-print/cups-1.5.9999
-	jpeg? ( virtual/jpeg )
-	lcms? ( media-libs/lcms:2 )
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.11-makefiles.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-php \
-		--with-optim="${CFLAGS}" \
-		$(use_enable jpeg) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable lcms cms) \
-		$(use_enable png) \
-		$(use_enable tiff) \
-		$(use_enable zlib)
-}
diff --git a/net-print/cups-filters/cups-filters-1.0.19.ebuild b/net-print/cups-filters/cups-filters-1.0.19.ebuild
new file mode 100644
index 000000000000..9d8580e3d186
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.0.19.ebuild
@@ -0,0 +1,81 @@
+# 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.19.ebuild,v 1.1 2012/07/18 18:20:42 scarabeus 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=""
+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[jpeg?,lcms,tiff?]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>net-print/cups-1.5.9999
+	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
+}
+
+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 d83b1bed44b0..e6b93580cd21 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.10 2012/06/26 20:19:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild,v 1.11 2012/07/18 18:20:42 scarabeus Exp $
 
 EAPI=4
 
@@ -8,12 +8,12 @@ GENTOO_DEPEND_ON_PERL=no
 
 inherit base perl-module
 
-if [[ "${PV}"=="9999" ]] ; then
+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.gz"
+	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
 	KEYWORDS=""
 fi
 DESCRIPTION="Cups PDF filters"