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

(Portage version: 2.1.2.7)

4 files changed, 8 insertions, 98 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/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/*