Pass --localstatedir=/var to correct uniconfd.ini location. Use -fno-strict-aliasing since this package is not ready for aliasing. Fix compability with sys-devel/gcc >= 4.7 wrt #419563 and #419971 by Ioannis Galanomatis. inherit eutils for epatch

Package-Manager: portage-2.2.0_alpha109/cvs/Linux x86_64

5 files changed, 175 insertions, 12 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index 4421e98ba120..16e9921bfbcd 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-libs/wvstreams
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.143 2012/05/05 02:54:29 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.144 2012/06/06 20:33:49 ssuominen Exp $
+
+  06 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+  wvstreams-4.6.1-r1.ebuild:
+  inherit eutils for epatch
+
+*wvstreams-4.6.1-r2 (06 Jun 2012)
+
+  06 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +wvstreams-4.6.1-r2.ebuild, +files/wvstreams-4.6.1-gcc47.patch:
+  Pass --localstatedir=/var to correct uniconfd.ini location. Use
+  -fno-strict-aliasing since this package is not ready for aliasing. Fix
+  compability with sys-devel/gcc >= 4.7 wrt #419563 and #419971 by Ioannis
+  Galanomatis.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> wvstreams-4.6.1-r1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 713bde3fdaa3..96aba37980ac 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,21 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX wvstreams-4.6.1-gcc47.patch 1296 RMD160 d02d9d9c3de54df7a2a4d46e30b6110833684b4d SHA1 2991d5e23f5778611ba1647643d6c567b8240328 SHA256 7b83dad8e3931686962823a7008af0034a430f35e1eb617f5c8137141e14ccdd
 AUX wvstreams-4.6.1-glibc212.patch 489 RMD160 ffe2e01f4c265f2963a43aa52ad54c7d84645d0f SHA1 366c599b28c39a3f0c31ad67d7e38d7e0d37960b SHA256 1090e2b4bcf94e21f18ebc81a1bf6c6ae8763b8e98a5b05ab6d57ff6425cda6a
 AUX wvstreams-4.6.1-openssl-1.0.0.patch 395 RMD160 e221e21048eaa4e23acd856f02c28646dc5b8e5d SHA1 ad267c5be7cb36877ce83d521a797f82569d6365 SHA256 5d95bf846dd6b306bf2b8f26efed1addb88753e5f72a0ec6466dbfaca847ecb6
 AUX wvstreams-4.6.1-parallel-make.patch 1874 RMD160 14ff046719f18db9738aec55fb1bca4c88050655 SHA1 d4bfb01ead042191bd675be972aec5df3208bd03 SHA256 f8e89d6cd227ee6aea225b89cf0848ae41f009718d1927b95dde8b87cd713f94
 DIST wvstreams-4.6.1.tar.gz 1118456 RMD160 55550608ccfa53c7daf0ee195466f077b3540acb SHA1 1431efc3f46a13b6a8dbcad4123e19473369f767 SHA256 8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
