summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Arnold <nerdboy@gentoo.org>2006-06-02 05:42:39 +0000
committerSteve Arnold <nerdboy@gentoo.org>2006-06-02 05:42:39 +0000
commit8e59a089f236481577c29353f0ea57b7b774e469 (patch)
tree0c81a48cf68aa3670310d6cc30fb17df3e409a6d /sci-libs/cfitsio
parentppc stable, bug #134397 (diff)
downloadgentoo-2-8e59a089f236481577c29353f0ea57b7b774e469.tar.gz
gentoo-2-8e59a089f236481577c29353f0ea57b7b774e469.tar.bz2
gentoo-2-8e59a089f236481577c29353f0ea57b7b774e469.zip
updated symlinks in both recent versions, fix for bug 135130
(Portage version: 2.1_rc3-r2)
Diffstat (limited to 'sci-libs/cfitsio')
-rw-r--r--sci-libs/cfitsio/ChangeLog7
-rw-r--r--sci-libs/cfitsio/cfitsio-2.510-r1.ebuild4
-rw-r--r--sci-libs/cfitsio/cfitsio-3.006.ebuild3
-rw-r--r--sci-libs/cfitsio/files/cfitsio-3.006-configure.patch6
4 files changed, 13 insertions, 7 deletions
diff --git a/sci-libs/cfitsio/ChangeLog b/sci-libs/cfitsio/ChangeLog
index 5c1fb9ca8270..ed65f16eecf0 100644
--- a/sci-libs/cfitsio/ChangeLog
+++ b/sci-libs/cfitsio/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-libs/cfitsio
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/ChangeLog,v 1.9 2006/05/23 20:13:56 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/ChangeLog,v 1.10 2006/06/02 05:42:39 nerdboy Exp $
+
+ 02 Jun 2006; Steve Arnold <nerdboy@gentoo.org>
+ files/cfitsio-3.006-configure.patch, cfitsio-2.510-r1.ebuild,
+ cfitsio-3.006.ebuild:
+ Updated symlinks in both recent versions, fix for bug 135130.
23 May 2006; Markus Rothe <corsair@gentoo.org> cfitsio-2.510-r1.ebuild:
Stable on ppc64
diff --git a/sci-libs/cfitsio/cfitsio-2.510-r1.ebuild b/sci-libs/cfitsio/cfitsio-2.510-r1.ebuild
index 8941d39da217..a6ae22b5085c 100644
--- a/sci-libs/cfitsio/cfitsio-2.510-r1.ebuild
+++ b/sci-libs/cfitsio/cfitsio-2.510-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-2.510-r1.ebuild,v 1.3 2006/05/23 20:13:56 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-2.510-r1.ebuild,v 1.4 2006/06/02 05:42:39 nerdboy Exp $
inherit eutils multilib toolchain-funcs
@@ -44,5 +44,5 @@ src_install () {
insinto /usr/include
doins fitsio.h fitsio2.h longnam.h drvrsmem.h
cd ${D}/usr/$(get_libdir)
- dosym libcfitsio.so.0.0 /usr/$(get_libdir)/libcfitsio.so
+ dosym libcfitsio.so.0 /usr/$(get_libdir)/libcfitsio.so
}
diff --git a/sci-libs/cfitsio/cfitsio-3.006.ebuild b/sci-libs/cfitsio/cfitsio-3.006.ebuild
index bd261bdfc809..5e7d8b01b921 100644
--- a/sci-libs/cfitsio/cfitsio-3.006.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.006.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.006.ebuild,v 1.3 2006/05/17 06:58:27 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.006.ebuild,v 1.4 2006/06/02 05:42:39 nerdboy Exp $
inherit eutils multilib toolchain-funcs
@@ -44,4 +44,5 @@ src_install () {
doins fitsio.h fitsio2.h longnam.h drvrsmem.h
cd ${D}/usr/$(get_libdir)
dosym libcfitsio.so.0.0 /usr/$(get_libdir)/libcfitsio.so
+ dosym libcfitsio.so.0.0 /usr/$(get_libdir)/libcfitsio.so.0
}
diff --git a/sci-libs/cfitsio/files/cfitsio-3.006-configure.patch b/sci-libs/cfitsio/files/cfitsio-3.006-configure.patch
index 1144e3651bf5..285f9811c806 100644
--- a/sci-libs/cfitsio/files/cfitsio-3.006-configure.patch
+++ b/sci-libs/cfitsio/files/cfitsio-3.006-configure.patch
@@ -23,8 +23,8 @@
;;
lnx)
SHLIB_LD=":"
-+ LD_FLAGS="-shared -Wl,-soname,libcfitsio.so.1"
-+ SHLIB_SUFFIX=".so.0"
++ LD_FLAGS="-shared -Wl,-soname,libcfitsio.so.0.0"
++ SHLIB_SUFFIX=".so.0.0"
;;
osf)
SHLIB_LD="ld -shared -expect_unresolved '*'"
@@ -33,7 +33,7 @@
# if test "x$GCC" = xyes; then
if test "x$GCC" = xyes && test "x$EXT" != xdarwin && test "x$EXT" != xcygwin; then
- SHLIB_LD="$CC -shared"
-+ SHLIB_LD="gcc -shared -Wl,-soname,libcfitsio.so.1"
++ SHLIB_LD="gcc -shared -Wl,-soname,libcfitsio.so.0.0"
lhea_shlib_cflags='-fPIC'
fi
if test "x$lhea_shlib_cflags" != x; then