Link perl module properly if cups is not installed yet, bug 398277

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

4 files changed, 35 insertions, 17 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index be300dfc4f83..3f4ff1f1c665 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.457 2012/04/18 22:28:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.458 2012/04/19 20:22:49 dilfridge Exp $
+
+  19 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r2.ebuild,
+  +files/cups-1.5.2-linkperl.patch:
+  Link perl module properly if cups is not installed yet, bug 398277
 
   18 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r2.ebuild:
   Set systemd unit dir correctly, bug 407975
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 07eb0cd5db03..8103ff16c93d 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -14,6 +14,7 @@ AUX cups-1.4.8-CVE-2011-3170.patch 1045 RMD160 9a27eb1ec34ced57da5bbe7c55261d8aa
 AUX cups-1.4.8-largeimage.patch 572 RMD160 62e0a92fb1dc62adff43bcdc22f201da426d8916 SHA1 1528f2b1f67e7c532418dd7f495db1788ae7d2d4 SHA256 364a3ed3e161ad75836e6bc56746c25207680ab6f44563219c93146f0cf74541
 AUX cups-1.5.0-systemd-socket.patch 12829 RMD160 d4ca24c299daf65f2621568443a339f82bd03a2a SHA1 f45e18ba92d3afbca6a26ac676f2f42738032c10 SHA256 350eb1bdb76618dd082e9cda26c5b1400f4f870ffd521186f4d74940d15b4cd5
 AUX cups-1.5.2-browsing.patch 513 RMD160 592b2a814f23beea82d61446989636a393ab34a7 SHA1 43f78e93f84a4da430cb2e1ced268ea00d5f00b3 SHA256 47a229fb7be6ada4e48806c24cdba70cd2b6161ac8fcf1290e07063e486b7bfe
+AUX cups-1.5.2-linkperl.patch 724 RMD160 5e94f21ab236a88ec2026e69aed58ce17dafaa5c SHA1 8556aea40a07176b0daa184bcce1b1abe3d81c48 SHA256 48891623d98a1767c11865d59c72146aa277f1bd0abda9871ae90540676b648e
 AUX cupsd.init.d 402 RMD160 1b132354d01ad2ecebbe5238b09dfa3cb9391d43 SHA1 ea48170f3369486792ed9f98fe7d1c53487b455c SHA256 66b14dffc99900c0db04453765e5bf48cdf0c197c6f50dccf2a55dc66dd0cf95
 AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1
 DIST cups-1.4.8-source.tar.bz2 4547162 RMD160 ee80e8d0b56dc0e2edf2a9aa9a43c4b92619f741 SHA1 9167f556e78e0bc075f1eb2f695d79cc1f334007 SHA256 6bd27e1213c139ed0bbadc5c29f97cf1e8f7f8f5b0bb29b227ecaff32aafa9a6
@@ -25,23 +26,23 @@ EBUILD cups-1.4.8-r1.ebuild 7242 RMD160 bf1997ca1d9b9b11066c2bb963cc8b54ea5c8f2a
 EBUILD cups-1.4.8-r23.ebuild 8852 RMD160 c50b3b77403cf6c724fcfd05c8ef173808066629 SHA1 c4aa7016bb5a1279bf446f41c09b9a93d5b87ff2 SHA256 1798aed0e2760c6a92a7c4e3631170989d984ac36908b369c37c43bfdab3cd6d
 EBUILD cups-1.5.0-r4.ebuild 7778 RMD160 589d4fd3981132f886ea353b02247c248d3717ff SHA1 02a9829da95c49dbc2dc27667581a0a16914f73b SHA256 c54f49196c44fde519fd57d0a4f3e2d25266e763763357c026e7093d480fdee4
 EBUILD cups-1.5.2-r1.ebuild 7612 RMD160 106fcb8c63f10d55a3ae494d3a70feaeab24034e SHA1 923b2d6a3983768f7048ab6acc4c6c3055db35c0 SHA256 5047115966134ee06dda96e8f376659f4d94904d3c5446236a094f70f1313b45
-EBUILD cups-1.5.2-r2.ebuild 8126 RMD160 b1e8dd0a88ed4887705d2dbebef54b7785484062 SHA1 02e8c85752d5d0e96e49f29878e70d00f9237cb2 SHA256 3ab307ade16dd43fdd2693616fbfa722be47d0f2a5d93da0a8ce7b80a0de33ee
-MISC ChangeLog 69539 RMD160 8e059c9ff86c055577f3e50bef69afe03f31b848 SHA1 f5266c5d578d92cbd579089d594af27ddb4c002b SHA256 f2a7ad0c96f3508dfc5a44f9332ae82e4ceafae82e54fec988e602f5b125821a
+EBUILD cups-1.5.2-r2.ebuild 8175 RMD160 b8043f29843c75c2b55085417cfc21a1db9db503 SHA1 a196e7c91ff5ea81b2ea2dfb4d598ea6541a24a8 SHA256 7a9a31d4b3a48ca207f9292255d3601f08981fdb4c276db712ffe87e6b1dc5b0
+MISC ChangeLog 69724 RMD160 eb37845a18d16442ec6560df72f918d92edb90c1 SHA1 eda190593ed2b3f8dce9a89f14c13d9273245931 SHA256 548844e0723e79c6e500be3da151037534d3f693f20f5b294fcb5f4cf820b436
 MISC metadata.xml 691 RMD160 2a77a55b3ba142202c16f7c9e5710107cdd7565f SHA1 0fedf6ebd837708cd218a4a03741a20091714950 SHA256 3d89754273130856a7433fb325a132b07b86f7c0391284ab2c7dc8a2fa46fec7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPj0AIAAoJENwGBM22xffeiu4P/i7VMzkvzCJhJm6NBUZQ14/K
