summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-06-19 11:19:42 +0000
committerJustin Lecher <jlec@gentoo.org>2012-06-19 11:19:42 +0000
commit186b54cb00027e675eaa9065f97ecda0bdfff622 (patch)
treeb829a573c555a6f2ef9ed47b88ce6b655eccf175 /sci-libs/gamer
parentold (diff)
downloadhistorical-186b54cb00027e675eaa9065f97ecda0bdfff622.tar.gz
historical-186b54cb00027e675eaa9065f97ecda0bdfff622.tar.bz2
historical-186b54cb00027e675eaa9065f97ecda0bdfff622.zip
sci-libs/gamer: Fix relink problems of libtool, #421749
Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64
Diffstat (limited to 'sci-libs/gamer')
-rw-r--r--sci-libs/gamer/ChangeLog5
-rw-r--r--sci-libs/gamer/Manifest10
-rw-r--r--sci-libs/gamer/files/1.5-underlinking.patch24
3 files changed, 29 insertions, 10 deletions
diff --git a/sci-libs/gamer/ChangeLog b/sci-libs/gamer/ChangeLog
index 716c71dfb0a6..44e0cf14b1ca 100644
--- a/sci-libs/gamer/ChangeLog
+++ b/sci-libs/gamer/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/gamer
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gamer/ChangeLog,v 1.5 2012/05/30 12:41:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gamer/ChangeLog,v 1.6 2012/06/19 11:19:42 jlec Exp $
+
+ 19 Jun 2012; Justin Lecher <jlec@gentoo.org> files/1.5-underlinking.patch:
+ Fix relink problems of libtool, #421749
*gamer-1.5-r1 (30 May 2012)
diff --git a/sci-libs/gamer/Manifest b/sci-libs/gamer/Manifest
index dd958799ad89..1bd3c333b325 100644
--- a/sci-libs/gamer/Manifest
+++ b/sci-libs/gamer/Manifest
@@ -3,19 +3,19 @@ Hash: SHA512
AUX 1.4-doc.patch 535 RMD160 cf367f54358caf438edf91341138d7eeb9d785ba SHA1 7142b84ff0d17a19cd81c4208563e159f08637c0 SHA256 dadce11b0201712e55bf1ddc095f174b2ea5424ce37c29ac7f815b4211a27a95
AUX 1.4-multilib.patch 849 RMD160 693534c70383f42f9786f477390af6e3f85da496 SHA1 282270bee8df24be47ed094d42ad835c3f1c0e9a SHA256 6ad93bb5d1d8826cacf8cf4be4d3b7be40fadd9e2b8eac69068637a08160d740
-AUX 1.5-underlinking.patch 862 RMD160 72bed4238e99f1d79dae21a26462659be115ce08 SHA1 d7dec41b62c6dc3ad795d3150d206cc31e3e39e6 SHA256 29f173fa8fffaa2c6ffd12579479e93335cf7e0cd9414ce3cf10019ca342cd04
+AUX 1.5-underlinking.patch 1229 RMD160 3d5605cebe784540e78c3007bd4d1ffb1616dba8 SHA1 6b020ccdd362f14e118c0c3f1b5c9aaf43ff60b1 SHA256 477b665da2d6889f62374a92102d142167846b0cb1b47aa406db31fb1256bf41
DIST gamer-1.4.tar.gz 3948295 RMD160 13710685ea1675cf4a60fcb6b55613ccccfe27c2 SHA1 3e7873ae5418b9fc8995fd2941a6597faadad664 SHA256 8b4177556e2868632dee3ffd941903ded4f763b0955b616b8bf97809c0e75ce1
DIST gamer-1.5.tar.gz 4232061 RMD160 2efcb2ce269c6563c76833c728671c97abf546db SHA1 e0e4fddc19ca22fd58ee469941fae8886e33c952 SHA256 3dce4a5137bf1a2b4ee84bde425ea83937b5f8442f1b95b1d284f07dae933788
EBUILD gamer-1.4.ebuild 1188 RMD160 002f00f8d1e766abe9f027519cfc18761f530708 SHA1 384e901078f1f12ddcb37caa0e0e44f43840bc3c SHA256 725dbe163d93803d7e937c6fc570ee458762b018ea8a0a1ec0875aecc9eafad7
EBUILD gamer-1.5-r1.ebuild 1160 RMD160 9f47da286e2321daf444f1e7977641778d9283b2 SHA1 2bae2db8dab5ae6699f65485d144eb6bdb0d521c SHA256 32627f1cdd745c02c61a8e4f3f6ee0a58659e94c8a985a62d474dd6001f1bfba
EBUILD gamer-1.5.ebuild 1169 RMD160 4b6661669efb39fd7b879f9207a4e68071260819 SHA1 50721e9fd56f2dbc4a3ca4e4f757a98b9c249522 SHA256 ca67babebaa5f09dfd6f3cffa5937fd1fa39b2d3d270dc1ba8ee4cb9e762c55a
-MISC ChangeLog 833 RMD160 00dfe9089af4a4170f30b68a1c3828b14bdae629 SHA1 70c10161fdca87bc14050aee44800e71d1326a19 SHA256 a009edcfb1868970250392f58a23f3863ee79d140805fefb2e8bb14edf646fd9
+MISC ChangeLog 953 RMD160 da2aeefee7286ddd415d5295a3224263dd03db12 SHA1 505a195135bf6c0af6ac270acdb5335dcfb74523 SHA256 84d2b2f7de03eca66f00d940a09ed644797aee6ae8208ae12b0642a9967d9a68
MISC metadata.xml 219 RMD160 e9da2d4271f89b9dbac478d145a519318f0f3314 SHA1 6d4a101013d6a40cd61cb2d8c6b517c443013bc7 SHA256 0be94b46df4c9a73494034f33b1371769951f52890e5c857ebe1dc9bc729d0a8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
Comment: GPGTools - http://gpgtools.org
-iEYEAREKAAYFAk/GFY4ACgkQgAnW8HDreRYPawCffXxBAlbXFv/mo2gBHmGMrbx3
-CmwAnj8vNur5R6gLzDoiES3fBLjMX6si
-=Kjsf
+iEYEAREKAAYFAk/gYFMACgkQgAnW8HDreRYZoQCfVDI2Cuti0siEYQInMYuqDW4T
+CCYAn1kfcKAmhlJnR6BgFypugSo71K/a
+=m99/
-----END PGP SIGNATURE-----
diff --git a/sci-libs/gamer/files/1.5-underlinking.patch b/sci-libs/gamer/files/1.5-underlinking.patch
index fba071ed0ee2..6cd8c93e49f6 100644
--- a/sci-libs/gamer/files/1.5-underlinking.patch
+++ b/sci-libs/gamer/files/1.5-underlinking.patch
@@ -1,10 +1,26 @@
+ src/aaa_lib/Makefile.am | 17 +++--------------
+ 1 files changed, 3 insertions(+), 14 deletions(-)
+
diff --git a/src/aaa_lib/Makefile.am b/src/aaa_lib/Makefile.am
-index de1d7c3..b2420c8 100644
+index de1d7c3..83e2e5c 100644
--- a/src/aaa_lib/Makefile.am
+++ b/src/aaa_lib/Makefile.am
-@@ -35,18 +35,17 @@ LIBTETGEN = libtetgen.la
- #LIBTETGEN =
- #endif
+@@ -22,31 +22,20 @@ BASE_LIBS = ../base/libbase.la
+ BIOM_LIBS = ../biom/libbiom.la
+
+ TRIANGLE_LIBS = ../triangle/libtriangle.la
+-#if BUILD_TRIANGLE
+-LIBTRIANGLE = libtriangle.la
+-#else
+-#LIBTRIANGLE =
+-#endif
+
+ TETGEN_LIBS = ../tetgen/libtetgen.la
+-#if BUILD_TETGEN
+-LIBTETGEN = libtetgen.la
+-#else
+-#LIBTETGEN =
+-#endif
-libdir = ${prefix}/lib
lib_LTLIBRARIES = libgamer.la ${LIBTRIANGLE} ${LIBTETGEN}