Bug 128326 - modified to build for users that didn't install xorg meta

Package-Manager: portage-2.1

5 files changed, 94 insertions, 12 deletions

diff --git a/dev-perl/perl-tk/ChangeLog b/dev-perl/perl-tk/ChangeLog
index 818c7c131123..7e3fad03fa56 100644
--- a/dev-perl/perl-tk/ChangeLog
+++ b/dev-perl/perl-tk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/perl-tk
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/ChangeLog,v 1.36 2005/12/12 08:55:44 spyderous Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/ChangeLog,v 1.37 2006/06/14 03:06:45 mcummings Exp $
+
+  14 Jun 2006; Michael Cummings <mcummings@gentoo.org> +files/xorg.patch,
+  perl-tk-804.027.ebuild:
+  Bug 128326 - modified to build for users that didn't install xorg meta
 
   12 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   perl-tk-804.027.ebuild:
diff --git a/dev-perl/perl-tk/Manifest b/dev-perl/perl-tk/Manifest
index 095c1e37a5a7..056ed75c1617 100644
--- a/dev-perl/perl-tk/Manifest
+++ b/dev-perl/perl-tk/Manifest
@@ -1,15 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5d93d01b6431cc13cac3905e28c1d453 ChangeLog 4094
-MD5 0f1f6e9b0ed927dc06a26a50906da667 files/digest-perl-tk-804.027 63
+AUX perl-tk-800.025-dirtarget.patch 518 RMD160 9472df0831571e8780090f368db7909ce5acf266 SHA1 9919708789aaa07f8e2486ae0174920c416ef33d SHA256 c18167f7c4cd31746dc3b3c36bcf50032526b49576a25e25603c6e2404f75226
 MD5 11a3b779734992780308fabad2d9f967 files/perl-tk-800.025-dirtarget.patch 518
+RMD160 9472df0831571e8780090f368db7909ce5acf266 files/perl-tk-800.025-dirtarget.patch 518
+SHA256 c18167f7c4cd31746dc3b3c36bcf50032526b49576a25e25603c6e2404f75226 files/perl-tk-800.025-dirtarget.patch 518
+AUX xorg.patch 1870 RMD160 fddee4757158997c67d41fbb2ad0ae30c618a511 SHA1 97bea3bd3854363ccba34757a00f6f1028351eb8 SHA256 444d9b341e32ea45620f569dcf7716ce2b2c6d60f9649c8f9de44e8e528f6e78
+MD5 37751e6f150b491428dc1669271b5880 files/xorg.patch 1870
+RMD160 fddee4757158997c67d41fbb2ad0ae30c618a511 files/xorg.patch 1870
+SHA256 444d9b341e32ea45620f569dcf7716ce2b2c6d60f9649c8f9de44e8e528f6e78 files/xorg.patch 1870
+DIST Tk-804.027.tar.gz 6011130 RMD160 8ef2086efa4d7818bd82cc6d36a4d60ca8654bc7 SHA1 a691b6d38783810e3c3a3266bdcf8baba4aaf7dd SHA256 fc12136d8885168cdb77af4107d0cd8121c329925219355a19bfffe01a1ad8a2
+EBUILD perl-tk-804.027.ebuild 751 RMD160 3a6da1e1cc5ff9d11d8cee824cc9d458e9885ea2 SHA1 58dd45c6014f6d5d3cacfb245cd494155cb59409 SHA256 b7ba82159e72bf6a30cd4bc3398c493ba19c99070b71503097749be0238cf74c
+MD5 a24aa5d5b6b1abbe88d20633f1a2869b perl-tk-804.027.ebuild 751
+RMD160 3a6da1e1cc5ff9d11d8cee824cc9d458e9885ea2 perl-tk-804.027.ebuild 751
+SHA256 b7ba82159e72bf6a30cd4bc3398c493ba19c99070b71503097749be0238cf74c perl-tk-804.027.ebuild 751
+MISC ChangeLog 4268 RMD160 80ff2299e1184f44aa485e8a06a7c18f9e6008c8 SHA1 eb671ebd44aa279cb328398b09e3fc26a53b0a6c SHA256 304e988a0be53afc7098fa82edd407facaa7f73dff329e3130dfe5048a5410ce
+MD5 5db1648cd5e1843abbcbe8d77b999c76 ChangeLog 4268
+RMD160 80ff2299e1184f44aa485e8a06a7c18f9e6008c8 ChangeLog 4268
+SHA256 304e988a0be53afc7098fa82edd407facaa7f73dff329e3130dfe5048a5410ce ChangeLog 4268
+MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 b800ecef5ee63a38a5feb0a9e5fe11e0 perl-tk-804.027.ebuild 636
+RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
+SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca metadata.xml 305
+MD5 4310c9aa8fb8c417edc91db529e9e24e files/digest-perl-tk-804.027 235
+RMD160 090c36a4e2eba1f51e56cd2a7a5bcfdad51767ae files/digest-perl-tk-804.027 235
+SHA256 37a3cbdc0f5c69b1e5920d18afb4eaec8cd15cf9a2d0939febfee936c59fbd8b files/digest-perl-tk-804.027 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFDzG2v2+ySkm8kpY0RAqp8AKC+z3bUFmwOAu+KQyc804qAa3KruACffUwa
-0mAiVXw9BU+nyPrKpaMSw8s=
-=IZO9
+iD8DBQFEj31VtG5z4I8BtQoRAsxiAJ9lxq/WSIH/1hXX51Ao8s4sX94gOQCeLN3W
+xacfTcYdZz4jYxyN3oijN6c=
+=/kP1
 -----END PGP SIGNATURE-----
