respecting CC variable, CFLAGS, LDFLAGS, omiting -Werror, fixing links, bugs #240232 #243956 #260888

Package-Manager: portage-2.1.6.13/cvs/Linux i686

5 files changed, 119 insertions, 32 deletions

diff --git a/dev-libs/vrb/ChangeLog b/dev-libs/vrb/ChangeLog
index 8096bddfba6e..88b0be225d73 100644
--- a/dev-libs/vrb/ChangeLog
+++ b/dev-libs/vrb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/vrb
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/vrb/ChangeLog,v 1.12 2008/08/27 19:05:54 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/vrb/ChangeLog,v 1.13 2009/08/06 02:11:05 vostorga Exp $
+
+  06 Aug 2009; Víctor Ostorga <vostorga@gentoo.org> vrb-0.3.0.ebuild,
+  vrb-0.5.1.ebuild, files/vrb-0.5.1-configure.patch:
+  respecting CC variable, CFLAGS, LDFLAGS, omiting -Werror, fixing links,
+  bugs #240232 #243956 #260888
 
   27 Aug 2008; Raúl Porcel <armin76@gentoo.org> vrb-0.5.1.ebuild:
   Re-add ~sparc
diff --git a/dev-libs/vrb/Manifest b/dev-libs/vrb/Manifest
index 57dba5f206a7..bd48cfe04a06 100644
--- a/dev-libs/vrb/Manifest
+++ b/dev-libs/vrb/Manifest
@@ -1,7 +1,7 @@
-AUX vrb-0.5.1-configure.patch 1884 RMD160 92322935f965c603bd5b3921d4db7e21c97ed9fc SHA1 619666a8e2fc516b1f280c4ae5d191b5099b206e SHA256 f91af3d8a06680d9ae96fa53f4d9380a3ed050999347b0291e57d1088b08251d
+AUX vrb-0.5.1-configure.patch 4283 RMD160 b431fb595538a8f4b39082952cbffdd3451915f6 SHA1 fb769cd17b3f7c44ec13b34107f4213c1b4dbf1d SHA256 96c23a3086d8c3c2297fa651af1994cdca58ff2ffbfb10531feae32da6a3c631
 DIST vrb-0.3.0.tar.gz 30228 RMD160 e5d98c912885895c0d27d1444184870e1f1a6daf SHA1 2d254a7bcfb2ae806d6b16fb474c4359ebd0f1af SHA256 982a7b0c49db88b61a2ebd7fd442d691548a5ab7e3cacd90431a045c314ed99c
 DIST vrb-0.5.1.tar.bz2 41106 RMD160 0676201fe5391f7c19bc6874c9fc792f2279df09 SHA1 1371128ef46744a71551863b062eaf339391ebba SHA256 d579ed1998ef2d78e2ef8481a748d26e1fa12cdda806d2e31d8ec66ffb0e289f
