Few fixups to build with forced as needed.

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

2 files changed, 18 insertions, 13 deletions

diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index 9edb98c5c0b8..d548da82d82c 100644
--- a/net-print/cups-filters/ChangeLog
+++ b/net-print/cups-filters/ChangeLog
@@ -1,6 +1,9 @@
 # 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.6 2012/06/07 21:37:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.7 2012/06/08 07:55:43 scarabeus Exp $
+
+  08 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> cups-filters-9999.ebuild:
+  Few fixups to build with forced as needed.
 
 *cups-filters-9999 (07 Jun 2012)
 
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index 7819c7e60824..f0b754035fa8 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.2 2012/06/08 07:38:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild,v 1.3 2012/06/08 07:55:43 scarabeus Exp $
 
 EAPI=4
 
@@ -10,6 +10,7 @@ HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdf
 if [[ "${PV}"=="9999" ]] ; then
 	inherit base autotools bzr
 	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
+	SRC_URI="dev.gentooexperimental.org/~scarabeus/build_fixes.patch"
 	KEYWORDS=""
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.gz"
@@ -18,42 +19,43 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="jpeg lcms png tiff"
+IUSE="jpeg png static-libs tiff"
 
 RDEPEND="
 	app-text/ghostscript-gpl
-	app-text/poppler[jpeg?,lcms?]
+	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 )
-	lcms? ( media-libs/lcms:2 )
 	png? ( media-libs/libpng )
 	tiff? ( media-libs/tiff )
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-beta.patch"
-	"${FILESDIR}/${P}-warnings.patch"
-	"${FILESDIR}/${P}-lib.patch"
-)
-
 src_prepare() {
 	base_src_prepare
 	if [[ "${PV}"=="9999" ]] ; then
+		epatch "${DISTDIR}/build_fixes.patch"
 		eautoreconf
 	fi
 }
 
 src_configure() {
 	econf \
-		--with-fontdir=fonts/conf.d \
+		$(use_enable static-libs static) \
+		--with-fontdir=fonts/conf.avail \
 		--enable-imagefilters \
 		$(use_with jpeg) \
 		$(use_with png) \
 		$(use_with tiff) \
-		$(use_with lcms cms) \
 		--without-php
 }
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}