Added patch to fix linking problem with afs libs. Re-added afs USE flag.

Package-Manager: portage-2.1.4_rc9

4 files changed, 58 insertions, 14 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index ae77aa282b43..2d9336de01cb 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-physics/root
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.17 2007/12/16 05:05:17 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.18 2007/12/16 17:04:42 markusle Exp $
+
+  16 Dec 2007; Markus Dittrich <markusle@gentoo.org>
+  +files/root-5.16.00-afs.patch, root-5.16.00-r1.ebuild:
+  Added patch to fix linking problem with afs libs. Re-added afs
+  USE flag.
 
 *root-5.16.00-r1 (15 Dec 2007)
 
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index c7da275d8f68..614c4e6c2971 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,3 +1,7 @@
+AUX root-5.16.00-afs.patch 1320 RMD160 76896f12113782f9ee534b6920a1dde53eb09c72 SHA1 052a6113f5c2c4bc786f7f1d567c1990a5791d8b SHA256 04b2e484cad98943487f3691d57d20b923bb0ce5998f28f423f94995a832a9dc
+MD5 f10c6e4f1295312df2d13e3bf25614ad files/root-5.16.00-afs.patch 1320
+RMD160 76896f12113782f9ee534b6920a1dde53eb09c72 files/root-5.16.00-afs.patch 1320
+SHA256 04b2e484cad98943487f3691d57d20b923bb0ce5998f28f423f94995a832a9dc files/root-5.16.00-afs.patch 1320
 AUX root-5.16.00-fortran.patch 5076 RMD160 2218584a3a5093a8d4171913a2b024bb759aae03 SHA1 4ed648d54260fd2593174154d8331c5d5afd5f09 SHA256 4ad7a3057528f30716d200c8f1462cf92da6f1ebef9bc3fee1874000bc10deec
 MD5 4d5db674fa620228fe7e50057ac40e95 files/root-5.16.00-fortran.patch 5076
 RMD160 2218584a3a5093a8d4171913a2b024bb759aae03 files/root-5.16.00-fortran.patch 5076
@@ -14,18 +18,18 @@ EBUILD root-3.05.04.ebuild 1657 RMD160 140ae365418c6b9252c892b76963d17cd8235c8f
 MD5 d1257ceae44d122672696002845f5667 root-3.05.04.ebuild 1657
 RMD160 140ae365418c6b9252c892b76963d17cd8235c8f root-3.05.04.ebuild 1657
 SHA256 1ad7642aaaffa6d272ab5bde1b1c4f53ddadf48098fc97f7b5abfc31c69a264f root-3.05.04.ebuild 1657
-EBUILD root-5.16.00-r1.ebuild 4775 RMD160 138e56ba1ab2c4627cdfc2e21dc44c094733b2ee SHA1 2a45da537f64596560c592f5aa64e7138d7d7b5e SHA256 3599522ded8a060f19fe7a75aefdf23c4604e08e8281042550bd8b78706d123d
-MD5 1522a4670ebbdc5ebf75c4529fe94b31 root-5.16.00-r1.ebuild 4775
-RMD160 138e56ba1ab2c4627cdfc2e21dc44c094733b2ee root-5.16.00-r1.ebuild 4775
-SHA256 3599522ded8a060f19fe7a75aefdf23c4604e08e8281042550bd8b78706d123d root-5.16.00-r1.ebuild 4775
+EBUILD root-5.16.00-r1.ebuild 4840 RMD160 87b71fa07fc5af677c5a3720fceff656dc7f016a SHA1 4ee3c6d1cc6f2da68950244480f6ebb519d2a355 SHA256 9a15074fe0ece12e5127e3faeb0bb0534ae6149931f92f993820c1436b16f1e4
+MD5 dd90124e5a4f2438d9425ef6272108ef root-5.16.00-r1.ebuild 4840
+RMD160 87b71fa07fc5af677c5a3720fceff656dc7f016a root-5.16.00-r1.ebuild 4840
+SHA256 9a15074fe0ece12e5127e3faeb0bb0534ae6149931f92f993820c1436b16f1e4 root-5.16.00-r1.ebuild 4840
 EBUILD root-5.16.00.ebuild 4958 RMD160 04990b1c710a41f838e82bb4954b57d05b929def SHA1 d61b11680d81b2d6f26a9b6b0a1b1efaab5f8bb9 SHA256 96ecabd5853ab5883aa64596470d5b316c4c55af3fdfaddc7bf42fdbd147a657
 MD5 460aec45e5f5d33358a82e5216af95a1 root-5.16.00.ebuild 4958
 RMD160 04990b1c710a41f838e82bb4954b57d05b929def root-5.16.00.ebuild 4958
 SHA256 96ecabd5853ab5883aa64596470d5b316c4c55af3fdfaddc7bf42fdbd147a657 root-5.16.00.ebuild 4958
