commit: 7442974f018c4f58ca1a25228ab1f01170ff441e
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 26 19:10:18 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 19:10:44 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7442974f
net-libs/wvstreams: EAPI bump.
Package-Manager: Portage-2.3.6, Repoman-2.3.3
.../files/wvstreams-4.6.1-_DEFAULT_SOURCE.patch | 11 ++++
.../wvstreams/files/wvstreams-4.6.1-autoconf.patch | 31 ++++++++++
net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild | 2 +-
...s-4.6.1-r3.ebuild => wvstreams-4.6.1-r4.ebuild} | 68 +++++++++-------------
4 files changed, 72 insertions(+), 40 deletions(-)
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-_DEFAULT_SOURCE.patch
b/net-libs/wvstreams/files/wvstreams-4.6.1-_DEFAULT_SOURCE.patch
new file mode 100644
index 00000000000..1084a5be21e
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.6.1-_DEFAULT_SOURCE.patch
@@ -0,0 +1,11 @@
+--- a/wvrules.mk
++++ b/wvrules.mk
+@@ -83,7 +83,7 @@
+
+ INCFLAGS=$(addprefix -I,$(WVSTREAMS_INC) $(XPATH))
+ CPPFLAGS+=$(INCFLAGS) \
+- -D_BSD_SOURCE -D_GNU_SOURCE $(OSDEFINE) \
++ -D_DEFAULT_SOURCE $(OSDEFINE) \
+ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
+ -DUNSTABLE
+
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-autoconf.patch
b/net-libs/wvstreams/files/wvstreams-4.6.1-autoconf.patch
new file mode 100644
index 00000000000..a9b9a5ac90c
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.6.1-autoconf.patch
@@ -0,0 +1,31 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -641,6 +641,8 @@
+
+ AC_CONFIG_HEADERS(include/wvautoconf.h)
+
++AC_CONFIG_SUBDIRS(argp)
++
+ AC_OUTPUT
+
+ # Now convert PACKAGE_* macros into WVPACKAGE_* in include/wvautoconf.h
+--- a/argp/configure.ac
++++ b/argp/configure.ac
+@@ -4,7 +4,7 @@
+ AC_PREREQ(2.54)
+ AC_INIT(argp-ba.c)
+ AM_INIT_AUTOMAKE(argp, standalone-1.3)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ # GNU libc defaults to supplying the ISO C library functions only. The
+ # _GNU_SOURCE define enables these extensions, in particular we want
+@@ -18,7 +18,7 @@
+ AC_PROG_RANLIB
+ AC_PROGRAM_CHECK(AR,ar,ar,:)
+ AC_PROGRAM_CHECK(AR,gar,gar,:)
+-AM_PROG_CC_STDC
++AC_PROG_CC
+
+ AC_SUBST(AR)
+
diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild
b/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild
index af37675388d..dad2d2f206a 100644
--- a/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild
@@ -23,7 +23,7 @@ RESTRICT="test"
RDEPEND="sys-libs/readline:0=
sys-libs/zlib
dbus? ( >=sys-apps/dbus-1.4.20 )
- dev-libs/openssl:0=
+ <dev-libs/openssl-1.1:0=
pam? ( virtual/pam )"
DEPEND="${RDEPEND}
virtual/pkgconfig
diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild
b/net-libs/wvstreams/wvstreams-4.6.1-r4.ebuild
similarity index 61%
copy from net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild
copy to net-libs/wvstreams/wvstreams-4.6.1-r4.ebuild
index af37675388d..df4b00f5a85 100644
--- a/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.6.1-r4.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit autotools eutils flag-o-matic toolchain-funcs versionator
DESCRIPTION="A network programming library in C++"
@@ -10,7 +10,7 @@ SRC_URI="https://wvstreams.googlecode.com/files/${P}.tar.gz";
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc sparc x86"
+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!
@@ -20,45 +20,34 @@ RESTRICT="test"
#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=
+RDEPEND="
+ <dev-libs/openssl-1.1:0=
+ sys-libs/readline:0=
sys-libs/zlib
dbus? ( >=sys-apps/dbus-1.4.20 )
- dev-libs/openssl:0=
- pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
+ pam? ( virtual/pam )
+"
+DEPEND="
+ ${RDEPEND}
virtual/pkgconfig
doc? ( app-doc/doxygen )
- boost? ( >=dev-libs/boost-1.34.1:= )"
-
+ 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
-}
+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() {
- 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
+ default
eautoreconf
- pushd argp >/dev/null
- eautoreconf
- popd >/dev/null
}
src_configure() {
@@ -70,15 +59,16 @@ src_configure() {
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 \
+ --cache-file=${T}/config.cache \
+ --disable-optimization \
+ --localstatedir=/var \
+ --with-openssl \
--with-zlib \
+ --without-qt \
+ --without-tcl \
--without-valgrind
}
@@ -99,7 +89,7 @@ src_install() {
if use doc; then
#the list of files is too big for dohtml -r Docs/doxy-html/*
- cd Docs/doxy-html
- dohtml -r *
+ docinto html
+ dodoc -r Docs/doxy-html/*
fi
}
