Fixed clean install of libs

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

5 files changed, 109 insertions, 114 deletions

diff --git a/sci-libs/neartree/ChangeLog b/sci-libs/neartree/ChangeLog
index 2dabf8922e45..579f2c113ee1 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.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/files/2.1.4-FLAGS.patch b/sci-libs/neartree/files/2.1.4-FLAGS.patch
deleted file mode 100644
index ef957881de8a..000000000000
--- 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
index 823497337a2b..000000000000
--- 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
index 000000000000..1570c9173f2f
--- /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
index 7f64ad28af56..a328b7ac3059 100644
--- 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