Fixed clean install of libs

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

diff --git a/sci-libs/neartree/ChangeLog b/sci-libs/neartree/ChangeLog
index 2dabf8922e457b7d4f77305995c02fd5248764ae..579f2c113ee1cbbf4d435ee521aad10793c8c1cc 100644 (file)
--- 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.2 2010/03/07 18:48:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/ChangeLog,v 1.3 2010/06/15 13:31:00 jlec Exp $
+
+*neartree-2.1.4-r2 (15 Jun 2010)
+
+  15 Jun 2010; Justin Lecher <jlec@gentoo.org> -files/2.1.4-FLAGS.patch,
+  +neartree-2.1.4-r2.ebuild, -files/2.1.4-dynlib.patch,
+  +files/2.1.4-gentoo.patch, -neartree-2.1.4-r1.ebuild:
+  Fixed clean install of libs
 
 *neartree-2.1.4-r1 (07 Mar 2010)
 

diff --git a/sci-libs/neartree/Manifest b/sci-libs/neartree/Manifest
index 5c6e50b61998d0dc10b230ea1414cb863ede69a6..c311e79a15a8b6da35f39bbb9ee9257966d08389 100644 (file)
--- a/sci-libs/neartree/Manifest
+++ b/sci-libs/neartree/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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-gentoo.patch 4037 RMD160 8e9281b4649e40377ca024de1911ffed61d897a8 SHA1 5f13c7ca2b4de743addf988b30e4d9d93baf6d85 SHA256 2775c71b6655a50e3957be713208f4602d365bfbe0c0ff0a42b3a80c8a4cc79f
 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-r1.ebuild 1540 RMD160 6b793754efebca67c981318bc82f94c81cbee6d5 SHA1 c8093019aac5dedae8131c86d38601a9fcdd33fc SHA256 748a43a80bc6bfcd1c4102280ec65585db9fb6df104bba898851dc23eab0bfb0
-MISC ChangeLog 745 RMD160 fb176d45128442546a0aa1e7903e1991210a9e9d SHA1 579598ba60c96d0c3af50ccc3d18bb95732d5cee SHA256 e67bf2a0e2ce8144b2bec1f82a779fcb8635a94a4061934810a0cda0f05a9a7d
+EBUILD neartree-2.1.4-r2.ebuild 1226 RMD160 c8d3e9120bd265d98082a56ebf6b0ae1a03dbc51 SHA1 09f7abbcf8acdc162f0f983f1da5bcfa1145e596 SHA256 0272a523972f87094a48a38c10fc7b884606131102a0dc5533c5146233c6ed6a
+MISC ChangeLog 995 RMD160 1faf66124c6221c13d99eabbc36b380fb0707658 SHA1 da0a6386046edc456353fa66f510c88187db0c7a SHA256 44e67c9b08b1d6f9714df528923b409e9131df5b4ee2f190ad7a6849396cf69e
 MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkuT9dcACgkQgAnW8HDreRbTyQCePeRXCkVqxrChq/0FQmzXwdq0
-u8wAn1MbalmFKE0Jt5bSHGtKedElUTUa
-=sD/V
+iEYEARECAAYFAkwXgJoACgkQgAnW8HDreRbySgCff+A1Bbe+tZg2yAxxB7J224w4
+UKsAoJGfFarh08xrKDNAQbLnMqW9zlJN
+=rx0x
 -----END PGP SIGNATURE-----

