Use the same CFLAGS on make install as used to compile the library (bug 179401 comment 8).

Package-Manager: portage-2.1.2.7

5 files changed, 20 insertions, 117 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index b86c0297bfe4..06d8e00d9411 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/wvstreams
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.104 2007/05/23 22:37:05 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.105 2007/05/24 07:32:47 mrness Exp $
+
+  24 May 2007; Alin Năstac <mrness@gentoo.org> -wvstreams-4.3-r1.ebuild,
+  wvstreams-4.3-r2.ebuild:
+  Use the same CFLAGS on make install as used to compile the library (bug
+  179401 comment 8).
 
   23 May 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   wvstreams-4.3-r2.ebuild:
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 8f3035a55c2a..7025d9433283 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -91,18 +91,14 @@ EBUILD wvstreams-4.2.2.ebuild 2537 RMD160 93309344254038873a0c706117c850e280e01a
 MD5 bfef0ede67c42cb43776f76d6ec982e3 wvstreams-4.2.2.ebuild 2537
 RMD160 93309344254038873a0c706117c850e280e01ab0 wvstreams-4.2.2.ebuild 2537
 SHA256 01d7807c175eaa446084241b2e123ed87449a3289c62992686f0e37db77b22c3 wvstreams-4.2.2.ebuild 2537
-EBUILD wvstreams-4.3-r1.ebuild 2477 RMD160 05e766d3ac7dce2fcf32b44944079f6cfb3f9de9 SHA1 6b70886e0c0c25395c3073b785c3808aa03aa26b SHA256 35bb7d6d8a0d855b40ec70cbb29678691e71f5697b5bf2f9255eef541deee668
-MD5 0a2b8f25975bc69d2bd5cbd3c6529a31 wvstreams-4.3-r1.ebuild 2477
-RMD160 05e766d3ac7dce2fcf32b44944079f6cfb3f9de9 wvstreams-4.3-r1.ebuild 2477
-SHA256 35bb7d6d8a0d855b40ec70cbb29678691e71f5697b5bf2f9255eef541deee668 wvstreams-4.3-r1.ebuild 2477
-EBUILD wvstreams-4.3-r2.ebuild 2520 RMD160 a4a042008a2c69fb935fd3e406bbd0efff15d836 SHA1 849dfa6711d0a1a860c7ab68e344e7108a797259 SHA256 0bcb22522bce4181d7b017cba939512dbe6d70107920b2181ae546768aa6e775
-MD5 d08f00e51ecd6b015c3191f153333d8b wvstreams-4.3-r2.ebuild 2520
-RMD160 a4a042008a2c69fb935fd3e406bbd0efff15d836 wvstreams-4.3-r2.ebuild 2520
-SHA256 0bcb22522bce4181d7b017cba939512dbe6d70107920b2181ae546768aa6e775 wvstreams-4.3-r2.ebuild 2520
-MISC ChangeLog 17323 RMD160 4ac910baca844480a93a7bebd69e44debd9dc08b SHA1 e83c4ed2b0223cd35d6315009c399d29f80fa589 SHA256 96cc6beaea8a9dce739380ccb15fac4c9cdce14d923e50ed070d081d91de2755
-MD5 cfec37f40ec717ebb2b660197e71e8b0 ChangeLog 17323
-RMD160 4ac910baca844480a93a7bebd69e44debd9dc08b ChangeLog 17323
-SHA256 96cc6beaea8a9dce739380ccb15fac4c9cdce14d923e50ed070d081d91de2755 ChangeLog 17323
+EBUILD wvstreams-4.3-r2.ebuild 2560 RMD160 8ce9d48c2ed175616adc82fbd664bb0bf3924915 SHA1 e34f5878233574147fcba3575ef734885eafb2c1 SHA256 a97cbccb4fc3419654bcc6b60dc8207fd19ef482d822c05a00e96c260d0eb041
+MD5 93aec475d06a520ea181553bc5c5e53f wvstreams-4.3-r2.ebuild 2560
+RMD160 8ce9d48c2ed175616adc82fbd664bb0bf3924915 wvstreams-4.3-r2.ebuild 2560
+SHA256 a97cbccb4fc3419654bcc6b60dc8207fd19ef482d822c05a00e96c260d0eb041 wvstreams-4.3-r2.ebuild 2560
+MISC ChangeLog 17518 RMD160 e36992d9ff5c2c60a7a7b6d7e92d84f20d07f146 SHA1 eda0f7e43003041bb3c2c7fc64e90124b09bd154 SHA256 7e61e5d87d2a40f4f1c97ad984c66191305d74b5d1f3969a038561da975e8232
+MD5 6c6cb644a7475b0eca418b24e9f3e6ad ChangeLog 17518
+RMD160 e36992d9ff5c2c60a7a7b6d7e92d84f20d07f146 ChangeLog 17518
+SHA256 7e61e5d87d2a40f4f1c97ad984c66191305d74b5d1f3969a038561da975e8232 ChangeLog 17518
 MISC metadata.xml 313 RMD160 e543c31d8ddc948a387dcdcc8638a848c587177b SHA1 a40d5fd17e50dc9f983efc63e5cbb8b407b95c7a SHA256 1ec30d4508abc443f3e9c4829b0e7d7e5c588419344203476818a29f71b98a37
 MD5 227de7f678ad662524292836709de75f metadata.xml 313
 RMD160 e543c31d8ddc948a387dcdcc8638a848c587177b metadata.xml 313
