Added patch to make sure and explicit that only system libs are being used (see bug #229885).

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-SENTINEL-3 i686)

4 files changed, 55 insertions, 31 deletions

diff --git a/sci-astronomy/xephem/ChangeLog b/sci-astronomy/xephem/ChangeLog
index ae7e94820aa5..dc06aaca009f 100644
--- a/sci-astronomy/xephem/ChangeLog
+++ b/sci-astronomy/xephem/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-astronomy/xephem
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/ChangeLog,v 1.25 2008/06/28 13:30:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/ChangeLog,v 1.26 2008/06/30 12:36:01 markusle Exp $
+
+  30 Jun 2008; Markus Dittrich <markusle@gentoo.org> -files/xephem-3.7.3-link-motif.patch, +files/xephem-3.7.3-use-system-lib.patch,
+  xephem-3.7.3.ebuild:
+  Added patch to make sure and explicit that only system libs are being used
+  (see bug #229885).
 
   28 Jun 2008; Ulrich Mueller <ulm@gentoo.org>
   +files/xephem-3.7.3-link-motif.patch, xephem-3.7.3.ebuild:
diff --git a/sci-astronomy/xephem/files/xephem-3.7.3-link-motif.patch b/sci-astronomy/xephem/files/xephem-3.7.3-link-motif.patch
deleted file mode 100644
index 4828d2eac39a..000000000000
--- a/sci-astronomy/xephem/files/xephem-3.7.3-link-motif.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- xephem-3.7.3-orig/GUI/xephem/Makefile	2006-05-14 01:06:06.000000000 +0200
-+++ xephem-3.7.3/GUI/xephem/Makefile	2008-06-28 11:23:32.000000000 +0200
-@@ -15,7 +15,7 @@
- LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
- 
- # MOTIFI is the directory containing the Xm directory of include files.
--# MOTIFL is the directory containing the libXm.a library.
-+# MOTIFL is the directory containing libXm
- # MOTIF can be used to set one common directory if desired.
- # Defaults work ok for Linux and Mac OS X.
- ifdef MOTIF
-@@ -34,7 +34,7 @@
- CLDFLAGS = -g
- CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/usr/X11R6/include
- LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/X11R6/lib
--XLIBS = $(MOTIFL)/libXm.a -lXp -lXt -lXext -lXmu -lX11
-+XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
- LIBS = $(XLIBS) $(LIBLIB) -lm
- 
- # for ppc Apple OS X to make universal (i386 and ppc binary), requires
diff --git a/sci-astronomy/xephem/files/xephem-3.7.3-use-system-lib.patch b/sci-astronomy/xephem/files/xephem-3.7.3-use-system-lib.patch
new file mode 100644
index 000000000000..662170a8f4fc
--- /dev/null
+++ b/sci-astronomy/xephem/files/xephem-3.7.3-use-system-lib.patch
@@ -0,0 +1,36 @@
+diff -Naur xephem-3.7.3/GUI/xephem/Makefile xephem-3.7.3.new/GUI/xephem/Makefile
+--- xephem-3.7.3/GUI/xephem/Makefile	2006-05-13 19:06:06.000000000 -0400
++++ xephem-3.7.3.new/GUI/xephem/Makefile	2008-06-30 06:38:50.000000000 -0400
+@@ -10,9 +10,9 @@
+ # back here and compile and link all the *.c files into one executable, xephem.
+ 
+ # -I and -L flags to find required supporting XEphem libraries
+-LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd -I../../libpng -I../../libz
+-LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd -L../../libpng -L../../libz
+-LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
++LIBINC = -I../../libastro -I../../libip -I../../liblilxml 
++LIBLNK = -L../../libastro -L../../libip -L../../liblilxml
++LIBLIB = -lastro -lip -llilxml -ljpeg -lpng -lz
+ 
+ # MOTIFI is the directory containing the Xm directory of include files.
+ # MOTIFL is the directory containing the libXm.a library.
+@@ -34,7 +34,7 @@
+ CLDFLAGS = -g
+ CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/usr/X11R6/include
+ LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/X11R6/lib
+-XLIBS = $(MOTIFL)/libXm.a -lXp -lXt -lXext -lXmu -lX11
++XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
+ LIBS = $(XLIBS) $(LIBLIB) -lm
+ 
+ # for ppc Apple OS X to make universal (i386 and ppc binary), requires
+@@ -187,10 +187,7 @@
+ libs:
+ 	cd ../../libastro; make
+ 	cd ../../libip; make
+-	cd ../../libjpegd; make
+ 	cd ../../liblilxml; make
+-	cd ../../libpng; make
+-	cd ../../libz; make
+ 
+ clean:
+ 	touch x.o
diff --git a/sci-astronomy/xephem/xephem-3.7.3.ebuild b/sci-astronomy/xephem/xephem-3.7.3.ebuild
index 737ea3f430b6..cfec844dd927 100644
--- a/sci-astronomy/xephem/xephem-3.7.3.ebuild
+++ b/sci-astronomy/xephem/xephem-3.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.3.ebuild,v 1.3 2008/06/28 13:30:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.3.ebuild,v 1.4 2008/06/30 12:36:01 markusle Exp $
 
 inherit eutils
 
@@ -12,17 +12,22 @@ IUSE=""
 SLOT="0"
 LICENSE="as-is"
 DEPEND="!media-gfx/feh
-	x11-libs/openmotif"
+	x11-libs/openmotif
+	media-libs/jpeg
+	media-libs/libpng"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# Link against Motif shared lib, bug 229761
-	epatch "${FILESDIR}/${P}-link-motif.patch"
+	# make sure we use system libs not the ones that
+	# ship with the xephem tarball
+	rm -fr libjpegd/ libpng/ libz/ libXm/ \
+		|| die "Failed to remove unneeded libs"
+	epatch "${FILESDIR}"/${P}-use-system-lib.patch
 
-	for i in libastro/Makefile libip/Makefile libjpegd/Makefile \
-		liblilxml/Makefile GUI/xephem/Makefile GUI/xephem/tools/*/Makefile ; do
+	for i in libastro/Makefile libip/Makefile liblilxml/Makefile \
+		GUI/xephem/Makefile GUI/xephem/tools/*/Makefile ; do
 		einfo "Fixing CFLAGS in ${i}"
 		sed -e "s~^CFLAGS[ ]*=\(.*\)-O2\(.*\)~CFLAGS= \1 \2 ${CFLAGS}~" \
 			-i ${i} \
@@ -39,12 +44,10 @@ src_compile() {
 	emake || die "emake failed"
 	local myldflags
 	cd "${S}"
-	for dir in libip liblilxml libjpegd GUI/xephem/tools/* GUI/xephem; do
+	for dir in libip liblilxml GUI/xephem/tools/* GUI/xephem; do
 		echo "going into ${dir}"
 		cd "${S}"/${dir}
-		if [ ${dir:0:3} = "lib" ]; then
-			myldflags=""
-		else
+		if [ ${dir:0:3} != "lib" ]; then
 			myldflags="${CLDFLAGS}"
 		fi
 		emake \