building shared libs now

(Portage version: 2.2_rc65/cvs/Linux x86_64)

3 files changed, 62 insertions, 14 deletions

diff --git a/sci-libs/neartree/ChangeLog b/sci-libs/neartree/ChangeLog
index 969b3c4c2f97..2dabf8922e45 100644
--- a/sci-libs/neartree/ChangeLog
+++ b/sci-libs/neartree/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/neartree
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/ChangeLog,v 1.1 2010/02/03 20:23:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/ChangeLog,v 1.2 2010/03/07 18:48:36 jlec Exp $
+
+*neartree-2.1.4-r1 (07 Mar 2010)
+
+  07 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +files/2.1.4-dynlib.patch, -neartree-2.1.4.ebuild,
+  +neartree-2.1.4-r1.ebuild:
+  building shared libs now
 
 *neartree-2.1.4 (03 Feb 2010)
 
diff --git a/sci-libs/neartree/files/2.1.4-dynlib.patch b/sci-libs/neartree/files/2.1.4-dynlib.patch
new file mode 100644
index 000000000000..823497337a2b
--- /dev/null
+++ b/sci-libs/neartree/files/2.1.4-dynlib.patch
@@ -0,0 +1,45 @@
+diff --git a/Makefile b/Makefile
+index 10e9ba2..54a3a89 100644
+--- a/Makefile
++++ b/Makefile
+@@ -42,7 +42,7 @@
+ 
+ # Version string
+ VERSION = 3:0:0
+-RELEASE = 2.1.3
++RELEASE = 2.1.4
+ 
+ 
+ #
+@@ -120,8 +120,8 @@ BUILD_COMMAND_STATIC   =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static-libtool
+ INSTALL_COMMAND        =  $(LIBTOOL) --mode=install cp
+ INSTALL_FINISH_COMMAND =  $(LIBTOOL) --mode=finish
+ 
+-OBJ_EXT                =  lo
+-LIB_EXT                =  la
++OBJ_EXT                =  o
++LIB_EXT                =  so
+ 
+ ######################################################################
+ #  You should not need to make modifications below this line         #
+@@ -218,8 +218,7 @@ endif
+ # Compile the library and examples
+ #
+ all:	$(LIB) $(BIN) $(SOURCE) $(HEADERS) \
+-		$(LIB)/libCNearTree.$(LIB_EXT) \
+-		$(BIN)/CPPMain $(BIN)/CMain $(BIN)/CPPNearTreeTest $(BIN)/CNearTreeTest
++		$(LIB)/libCNearTree.$(LIB_EXT)
+ 		
+ install:  all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include \
+           $(INC) $(LIB)/libCNearTree.$(LIB_EXT)  $(INC)/TNear.h $(INC)/CNearTree.h $(INC)/rhrand.h
+@@ -270,8 +269,8 @@ $(BIN):
+ # CNearTree library
+ #
+ $(LIB)/libCNearTree.$(LIB_EXT): $(SRC)/CNearTree.c $(INC)/CNearTree.h $(LIB) $(COMMONDEP)
+-	$(COMPILE_COMMAND) -c $(SRC)/CNearTree.c
+-	$(LIBRARY_LINK_COMMAND) -o $(LIB)/libCNearTree.$(LIB_EXT) CNearTree.$(OBJ_EXT)  $(INCLUDES) \
++	$(CC) $(CFLAGS) -fPIC -c $(SRC)/CNearTree.c -o CNearTree.o -I.
++	$(CC) $(LDFLAGS) -Wl,--soname,libCNearTree.so.2 -shared -o libCNearTree.so.$(RELEASE) *.$(OBJ_EXT) \
+ 	$(CLIBRARIES)
+ 
+ #
diff --git a/sci-libs/neartree/neartree-2.1.4.ebuild b/sci-libs/neartree/neartree-2.1.4-r1.ebuild
index 88a1c6790c41..91b4fb397471 100644
--- a/sci-libs/neartree/neartree-2.1.4.ebuild
+++ b/sci-libs/neartree/neartree-2.1.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/neartree-2.1.4.ebuild,v 1.1 2010/02/03 20:23:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/neartree-2.1.4-r1.ebuild,v 1.1 2010/03/07 18:48:36 jlec Exp $
 
 EAPI="3"
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit base flag-o-matic multilib toolchain-funcs versionator
 
 MY_PN=NearTree
 MY_P="${MY_PN}-${PV}"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}/${MY_PN}.zip -> ${P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-libs/cvector"
@@ -28,6 +28,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PV}-gcc4.3.patch
 	epatch "${FILESDIR}"/${PV}-iterator.patch
 	epatch "${FILESDIR}"/${PV}-test.patch
+	epatch "${FILESDIR}"/${PV}-dynlib.patch
 
 	sed \
 		-e "s:GENTOOLIBDIR:$(get_libdir):g" \
@@ -42,19 +43,14 @@ src_compile() {
 		all || die
 }
 
-src_test() {
-	emake \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		tests || die
-}
-
 src_install() {
-	dobin bin/* || die "failed to install bins"
-	dolib.a lib/.libs/*.a || die "failed to install libs"
+	dolib.so *.so.${PV} || die
+	dosym libCNearTree.so.${PV} /usr/$(get_libdir)/libCNearTree.so.$(get_version_component_range 1-2) || die
+	dosym libCNearTree.so.${PV} /usr/$(get_libdir)/libCNearTree.so.$(get_major_version) || die
+	dosym libCNearTree.so.${PV} /usr/$(get_libdir)/libCNearTree.so || die
 
 	insinto /usr/include
-	doins *.h || die "failed to install includes"
+	doins CNearTree.h || die
 
 	dodoc README_NearTree.txt || die
 	dohtml *.html || die