-EBUILD vrb-0.3.0.ebuild 921 RMD160 094c8cf2306ff423f251aeab13da395dc07eee36 SHA1 c46cfcd5c1373ce79ffda675d90bff098a9d5bc7 SHA256 a93847f3265fbdc199ab093272d18aaec45a23c79dfdb5d0fd18b2281eab927c
-EBUILD vrb-0.5.1.ebuild 872 RMD160 44faf6870e28874f3ac8e9225c565f440487f45e SHA1 2c58ba631587d9f5cfc9ea8f8035667abd12748e SHA256 bf14e734960b94b1c9be50be73a0a15e109def7765bd71277e4c358416f7a7b6
-MISC ChangeLog 1095 RMD160 2e8208635841c835d740632b1d86041d46ea6c77 SHA1 73f6044550d14459510b9ea0e1b7890cb93724df SHA256 dcfb86f1f1210d8c0bccc44300dbe829554a1799e8a0a1e66f04f9e4dfabe1d1
+EBUILD vrb-0.3.0.ebuild 1210 RMD160 b895ed87a44ba75b6a02f4afc809f1c1ab17735a SHA1 33516daea8674a6708a69ac538fdbbc859901f0b SHA256 8bab0bb521aa1c2006991b63f429cf6150935d9ff62b0df0ab89f91babc743b4
+EBUILD vrb-0.5.1.ebuild 934 RMD160 f97548f35e522958119ae973293f801bf015fd02 SHA1 5048b9bd75d19b34ea553bcc74e8ea09a4380765 SHA256 ad721a917d238c80fd64bb9c22a6025eb88677305050d2e4b577f73e8eae2654
+MISC ChangeLog 1326 RMD160 12d245f1cda903d59a9ab986ea98a3c76bbb7fc1 SHA1 a35f56499133b88899f051ea037db7ac3633d725 SHA256 7bbfd905e93ba27e953016f6105a11baf87e56a5375e678492c3388f79a48d90
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
diff --git a/dev-libs/vrb/files/vrb-0.5.1-configure.patch b/dev-libs/vrb/files/vrb-0.5.1-configure.patch
index c1bf5ddebdef..281efa6850e9 100644
--- a/dev-libs/vrb/files/vrb-0.5.1-configure.patch
+++ b/dev-libs/vrb/files/vrb-0.5.1-configure.patch
@@ -1,17 +1,65 @@
---- configure.old	2007-03-08 21:38:59.000000000 +0530
-+++ configure	2007-03-08 21:42:37.000000000 +0530
-@@ -341,8 +341,8 @@
+diff -NrU5 vrb-0.5.1.original/configure vrb-0.5.1/configure
+--- vrb-0.5.1.original/configure	2009-08-05 19:22:47.000000000 -0600
++++ vrb-0.5.1/configure	2009-08-05 19:57:15.000000000 -0600
+@@ -314,11 +314,11 @@
+ #-----------------------------------------------------------------------------
+ unamem=$( uname -m | tr ' ' '_' )
+ unames=$( uname -s | tr ' ' '_' )
+ unamer=$( uname -r | tr ' ' '_' )
+ 
+-gcc="gcc"
++gcc=${CC}
+ 
+ lib_cp_cmd="${gcc}"
+ pgm_cp_cmd="${gcc}"
+ 
+ lib_cc_cmd="${gcc}"
+@@ -331,23 +331,23 @@
+ pgm_ld_cmd="${gcc}"
+ 
+ lib_def=( "${lib_def[@]}" "-DARCH_${unamem}" "-DARCH=${unamem}" )
+ pgm_def=( "${pgm_def[@]}" "-DARCH_${unamem}" "-DARCH=${unamem}" )
+ 
+-lib_warn=( -Werror -Wall -Wnested-externs -Wno-cast-qual -Wno-trigraphs -Wuninitialized -Wwrite-strings )
+-pgm_warn=( -Werror -Wall -Wnested-externs -Wno-cast-qual -Wno-trigraphs -Wuninitialized -Wwrite-strings )
++lib_warn=(  -Wall -Wnested-externs -Wno-cast-qual -Wno-trigraphs -Wuninitialized -Wwrite-strings )
++pgm_warn=(  -Wall -Wnested-externs -Wno-cast-qual -Wno-trigraphs -Wuninitialized -Wwrite-strings )
+ 
+ if [[ -n "${warninline}" ]]; then
+     lib_warn=( "${lib_warn[@]}" -Winline )
      pgm_warn=( "${pgm_warn[@]}" -Winline )
  fi
  
 -lib_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -fgnu-linker -frerun-loop-opt -finline -finline-functions -fmove-all-movables )
 -pgm_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -fgnu-linker -frerun-loop-opt -finline -finline-functions -fmove-all-movables )
-+lib_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -frerun-loop-opt -finline -finline-functions )
-+pgm_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -frerun-loop-opt -finline -finline-functions )
++lib_feat="${CFLAGS} ${LDFLAGS}"
++pgm_feat="${CFLAGS} ${LDFLAGS}"
  