-yGPJcBDDhATiR354S0Rt6lk+kz946+15X8Cyhd3TzYijneRo7dWu1ukozcaPUSvw
-RVqoTmTxox5Kuy/VehZA3dXTq7CkQS1zjrHsnH/wonRHfxHh0CpajxEy2PFUbAZf
-LFy9S4Nvj8Z0TE+l/OtesC8JBbFjTaWB97yQ/c4x6Jp865Evficd2SJSrUtJJ5p4
-f562eCcXs1k3RQUfoZsyKilfayx+upUVBMYFQE2FZJCGkassJB23+FRM/16YO/qU
-ZoPhEPGnE4eybiAmRn/HGPMOg7FNb3wdHJeJOItAHfCD2NWzVlO6hqsGAX1ibI6b
-9viE6Q0KAH7BJKQe7m/xDgwQsyGb9c7Ifqz5x6yuLAXk1zwpazcgYdlCVRsGO3/G
-i3DLxGrsiJM8g/t9LPsQohwt8Kpk2V0sdAuQZNxj3DCqC928O73eNSkCUzJAVZoj
-86GYXYdOgMhQVoD+T3Eb11Db4etGotC30DST0BMzozTDroQBHMHgED8i1rCZyUYn
-SuluUwEI596+YUxTmPm3xwsmlCsIa/IiahQ7Mx6MRnm+vhFzB7Hm2ZoMJPPE5zWd
-g1a9Xk8h9gT416Ru65uQQ7WXHADx0HU+46kTlUjJepzVU0G/B+iv2tAJMkR7Ckwj
-XXlIZkqmHnLYCd2+Cy/y
-=CNQj
+iQIcBAEBCgAGBQJPkHQzAAoJENwGBM22xffeSKkP/ivCeHSzBKHQJ9uJudIzQCNU
+7bO9t/7F1tDvDt7aPR/Xif4mGDWppiaAn7D9sJmwjBv7cfQvcbhTeQkS9cURUrsO
+RPf+UqEhPnioWO6Amxt99rPjoQPgdvwft9gfav0drYG3J8BYhbVd39qT1szCSjoZ
+w4y7pT4Hmw5o+2557ZLYfPM7zjTVkQSmNZ35T7h61k775bezRjPo5yHfS/cZUpsH
+Ovx4YM0y9LigdAJDPXCVALGKvcPNtldMP7Eq7zz1t9xm1vrOLaRX+W+EpD5+GYyA
+Hm4sGxcotO0tL0ZhBWQM1NEgliDYPfBXMZFEosuLWjV+b5zcSXkbgBMG1PwthYvn
+zVyBNm6lN7cf/VzlFKiBPndy6EwFImUyrfLsXP89/05ZkVV7KusTDqwReFaxCmTf
+NKGTmndHGKK9JrvcuU3NF1UNU7CMvvwneQJSOa5oxVOOVe8WZgsW9MAY7u8BzQx8
+SwL1hQabqYTGttYb2byRnCa8Oe74OnlF82fMNAZetL3JA97WlbIcY5iofdMbWrKi
+RVcYILkDRjuuuneUpbVA5hvJddgwnzKEWcOsqQMDE2346I3oS4a3F7BE1Bg5PPF0
+D38z9TClaDD+EIbAu3gzE7a9fh1GwoFYUef6Y+rhIuCg2XNyhhFiFhwN5jELFvW9
+EpHlSIt0ZZQfN2d26wmJ
+=omu5
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.5.2-r2.ebuild b/net-print/cups/cups-1.5.2-r2.ebuild
index 66bf6b2b06f7..57ca1251afba 100644
--- a/net-print/cups/cups-1.5.2-r2.ebuild
+++ b/net-print/cups/cups-1.5.2-r2.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/cups-1.5.2-r2.ebuild,v 1.3 2012/04/18 22:28:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r2.ebuild,v 1.4 2012/04/19 20:22:49 dilfridge Exp $
 
 EAPI=4
 
@@ -128,6 +128,7 @@ src_prepare() {
 	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"
+	epatch "${FILESDIR}/${PN}-1.5.2-linkperl.patch"
 
 	# systemd support
 	epatch "${FILESDIR}/${PN}-1.5.0-systemd-socket.patch"
diff --git a/net-print/cups/files/cups-1.5.2-linkperl.patch b/net-print/cups/files/cups-1.5.2-linkperl.patch
new file mode 100644
index 000000000000..1bffda5d3473
--- /dev/null
+++ b/net-print/cups/files/cups-1.5.2-linkperl.patch
@@ -0,0 +1,12 @@
+diff -ruN cups-1.5.2.orig/scripting/perl/Makefile.PL cups-1.5.2/scripting/perl/Makefile.PL
+--- cups-1.5.2.orig/scripting/perl/Makefile.PL	2002-08-19 22:43:03.000000000 +0200
++++ cups-1.5.2/scripting/perl/Makefile.PL	2012-04-19 22:11:45.000000000 +0200
+@@ -8,7 +8,7 @@
+     ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
+       (ABSTRACT_FROM => 'CUPS.pm', # retrieve abstract from module
+        AUTHOR     => 'A. U. Thor <a.u.thor@a.galaxy.far.far.away>') : ()),
+-    'LIBS'		=> ['-lcups '], # e.g., '-lm'
++    'LIBS'		=> ['-L../../cups -lcups '], # e.g., '-lm'
+     'DEFINE'		=> '', # e.g., '-DHAVE_SOMETHING'
+ 	# Insert -I. if you add *.h files later:
+     'INC'		=> '', # e.g., '-I/usr/include/other'