[gentoo-commits] repo/gentoo:master commit in: net-libs/wvstreams/files/, net-libs/wvstreams/

[Jeroen Roovers]

commit:     ba48b6eef15db93238c4646e21e67bdae135bb3f
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 08:47:15 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 08:47:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba48b6ee

net-libs/wvstreams: Old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-libs/wvstreams/Manifest                        |   1 -
 ...ytes-should-be-enough-right-question-mark.patch |  11 ---
 .../files/wvstreams-4.6.1-fix-c++14.patch          |  36 -------
 .../wvstreams/files/wvstreams-4.6.1-glibc212.patch |  23 -----
 .../files/wvstreams-4.6.1-openssl-1.0.0.patch      |  16 ----
 net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild       | 105 ---------------------
 net-libs/wvstreams/wvstreams-4.6.1-r4.ebuild       |  95 -------------------
 net-libs/wvstreams/wvstreams-4.6.1-r5.ebuild       |  96 -------------------
 8 files changed, 383 deletions(-)

diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 579ea20214d..ac908263b97 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,3 +1,2 @@
-DIST wvstreams-4.6.1.tar.gz 1118456 BLAKE2B 62243d9adc6ff5d01b7dfeb2ce24e8e530914e6ac4540e542dc3cee31e00d32211ad1c6085d7f5bd6e5fd85ff66e8c93afa37cec81f976590ba150f039dc8580 SHA512 59d64e527d86394b768b35254bf95ea59c412c0e092393ea3c84ec3202949150439bb6093bd7350b64ad4767acdb8feb38806c03de4e5cf238ed893f41db4a4a
 DIST wvstreams_4.6.1-14.debian.tar.xz 21124 BLAKE2B 2af6ec180c3130dd7def733e5ea569fd0a81cd2c2411daca25e6042dcbe78792bafc4b13f1c1fffddb6cd66273f11c62f54b415c975cbea0af052b18ff0955d1 SHA512 93ea7c4fbab542bd552d6e91ae0c49a27ad8aded177ae6474943acb08d204ab31eac49b3f416b4d90a38ea697f3641c09651a64f9c40d12543d454aadf2ad9e4
 DIST wvstreams_4.6.1.orig.tar.gz 1118456 BLAKE2B 62243d9adc6ff5d01b7dfeb2ce24e8e530914e6ac4540e542dc3cee31e00d32211ad1c6085d7f5bd6e5fd85ff66e8c93afa37cec81f976590ba150f039dc8580 SHA512 59d64e527d86394b768b35254bf95ea59c412c0e092393ea3c84ec3202949150439bb6093bd7350b64ad4767acdb8feb38806c03de4e5cf238ed893f41db4a4a

diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-2048-bytes-should-be-enough-right-question-mark.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-2048-bytes-should-be-enough-right-question-mark.patch
deleted file mode 100644
index 15fb13ca633..00000000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-2048-bytes-should-be-enough-right-question-mark.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/utils/wvtask.cc
-+++ b/utils/wvtask.cc
-@@ -429,7 +429,7 @@
- 	    total = (val+1) * (size_t)1024;
- 	    
-             if (!use_shared_stack())
--                total = 1024; // enough to save the do_task stack frame
-+                total = 2048; // enough to save the do_task stack frame
- 
- 	    // set up a stack frame for the new task.  This runs once
- 	    // per get_stack.

diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-fix-c++14.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-fix-c++14.patch
deleted file mode 100644
index b2c2efd5624..00000000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-fix-c++14.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix building with C++14, which errors out due to explicit operator bool() conversion
-See also: https://bugs.gentoo.org/show_bug.cgi?id=594058
-
---- a/streams/wvstream.cc
-+++ b/streams/wvstream.cc
-@@ -907,9 +907,9 @@
-     
-     if (forceable)
-     {
--	si.wants.readable = readcb;
--	si.wants.writable = writecb;
--	si.wants.isexception = exceptcb;
-+	si.wants.readable = static_cast<bool>(readcb);
-+	si.wants.writable = static_cast<bool>(writecb);
-+	si.wants.isexception = static_cast<bool>(exceptcb);
-     }
-     else
-     {
-@@ -1019,7 +1019,7 @@
- 
- IWvStream::SelectRequest WvStream::get_select_request()
- {
--    return IWvStream::SelectRequest(readcb, writecb, exceptcb);
-+    return IWvStream::SelectRequest(static_cast<bool>(readcb), static_cast<bool>(writecb), static_cast<bool>(exceptcb));
- }
- 
- 
-@@ -1107,7 +1107,7 @@
-     // inefficient, because if the alarm was expired then pre_select()
-     // returned true anyway and short-circuited the previous select().
-     TRACE("hello-%p\n", this);
--    return !alarm_was_ticking || select(0, readcb, writecb, exceptcb);
-+    return !alarm_was_ticking || select(0, static_cast<bool>(readcb), static_cast<bool>(writecb), static_cast<bool>(exceptcb));
- }
- 
- 

diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch
deleted file mode 100644
index 38218d7213a..00000000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/333301
-
---- a/ipstreams/wvunixdgsocket.cc
-+++ b/ipstreams/wvunixdgsocket.cc
-@@ -1,5 +1,5 @@
- #include "wvunixdgsocket.h"
--#ifdef MACOS
-+#if defined(MACOS) || defined(__GNUC__)
- #include <sys/types.h>
- #include <sys/stat.h>
- #endif
---- a/streams/wvatomicfile.cc
-+++ b/streams/wvatomicfile.cc
-@@ -11,7 +11,8 @@
- #include "wvfileutils.h"
- #include "wvstrutils.h"
- 
--#ifdef MACOS
-+#if defined(MACOS) || defined(__GNUC__)
-+#include <sys/types.h>
- #include <sys/stat.h>
- #endif
- 

diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch
deleted file mode 100644
index 327e19a0c11..00000000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/304283
-
---- a/crypto/wvx509.cc
-+++ b/crypto/wvx509.cc
-@@ -1157,7 +1157,11 @@
-         
-         if (ext)
-         {
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+            const X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
-+#else
-             X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
-+#endif
-             if (!method)
-             {
-                 WvDynBuf buf;

diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild
deleted file mode 100644
index 34eb54286d8..00000000000
--- a/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic toolchain-funcs versionator
-
-DESCRIPTION="A network programming library in C++"
-HOMEPAGE="http://alumnit.ca/wiki/?WvStreams"
-SRC_URI="https://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 boost"
-
-#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:0=
-	sys-libs/zlib
-	dbus? ( >=sys-apps/dbus-1.4.20 )
-	<dev-libs/openssl-1.1:0=
-	pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	boost? ( >=dev-libs/boost-1.34.1:= )"
-
-DOCS="ChangeLog README*"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == "binary" ]] && return
-
-	if ! use boost && ! 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 USE=boost must be installed."
-		die "Please activate >=sys-devel/gcc-4.1 with gcc-config."
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-parallel-make.patch \
-		"${FILESDIR}"/${P}-openssl-1.0.0.patch \
-		"${FILESDIR}"/${P}-glibc212.patch \
-		"${FILESDIR}"/${P}-gcc47.patch \
-		"${FILESDIR}"/${P}-fix-c++14.patch
-
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
-		argp/configure.ac || die
-
-	eautoreconf
-	pushd argp >/dev/null
-	eautoreconf
-	popd >/dev/null
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	append-flags -fno-tree-dce -fno-optimize-sibling-calls #421375
-
-	tc-export AR CXX
-
-	use boost && export ac_cv_header_tr1_functional=no
-
-	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
-}

diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r4.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r4.ebuild
deleted file mode 100644
index 2cd4879c732..00000000000
--- a/net-libs/wvstreams/wvstreams-4.6.1-r4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic toolchain-funcs versionator
-
-DESCRIPTION="A network programming library in C++"
-HOMEPAGE="http://alumnit.ca/wiki/?WvStreams"
-SRC_URI="https://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 boost"
-
-#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="
-	<dev-libs/openssl-1.1:0=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	dbus? ( >=sys-apps/dbus-1.4.20 )
-	pam? ( sys-libs/pam )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	boost? ( >=dev-libs/boost-1.34.1:= )
-"
-DOCS="ChangeLog README*"
-PATCHES=(
-	"${FILESDIR}"/${P}-autoconf.patch
-	"${FILESDIR}"/${P}-fix-c++14.patch
-	"${FILESDIR}"/${P}-gcc47.patch
-	"${FILESDIR}"/${P}-glibc212.patch
-	"${FILESDIR}"/${P}-openssl-1.0.0.patch
-	"${FILESDIR}"/${P}-parallel-make.patch
-	"${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	append-flags -fno-tree-dce -fno-optimize-sibling-calls #421375
-
-	tc-export AR CXX
-
-	use boost && export ac_cv_header_tr1_functional=no
-
-	econf \
-		$(use_enable debug) \
-		$(use_with dbus) \
-		$(use_with pam) \
-		--cache-file="${T}"/config.cache \
-		--disable-optimization \
-		--localstatedir=/var \
-		--with-openssl \
-		--with-zlib \
-		--without-qt \
-		--without-tcl \
-		--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/*
-		docinto html
-		dodoc -r Docs/doxy-html/*
-	fi
-}

diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r5.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r5.ebuild
deleted file mode 100644
index db808c10219..00000000000
--- a/net-libs/wvstreams/wvstreams-4.6.1-r5.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic toolchain-funcs versionator
-
-DESCRIPTION="A network programming library in C++"
-HOMEPAGE="http://alumnit.ca/wiki/?WvStreams"
-SRC_URI="https://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 boost"
-
-#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="
-	<dev-libs/openssl-1.1:0=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	dbus? ( >=sys-apps/dbus-1.4.20 )
-	pam? ( sys-libs/pam )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	boost? ( >=dev-libs/boost-1.34.1:= )
-"
-DOCS="ChangeLog README*"
-PATCHES=(
-	"${FILESDIR}"/${P}-autoconf.patch
-	"${FILESDIR}"/${P}-fix-c++14.patch
-	"${FILESDIR}"/${P}-gcc47.patch
-	"${FILESDIR}"/${P}-glibc212.patch
-	"${FILESDIR}"/${P}-openssl-1.0.0.patch
-	"${FILESDIR}"/${P}-parallel-make.patch
-	"${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch
-	"${FILESDIR}"/${P}-2048-bytes-should-be-enough-right-question-mark.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	append-flags -fno-tree-dce -fno-optimize-sibling-calls #421375
-
-	tc-export AR CXX
-
-	use boost && export ac_cv_header_tr1_functional=no
-
-	econf \
-		$(use_enable debug) \
-		$(use_with dbus) \
-		$(use_with pam) \
-		--cache-file="${T}"/config.cache \
-		--disable-optimization \
-		--localstatedir=/var \
-		--with-openssl \
-		--with-zlib \
-		--without-qt \
-		--without-tcl \
-		--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/*
-		docinto html
-		dodoc -r Docs/doxy-html/*
-	fi
-}