- lib_cp_opt=( -pipe )
- pgm_cp_opt=( -pipe )
-@@ -1268,7 +1268,7 @@
+-lib_cp_opt=( -pipe )
+-pgm_cp_opt=( -pipe )
++lib_cp_opt="${CFLAGS} ${LDFLAGS}"
++pgm_cp_opt="${CFLAGS} ${LDFLAGS}"
+ 
+ if [[ -n "${std}" ]]; then
+     lib_cp_opt=( "${lib_cp_opt[@]}" "-std=${std}" )
+     pgm_cp_opt=( "${pgm_cp_opt[@]}" "-std=${std}" )
+ fi
+@@ -375,11 +375,11 @@
+ if [[ -n "${as_verbose}" ]]; then
+     lib_as_opt=( -v "${lib_as_opt[@]}" )
+     pgm_as_opt=( -v "${pgm_as_opt[@]}" )
+ fi
+ 
+-lib_ld_opt=( -pipe -shared -nostdlib -nostartfiles )
++lib_ld_opt=("${CFLAGS} ${LDFLAGS}" -pipe -shared -nostdlib -nostartfiles)
+ pgm_ld_opt=( -pipe )
+ if [[ -n "${ld_verbose}" ]]; then
+     lib_ld_opt=( -v "${lib_ld_opt[@]}" )
+     pgm_ld_opt=( -v "${pgm_ld_opt[@]}" )
+ fi
+@@ -1266,11 +1266,11 @@
+ 	# Generate Makefile specs to compile library sources.
+ 	#----------------------------------------------------
  	class_product_src lib "${libname}" | while read srcname; do
  	    vmsg 9 "Generating Makefile section: lib ${libname} ${srcname}"
  	    srcdir=$( dirname "${srcname}" )
@@ -20,12 +68,31 @@
  	    objname=$( echo "${srcname}" | gawk -F/ '{print $NF;}' | gawk -F. 'BEGIN{OFS=".";}{$NF="o";print $0;}' )
  	    for lc in arlib solib; do
  		[[ "${lc}" = "arlib" ]] && libfeat=( -DARLIBRARY=1 )
-@@ -1398,7 +1398,7 @@
+ 		[[ "${lc}" = "solib" ]] && libfeat=( -DSOLIBRARY=1 -DfPIC=1 -fPIC )
+ 
+@@ -1352,11 +1352,11 @@
+ 	    echo -n " obj/${pgmclass}/${pgmname}/${objname}"
+ 	done
+ 	echo ""
+ 
+ 	# link, object files, libraries
+-	echo -n "${tab}\$(pgm_ld_cmd) \$(pgm_ld_opt) -o ${pgmclass}/${pgmname}"
++	echo -n "${tab}\$(pgm_ld_cmd) \$(CFLAGS) \$(LDFLAGS) \$(pgm_ld_opt) -o ${pgmclass}/${pgmname}"
+ 	class_product_obj "${pgmclass}" "${pgmname}" | while read objname; do
+ 	    echo -n " obj/${pgmclass}/${pgmname}/${objname}"
+ 	done
+ 	if [[ -z "${nosolib}" && -n "${execdynamic}" ]]; then
+ 	    echo -n " -L./lib"
+@@ -1396,11 +1396,11 @@
+ 
+ 	# compile each source file for each object needed by this executable
  	class_product_src "${pgmclass}" "${pgmname}" | while read srcname; do
  	    vmsg 9 "Generating Makefile section: ${pgmclass} ${pgmname} ${srcname}"
  	    srcdir=$( dirname "${srcname}" )
 -	    srcref="-I ${srcdir} -I ${source}/include -I- -I ./include ${srcname}"
 + 	    srcref="-iquote ${srcdir} -iquote ${source}/include -I ./include ${srcname}"
-	    objname=$( echo "${srcname}" | gawk -F/ '{print $NF;}' | gawk -F. 'BEGIN{OFS=".";}{$NF="o";print $0;}' )
+ 	    objname=$( echo "${srcname}" | gawk -F/ '{print $NF;}' | gawk -F. 'BEGIN{OFS=".";}{$NF="o";print $0;}' )
  	    echo "obj/${pgmclass}/${pgmname}/${objname}: ${srcname}"
  	    if [[ -n "${asm}" ]]; then
