sci-libs/gamer: Fix underlinking issue

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 89 insertions, 22 deletions

diff --git a/sci-libs/gamer/ChangeLog b/sci-libs/gamer/ChangeLog
index 44e0cf14b1ca..f96d87d5a419 100644
--- a/sci-libs/gamer/ChangeLog
+++ b/sci-libs/gamer/ChangeLog
@@ -1,6 +1,12 @@
 # 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.6 2012/06/19 11:19:42 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gamer/ChangeLog,v 1.7 2013/12/06 13:03:35 jlec Exp $
+
+*gamer-1.5-r2 (06 Dec 2013)
+
+  06 Dec 2013; Justin Lecher <jlec@gentoo.org> +gamer-1.5-r2.ebuild,
+  files/1.4-multilib.patch, metadata.xml:
+  Fix underlinking issue
 
   19 Jun 2012; Justin Lecher <jlec@gentoo.org> files/1.5-underlinking.patch:
   Fix relink problems of libtool, #421749
diff --git a/sci-libs/gamer/Manifest b/sci-libs/gamer/Manifest
index 1bd3c333b325..eaf1e3e68154 100644
--- a/sci-libs/gamer/Manifest
+++ b/sci-libs/gamer/Manifest
@@ -1,21 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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 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 953 RMD160 da2aeefee7286ddd415d5295a3224263dd03db12 SHA1 505a195135bf6c0af6ac270acdb5335dcfb74523 SHA256 84d2b2f7de03eca66f00d940a09ed644797aee6ae8208ae12b0642a9967d9a68
-MISC metadata.xml 219 RMD160 e9da2d4271f89b9dbac478d145a519318f0f3314 SHA1 6d4a101013d6a40cd61cb2d8c6b517c443013bc7 SHA256 0be94b46df4c9a73494034f33b1371769951f52890e5c857ebe1dc9bc729d0a8
+AUX 1.4-doc.patch 535 SHA256 dadce11b0201712e55bf1ddc095f174b2ea5424ce37c29ac7f815b4211a27a95 SHA512 639f0e80eb116c77d723f707488cd66124f1eaefa2f74c2fff80152ce0cf7f17b9c334f33500eeb0f78f11b0574bb20945dcd9718b1ef5e9a149ccce07981228 WHIRLPOOL aa5b23cf2be9ec818269b5733c7a142972cd95282ebcad46b2bf39b875c59c3961d297413aa1443b4eaa9413f5f0919cfc31a50b9852fa8fa0a47a44e69d7a93
+AUX 1.4-multilib.patch 872 SHA256 caf21218d42403d86662b35c5ceeaaf28040435266af4ae01acebfee90213a98 SHA512 44ac7731277c47b822bbcac11b62d62e397c539d7a9dd32c805ee656ecc2cc4cad2878082212abded212419bf609823c21f9d351ad828a07357c9b2900c112e9 WHIRLPOOL df95ada76b55ad18d676ee9880653f9451f259159ef6c593bf9a56774d9c0f950d8d5ff52c4f9bbf43915d691e5dfac15c613779b5d633fe113606bd04e2cb82
+AUX 1.5-underlinking.patch 1229 SHA256 477b665da2d6889f62374a92102d142167846b0cb1b47aa406db31fb1256bf41 SHA512 622c86f2fc968d0b9003bbda8760554f482be579ac748a756c604dc86d14884d0cc077fcfc206daef8f570cae54394edc8c03181c625f1321cbfc1c61b81c40b WHIRLPOOL dcda7d6365625d843944a2541a6b11185501a1c88f6de4ff001502947e613d0b6450d0ab3ecfcc7ae368c0b93f5b060c7f48b5fe40828128302dac634eda8125
+DIST gamer-1.4.tar.gz 3948295 SHA256 8b4177556e2868632dee3ffd941903ded4f763b0955b616b8bf97809c0e75ce1
+DIST gamer-1.5.tar.gz 4232061 SHA256 3dce4a5137bf1a2b4ee84bde425ea83937b5f8442f1b95b1d284f07dae933788 SHA512 4911b208ae5cd7be7ef165bac8fc9680ff03c0936881ae3d162205df9ef4f3fb176455e27b2f4ca202c3129352156cf5166b1d7d99fde7b281b404e383f72a44 WHIRLPOOL cc32e8772d32bc11a2bed8f5bad124ff4a1c3fad2e2f15462c9fb710f8de82547ae5db9ad0a87a6469ca9839c4e066c9eadc32c5decdb9c207eead2f8a939eb2
+EBUILD gamer-1.4.ebuild 1188 SHA256 725dbe163d93803d7e937c6fc570ee458762b018ea8a0a1ec0875aecc9eafad7 SHA512 13affdda072911e7f1d5e3e41c340be4633ec4b14e1d34663936467fb4ce5600961041b1486a8e330e65403b72472cd0f1ac374bfca04e57b21ebfb0bb96cdd0 WHIRLPOOL eaafd6884fa5563fc73ab3f509c0b6850e0082aa26ff69f6f682195bccb4293e23d68819162c1f94c95afa719f55d1da17253b04a48418278f32406a2c175c17
+EBUILD gamer-1.5-r1.ebuild 1160 SHA256 32627f1cdd745c02c61a8e4f3f6ee0a58659e94c8a985a62d474dd6001f1bfba SHA512 d2642e9229e513c40959f4edcbdbfdce153fc46465a43df8a99acec02d33ae2f15fac5c1eb5e993e52f3e6e130ba7d6805b3bbb26015356d7dfa154f84036753 WHIRLPOOL 96611e915662663e9d1125865dc42133127587057f6da248ddf0ff7ef5bc6b204a2be0ad66b996da2f6fe3205d8b63b2f7df04c3fd5c4fa73afa34be3bf670f4
+EBUILD gamer-1.5-r2.ebuild 1172 SHA256 409373cf38bb7528615d041767010a1e735c259f2e41425e450a41652d5df9fd SHA512 4f0ebaf411343c1f1d3459d42f518dcca6eb71ce43615748801879edf408ff0429559d7bae475728afc0090207143a5c95f376219d9b5d64c3d016bdc82c040c WHIRLPOOL 1b9c72f1a681f72a588e7a7934b3e3d57c644abf98d01479ec5b7e85bc77aaf5b40ec11eb5fd02ff6cfec54ddccb0a0077496ec21662bfbf9a490062ff8ea9f1
+EBUILD gamer-1.5.ebuild 1169 SHA256 ca67babebaa5f09dfd6f3cffa5937fd1fa39b2d3d270dc1ba8ee4cb9e762c55a SHA512 1a7d6f2e9a163d00dbda8e971730f7785037576d439f3f45261f6fb72e0744847e6e75923136d27f261e266bf821f1f3b1d87b94353c2b34dda9ea6889af4044 WHIRLPOOL 0e3518edd7cc71cdc8c8dce0a616354fc0407074dd34f67e2dcad0140cace2283ceb68d73b012000906b4fca7a26f5605be0dd90b9ecd2c546ce06f363f8a6a2
+MISC ChangeLog 1119 SHA256 fc34116ec511bcfa674d345e491cd07fe9b78b9ffe65a4853c9660e5951d0e53 SHA512 9331d83c62a9ffe587a1a4c8a068bb3c44e5f015d477249ea79f48d628c9a011785d5b5dc386c861773e05b065a0bb15e52ddfe15c1b5565c9e9d1112340ff32 WHIRLPOOL cf3b92253008ae3366d345ddc0d95c98466c5e230309f00019fd74d1946acd189b19d18e608fc96919317ef66c3b8baae4437e94e9fff1623771860904a6c910
+MISC metadata.xml 224 SHA256 84b014a026c2945b1b4c6eda4a4576b09039b36c27c2f9f8920ae146a8acfa3e SHA512 3b70a09392d7a939bc59e483e63789152e8dc73351dc682548a47db282224b5d9df7eac8c51bca9847e0b647f88fe2a1e4059ffe262c89a84002a13507fb3586 WHIRLPOOL 078ad63719dd7c12015a2e69f1f00322eda7e4a85f8499b89779a9bdedc92e11bb6c8cb28d6cbdc61c144fe5f22b11264d65a06cc2e67d09a0e4ef37529df71a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREKAAYFAk/gYFMACgkQgAnW8HDreRYZoQCfVDI2Cuti0siEYQInMYuqDW4T
-CCYAn1kfcKAmhlJnR6BgFypugSo71K/a
-=m99/
+iQIcBAEBCgAGBQJSocsoAAoJELnU8jG9FVirr+kP/2398BeMQt8ZkM9KndgXty54
+5pVsPsKX1INViEFbE2aZ5HhBCz2WovdntF/Rc36iprImglYyh1v4/23q2TbtHU2U
+uftMPXfZuWqRnRed1JZfO0MJ/LzySj8IGWgrP9M2NzpynCUaS9V+4IeYl2ZjLAtH
+Od0fHEM2z2YlOrqrLijwWPpkfIZzNSLtxIZNb+AF8w92j9ZUFUiGIG5mgqSUQIk/
+R4sNJjgGib/XuhprnfvIH5zdteLwT6lkkKXDRjFu5MQDFhqNsf5Dn2vwx5iFksp+
+Ji3o6wS8FzUIyISe6b5fcn6oCc8XJOn1Qe1dq744yOC9RQwjh+NwrOYoiczKwRCN
+8c4Zis6/fBt3/nfDKNgfVhtM2cTY/R5GdMAMCo36fXQhMXAG7v1kH7evAq8l9rSD
+XGg3pVV5dNTu9sWGW2ZAUJzKgRBxwuUCOPU8GGDhRH4+HHpibq8JQxE87oFq7hb9
+7PHldIuTd5N9r4JjKjm6usjnNfOO68vsBB2LEvbVcE1jAF4fOUY3ZTtyh7Vj84Cs
+6uDm6NPGO6k/KJR1j0o4z4KLlitlPsq+smzlM/YVGvznca5OgmwJZ622BN/wiXrO
+rLSs8btqCbF2ZAdLIH0N/iEYWkNem9Zb6/xlG7nSW+GNv37dXtY0XEg9Kfgzd4E9
+8ZYzVUXu/T1ba2vI5a02
+=xChV
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/gamer/files/1.4-multilib.patch b/sci-libs/gamer/files/1.4-multilib.patch
index 85ccc9539839..3ebc8dcd7aab 100644
--- a/sci-libs/gamer/files/1.4-multilib.patch
+++ b/sci-libs/gamer/files/1.4-multilib.patch
@@ -11,7 +11,7 @@ index de1d7c3..b2420c8 100644
  
  libgamer_la_SOURCES = 
 -libgamer_la_LIBADD  = ${BASE_LIBS} ${BIOM_LIBS}