diff --git a/sci-libs/neartree/files/2.1.4-FLAGS.patch b/sci-libs/neartree/files/2.1.4-FLAGS.patch
deleted file mode 100644 (file)
index ef95788..0000000
--- a/sci-libs/neartree/files/2.1.4-FLAGS.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 10e9ba2..796670e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -48,11 +48,11 @@ RELEASE = 2.1.3
- #
- # Compiler and compilation flags
- #
--CC    = gcc
-+CC    ?= gcc
- ifneq ($(MSYSTEM),MINGW32)
--CFLAGS  = -g -O2  -Wall  -ansi -pedantic -DCNEARTREE_SAFE_TRIANG=1
-+CFLAGS  += -ansi -DCNEARTREE_SAFE_TRIANG=1
- else
--CFLAGS  = -g -O2 -Wall  -DCNEARTREE_SAFE_TRIANG=1
-+CFLAGS  = -DCNEARTREE_SAFE_TRIANG=1
- endif
- 
- #
-@@ -72,8 +72,8 @@ endif
- # Uncomment the next two lines if CVector is installed locally in $(HOME)/include
- # and $(HOME)/lib
- #
--#CVECTOR_INCLUDE = -I$(HOME)/include 
--#CVECTOR_LIBLOC = -L$(HOME)/lib
-+CVECTOR_INCLUDE = -I/usr/include 
-+CVECTOR_LIBLOC = -L/usr/GENTOOLIBDIR
- 
- #
- # Directories
-@@ -86,7 +86,7 @@ INC      = $(ROOT)
- EXAMPLES = $(ROOT)
- TESTDATA = $(ROOT)
- ifndef INSTALL_PREFIX
--INSTALL_PREFIX = /usr/local
-+INSTALL_PREFIX = /usr
- #INSTALL_PREFIX  = $(HOME)
- endif
- 
-@@ -111,12 +111,12 @@ CPPLIBRARIES = -lm
- CLIBRARIES = $(CVECTOR_LIBLOC) -lCVector -lm
- 
- COMPILE_COMMAND        =  $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
--CPPCOMPILE_COMMAND     =  $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
--LIBRARY_LINK_COMMAND   =  $(LIBTOOL) --mode=link  $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined -rpath $(INSTALL_PREFIX)/lib
--BUILD_COMMAND_LOCAL    =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
--CPPBUILD_COMMAND_LOCAL =  $(LIBTOOL) --mode=link $(CXX) -no-undefined $(CFLAGS) $(INCLUDES)
--BUILD_COMMAND_DYNAMIC  =  $(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) -shared -I$(INSTALL_PREFIX)/include
--BUILD_COMMAND_STATIC   =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static-libtool-libs -I$(INSTALL_PREFIX)/include
-+CPPCOMPILE_COMMAND     =  $(LIBTOOL) --mode=compile $(CXX) $(CXXFLAGS) $(INCLUDES) $(WARNINGS) -c
-+LIBRARY_LINK_COMMAND   =  $(LIBTOOL) --mode=link  $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined $(LDFLAGS)
-+BUILD_COMMAND_LOCAL    =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES)
-+CPPBUILD_COMMAND_LOCAL =  $(LIBTOOL) --mode=link $(CXX) -no-undefined $(CXXFLAGS) $(LDFLAGS) $(INCLUDES)
-+BUILD_COMMAND_DYNAMIC  =  $(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) $(LDFLAGS) -shared -I/usr/include
-+BUILD_COMMAND_STATIC   =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -static-libtool-libs -I/usr/include
- INSTALL_COMMAND        =  $(LIBTOOL) --mode=install cp
- INSTALL_FINISH_COMMAND =  $(LIBTOOL) --mode=finish
- 

