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

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

4 files changed, 67 insertions, 12 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/Manifest b/sci-libs/cqrlib/Manifest
index 8adbdcc8bfaf..e3209ff85bc0 100644
--- a/sci-libs/cqrlib/Manifest
+++ b/sci-libs/cqrlib/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA1
 
 AUX 1.0.3-LDFLAGS.patch 1154 RMD160 9018a66502de06afb01750b923acedab8ec478f1 SHA1 960dc8cc81e7083f286dd86123266c329498197c SHA256 163ff3e44dcc747e718f8e53473e97302faae3c08d839c9fff0e02f5b9531497
+AUX 1.0.3-dynlib.patch 1844 RMD160 73c2234639111c54c86eda686145bced146023f2 SHA1 58ab924287a5db60e87fc19b0ee39461a3182c7f SHA256 82258b3af151a76653455a7888bb41d3564fb0a734ebe621971b091ae61e9f2b
 DIST CQRlib-1.0.3.tar.gz 31940 RMD160 b3ca3ea9d454098f666a9657f848d8176a71f3cf SHA1 4f9669a5db8da569937c440082647158bacced61 SHA256 e4b2323c8f27e3b625c79d5363176e9e6d7e4f90bac3895822b956bf8433fa45
-EBUILD cqrlib-1.0.3.ebuild 995 RMD160 6394d4566b440b93c1ba04ac698366b3dcf511aa SHA1 0a0cf9419e6cbaf7ef57673de4d519540870927a SHA256 7019643d70c759be3df28443d760ecc55b082cc28025870e6dfbde853b8207f2
-MISC ChangeLog 457 RMD160 408f41af90a67e97c7b16ad6d021dc3fd4cf9179 SHA1 89e7922f26b35debbaa8eb06726bca380de615ab SHA256 7be7840b04aa98a50ef3a67d203967c247e3df5cc2cf599dbf60d8e98bd81948
+EBUILD cqrlib-1.0.3-r1.ebuild 1310 RMD160 cd80777ab855abbf3c8875663d76b9d6dbf6435b SHA1 60dfb3ff015a17aa3ff3d282d1f6592f160e1e9f SHA256 196cda3bd79906af76d7c9ab989c41fa69741ea82cb54fd67687f243acc5a7c5
+MISC ChangeLog 665 RMD160 052ed34f7e5663adfa5d8c4e5311e6277c51769e SHA1 021fa124c0019fa2c8e9774f774b21b9d972cdf5 SHA256 3158d02980421ded1b5b16476fe178cf9c2b39a2ff712ea17351073848e306dc
 MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktp9MsACgkQgAnW8HDreRbDRACcCHcG0SF7NtD2gYRprnc/8mEZ
-pP0An1UE6dP8Ir7LPktTDvbG11jFPfqH
-=oXVu
+iEYEARECAAYFAkuT7doACgkQgAnW8HDreRbpVwCfcecCUSFHJlGnkSrI85FASST5
+scwAn18UGSKQonAMUBKWypGHU5R5iMZG
+=CqH4
 -----END PGP SIGNATURE-----
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