-MISC ChangeLog 7111 RMD160 60ab6ef143d8d10fdc01ce4936f467cd81cb0e14 SHA1 f5998a86202cd7679631b2774fca95bdc16c706d SHA256 29324d1a732058abc2b2c1873e911d3594e51eb1d5ad71f2603ca020b23a77d9
-MD5 967eabb9735e247b28d5fe9fb86ae54c ChangeLog 7111
-RMD160 60ab6ef143d8d10fdc01ce4936f467cd81cb0e14 ChangeLog 7111
-SHA256 29324d1a732058abc2b2c1873e911d3594e51eb1d5ad71f2603ca020b23a77d9 ChangeLog 7111
+MISC ChangeLog 7299 RMD160 8dfd0c1bdd56333b0b3f23c0d9b11d15449e9cb7 SHA1 7c3d8fb64b0776010c8f52a59c29b340f9b7c717 SHA256 b05c5bd7de4d249354e5e0132be3252b7346b3db53941d28ea2679d45d89798d
+MD5 911312279f00326272a3b308b399a479 ChangeLog 7299
+RMD160 8dfd0c1bdd56333b0b3f23c0d9b11d15449e9cb7 ChangeLog 7299
+SHA256 b05c5bd7de4d249354e5e0132be3252b7346b3db53941d28ea2679d45d89798d ChangeLog 7299
 MISC metadata.xml 597 RMD160 d61e05bcfed3b0839b7daf4cf3fdac3fcdfd268d SHA1 8fd69478a8a90f6222b1e428961815e0e697905a SHA256 8ae8ab4051e8534ca2df70f81fb999c478b8f1223980c0b366dc0501fa987c6c
 MD5 0aa16bc6128c88a9afdbf32450c6f8de metadata.xml 597
 RMD160 d61e05bcfed3b0839b7daf4cf3fdac3fcdfd268d metadata.xml 597