+ 		if [[ -n "${cpp}" ]]; then
+ 		    cppname=$( echo "${objname}" | gawk -F. 'BEGIN{OFS=".";}{$NF="i";print $0;}' )
diff --git a/dev-libs/vrb/vrb-0.3.0.ebuild b/dev-libs/vrb/vrb-0.3.0.ebuild
index 56d3556bb0a1..9d12c0d22f56 100644
--- a/dev-libs/vrb/vrb-0.3.0.ebuild
+++ b/dev-libs/vrb/vrb-0.3.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/vrb/vrb-0.3.0.ebuild,v 1.13 2004/07/13 06:25:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/vrb/vrb-0.3.0.ebuild,v 1.14 2009/08/06 02:11:05 vostorga Exp $
+
+inherit toolchain-funcs
 
 DESCRIPTION="library for a virtual ring buffer"
 HOMEPAGE="http://phil.ipal.org/freeware/vrb/"
@@ -12,14 +14,25 @@ KEYWORDS="x86 sparc"
 IUSE=""
 
 DEPEND="virtual/libc"
+RDEPEND="${DEPEND}"
+
+MAKEOPTS="${MAKEOPTS} -j1"
 
 src_compile() {
-	sed -i "s/copts=\"-pipe -O2\"/copts=\"${CFLAGS}\"/g" Configure
+	#respecting CFLAGS and LDFLAGS
+	sed -i "s/copts=\"-pipe -O2\"/copts=\"${CFLAGS} ${LDFLAGS}\"/g" Configure
+	sed -i "s/gcc -v/\${CC} \${COPTS}/g" Configure
+
+	#respecting CC
+	sed -i "s/gcc/\${CC}/g" Configure
 
-	./Configure 						\
+	#omiting -Werror
+	sed -i "s/-Werror//g" Configure
+
+	CC="$(tc-getCC)" ./Configure 						\
 		--prefix=/usr || die "./Configure failed"
 
-	make || die "emake failed"
+	emake || die "emake failed"
 }
 
 src_install() {
@@ -27,9 +40,10 @@ src_install() {
 	doins include/vrb.h
 
 	dolib.so lib/libvrb.so.0.3.0
-	dosym /usr/lib/libvrb.so.0.3.0 /usr/lib/libvrb.so.0.3
-	dosym /usr/lib/libvrb.so.0.3.0 /usr/lib/libvrb.so.0
-	dosym /usr/lib/libvrb.so.0.3.0 /usr/lib/libvrb.so
+
+	dosym libvrb.so.0.3.0 /usr/$(get_libdir)/libvrb.so.0.3
+	dosym libvrb.so.0.3.0 /usr/$(get_libdir)/libvrb.so.0
+	dosym libvrb.so.0.3.0 /usr/$(get_libdir)/libvrb.so
 
 	dobin bin/iobuffer
 
diff --git a/dev-libs/vrb/vrb-0.5.1.ebuild b/dev-libs/vrb/vrb-0.5.1.ebuild
index 10a430716547..4d4f69ddedef 100644
--- a/dev-libs/vrb/vrb-0.5.1.ebuild
+++ b/dev-libs/vrb/vrb-0.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/vrb/vrb-0.5.1.ebuild,v 1.3 2008/08/27 19:05:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/vrb/vrb-0.5.1.ebuild,v 1.4 2009/08/06 02:11:05 vostorga Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Library for a virtual ring buffer"
 HOMEPAGE="http://vrb.slashusr.org/"
@@ -15,11 +15,12 @@ IUSE="static"
 RESTRICT="strip"
 
 DEPEND="virtual/libc"
+RDEPEND="${DEPEND}"
 
 src_compile() {
-	epatch ${FILESDIR}/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-configure.patch
 
-	./configure --prefix=/usr || die "Configure failed!"
+	CC="$(tc-getCC)" ./configure --prefix=/usr || die "Configure failed!"
 	make || die "Make failed!"
 }
 
@@ -27,13 +28,13 @@ src_install() {
 	insinto /usr/include
 	doins build/include/vrb.h
 
-	mkdir ${D}usr/lib
+	mkdir "${D}"usr/lib
 
 	if use static ; then
-		cp build/lib/libvrb.a* ${D}usr/lib/
+		cp build/lib/libvrb.a* "${D}"usr/lib/
 	fi
 
-	cp build/lib/libvrb.so* ${D}usr/lib/
+	cp build/lib/libvrb.so* "${D}"usr/lib/
 
 	dobin build/bin/vbuf