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).

(Portage version: 2.1.1-r2)

5 files changed, 165 insertions, 3 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/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
+}