building shared libs now

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

4 files changed, 68 insertions, 19 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/Manifest b/sci-libs/neartree/Manifest
index a38ce9ff3229..909b3a94d736 100644
--- a/sci-libs/neartree/Manifest
+++ b/sci-libs/neartree/Manifest
@@ -2,17 +2,18 @@
 Hash: SHA1
 
 AUX 2.1.4-FLAGS.patch 2506 RMD160 4348d93a6875bd4810eb05e37e06ae7739b215c5 SHA1 ccf6f7580729b05d2dc7527c9bc7a65c124ec7fb SHA256 3a9390047f038a30490545e97b0b4580295efc5d1a0ee6b3a6d13897c843ba98
+AUX 2.1.4-dynlib.patch 1576 RMD160 b90493738f67c58b56f7159589e8d0dffaa8fd8a SHA1 86413413101ceb9b84001ce4434e87b9c6b6f30a SHA256 e566eacfcf5943ccb5ba2350bd7f96dfd1be2282c5f9ae85bc3ee2447a2c2025
 AUX 2.1.4-gcc4.3.patch 616 RMD160 9a3c54f125c8f8d15b026a8799d58aff6c7b9faf SHA1 7dc0d4a04b7a4f7456059da1ebf223ca699773d3 SHA256 a04edc6d830d13707adb4b386ad5f31cc93efae2e4168cfb6e94cd7c1bd8f6b0
 AUX 2.1.4-iterator.patch 845 RMD160 33c451d43b0817680818648e91ce146e5c2f71c2 SHA1 b0e7b24400eedd129a1a0bd4fffeada2a79c80bd SHA256 977f9d70688cbd42baeba9262ad113797bcee76e455629ca7fac26d06e2a7de8
 AUX 2.1.4-test.patch 638 RMD160 8d3352b9c48ed13f724d10e6551cca4df478e466 SHA1 86937e57f7e5d0f5e82d91b91bfe42394502d29b SHA256 0771a2a7ac552d56d8642388300ba1b4b51d781aeb89e7594ef9ea0129d5f0ad
 DIST neartree-2.1.4.zip 95970 RMD160 cbf90912f9ce8f162c5440bd67d695168c92c6c3 SHA1 aa5ef6174ed81423423145cf7facdc0f6a4decb8 SHA256 54ba8d6e35734586605221342b62b78ee11e88d7855e2ba34130deed5f70ef55
-EBUILD neartree-2.1.4.ebuild 1348 RMD160 ee8e211e8fe05d6aa523f25e311587b14935817b SHA1 8c525fe3bbae24a0077ddadcd7712b2f322e8cbc SHA256 c76c4b5020211086fb19ec37703a168fe34a5ff0bfd6f330d0ed18f6077be1af
-MISC ChangeLog 547 RMD160 fb975caa26ccfe541e8907465a184b77b3794276 SHA1 9776b8abdc739d007d00859eec657277d6b7fdb1 SHA256 ae7992f3082b4d6b2ebaad439797ebcbd24346a6a2fc3282ad615f7be049bc38
+EBUILD neartree-2.1.4-r1.ebuild 1531 RMD160 6a14e9946b65b470542e9a85f68ab521d433a69f SHA1 ee651e01809ced6d921ef0ea3c27a94e81e325e8 SHA256 0cf5e86e13180bc8da0e10d16dfa188a1f79defb006533a50803e1699f394d8c
+MISC ChangeLog 745 RMD160 fb176d45128442546a0aa1e7903e1991210a9e9d SHA1 579598ba60c96d0c3af50ccc3d18bb95732d5cee SHA256 e67bf2a0e2ce8144b2bec1f82a779fcb8635a94a4061934810a0cda0f05a9a7d
 MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktp22IACgkQgAnW8HDreRaIfQCfU1pbrCIySwkcnaISZNx+jtPT
-N0YAoIgsOCAKjpcaCXUxidUfJw8FxcTX
-=HwOk
+iEYEARECAAYFAkuT9QkACgkQgAnW8HDreRbgHACfVN47r6BnwQBIztoFeecz3UgX
+4fQAoMVaLwITExIDlYdwCLfF+dM/5+qc
+=nWoR
 -----END PGP SIGNATURE-----
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