diff --git a/dev-perl/perl-tk/files/digest-perl-tk-804.027 b/dev-perl/perl-tk/files/digest-perl-tk-804.027
index 0651c014c6c9..de30de9344eb 100644
--- a/dev-perl/perl-tk/files/digest-perl-tk-804.027
+++ b/dev-perl/perl-tk/files/digest-perl-tk-804.027
@@ -1 +1,3 @@
 MD5 d1ca4a6bff6dae4d937fabde4e86256b Tk-804.027.tar.gz 6011130
+RMD160 8ef2086efa4d7818bd82cc6d36a4d60ca8654bc7 Tk-804.027.tar.gz 6011130
+SHA256 fc12136d8885168cdb77af4107d0cd8121c329925219355a19bfffe01a1ad8a2 Tk-804.027.tar.gz 6011130
diff --git a/dev-perl/perl-tk/files/xorg.patch b/dev-perl/perl-tk/files/xorg.patch
new file mode 100644
index 000000000000..9e88f46100db
--- /dev/null
+++ b/dev-perl/perl-tk/files/xorg.patch
@@ -0,0 +1,49 @@
+diff -Naurp Tk-804.027/Tk/MakeDepend.pm Tk-804.027.new/Tk/MakeDepend.pm
+--- Tk-804.027/Tk/MakeDepend.pm	2003-12-13 07:28:22.000000000 -0500
++++ Tk-804.027.new/Tk/MakeDepend.pm	2006-06-13 22:34:21.000000000 -0400
+@@ -248,6 +248,7 @@ sub command_line
+  # force /usr/include to be last element of @include
+  push @include, $Config{'usrinc'}
+    if (defined $Config{'usrinc'} and $Config{'usrinc'} ne '');
++ push @include, "/usr/include";
+  # warn "Include:@include\n";
+  while (@files)
+   {
+diff -Naurp Tk-804.027/myConfig Tk-804.027.new/myConfig
+--- Tk-804.027/myConfig	2004-02-28 11:59:28.000000000 -0500
++++ Tk-804.027.new/myConfig	2006-06-13 22:27:53.000000000 -0400
+@@ -253,7 +253,7 @@ if ($win_arch eq 'x') {
+ 	}
+ 	close(XMKMF);
+ 	while (defined $uidir) {
+-	  last unless ($uidir =~ s!^.*-I(\S+)/lib/X11/config!!o);
++	  last unless ($uidir =~ s!^.*-I(\S+)/lib(64)/X11/config!!o);
+ 	  $try = $1;
+ 	  $try =~ s/'x11root'/$ENV{X11ROOT}/;
+ 	  push(@xdirs,$try);
+@@ -294,7 +294,7 @@ if ($win_arch eq 'x') {
+   #
+   unless (defined $xlib)
+     {
+-      $xlib = &lX11(0,chooseX11(</usr/X11*/lib>),chooseX11(</usr/lib/X11*>),</usr/Xfree*/lib>,'/usr/X386/lib')
++      $xlib = &lX11(0,chooseX11(</usr/X11*/lib>),chooseX11(</usr/lib/X11*>),</usr/Xfree*/lib>,'/usr/X386/lib','/usr/lib64')
+     }
+ 
+   #
+@@ -309,7 +309,7 @@ if ($win_arch eq 'x') {
+ 
+   die "Cannot find -lX11 anywhere" unless(defined $xlib);
+ 
+-  ($base) = $xlib =~ m#-L(.*)(?:/lib)$#x;
++  ($base) = $xlib =~ m#-L(.*)(?:/lib(64))$#x;
+   if (defined $X11INC)
+     {
+       $xinc = &IX11("$X11INC");
+@@ -321,6 +321,7 @@ if ($win_arch eq 'x') {
+     {
+       warn "Cannot find X include files via $base/include\n";
+       $xinc = &IX11(map("$_/include",@xdirs),
++            chooseX11(</usr/include/X11*>),
+ 		    '/usr/openwin/include',
+ 		    chooseX11(</usr/X11*/include>),
+ 		    chooseX11(</usr/include/X11*>),
diff --git a/dev-perl/perl-tk/perl-tk-804.027.ebuild b/dev-perl/perl-tk/perl-tk-804.027.ebuild
index 272bbc9f898c..a38f37af60c9 100644
--- a/dev-perl/perl-tk/perl-tk-804.027.ebuild
+++ b/dev-perl/perl-tk/perl-tk-804.027.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/perl-tk-804.027.ebuild,v 1.18 2006/01/17 04:06:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/perl-tk-804.027.ebuild,v 1.19 2006/06/14 03:06:45 mcummings Exp $
 
-inherit perl-module eutils
+inherit perl-module eutils multilib
 
 MY_P=Tk-${PV}
 S=${WORKDIR}/${MY_P}
@@ -17,6 +17,14 @@ IUSE=""
 
 DEPEND="|| ( x11-libs/libX11 virtual/x11 )"
 
-myconf="X11LIB=/usr/$(get_libdir)"
+myconf="-I/usr/include/ -l/usr/$(get_libdir)"
 
 mydoc="ToDo VERSIONS"
+
+export X11ROOT=/usr
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/xorg.patch
+}