summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-03-03 12:42:47 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-03-03 12:42:47 +0000
commit44cae61c267f5816ba3dc4ac1ad21503cef01f34 (patch)
treebad87be189f2d1495a49e0c394828bc663666c0b /sci-libs/fftw
parentMarked ~amd64, keywording KDE split ebuilds, bug 80944. (diff)
downloadhistorical-44cae61c267f5816ba3dc4ac1ad21503cef01f34.tar.gz
historical-44cae61c267f5816ba3dc4ac1ad21503cef01f34.tar.bz2
historical-44cae61c267f5816ba3dc4ac1ad21503cef01f34.zip
Multilib fixes.
Package-Manager: portage-2.0.51.18
Diffstat (limited to 'sci-libs/fftw')
-rw-r--r--sci-libs/fftw/ChangeLog6
-rw-r--r--sci-libs/fftw/Manifest14
-rw-r--r--sci-libs/fftw/fftw-2.1.5-r1.ebuild25
3 files changed, 29 insertions, 16 deletions
diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index dd259d884825..db3d749ff00f 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/fftw
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.5 2005/01/13 17:23:46 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.6 2005/03/03 12:42:47 eradicator Exp $
+
+ 03 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+ fftw-2.1.5-r1.ebuild:
+ Multilib fixes.
13 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>; fftw-2.1.5-r1.ebuild:
Change insinto "${D}usr/include" to insinto /usr/include, thanks to Seemant
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index aeb92ba13525..4232a21ee277 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,5 +1,8 @@
-MD5 50c2b6c6e7fd13e1ed163e69b49882cf ChangeLog 4723
-MD5 7fb2a3804fd09fa02c5672172ea5070a fftw-2.1.5-r1.ebuild 4113
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 89a53424760f7b8622b6bb769594b4ed ChangeLog 4824
+MD5 03d9875302fd899418bfe73f4d38de14 fftw-2.1.5-r1.ebuild 4138
MD5 43c18140a8e39d5b9858b0517086068d fftw-3.0.1-r1.ebuild 2697
MD5 158f42a78e4eefe222b212aaffe71c24 fftw-3.0.1.ebuild 2365
MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
@@ -7,3 +10,10 @@ MD5 236dda9695005c9f306fb2c55f020686 files/digest-fftw-2.1.5-r1 63
MD5 cd32698a34d886267d48a8ccb99747b1 files/digest-fftw-3.0.1 63
MD5 cd32698a34d886267d48a8ccb99747b1 files/digest-fftw-3.0.1-r1 63
MD5 7718e5a1330e574b38daecb472bffa17 files/fftw-ppc-macos.patch 1356
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD4DBQFCJwZRArHZZzCEUG0RAsAKAJdSLHC0K5nxuFbz1OUVMjg8tmo7AJ4xGVoz
+g/AP9jWvbrR2qC/ItSSv9A==
+=B9RX
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/fftw/fftw-2.1.5-r1.ebuild b/sci-libs/fftw/fftw-2.1.5-r1.ebuild
index 64f50c269050..66dae44e76e7 100644
--- a/sci-libs/fftw/fftw-2.1.5-r1.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r1.ebuild,v 1.3 2005/01/13 17:23:46 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r1.ebuild,v 1.4 2005/03/03 12:42:47 eradicator Exp $
-inherit flag-o-matic
+inherit flag-o-matic multilib
IUSE="mpi"
@@ -14,7 +14,6 @@ DEPEND="mpi? ( >=sys-cluster/lam-mpi-6.5.6 )"
SLOT="2.1"
LICENSE="GPL-2"
-#remove ~'s on ppc and sparc when removig on x86 (as per recent discussion on -core)
KEYWORDS="x86 ppc sparc alpha amd64"
#this one is reported to cause trouble on pentium4 m series
@@ -117,22 +116,22 @@ src_install () {
dosym srfftw.h /usr/include/rfftw.h
dosym sfftw_threads.h /usr/include/fftw_threads.h
dosym srfftw_threads.h /usr/include/rfftw_threads.h
- cd ${D}usr/lib
- dosym libsfftw.so /usr/lib/libfftw.so
- dosym libsrfftw.so /usr/lib/librfftw.so
- dosym libsfftw_threads.so /usr/lib/libfftw_threads.so
- dosym libsrfftw_threads.so /usr/lib/librfftw_threads.so
+ cd ${D}usr/$(get_libdir)
+ dosym libsfftw.so /usr/$(get_libdir)/libfftw.so
+ dosym libsrfftw.so /usr/$(get_libdir)/librfftw.so
+ dosym libsfftw_threads.so /usr/$(get_libdir)/libfftw_threads.so
+ dosym libsrfftw_threads.so /usr/$(get_libdir)/librfftw_threads.so
else
cd ${D}usr/include
dosym dfftw.h /usr/include/fftw.h
dosym drfftw.h /usr/include/rfftw.h
dosym dfftw_threads.h /usr/include/fftw_threads.h
dosym drfftw_threads.h /usr/include/rfftw_threads.h
- cd ${D}usr/lib
- dosym libdfftw.so /usr/lib/libfftw.so
- dosym libdrfftw.so /usr/lib/librfftw.so
- dosym libdfftw_threads.so /usr/lib/libfftw_threads.so
- dosym libdrfftw_threads.so /usr/lib/librfftw_threads.so
+ cd ${D}usr/$(get_libdir)
+ dosym libdfftw.so /usr/$(get_libdir)/libfftw.so
+ dosym libdrfftw.so /usr/$(get_libdir)/librfftw.so
+ dosym libdfftw_threads.so /usr/$(get_libdir)/libfftw_threads.so
+ dosym libdrfftw_threads.so /usr/$(get_libdir)/librfftw_threads.so
fi
cd "${S}-single/fortran"