Fix building with perl useflag enabled. Per bug #336839.

Package-Manager: portage-2.2_rc80/cvs/Linux x86_64

4 files changed, 22 insertions, 4 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 25c24ce6baab..67a9e1739841 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.398 2010/09/11 12:10:19 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.399 2010/09/12 17:19:23 scarabeus Exp $
+
+  12 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> cups-1.4.4-r2.ebuild,
+  +files/cups-1.4.4-perl-includes.patch:
+  Fix building with perl useflag enabled. Per bug #336839.
 
 *cups-1.4.4-r2 (11 Sep 2010)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 1c9d9fb4a51a..ef6212bd1c96 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -9,6 +9,7 @@ AUX cups-1.4.2-str3200.patch 1654 RMD160 cc40d26f7e9dbe5a12d9426535d09de10254da2
 AUX cups-1.4.4-dont-compress-manpages.patch 580 RMD160 cbc2bf11025c1f27286bd7f2ece7ba76be6aa7ee SHA1 d7b2447263724eeb092b8cfc8ce54553ad1e5e11 SHA256 cdefd273dcdc78aa5fe14bb0246e25572da7d28a91de5c7ac8be2a0bdd915860
 AUX cups-1.4.4-fix-install-perms.patch 838 RMD160 206bd49e918bab96d24ca72f85f679d3c9122975 SHA1 6e8ef0f3e5c0efa636b4d2324bab2c8edc9461db SHA256 66e68f3bebd7339434e3de99582190d0bedce4b2e5370ff65104cc863daee6c2
 AUX cups-1.4.4-nostrip.patch 487 RMD160 27fe9a5512abb3496416e492dc4ec4fcd9c733c2 SHA1 2a1b6e7b718a5feb5921f38ec02f37b9d0edd310 SHA256 b96448896f08c5f91d5afb0c093f2638a262d1c45e716c29d5164cefee18bc61
+AUX cups-1.4.4-perl-includes.patch 637 RMD160 88d4f170ed5c9392860462f140adf9f860a24cfd SHA1 93185acfe7252ff9a69499f63192b3483d857cb0 SHA256 c730419e7b4bc16a8773a01eeb66523882901480af68686d0790558a2f5fe57d
 AUX cups-1.4.4-php-destdir.patch 679 RMD160 1b15d42373a952a608a01cb8c97efbbd3c78ac77 SHA1 e312bbae57224dead45284f9c62942b1a25282fc SHA256 d5126c5e917d8c41c7a4da1477800edd4aa752aaa4c6a67a73adbe1e3b050110
 AUX cupsd.init.d 293 RMD160 19fbef21cee7e472e7028f3101b680baa0089c54 SHA1 e6b27b2638fec258fe2f55c926c2530e909ca3d2 SHA256 b4268a6bae95e96b6af21c3716ecc905073736ce7dc33be1489d574a447f3c48
 AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1
@@ -16,6 +17,6 @@ DIST cups-1.3.11-source.tar.bz2 3799393 RMD160 a0646f2ba29fbd39d211ea5c3fdbd24a0
 DIST cups-1.4.4-source.tar.bz2 4472741 RMD160 1f486acda02e83b6824f8ca33b74c02ff3f01994 SHA1 3e179c007fa6cd6874b60ff18a6f48070547a00a SHA256 d25ffa35add3abeeec0eba60be2cffc89425b649c64ef3a73dfc724683a59aa3
 EBUILD cups-1.3.11-r1.ebuild 8236 RMD160 3d691e0cd89724f2f167c0df9b0709ebd5d1c568 SHA1 670d92532d1b436470e851e8fa3df90d3c0575f8 SHA256 cfce6af026847d98ed64c8ceb2c4114d2df6e896c6f2b0ab3605f9c1755701b7
 EBUILD cups-1.3.11-r2.ebuild 8431 RMD160 f57db7c53959e8f2e9f334019552210d662982d8 SHA1 a046c3c5255a9ac4e1c1c2b19d511e0aaac8d102 SHA256 c10dc5a854f9b859c236c29c09c87d3467c191bbad455eaa5d22d672e3166e6e
-EBUILD cups-1.4.4-r2.ebuild 6072 RMD160 b2b2c4f36a2ce4961c411449bce7db4e037008f7 SHA1 bb9d19e97bf8f53fd7bb87b980f327d333f62745 SHA256 44ea820d4d8bada184e9f15b2dcf23ca77946b3744669ee1a2d914eb5b8ac954
-MISC ChangeLog 59300 RMD160 68d50a3201b59f354a13ae64422b1fd77fb4a590 SHA1 2101858e7af16596fe37536b40287fb128d7c86f SHA256 bdb4f5368665be2c7cc62093af04e3ac323396f2fd255b9c1801397864130531
+EBUILD cups-1.4.4-r2.ebuild 6127 RMD160 d91c15b4f65b756a4f4915a3b10bad7ab3d99dfe SHA1 921b310e292da37db4ba4c14155e521e5845e68b SHA256 95805404c46a8a0002104ae07991b6f11146fb9fd934504b83ab458b6cb0192a
+MISC ChangeLog 59482 RMD160 8cef51050897469674ddeb9b9bdd5605dd1e71c4 SHA1 522767f313912d3c1c0efef5f80b4666271916eb SHA256 c9ff7760b926aada3ef2115a826c982ce26f166516b82f1bf3cf2e1e52bf3e09
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/net-print/cups/cups-1.4.4-r2.ebuild b/net-print/cups/cups-1.4.4-r2.ebuild
index 6cbae600fdb9..b1d35a65500e 100644
--- a/net-print/cups/cups-1.4.4-r2.ebuild
+++ b/net-print/cups/cups-1.4.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.4-r2.ebuild,v 1.2 2010/09/11 17:53:40 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.4-r2.ebuild,v 1.3 2010/09/12 17:19:23 scarabeus Exp $
 
 EAPI=3
 
@@ -88,6 +88,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.4.4-fix-install-perms.patch"
 	epatch "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
 	epatch "${FILESDIR}/${PN}-1.4.4-php-destdir.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
 
 	AT_M4DIR=config-scripts eaclocal
 	eautoconf
diff --git a/net-print/cups/files/cups-1.4.4-perl-includes.patch b/net-print/cups/files/cups-1.4.4-perl-includes.patch
new file mode 100644
index 000000000000..677c57ded88a
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.4-perl-includes.patch
@@ -0,0 +1,12 @@
+diff -urN cups-1.4.4/scripting/perl/Makefile.PL cups-1.4.4.new//scripting/perl/Makefile.PL
+--- cups-1.4.4/scripting/perl/Makefile.PL	2002-08-19 22:43:03.000000000 +0200
++++ cups-1.4.4.new//scripting/perl/Makefile.PL	2010-09-12 19:12:53.173000149 +0200
+@@ -11,7 +11,7 @@
+     'LIBS'		=> ['-lcups '], # e.g., '-lm'
+     'DEFINE'		=> '', # e.g., '-DHAVE_SOMETHING'
+ 	# Insert -I. if you add *.h files later:
+-    'INC'		=> '', # e.g., '-I/usr/include/other'
++    'INC'		=> '-I../../', # e.g., '-I/usr/include/other'
+ 	# Un-comment this if you add C files to link with later:
+     # 'OBJECT'		=> '$(O_FILES)', # link all the C files too
+ );