| 1 |
markusle 08/06/30 12:36:01 |
| 2 |
|
| 3 |
Modified: xephem-3.7.3.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Added patch to make sure and explicit that only system libs are being used (see bug #229885). |
| 6 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-SENTINEL-3 i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.4 sci-astronomy/xephem/xephem-3.7.3.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/xephem/xephem-3.7.3.ebuild?rev=1.4&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/xephem/xephem-3.7.3.ebuild?rev=1.4&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/xephem/xephem-3.7.3.ebuild?r1=1.3&r2=1.4 |
| 14 |
|
| 15 |
Index: xephem-3.7.3.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.3.ebuild,v |
| 18 |
retrieving revision 1.3 |
| 19 |
retrieving revision 1.4 |
| 20 |
diff -u -r1.3 -r1.4 |
| 21 |
--- xephem-3.7.3.ebuild 28 Jun 2008 13:30:30 -0000 1.3 |
| 22 |
+++ xephem-3.7.3.ebuild 30 Jun 2008 12:36:01 -0000 1.4 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2008 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.3.ebuild,v 1.3 2008/06/28 13:30:30 ulm Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.3.ebuild,v 1.4 2008/06/30 12:36:01 markusle Exp $ |
| 28 |
|
| 29 |
inherit eutils |
| 30 |
|
| 31 |
@@ -12,17 +12,22 @@ |
| 32 |
SLOT="0" |
| 33 |
LICENSE="as-is" |
| 34 |
DEPEND="!media-gfx/feh |
| 35 |
- x11-libs/openmotif" |
| 36 |
+ x11-libs/openmotif |
| 37 |
+ media-libs/jpeg |
| 38 |
+ media-libs/libpng" |
| 39 |
|
| 40 |
src_unpack() { |
| 41 |
unpack ${A} |
| 42 |
cd "${S}" |
| 43 |
|
| 44 |
- # Link against Motif shared lib, bug 229761 |
| 45 |
- epatch "${FILESDIR}/${P}-link-motif.patch" |
| 46 |
+ # make sure we use system libs not the ones that |
| 47 |
+ # ship with the xephem tarball |
| 48 |
+ rm -fr libjpegd/ libpng/ libz/ libXm/ \ |
| 49 |
+ || die "Failed to remove unneeded libs" |
| 50 |
+ epatch "${FILESDIR}"/${P}-use-system-lib.patch |
| 51 |
|
| 52 |
- for i in libastro/Makefile libip/Makefile libjpegd/Makefile \ |
| 53 |
- liblilxml/Makefile GUI/xephem/Makefile GUI/xephem/tools/*/Makefile ; do |
| 54 |
+ for i in libastro/Makefile libip/Makefile liblilxml/Makefile \ |
| 55 |
+ GUI/xephem/Makefile GUI/xephem/tools/*/Makefile ; do |
| 56 |
einfo "Fixing CFLAGS in ${i}" |
| 57 |
sed -e "s~^CFLAGS[ ]*=\(.*\)-O2\(.*\)~CFLAGS= \1 \2 ${CFLAGS}~" \ |
| 58 |
-i ${i} \ |
| 59 |
@@ -39,12 +44,10 @@ |
| 60 |
emake || die "emake failed" |
| 61 |
local myldflags |
| 62 |
cd "${S}" |
| 63 |
- for dir in libip liblilxml libjpegd GUI/xephem/tools/* GUI/xephem; do |
| 64 |
+ for dir in libip liblilxml GUI/xephem/tools/* GUI/xephem; do |
| 65 |
echo "going into ${dir}" |
| 66 |
cd "${S}"/${dir} |
| 67 |
- if [ ${dir:0:3} = "lib" ]; then |
| 68 |
- myldflags="" |
| 69 |
- else |
| 70 |
+ if [ ${dir:0:3} != "lib" ]; then |
| 71 |
myldflags="${CLDFLAGS}" |
| 72 |
fi |
| 73 |
emake \ |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
1.26 sci-astronomy/xephem/ChangeLog |
| 78 |
|
| 79 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/xephem/ChangeLog?rev=1.26&view=markup |
| 80 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/xephem/ChangeLog?rev=1.26&content-type=text/plain |
| 81 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/xephem/ChangeLog?r1=1.25&r2=1.26 |
| 82 |
|
| 83 |
Index: ChangeLog |
| 84 |
=================================================================== |
| 85 |
RCS file: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/ChangeLog,v |
| 86 |
retrieving revision 1.25 |
| 87 |
retrieving revision 1.26 |
| 88 |
diff -u -r1.25 -r1.26 |
| 89 |
--- ChangeLog 28 Jun 2008 13:30:30 -0000 1.25 |
| 90 |
+++ ChangeLog 30 Jun 2008 12:36:01 -0000 1.26 |
| 91 |
@@ -1,6 +1,11 @@ |
| 92 |
# ChangeLog for sci-astronomy/xephem |
| 93 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 94 |
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/ChangeLog,v 1.25 2008/06/28 13:30:30 ulm Exp $ |
| 95 |
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/ChangeLog,v 1.26 2008/06/30 12:36:01 markusle Exp $ |
| 96 |
+ |
| 97 |
+ 30 Jun 2008; Markus Dittrich <markusle@g.o> -files/xephem-3.7.3-link-motif.patch, +files/xephem-3.7.3-use-system-lib.patch, |
| 98 |
+ xephem-3.7.3.ebuild: |
| 99 |
+ Added patch to make sure and explicit that only system libs are being used |
| 100 |
+ (see bug #229885). |
| 101 |
|
| 102 |
28 Jun 2008; Ulrich Mueller <ulm@g.o> |
| 103 |
+files/xephem-3.7.3-link-motif.patch, xephem-3.7.3.ebuild: |
| 104 |
|
| 105 |
|
| 106 |
|
| 107 |
-- |
| 108 |
gentoo-commits@l.g.o mailing list |
Archives