@@ -116,16 +112,13 @@ SHA256 af8d2d360c3e497dcd8a2f2cc57ec947b2c99a440dff184197b350e60491f451 files/di
 MD5 ce2f63ffae6742f96ede8200eb39c3d1 files/digest-wvstreams-4.2.2-r3 250
 RMD160 ad134621ec5ac0b3b3884506e3abfbf770e34b52 files/digest-wvstreams-4.2.2-r3 250
 SHA256 af8d2d360c3e497dcd8a2f2cc57ec947b2c99a440dff184197b350e60491f451 files/digest-wvstreams-4.2.2-r3 250
-MD5 573eed9105c7a3828296d072fbc449eb files/digest-wvstreams-4.3-r1 244
-RMD160 323f0e3ef47ac41b690134fc8b9a73f5ffbbd9ca files/digest-wvstreams-4.3-r1 244
-SHA256 e3bb902f085262bd9e556d98911fdf2940e54befc15a71c88e4eb726df6a1692 files/digest-wvstreams-4.3-r1 244
 MD5 573eed9105c7a3828296d072fbc449eb files/digest-wvstreams-4.3-r2 244
 RMD160 323f0e3ef47ac41b690134fc8b9a73f5ffbbd9ca files/digest-wvstreams-4.3-r2 244
 SHA256 e3bb902f085262bd9e556d98911fdf2940e54befc15a71c88e4eb726df6a1692 files/digest-wvstreams-4.3-r2 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGVMITKRy60XGEcJIRAjO+AKCXfRRrJVejXu08cG4w39J6j2R46gCfRjST
-0Lz4zSAxTbYEXZvFkHQT0DI=
-=2hr8
+iD8DBQFGVT+pJnxX6mF440QRAmsRAJ41Xy+bxyaEXw01WkpfNhNTknN7uACeNkjk
+70yCsUJWZ0udFYr/zUNZYxw=
+=9VlV
 -----END PGP SIGNATURE-----
diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.3-r1 b/net-libs/wvstreams/files/digest-wvstreams-4.3-r1
deleted file mode 100644
index 3b2f6d51a4f1..000000000000
--- a/net-libs/wvstreams/files/digest-wvstreams-4.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eb34544384c951fd14470d583273e02a wvstreams-4.3.tar.gz 1294177
-RMD160 fb6c480903cb725bf4911a05bfa1ef12bf05dfec wvstreams-4.3.tar.gz 1294177
-SHA256 54b2a693ef67fde375292d768fc6471bb00105870714cc4051289986a51aabb9 wvstreams-4.3.tar.gz 1294177
diff --git a/net-libs/wvstreams/wvstreams-4.3-r1.ebuild b/net-libs/wvstreams/wvstreams-4.3-r1.ebuild
deleted file mode 100644
index 5aef931d0a8a..000000000000
--- a/net-libs/wvstreams/wvstreams-4.3-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.3-r1.ebuild,v 1.2 2007/05/22 14:08:49 gustavoz Exp $
-
-WANT_AUTOCONF=2.59
-WANT_AUTOMAKE=none
-
-inherit eutils fixheadtails autotools qt3
-
-DESCRIPTION="A network programming library in C++"
-HOMEPAGE="http://alumnit.ca/wiki/?WvStreams"
-SRC_URI="http://alumnit.ca/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc sparc ~x86"
-IUSE="qt3 qdbm pam slp doc debug"
-
-RESTRICT="test"
-
-RDEPEND=">=sys-libs/db-3
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.7
-	>=dev-libs/xplc-0.3.13
-	qt3? ( $(qt_min_version 3.1) )
-	qdbm? ( dev-db/qdbm )
-	pam? ( >=sys-libs/pam-0.75 )
-	slp? ( >=net-libs/openslp-1.0.9a )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-linux-serial.patch"
-	epatch "${FILESDIR}/${P}-wireless-user.patch"
-	epatch "${FILESDIR}/${P}-uniconfd-ini.patch"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-	epatch "${FILESDIR}/${P}-sane-cflags.patch"
-	epatch "${FILESDIR}/${P}-64bit.patch"
-	epatch "${FILESDIR}/${P}-type-punned.patch"
-
-	epatch "${FILESDIR}/${P}-external-xplc.patch"
-	local XPLC_VER=`best_version dev-libs/xplc`
-	XPLC_VER=${XPLC_VER#*/*-} #reduce it to ${PV}-${PR}
-	XPLC_VER=${XPLC_VER%%[_-]*} # main version without beta/pre/patch/revision
-	sed -i -e "s:^xplc_version=.*:xplc_version='${XPLC_VER}':" "${S}/configure.ac" \
-		|| die "failed to set current xplc version"
-	rm -r "${S}/xplc"
-
-	use qt3 && epatch "${FILESDIR}/${P}-MOC-fix.patch"
-
-	ht_fix_file "${S}/configure.ac"
-
-	#needed by xplc and as-needed patch:
-	cd "${S}"
-	eautoconf || die "autoconf failed"
-	#without following, the makefile would remove some files and request 
-	#you to run ./configure again
-	touch include/wvautoconf.h.in configure
-}
-
-src_compile() {
-	econf \
-		`use_with qdbm` \
-		`use_with pam` \
-		`use_with slp openslp` \
-		`use_with qt3 qt` \
-		`use_enable debug` \
-		--without-tcl \
-		--without-swig \
-		--with-xplc \
-		--enable-verbose \
-		--with-bdb \
-		--with-zlib \
-		--with-openssl \
-		|| die "configure failed"
-	emake CXXOPTS="-fPIC -DPIC" COPTS="-fPIC -DPIC" || die "compile failed"
-	use doc && doxygen
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if use doc ; then
-		#the list of files is too big for dohtml -r Docs/doxy-html/*
-		cd Docs/doxy-html
-		dohtml -r *
-	fi
-}
diff --git a/net-libs/wvstreams/wvstreams-4.3-r2.ebuild b/net-libs/wvstreams/wvstreams-4.3-r2.ebuild
index 7d59d57957a7..074c425e255f 100644
--- a/net-libs/wvstreams/wvstreams-4.3-r2.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.3-r2.ebuild,v 1.2 2007/05/23 22:37:05 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.3-r2.ebuild,v 1.3 2007/05/24 07:32:47 mrness Exp $
 
 WANT_AUTOCONF=2.59
 WANT_AUTOMAKE=none
@@ -83,7 +83,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake CXXOPTS="-fPIC -DPIC" COPTS="-fPIC -DPIC" DESTDIR="${D}" install || die "make install failed"
 
 	if use doc ; then
 		#the list of files is too big for dohtml -r Docs/doxy-html/*