diff --git a/sci-physics/root/files/root-5.16.00-afs.patch b/sci-physics/root/files/root-5.16.00-afs.patch
new file mode 100644
index 000000000000..cf709362aca8
--- /dev/null
+++ b/sci-physics/root/files/root-5.16.00-afs.patch
@@ -0,0 +1,33 @@
+diff -Naur root/configure root.new/configure
+--- root/configure	2007-06-07 02:48:25.000000000 -0500
++++ root.new/configure	2007-12-16 07:18:51.000000000 -0500
+@@ -307,7 +307,7 @@
+     # the .lib export library to link.
+     libs=""
+     for i in $lib ; do
+-	for ext in .a .lib "" ; do     # lib without extension for MacOS X
++	for ext in foobar "" ; do     # lib without extension for MacOS X
+ 	    libs="$libs $i$ext"
+ 	done
+     done
+@@ -403,7 +403,7 @@
+ 	flib=""
+         maclib=""
+ 	for i in $lib ; do
+-	    for ext in .a .lib "" ; do     # lib without extension for MacOS X
++	    for ext in foobar "" ; do     # lib without extension for MacOS X
+ 		if test "x$found_lib" = "x$i$ext" ; then
+ 		    flib=$i$ext
+                     if test "x$ext" = "x" ; then
+diff -Naur root/xrootd/Module.mk root.new/xrootd/Module.mk
+--- root/xrootd/Module.mk	2007-03-24 09:06:26.000000000 -0500
++++ root.new/xrootd/Module.mk	2007-12-16 07:25:47.000000000 -0500
+@@ -77,6 +77,8 @@
+ 		   gunzip -c $(XROOTDVERS).src.tgz | tar xf -; \
+ 		   etag=`basename $(XROOTDETAG)` ; \
+ 		   touch $$etag ; \
++		   sed -e "s:.a .lib:.foobar:" -i xrootd/configure.classic ; \
++		   sed -e "s:-lXrdSys:-lXrdSys -lresolv:" -i xrootd/src/XrdSecpwd/GNUmakefile ; \
+ 		fi)
+ ifeq ($(PLATFORM),win32)
+ 		@(if [ -d $(XROOTDDIRD)/pthreads-win32 ]; then \
diff --git a/sci-physics/root/root-5.16.00-r1.ebuild b/sci-physics/root/root-5.16.00-r1.ebuild
index 64ab3146cb6c..5868e77b9614 100644
--- a/sci-physics/root/root-5.16.00-r1.ebuild
+++ b/sci-physics/root/root-5.16.00-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.16.00-r1.ebuild,v 1.1 2007/12/16 05:05:17 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.16.00-r1.ebuild,v 1.2 2007/12/16 17:04:42 markusle Exp $
 
 inherit versionator flag-o-matic eutils toolchain-funcs qt3 fortran
 
@@ -16,7 +16,7 @@ SLOT="0"
 LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~sparc ~x86"
 
-IUSE="cern doc fftw kerberos ldap mysql odbc postgres
+IUSE="afs cern doc fftw kerberos ldap mysql odbc postgres
 	python ruby qt3 ssl truetype xml"
 
 DEPEND="sys-apps/shadow
@@ -26,6 +26,7 @@ DEPEND="sys-apps/shadow
 	virtual/opengl
 	virtual/glu
 	|| ( media-libs/libafterimage x11-wm/afterstep )
+	afs? ( net-fs/openafs )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql )
 	kerberos? ( virtual/krb5 )
@@ -64,6 +65,7 @@ src_unpack() {
 	# patch to properly set link flags with fortran compilers
 	epatch "${FILESDIR}"/${P}-fortran.patch
 	epatch "${DISTDIR}"/${P}-gcc-4.2.patch.bz2
+	epatch "${FILESDIR}"/${P}-afs.patch
 	if [[ ${ARCH} == sparc ]]; then
 		cd "${S}/xrootd/src"
 		tar xzf xrootd-20060928-1600.src.tgz
@@ -82,7 +84,7 @@ src_compile() {
 			target=linuxicc
 		fi
 	fi
-	#use afs && append-flags -DAFS_OLD_COM_ERR
+	use afs && append-flags -DAFS_OLD_COM_ERR
 	local myfortran
 	use cern && myfortran="F77=${FORTRANC}"
 
@@ -137,7 +139,7 @@ src_compile() {
 		--enable-table \
 		--enable-unuran \
 		--enable-xrootd \
-		--disable-afs \
+		$(use_enable afs) \
 		$(use_enable cern) \
 		$(use_enable fftw fftw3) \
 		$(use_enable kerberos krb5) \
@@ -155,7 +157,7 @@ src_compile() {
 		${EXTRA_CONF} \
 		|| die "configure failed"
 
-	emake -j1 \
+	emake \
 		OPTFLAGS="${CXXFLAGS}" \
 		${myfortran} \
 		|| die "emake failed"