sci-libs/gamer: Fix underlinking

(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

3 files changed, 83 insertions, 1 deletions

diff --git a/sci-libs/gamer/ChangeLog b/sci-libs/gamer/ChangeLog
index bfaad2688f23..716c71dfb0a6 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.4 2012/04/30 17:21:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gamer/ChangeLog,v 1.5 2012/05/30 12:41:45 jlec Exp $
+
+*gamer-1.5-r1 (30 May 2012)
+
+  30 May 2012; Justin Lecher <jlec@gentoo.org> +files/1.5-underlinking.patch,
+  +gamer-1.5-r1.ebuild:
+  Fix underlinking
 
   30 Apr 2012; Justin Lecher <jlec@gentoo.org> gamer-1.5.ebuild, metadata.xml:
   Handle static libs
diff --git a/sci-libs/gamer/files/1.5-underlinking.patch b/sci-libs/gamer/files/1.5-underlinking.patch
new file mode 100644
index 000000000000..fba071ed0ee2
--- /dev/null
+++ b/sci-libs/gamer/files/1.5-underlinking.patch
@@ -0,0 +1,26 @@
+diff --git a/src/aaa_lib/Makefile.am b/src/aaa_lib/Makefile.am
+index de1d7c3..b2420c8 100644
+--- a/src/aaa_lib/Makefile.am
++++ b/src/aaa_lib/Makefile.am
+@@ -35,18 +35,17 @@ LIBTETGEN   = libtetgen.la
+ #LIBTETGEN   = 
+ #endif
+ 
+-libdir = ${prefix}/lib
+ lib_LTLIBRARIES = libgamer.la ${LIBTRIANGLE} ${LIBTETGEN}
+ 
+ libgamer_la_SOURCES = 
+-libgamer_la_LIBADD  = ${BASE_LIBS} ${BIOM_LIBS}
++libgamer_la_LIBADD  = ${BASE_LIBS} ${BIOM_LIBS} -lm -lstdc++ ${LIBTETGEN}
+ libgamer_la_LDFLAGS = -version-info ${FETK_VERSION}
+ 
+ libtriangle_la_SOURCES = 
+-libtriangle_la_LIBADD  = ${TRIANGLE_LIBS}
++libtriangle_la_LIBADD  = ${TRIANGLE_LIBS} -lm
+ libtriangle_la_LDFLAGS = -version-info ${FETK_VERSION}
+ 
+ libtetgen_la_SOURCES = 
+-libtetgen_la_LIBADD  = ${TETGEN_LIBS}
++libtetgen_la_LIBADD  = ${TETGEN_LIBS} -lm -lstdc++
+ libtetgen_la_LDFLAGS = -version-info ${FETK_VERSION}
+ 
diff --git a/sci-libs/gamer/gamer-1.5-r1.ebuild b/sci-libs/gamer/gamer-1.5-r1.ebuild
new file mode 100644
index 000000000000..be1693f7ce5c
--- /dev/null
+++ b/sci-libs/gamer/gamer-1.5-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gamer/gamer-1.5-r1.ebuild,v 1.1 2012/05/30 12:41:45 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}"/${PV}-underlinking.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
+		)
+	autotools-utils_src_configure
+}