-EBUILD wvstreams-4.6.1-r1.ebuild 2162 RMD160 212d6067e9a1d467f2b645cfedfca8c66ed506da SHA1 44c2bb88d328c856ba28c8c1e68e0e314f58187c SHA256 9080227fb81aad85e9049ab4d44a720d65f8abef321843ecac7b0f97d35012f9
-MISC ChangeLog 25203 RMD160 d778d87b4d9d1e714f30d44083c1e92ba3810ac6 SHA1 f088ddf59a6d283ecb43dcf4cc7b0cf9d61a8908 SHA256 0549aefc117b7a0e8a206358eb3a2e5ed637ac0beb6b6a4660b8c3990113f530
+EBUILD wvstreams-4.6.1-r1.ebuild 2172 RMD160 5a41010fdd1ffbd2a8ee49da66e8e46e93412aa2 SHA1 078f6c896f9376b72a07f3c2a6f9336dce1461f1 SHA256 00015dcdd2238268802cc133de001611b06312f1235a05ed50f982c6292367be
+EBUILD wvstreams-4.6.1-r2.ebuild 2273 RMD160 50dd7d15ef8c2ed12ae7052351f981baa0a77aba SHA1 1d2bf083a91569a5af3539ed172b3a17b8a1dfb5 SHA256 b0a10be784067a23961848fc06b3d36683c859c404b6359d43a4db2c4e3a8513
+MISC ChangeLog 25703 RMD160 4bca9d7a12e20ddbd280e76487899159323eec01 SHA1 dcdea1384c99666d5777c0e1448a46ba5d7f26b1 SHA256 7c35069fbcfad691f670cea2e1757e1f0fe7c83cbbc93c21d9a6f829262f4902
 MISC metadata.xml 309 RMD160 79f8337ae4402c7200ab36ef4b79f60e680fccc0 SHA1 9bc4a7e425c46bd649248117756cf6f61f26de4d SHA256 0fb209b78e6aa6c3fc22d651fca0479853bc177f96776c00ee30c6e637bc73f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPz7jXAAoJEEdUh39IaPFNdgEH+QHPqZqt/ex04LDB/P4qtWJT
-5upz3324XYLbQC8WgSlj2jIbRFkDqOi/sVtuNDddR3BHZxARiOjCfBc94LyWF103
-JHY6L4VwATFQG8ro+PE/iT2tDBFleDV3Ib2n3pQJFp25I+2M1zYysFrzNzd2kkPu
-rdA8hatNBfeCaX7Y6BT7fK337L0wX9yTiomWOwVlo78Zg5SMmwsfF8wU4UCX2+K/
-G9ZvmqbuDpOQXiaTwl0PsqJtusnYu5P37De6Lc+QWNMOqqXTW+1F9jtMkL/t3OU/
-LE93fvXvHK4p1HCyLBI3BfEyD39W6pQzILMH0vhm+b656SubGVXDMwBo3lYKrkM=
-=oQti
+iQEcBAEBAgAGBQJPz73BAAoJEEdUh39IaPFNiacIAJvqRUL5cOsiFUWcd1U7qxdm
+8HJjTOX/ywD3Vb5w0ffWXr48BnY6i7M0Pc2HDw1au6EQkh0potakj9hYO+a/Z86y
+5LCAUsPLrO4QsMgiAhP4GnkhFAHNf5F402fFxlmWMkuL++gHi85OJLSL3zPr8zEd
+/jthJP7VoMQ5MLM1pp2GuwH5xbb5RrgrcPKcZdZHKQBf5NWp1oEF6IrDftMoQNPL
+ZuHcTc6iUJBKJDhylVy/T5VHxXyol2Hrau291DbyayOUiRolrJVeeB0wc3uZJ5lC
+tpWwVL5u9imaBVlF7xitgtO6ZhqxvcJ12bW1ip71Eiy8LdBDF5ie9thXL0egEzg=
+=6BwJ
 -----END PGP SIGNATURE-----
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch
new file mode 100644
index 000000000000..b284da8f3e79
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch
@@ -0,0 +1,50 @@
+http://bugs.gentoo.org/419563
+http://bugs.gentoo.org/419971
+
+See -gcc47-patch and -magic.patch in Fedora git:
+
+http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree
+
+--- include/wvtask.h
++++ include/wvtask.h
+@@ -45,7 +45,8 @@
+     typedef void TaskFunc(void *userdata);
+     
+     static int taskcount, numtasks, numrunning;
+-    int magic_number, *stack_magic;
++    int volatile magic_number;
++    int *stack_magic;
+     WvString name;
+     int tid;
+     
+@@ -84,7 +85,7 @@
+     static WvTaskMan *singleton;
+     static int links;
+     
+-    static int magic_number;
++    static int volatile magic_number;
+     static WvTaskList all_tasks, free_tasks;
+     
+     static void get_stack(WvTask &task, size_t size);
+--- include/wvuid.h
++++ include/wvuid.h
+@@ -7,6 +7,7 @@
+ #ifndef __WVUID_H
+ #define __WVUID_H
+ 
++#include <unistd.h>
+ #include "wvstring.h"
+ 
+ #if WIN32
+--- utils/wvtask.cc
++++ utils/wvtask.cc
+@@ -58,7 +58,8 @@
+ int WvTask::taskcount, WvTask::numtasks, WvTask::numrunning;
+ 
+ WvTaskMan *WvTaskMan::singleton;
+-int WvTaskMan::links, WvTaskMan::magic_number;
++int WvTaskMan::links;
++int volatile WvTaskMan::magic_number;
+ WvTaskList WvTaskMan::all_tasks, WvTaskMan::free_tasks;
+ ucontext_t WvTaskMan::stackmaster_task, WvTaskMan::get_stack_return,
+     WvTaskMan::toplevel;
diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r1.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r1.ebuild
index e9aed8962a55..98887a3f3b81 100644
--- a/net-libs/wvstreams/wvstreams-4.6.1-r1.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.6.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.6.1-r1.ebuild,v 1.8 2012/05/05 02:54:29 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.6.1-r1.ebuild,v 1.9 2012/06/06 20:33:49 ssuominen Exp $
 
 EAPI=2