diff --git a/sci-libs/neartree/files/2.1.4-dynlib.patch b/sci-libs/neartree/files/2.1.4-dynlib.patch
deleted file mode 100644 (file)
index 8234973..0000000
--- a/sci-libs/neartree/files/2.1.4-dynlib.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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/files/2.1.4-gentoo.patch b/sci-libs/neartree/files/2.1.4-gentoo.patch
new file mode 100644 (file)
index 0000000..1570c91
--- /dev/null
+++ b/sci-libs/neartree/files/2.1.4-gentoo.patch
@@ -0,0 +1,95 @@
+diff --git a/Makefile b/Makefile
+index 10e9ba2..a992ea6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -42,17 +42,17 @@
+ 
+ # Version string
+ VERSION = 3:0:0
+-RELEASE = 2.1.3
++RELEASE = 2.1.4
+ 
+ 
+ #
+ # Compiler and compilation flags
+ #
+-CC    = gcc
++CC    ?= gcc
+ ifneq ($(MSYSTEM),MINGW32)
+-CFLAGS  = -g -O2  -Wall  -ansi -pedantic -DCNEARTREE_SAFE_TRIANG=1
++CFLAGS  += -ansi -DCNEARTREE_SAFE_TRIANG=1
+ else
+-CFLAGS  = -g -O2 -Wall  -DCNEARTREE_SAFE_TRIANG=1
++CFLAGS  += -DCNEARTREE_SAFE_TRIANG=1
+ endif
+ 
+ #
+@@ -72,8 +72,8 @@ endif
+ # Uncomment the next two lines if CVector is installed locally in $(HOME)/include
+ # and $(HOME)/lib
+ #
+-#CVECTOR_INCLUDE = -I$(HOME)/include 
+-#CVECTOR_LIBLOC = -L$(HOME)/lib
++CVECTOR_INCLUDE = -I/usr/include
++CVECTOR_LIBLOC = -L/usr/GENTOOLIBDIR
+ 
+ #
+ # Directories
+@@ -86,7 +86,7 @@ INC      = $(ROOT)
+ EXAMPLES = $(ROOT)
+ TESTDATA = $(ROOT)
+ ifndef INSTALL_PREFIX
+-INSTALL_PREFIX = /usr/local
++INSTALL_PREFIX = $(DESTDIR)/usr
+ #INSTALL_PREFIX  = $(HOME)
+ endif
+ 
+@@ -112,7 +112,7 @@ CLIBRARIES = $(CVECTOR_LIBLOC) -lCVector -lm
+ 
+ COMPILE_COMMAND        =  $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
+ CPPCOMPILE_COMMAND     =  $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
+-LIBRARY_LINK_COMMAND   =  $(LIBTOOL) --mode=link  $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined -rpath $(INSTALL_PREFIX)/lib
++LIBRARY_LINK_COMMAND   =  $(LIBTOOL) --mode=link  $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined -rpath $(INSTALL_PREFIX)/GENTOOLIBDIR $(LDFLAGS)
+ BUILD_COMMAND_LOCAL    =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
+ CPPBUILD_COMMAND_LOCAL =  $(LIBTOOL) --mode=link $(CXX) -no-undefined $(CFLAGS) $(INCLUDES)
+ BUILD_COMMAND_DYNAMIC  =  $(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) -shared -I$(INSTALL_PREFIX)/include
+@@ -221,10 +221,10 @@ all:     $(LIB) $(BIN) $(SOURCE) $(HEADERS) \
+               $(LIB)/libCNearTree.$(LIB_EXT) \
+               $(BIN)/CPPMain $(BIN)/CMain $(BIN)/CPPNearTreeTest $(BIN)/CNearTreeTest
+               
+-install:  all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include \
++install:  all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/GENTOOLIBDIR $(INSTALL_PREFIX)/include \
+           $(INC) $(LIB)/libCNearTree.$(LIB_EXT)  $(INC)/TNear.h $(INC)/CNearTree.h $(INC)/rhrand.h
+-                $(INSTALL_COMMAND) $(LIB)/libCNearTree.$(LIB_EXT) $(INSTALL_PREFIX)/lib/libCNearTree.$(LIB_EXT)
+-                $(INSTALL_FINISH_COMMAND) $(INSTALL_PREFIX)/lib/libCNearTree.$(LIB_EXT)
++                $(INSTALL_COMMAND) $(LIB)/libCNearTree.$(LIB_EXT) $(INSTALL_PREFIX)/GENTOOLIBDIR/libCNearTree.$(LIB_EXT)
++                $(INSTALL_FINISH_COMMAND) $(INSTALL_PREFIX)/GENTOOLIBDIR/libCNearTree.$(LIB_EXT)
+                 -cp $(INSTALL_PREFIX)/include/TNear.h $(INSTALL_PREFIX)/include/TNear_old.h
+                 -cp $(INSTALL_PREFIX)/include/CNearTree.h $(INSTALL_PREFIX)/include/CNearTree_old.h
+                 cp $(INC)/TNear.h $(INSTALL_PREFIX)/include/TNear.h
+@@ -233,14 +233,6 @@ install:  all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include
+                 chmod 644 $(INSTALL_PREFIX)/include/TNear.h
+                 chmod 644 $(INSTALL_PREFIX)/include/CNearTree.h
+                 chmod 644 $(INSTALL_PREFIX)/include/rhrand.h
+-                echo "Testing final install dynamic"
+-                $(BUILD_COMMAND_DYNAMIC) $(INCLUDES) $(EXAMPLES)/CNearTreeTest.c \
+-                -L$(INSTALL_PREFIX)/lib -lCNearTree $(CLIBRARIES) -o $(BIN)/CNearTreeTest_dynamic
+-                $(BIN)/CNearTreeTest_dynamic 
+-                echo "Testing final install static"
+-                $(BUILD_COMMAND_STATIC) $(INCLUDES) $(EXAMPLES)/CNearTreeTest.c \
+-                -L$(INSTALL_PREFIX)/lib -lCNearTree $(CLIBRARIES) -o $(BIN)/CNearTreeTest_static
+-                $(BIN)/CNearTreeTest_static 
+                       
+                 
+                 
+@@ -250,8 +242,8 @@ install:  all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include
+ $(INSTALL_PREFIX):
+       mkdir -p $(INSTALL_PREFIX)
+ 
+-$(INSTALL_PREFIX)/lib:  $(INSTALL_PREFIX)
+-      mkdir -p $(INSTALL_PREFIX)/lib
++$(INSTALL_PREFIX)/GENTOOLIBDIR:  $(INSTALL_PREFIX)
++      mkdir -p $(INSTALL_PREFIX)/GENTOOLIBDIR
+ 
+ $(INSTALL_PREFIX)/bin:  $(INSTALL_PREFIX)
+       mkdir -p $(INSTALL_PREFIX)/bin

