building shared libs now, keyworded for *-linux, tested by me

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

3 files changed, 61 insertions, 7 deletions

diff --git a/sci-libs/cqrlib/ChangeLog b/sci-libs/cqrlib/ChangeLog
index 223e1e5a192a..9f326d5c2d92 100644
--- a/sci-libs/cqrlib/ChangeLog
+++ b/sci-libs/cqrlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/cqrlib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cqrlib/ChangeLog,v 1.1 2010/02/03 22:12:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cqrlib/ChangeLog,v 1.2 2010/03/07 18:17:57 jlec Exp $
+
+*cqrlib-1.0.3-r1 (07 Mar 2010)
+
+  07 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +files/1.0.3-dynlib.patch, -cqrlib-1.0.3.ebuild, +cqrlib-1.0.3-r1.ebuild:
+  Building shared instead of statis libs now
 
 *cqrlib-1.0.3 (03 Feb 2010)
 
diff --git a/sci-libs/cqrlib/cqrlib-1.0.3.ebuild b/sci-libs/cqrlib/cqrlib-1.0.3-r1.ebuild
index 5806c662e947..e0995a0758ee 100644
--- a/sci-libs/cqrlib/cqrlib-1.0.3.ebuild
+++ b/sci-libs/cqrlib/cqrlib-1.0.3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cqrlib/cqrlib-1.0.3.ebuild,v 1.1 2010/02/03 22:12:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cqrlib/cqrlib-1.0.3-r1.ebuild,v 1.1 2010/03/07 18:17:57 jlec Exp $
 
-inherit base flag-o-matic toolchain-funcs
+inherit base flag-o-matic multilib toolchain-funcs versionator
 
 MY_PN=CQRlib
 MY_P="${MY_PN}-${PV}"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-libs/cvector"
@@ -23,11 +23,12 @@ S="${WORKDIR}"/${MY_P}
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-LDFLAGS.patch
+	"${FILESDIR}"/${PV}-dynlib.patch
 	)
 
 src_compile() {
 	append-flags -ansi
-	emake \
+	emake -j1 \
 		CC=$(tc-getCC) \
 		CXX=$(tc-getCXX) \
 		CFLAGS="${CFLAGS}" \
@@ -39,8 +40,10 @@ src_test() {
 }
 
 src_install() {
-	dobin bin/* || die
-	dolib.a lib/.libs/*.a || die
+	dolib.so *.so.${PV} || die
+	dosym libCQRlib.so.${PV} /usr/$(get_libdir)/libCQRlib.so.$(get_version_component_range 1-2) || die
+	dosym libCQRlib.so.${PV} /usr/$(get_libdir)/libCQRlib.so.$(get_major_version) || die
+	dosym libCQRlib.so.${PV} /usr/$(get_libdir)/libCQRlib.so || die
 
 	insinto /usr/include
 	doins *.h || die
diff --git a/sci-libs/cqrlib/files/1.0.3-dynlib.patch b/sci-libs/cqrlib/files/1.0.3-dynlib.patch
new file mode 100644
index 000000000000..3c7e62378594
--- /dev/null
+++ b/sci-libs/cqrlib/files/1.0.3-dynlib.patch
@@ -0,0 +1,45 @@
+diff --git a/Makefile b/Makefile
+index e21d52e..b71e11c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -85,7 +85,7 @@ else
+ INCLUDES = -I$(INC)
+ endif
+ 
+-COMPILE_COMMAND        =  $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
++COMPILE_COMMAND        =  $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -shared -c
+ LIBRARY_LINK_COMMAND   =  $(LIBTOOL) --mode=link  $(CC) -version-info $(VERSION) -release $(RELEASE) $(LDFLAGS)
+ BUILD_COMMAND_LOCAL    =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES)
+ BUILD_COMMAND_DYNAMIC  =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -dynamic
+@@ -93,8 +93,8 @@ BUILD_COMMAND_STATIC   =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -sta
+ 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         #
+@@ -178,8 +178,7 @@ default:
+ # Compile the library and examples
+ #
+ all:	$(LIB) $(BIN) $(SOURCE) $(HEADERS) \
+-		$(LIB)/libCQRlib.$(LIB_EXT) \
+-		$(BIN)/CQRlibTest
++		$(LIB)/libCQRlib.$(LIB_EXT)
+ 		
+ install:  all $(INSTALLDIR) $(INSTALLDIR)/lib $(INSTALLDIR)/include \
+           $(INC) $(LIB)/libCQRlib.$(LIB_EXT)  $(INC)/cqrlib.h
+@@ -229,8 +228,8 @@ $(BIN):
+ # CQRlib library
+ #
+ $(LIB)/libCQRlib.$(LIB_EXT): $(SOURCE) $(HEADERS) $(COMMONDEP)
+-	$(COMPILE_COMMAND) -c $(SOURCE)
+-	$(LIBRARY_LINK_COMMAND) -o $(LIB)/libCQRlib.$(LIB_EXT) *.$(OBJ_EXT) 
++	$(CC) $(CFLAGS) -fPIC -c $(SOURCE) -o cqrlib.o
++	$(CC) $(LDFLAGS) -Wl,--soname,libCQRlib.so.1 -shared -o libCQRlib.so.$(RELEASE) *.$(OBJ_EXT) -lm 
+ 
+ #
+ # CQRlibTest example program