-+libgamer_la_LIBADD  = ${BASE_LIBS} ${BIOM_LIBS} -lm -lstdc++
++libgamer_la_LIBADD  = ${BASE_LIBS} ${BIOM_LIBS} -lm -lstdc++ ../tetgen/libtetgen.la
  libgamer_la_LDFLAGS = -version-info ${FETK_VERSION}
  
  libtriangle_la_SOURCES = 
diff --git a/sci-libs/gamer/gamer-1.5-r2.ebuild b/sci-libs/gamer/gamer-1.5-r2.ebuild
new file mode 100644
index 000000000000..f4be70b11637
--- /dev/null
+++ b/sci-libs/gamer/gamer-1.5-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gamer/gamer-1.5-r2.ebuild,v 1.1 2013/12/06 13:03:35 jlec Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils multilib
+
+DESCRIPTION="Geometry-preserving Adaptive MeshER"
+HOMEPAGE="http://fetk.org/codes/gamer/index.html"
+SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+IUSE="doc static-libs"
+
+RDEPEND=">=dev-libs/maloc-1.4"
+DEPEND="
+	${RDEPEND}
+	doc? (
+		media-gfx/graphviz
+		app-doc/doxygen )"
+
+S="${WORKDIR}"/${PN}
+
+PATCHES=(
+		"${FILESDIR}"/1.4-multilib.patch
+		"${FILESDIR}"/1.4-doc.patch )
+
+src_configure() {
+	local fetk_include
+	local fetk_lib
+	local myeconfargs
+
+	use doc || myeconfargs+=( ${myconf} --with-doxygen= --with-dot= )
+
+	fetk_include="${EPREFIX}"/usr/include
+	fetk_lib="${EPREFIX}"/usr/$(get_libdir)
+	export FETK_INCLUDE="${fetk_include}"
+	export FETK_LIBRARY="${fetk_lib}"
+
+	myeconfargs+=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--disable-triplet
+		--enable-shared
+		)
+	autotools-utils_src_configure
+}
diff --git a/sci-libs/gamer/metadata.xml b/sci-libs/gamer/metadata.xml
index 210ad0db014c..5ef07a39e7e1 100644
--- a/sci-libs/gamer/metadata.xml
+++ b/sci-libs/gamer/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<maintainer>
-		<email>jlec@gentoo.org</email>
-	</maintainer>
+  <herd>sci</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>