diff --git a/sci-libs/neartree/neartree-2.1.4-r1.ebuild b/sci-libs/neartree/neartree-2.1.4-r2.ebuild
similarity index 68%
rename from sci-libs/neartree/neartree-2.1.4-r1.ebuild
rename to sci-libs/neartree/neartree-2.1.4-r2.ebuild
index 7f64ad28af56534bd6db675460e92fa6ab387197..a328b7ac30594520735f8c57e84eeb40dc792ea4 100644 (file)
--- a/sci-libs/neartree/neartree-2.1.4-r1.ebuild
+++ b/sci-libs/neartree/neartree-2.1.4-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.2 2010/03/07 18:52:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/neartree-2.1.4-r2.ebuild,v 1.1 2010/06/15 13:31:00 jlec Exp $
 
 EAPI="3"
 
@@ -24,11 +24,10 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}"
 
 src_prepare() {
-       epatch "${FILESDIR}"/${PV}-FLAGS.patch
        epatch "${FILESDIR}"/${PV}-gcc4.3.patch
        epatch "${FILESDIR}"/${PV}-iterator.patch
        epatch "${FILESDIR}"/${PV}-test.patch
-       epatch "${FILESDIR}"/${PV}-dynlib.patch
+       epatch "${FILESDIR}"/${PV}-gentoo.patch
 
        sed \
                -e "s:GENTOOLIBDIR:$(get_libdir):g" \
@@ -44,13 +43,10 @@ src_compile() {
 }
 
 src_install() {
-       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 CNearTree.h rhrand.h || die
+       emake \
+               CC=$(tc-getCC) \
+               CXX=$(tc-getCXX) \
+               DESTDIR="${D}" install || die
 
        dodoc README_NearTree.txt || die
        dohtml *.html || die