Don't add -g -O2 to the user selected CFLAGS. Sanitize the ebuild, thanks to Tiziano Müller <dev-zero@gentoo.org>. Use sys/sysctl.h for __user definition - linux/compiler.h has been removed from kernel 2.6.19 (#164829).

Package-Manager: portage-2.1.1-r2

6 files changed, 188 insertions, 15 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index a7d2d14723ff..91a2eb91da7d 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/wvstreams
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.97 2006/11/11 16:43:00 mrness Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.98 2007/02/08 19:07:02 mrness Exp $
+
+*wvstreams-4.2.2-r3 (08 Feb 2007)
+
+  08 Feb 2007; Alin Năstac <mrness@gentoo.org>
+  +files/wvstreams-4.2.2-sane-cflags.patch,
+  files/wvstreams-4.2.2-wireless-user.patch, +wvstreams-4.2.2-r3.ebuild:
+  Don't add -g -O2 to the user selected CFLAGS. Sanitize the ebuild, thanks to
+  Tiziano Müller <dev-zero@gentoo.org>. Use sys/sysctl.h for __user
+  definition - linux/compiler.h has been removed from kernel 2.6.19 (#164829).
 
   11 Nov 2006; Alin Nastac <mrness@gentoo.org>
   -files/wvstreams-4.0.2-MOC-fix.patch,
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 4671f4041bd0..446011bebb7c 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -21,6 +21,10 @@ AUX wvstreams-4.2.2-linux-serial.patch 1649 RMD160 0d40148b3b66a6bda21cae8145360
 MD5 3728d5a371443c7bf725bd9518bcec6f files/wvstreams-4.2.2-linux-serial.patch 1649
 RMD160 0d40148b3b66a6bda21cae81453605d7f2c0a96c files/wvstreams-4.2.2-linux-serial.patch 1649
 SHA256 9073db1a01e36b11ea0cd79d1eed530b6a0938447e4aa66c89497582c23ce9b9 files/wvstreams-4.2.2-linux-serial.patch 1649
+AUX wvstreams-4.2.2-sane-cflags.patch 1582 RMD160 f0e0688d8af719fba3907e57b6efdc5f946fc215 SHA1 abaa5f2cfb56f715ce0396f6045a23016f0e1570 SHA256 ad6b2ef37f6c314ba267a24f7ff8e83c5e4b0b280aa677e0aa4aebabd56cf6dc
+MD5 17da4168a7ebb7515d6a533178d1d3cb files/wvstreams-4.2.2-sane-cflags.patch 1582
+RMD160 f0e0688d8af719fba3907e57b6efdc5f946fc215 files/wvstreams-4.2.2-sane-cflags.patch 1582
+SHA256 ad6b2ef37f6c314ba267a24f7ff8e83c5e4b0b280aa677e0aa4aebabd56cf6dc files/wvstreams-4.2.2-sane-cflags.patch 1582
 AUX wvstreams-4.2.2-tcl_8_4.patch 1022 RMD160 cd45fe4b862d6379eefce9bafb5a031b38df93c6 SHA1 7503c63a29fde6a87d47257cc2bd3afceda6e841 SHA256 858057abdb2876f1371b5f8a87f0d08ef987850227aa96ea98467b7981155b36
 MD5 eb612ca9150b75c84d0a8dedeb2f483e files/wvstreams-4.2.2-tcl_8_4.patch 1022
 RMD160 cd45fe4b862d6379eefce9bafb5a031b38df93c6 files/wvstreams-4.2.2-tcl_8_4.patch 1022
@@ -29,23 +33,27 @@ AUX wvstreams-4.2.2-uniconfd-ini.patch 804 RMD160 f8766ba8aea5ab22eed5fc26e2414f
 MD5 d6120d7dc3ee356de9144aab47c8e2fc files/wvstreams-4.2.2-uniconfd-ini.patch 804
 RMD160 f8766ba8aea5ab22eed5fc26e2414f2f0ca30a0b files/wvstreams-4.2.2-uniconfd-ini.patch 804
 SHA256 23c4f137ca41378d39823a2660c4767adccbed7ad31ca01b958302bccb5dd080 files/wvstreams-4.2.2-uniconfd-ini.patch 804
-AUX wvstreams-4.2.2-wireless-user.patch 466 RMD160 1d3d9d5ef17892ba941fddac841b908de9303562 SHA1 f1bed39371eb648bc8fb4e6d64693c59003c7d91 SHA256 b47b42821695cd8621156e52f89c0205bfd2ab7f5814892c95575eb5047315fa
-MD5 78cabecec5a214b5919c61cde43ab70c files/wvstreams-4.2.2-wireless-user.patch 466
-RMD160 1d3d9d5ef17892ba941fddac841b908de9303562 files/wvstreams-4.2.2-wireless-user.patch 466
-SHA256 b47b42821695cd8621156e52f89c0205bfd2ab7f5814892c95575eb5047315fa files/wvstreams-4.2.2-wireless-user.patch 466
+AUX wvstreams-4.2.2-wireless-user.patch 462 RMD160 2c206e7d3373813c733e2f0b10436a0fd88dccf8 SHA1 8e384d3cd2b56f28b185146f19c37bdd019f189f SHA256 ee6cf04970b7ee20c406b8cd30a1ae36754eaa32edc76b44514bac5e462fb8b4
+MD5 d6b7827616d5527165007c1afeedfd06 files/wvstreams-4.2.2-wireless-user.patch 462
+RMD160 2c206e7d3373813c733e2f0b10436a0fd88dccf8 files/wvstreams-4.2.2-wireless-user.patch 462
+SHA256 ee6cf04970b7ee20c406b8cd30a1ae36754eaa32edc76b44514bac5e462fb8b4 files/wvstreams-4.2.2-wireless-user.patch 462
 DIST wvstreams-4.2.2.tar.gz 1269821 RMD160 dece6092e847976d01568f20707701a8241d30d2 SHA1 a44a9ded6339fb2c53eb472d0763e4cf6b0c0534 SHA256 8fa45a6bfe4d6ac3d9a457543844873090d0c7da817991ac0cd547732f475a14
 EBUILD wvstreams-4.2.2-r2.ebuild 2501 RMD160 5cbae61a26d20d2234160df64009b9c86549fae4 SHA1 5686270c6bca044fbf722712f940c414b26b1a8a SHA256 7eba6e6b030546b58eb40c44dc900916e09024687292cbc9464583c3510d4d35
 MD5 8f737e2ff600fb4bb676f1b6a611c963 wvstreams-4.2.2-r2.ebuild 2501
 RMD160 5cbae61a26d20d2234160df64009b9c86549fae4 wvstreams-4.2.2-r2.ebuild 2501
 SHA256 7eba6e6b030546b58eb40c44dc900916e09024687292cbc9464583c3510d4d35 wvstreams-4.2.2-r2.ebuild 2501
+EBUILD wvstreams-4.2.2-r3.ebuild 2440 RMD160 f4ed0c987a6e7c5b94f4fe8496a6571908711a76 SHA1 3bb20efa6062e141ab26680afd33520024a72b71 SHA256 220e6fd9f497545efc97cc1e9a7498b2164a17110ac065111c73e7d49c796be2
+MD5 ea1a272a384fa3ac8cdbe49f98c643ca wvstreams-4.2.2-r3.ebuild 2440
+RMD160 f4ed0c987a6e7c5b94f4fe8496a6571908711a76 wvstreams-4.2.2-r3.ebuild 2440
+SHA256 220e6fd9f497545efc97cc1e9a7498b2164a17110ac065111c73e7d49c796be2 wvstreams-4.2.2-r3.ebuild 2440
 EBUILD wvstreams-4.2.2.ebuild 2537 RMD160 93309344254038873a0c706117c850e280e01ab0 SHA1 709997e1e5e3aeff42a0f46c9987000c2a26b10a SHA256 01d7807c175eaa446084241b2e123ed87449a3289c62992686f0e37db77b22c3
 MD5 bfef0ede67c42cb43776f76d6ec982e3 wvstreams-4.2.2.ebuild 2537
 RMD160 93309344254038873a0c706117c850e280e01ab0 wvstreams-4.2.2.ebuild 2537
 SHA256 01d7807c175eaa446084241b2e123ed87449a3289c62992686f0e37db77b22c3 wvstreams-4.2.2.ebuild 2537
-MISC ChangeLog 15598 RMD160 63b163e5b4d4f7c8f6deddb8973c41de8fc9dc9a SHA1 90edd975fc5db1e70d16043631cf41af8a063dd0 SHA256 6088ed0feed72d253178b4e95f1fe5a4212aeff6dcc323260466cf0ed324bd82
-MD5 8fef4257ae3ee2ccf3e53398dd015365 ChangeLog 15598
-RMD160 63b163e5b4d4f7c8f6deddb8973c41de8fc9dc9a ChangeLog 15598
-SHA256 6088ed0feed72d253178b4e95f1fe5a4212aeff6dcc323260466cf0ed324bd82 ChangeLog 15598
+MISC ChangeLog 16026 RMD160 360fbb6312160d2b2fe92e411e416f8990b807d0 SHA1 a6d80c0fbb4c650ff1e888e9f0b00d1782310b18 SHA256 169cdc32987bf5d49b1f8fea6e2b8f2e478a02b08cd2c3c6967539f151291d1f
+MD5 20da2ea2d1ab507cabc32f34f63d2507 ChangeLog 16026
+RMD160 360fbb6312160d2b2fe92e411e416f8990b807d0 ChangeLog 16026
+SHA256 169cdc32987bf5d49b1f8fea6e2b8f2e478a02b08cd2c3c6967539f151291d1f ChangeLog 16026
 MISC metadata.xml 313 RMD160 e543c31d8ddc948a387dcdcc8638a848c587177b SHA1 a40d5fd17e50dc9f983efc63e5cbb8b407b95c7a SHA256 1ec30d4508abc443f3e9c4829b0e7d7e5c588419344203476818a29f71b98a37
 MD5 227de7f678ad662524292836709de75f metadata.xml 313
 RMD160 e543c31d8ddc948a387dcdcc8638a848c587177b metadata.xml 313
@@ -56,10 +64,13 @@ SHA256 af8d2d360c3e497dcd8a2f2cc57ec947b2c99a440dff184197b350e60491f451 files/di
 MD5 ce2f63ffae6742f96ede8200eb39c3d1 files/digest-wvstreams-4.2.2-r2 250
 RMD160 ad134621ec5ac0b3b3884506e3abfbf770e34b52 files/digest-wvstreams-4.2.2-r2 250
 SHA256 af8d2d360c3e497dcd8a2f2cc57ec947b2c99a440dff184197b350e60491f451 files/digest-wvstreams-4.2.2-r2 250
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFVf2l3sf9c6kjmR8RAsxAAKCuAxX5WqBzKmtkmTfPf0ylvYcGwwCghgQq
-Ji7WH0S8qjvZWHymhGCNPMc=
-=LgUO
+iD8DBQFFy3TyJnxX6mF440QRAhxBAKC1/zOnx95TCuNSAst7dZI7ftz6xgCgp15p
+M/o9/MubKoHzlptOB0ggpeg=
+=XeWV
 -----END PGP SIGNATURE-----
diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r3 b/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r3
new file mode 100644
index 000000000000..02e8894f22b4
--- /dev/null
+++ b/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r3
@@ -0,0 +1,3 @@
+MD5 103230cb9926cb8f3f4d8dc8584f3b9c wvstreams-4.2.2.tar.gz 1269821
+RMD160 dece6092e847976d01568f20707701a8241d30d2 wvstreams-4.2.2.tar.gz 1269821
+SHA256 8fa45a6bfe4d6ac3d9a457543844873090d0c7da817991ac0cd547732f475a14 wvstreams-4.2.2.tar.gz 1269821
diff --git a/net-libs/wvstreams/files/wvstreams-4.2.2-sane-cflags.patch b/net-libs/wvstreams/files/wvstreams-4.2.2-sane-cflags.patch
new file mode 100644
index 000000000000..4435681ccb62
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.2.2-sane-cflags.patch
@@ -0,0 +1,59 @@
+diff -Nru wvstreams-4.2.2.orig/vars.mk wvstreams-4.2.2/vars.mk
+--- wvstreams-4.2.2.orig/vars.mk	2007-02-08 20:50:16.000000000 +0200
++++ wvstreams-4.2.2/vars.mk	2007-02-08 20:50:36.000000000 +0200
+@@ -66,10 +66,10 @@
+ CXXFLAGS+=-D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+ CFLAGS+=-D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+ 
+-ifeq ($(DEBUG),)
+-CXXFLAGS+=-g
+-CFLAGS+=-g
+-endif
++#ifeq ($(DEBUG),)
++#CXXFLAGS+=-g
++#CFLAGS+=-g
++#endif
+ 
+ ifneq ($(DEBUG),)
+ CXXFLAGS+=-ggdb -DDEBUG$(if $(filter-out yes,$(DEBUG)), -DDEBUG_$(DEBUG))
+@@ -91,9 +91,9 @@
+ endif
+ 
+ ifneq ("$(enable_optimization)", "no")
+-CXXFLAGS+=-O2
++#CXXFLAGS+=-O2
+ #CXXFLAGS+=-felide-constructors
+-CFLAGS+=-O2
++#CFLAGS+=-O2
+ endif
+ 
+ ifneq ("$(enable_warnings)", "no")
+diff -Nru wvstreams-4.2.2.orig/wvrules.mk wvstreams-4.2.2/wvrules.mk
+--- wvstreams-4.2.2.orig/wvrules.mk	2007-02-08 20:50:16.000000000 +0200
++++ wvstreams-4.2.2/wvrules.mk	2007-02-08 20:49:04.000000000 +0200
+@@ -82,9 +82,9 @@
+ endif
+ 
+ ifneq ("$(enable_optimization)", "no")
+-  CXXFLAGS+=-O2
++  #CXXFLAGS+=-O2
+   #CXXFLAGS+=-felide-constructors
+-  CFLAGS+=-O2
++  #CFLAGS+=-O2
+ endif
+ 
+ ifneq ("$(enable_warnings)", "no")
+@@ -177,11 +177,11 @@
+   C_AND_CXX_FLAGS += -ggdb -DDEBUG=1
+   LDFLAGS += -ggdb
+ else
+-  C_AND_CXX_FLAGS += -g -DDEBUG=0
++  C_AND_CXX_FLAGS += -DDEBUG=0
+   #CFLAGS += -DNDEBUG    # I don't like disabling assertions...
+   #CFLAGS += -fomit-frame-pointer  # really evil
+   #CXXFLAGS += -fno-implement-inlines  # causes trouble with egcs 1.0
+-  LDFLAGS += -g
++  #LDFLAGS += -g
+ endif
+ 
+ ifeq ($(PROFILE),1)
diff --git a/net-libs/wvstreams/files/wvstreams-4.2.2-wireless-user.patch b/net-libs/wvstreams/files/wvstreams-4.2.2-wireless-user.patch
index cbb7f2db2c94..35092a93cf01 100644
--- a/net-libs/wvstreams/files/wvstreams-4.2.2-wireless-user.patch
+++ b/net-libs/wvstreams/files/wvstreams-4.2.2-wireless-user.patch
@@ -5,7 +5,7 @@ diff -Nur wvstreams-4.2.2.orig/linuxstreams/wvinterface.cc wvstreams-4.2.2/linux
  #include <errno.h>
  #include <linux/sockios.h>
  
-+#include <linux/compiler.h>
++#include <sys/sysctl.h>
  #define _LINUX_IF_H /* Hack to prevent loading linux/if.h */
  #include <linux/wireless.h>
  
diff --git a/net-libs/wvstreams/wvstreams-4.2.2-r3.ebuild b/net-libs/wvstreams/wvstreams-4.2.2-r3.ebuild
new file mode 100644
index 000000000000..d93aa0348378
--- /dev/null
+++ b/net-libs/wvstreams/wvstreams-4.2.2-r3.ebuild
@@ -0,0 +1,91 @@
+# 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.2.2-r3.ebuild,v 1.1 2007/02/08 19:07:02 mrness Exp $
+
+WANT_AUTOCONF=2.59
+WANT_AUTOMAKE=none
+
+inherit eutils fixheadtails autotools qt3
+
+DESCRIPTION="A network programming library in C++"
+HOMEPAGE="http://open.nit.ca/wiki/?page=WvStreams"
+SRC_URI="http://open.nit.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}-gcc41.patch"
+	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}-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
+}