Few fixups to build with forced as needed.

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

3 files changed, 41 insertions, 15 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/Manifest b/net-print/cups-filters/Manifest
index 910529c86ce1..71623c4e5ae3 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,11 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cups-filters-1.0.11-makefiles.patch 7582 RMD160 9a753859a45c56d6e18b0275eafd6f69d5195334 SHA1 9773ee18d3481e1759986c20baf1adfa2d30d203 SHA256 9a25decdb0033eb1a1910c3787eaad6ac4ec69715db426edbdbdf22b759a5bdc
 AUX cups-filters-9999-beta.patch 7668 RMD160 710104f38e220ce7c532defb032fbb8c63b2b061 SHA1 fa4a9da5b08655584d4402d199234a4784b9d979 SHA256 098ea20e7bcbcc22b9911d5bffd8dc9a4283590bffa1532814088ff7a1c976b1
 AUX cups-filters-9999-lib.patch 553 RMD160 4cf7788839e177935f2eb3453e17aac94233b885 SHA1 b0ee10e10ac56cbf9a587544ec95011f5c86c7d2 SHA256 713f663c0a4411b5e6250fbea0e3d207f2d5393ab638e5f93b3df79658f26db5
 AUX cups-filters-9999-warnings.patch 579 RMD160 cc3c78b1e9f69f75204812c6c767efe95a31e63c SHA1 e8c07ea9e84eef0a4d911c80b14b59a3237738b3 SHA256 f385e7db8e9447665da6f2199223acc088192444ac16b19f7e8b012ec8eb4948
+DIST build_fixes.patch 20162 RMD160 99afe0bae2a1ef4d9f7e02c1774b8eeb880d4c47 SHA1 5a0185eec3d6b1f1c94fe8f626e60612cbbf74c6 SHA256 53db1f37821609ee57ac22d5e729ba3f16a487c693ef6ef20838f71facfc0909
 DIST cups-filters-1.0.17.tar.gz 1019661 RMD160 de5c5fa4eb1391271d76ca5c049145d601ed0923 SHA1 fd80efeefb5f37755588db868c52a8cd49e620d5 SHA256 af66f4b19c6448f4b42613a66c852fbd7d4622aa9bad1ccc0e42cb7f2e617772
 DIST cups-filters-1.0.18.tar.gz 1022509 RMD160 84cba51cab4a8c78f80de268342ec281967bdf68 SHA1 00fa6d585a4b546b36d0f4a92855a43982933875 SHA256 6926980653e7cb5f94b91921517678cca7f0e6781364823a05f7b4b0ec919106
 EBUILD cups-filters-1.0.17.ebuild 1119 RMD160 65561b8d4be11439ddccc8fccc3ef4681721999e SHA1 c8a647667d83e53f543b51ad580f807bc8d0c107 SHA256 1cc5f7de3b0b68f7bd0a0c083d235db7fc152bc62b12b874a955e78559566a8a
 EBUILD cups-filters-1.0.18.ebuild 1119 RMD160 7cf53106d123bb434d3e54907ca2f4dbc902bc28 SHA1 1da23549bc08811f42c983081d0177035f10633d SHA256 9f93882bd7da4d4bf55c8254bf1868427b8892cabbbca27cc092ed65e7840ae9
-EBUILD cups-filters-9999.ebuild 1338 RMD160 2f0f783f2f5b02232522ae50621ceb98ffff0269 SHA1 b93ef61738b6a62808fe65dd40fbc60901d4ae37 SHA256 09f839960dc2f447d97a56fed6a94546fe9cd0f6e0aa426d498f8e13f72b33ba
-MISC ChangeLog 1508 RMD160 404a3227c14e389217a8b5aed22483c91502063d SHA1 b0c88194c638610590c28463c3b8a8258a0b0268 SHA256 d1ef2122f3cff7f8417b2c56c9874c2b9f05a7b0dabb847458b1dee31bf4cb7f
+EBUILD cups-filters-9999.ebuild 1427 RMD160 9e5537a148e471722a0fd1c33085cdad3ac95090 SHA1 dbf349b75ba8d76556e332785528eca3324499e0 SHA256 cc831aa059a287a15c8d3a032bbfc2b6acb52a7d0392b69a1467e9918157cd6a
+MISC ChangeLog 1635 RMD160 599492e848867df67f4953e244dba70770286b33 SHA1 53a1304374cc8c7d9892003dfe396d32a0e23fa5 SHA256 3074a3a16cf59042129ab8309f05ebf633a21444557eef3b3a0adc4d4eab33a6
 MISC metadata.xml 162 RMD160 145aada347c27fc879828b9bb22ff79f4e23325c SHA1 97a164202fb2c7165cdbd9721ea05b4ac2724035 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJP0bAIAAoJEOSiRoyO7jvolSQP+gK6honh6iXxY76VnJiXD7Xd
+pLp1P7ehbPdMpIs40E9dAHxt/5w8BcW9+S4WiIJVyqUCsnE8LXnSOCip5KDDEJj7
+ExyKhdCNoHnpI9nzbvdg2Ryt8lBGkjRt2v2IEyLfJAv4pme4IuRWJn8KyIxQxIax
+VvWL5P8+DfHMmYEO7J6TKCgxthtWHKIoqkIVa1LcejoL6WMb0PT44/j11nI3qmVj
+ke7/Q4bB1i5kT7Z3fbgEtldBKKRTtAHMQn2+W55y7aWqSXXt5swsbvtQ99YXTQOh
+W9o+p4x7TcNcOvjLRXFc8rW8Prx+D4uUaYYPlJUGepppVorQVSQR72sbdwgGUN2e
+P6HkbYlGhmXWnwzRoXHH4GQW73wHME3sCK0VI45d0tMNBa8dm0JjTqmWcl/WprA/
+NmMMZJoFuXLDXIgZusgjaVUhnqWmM4ABbpEOA8FqB6GkpIx/IAonQtwWnnaKxA+v
+i3VwzMRWhCmibw6g+qB8QQaet3G3GP1Ao/gQCKtfi8OAhMcImKUV3gPdyT+XKuVu
+Xdng8nwFlC0Cei4b+Hm7uaWqonOiChXkgIWTz5teKCdYW3QMfwWjAlNoUk28SRXc
+tJNT2Vydf+RiYFJRx8aRwPN9FyLFTLDPRP48xq/JlIxMDO1hMYM4kMbmXV4FRvwe
+d9zwtDH1LOW5LqbkgdU4
+=kWq3
+-----END PGP SIGNATURE-----
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 {} +
+}