-inherit autotools toolchain-funcs versionator
+inherit autotools eutils toolchain-funcs versionator
 
 DESCRIPTION="A network programming library in C++"
 HOMEPAGE="http://alumnit.ca/wiki/?WvStreams"
diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild
new file mode 100644
index 000000000000..c10e87366a52
--- /dev/null
+++ b/net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild,v 1.1 2012/06/06 20:33:49 ssuominen Exp $
+
+EAPI=4
+inherit autotools eutils flag-o-matic toolchain-funcs versionator
+
+DESCRIPTION="A network programming library in C++"
+HOMEPAGE="http://alumnit.ca/wiki/?WvStreams"
+SRC_URI="http://wvstreams.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="pam doc +ssl +dbus debug"
+
+#Tests fail if openssl is not compiled with -DPURIFY. Gentoo's isn't. FAIL!
+RESTRICT="test"
+
+#QA Fail: xplc is compiled as a part of wvstreams.
+#It'll take a larger patching effort to get it extracted, since upstream integrated it
+#more tightly this time. Probably for the better since upstream xplc seems dead.
+
+RDEPEND="sys-libs/readline
+	sys-libs/zlib
+	dbus? ( >=sys-apps/dbus-1.4.20 )
+	dev-libs/openssl:0
+	pam? ( sys-libs/pam )
+	virtual/c++-tr1-functional"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+DOCS="ChangeLog README*"
+
+pkg_setup() {
+	if has_version '>=sys-devel/gcc-4.1' && ! has_version '>=dev-libs/boost-1.34.1'
+	then
+		if ! version_is_at_least 4.1 "$(gcc-fullversion)"
+		then
+			eerror "This package requires the active gcc to be at least version 4.1"
+			eerror "or >=dev-libs/boost-1.34.1 must be installed."
+			die "Please activate >=sys-devel/gcc-4.1 with gcc-config."
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-parallel-make.patch \
+		"${FILESDIR}"/${P}-openssl-1.0.0.patch \
+		"${FILESDIR}"/${P}-glibc212.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
+
+	eautoreconf
+	pushd argp >/dev/null
+	eautoreconf
+	popd >/dev/null
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	tc-export CXX
+
+	econf \
+		--localstatedir=/var \
+		$(use_enable debug) \
+		--disable-optimization \
+		$(use_with dbus) \
+		--with-openssl \
+		$(use_with pam) \
+		--without-tcl \
+		--without-qt \
+		--with-zlib \
+		--without-valgrind
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		doxygen || die
+	fi
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		#the list of files is too big for dohtml -r Docs/doxy-html/*
+		cd Docs/doxy-html
+		dohtml -r *
+	fi
+}