[gentoo-commits] gentoo-x86 commit in net-libs/wvstreams: metadata.xml wvstreams-4.6.1-r3.ebuild wvstreams-4.6.1-r2.ebuild ChangeLog wvstreams-4.6.1-r1.ebuild

[Diego Petteno (flameeyes)]

flameeyes    13/03/05 13:34:34

  Modified:             metadata.xml wvstreams-4.6.1-r2.ebuild ChangeLog
  Added:                wvstreams-4.6.1-r3.ebuild
  Removed:              wvstreams-4.6.1-r1.ebuild
  Log:
  Introduce a new version that handles boost dependency properly; replace dependency on virtual with its own dependency (and as a build-time dependency only). Move maintainership to net-dialup since this is only used by net-dialup/wvdial.
  
  (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)

Revision  Changes    Path
1.7                  net-libs/wvstreams/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/wvstreams/metadata.xml?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/wvstreams/metadata.xml?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/wvstreams/metadata.xml?r1=1.6&r2=1.7

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/wvstreams/metadata.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- metadata.xml	31 Mar 2012 17:03:05 -0000	1.6
+++ metadata.xml	5 Mar 2013 13:34:34 -0000	1.7
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
-	<longdescription>A network programming library in C++</longdescription>
-	<upstream>
-		<remote-id type="google-code">wvstreams</remote-id>
-	</upstream>
+  <herd>net-dialup</herd>
+  <upstream>
+    <remote-id type="google-code">wvstreams</remote-id>
+  </upstream>
+  <use>
+    <flag name="boost">
+      Use <pkg>dev-libs/boost</pkg> to provide TR1-compatible
+      functional interface. This USE flag is only needed with GCC
+      earlier than version 4.1, or with other compilares not providing
+      said interface.
+    </flag>
+  </use>
 </pkgmetadata>



1.9                  net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild?r1=1.8&r2=1.9

Index: wvstreams-4.6.1-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wvstreams-4.6.1-r2.ebuild	8 Aug 2012 19:41:04 -0000	1.8
+++ wvstreams-4.6.1-r2.ebuild	5 Mar 2013 13:34:34 -0000	1.9
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.8 2012/08/08 19:41:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild,v 1.9 2013/03/05 13:34:34 flameeyes Exp $
 
 EAPI=4
 inherit autotools eutils flag-o-matic toolchain-funcs versionator
@@ -25,9 +25,9 @@
 	sys-libs/zlib
 	dbus? ( >=sys-apps/dbus-1.4.20 )
 	dev-libs/openssl:0
-	pam? ( sys-libs/pam )
-	virtual/c++-tr1-functional"
+	pam? ( sys-libs/pam )"
 DEPEND="${RDEPEND}
+	|| ( >=sys-devel/gcc-4.1 >=dev-libs/boost-1.34.0 )
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 



1.151                net-libs/wvstreams/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/wvstreams/ChangeLog?rev=1.151&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/wvstreams/ChangeLog?rev=1.151&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/wvstreams/ChangeLog?r1=1.150&r2=1.151

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- ChangeLog	8 Aug 2012 19:41:04 -0000	1.150
+++ ChangeLog	5 Mar 2013 13:34:34 -0000	1.151
@@ -1,6 +1,16 @@
 # 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.150 2012/08/08 19:41:04 ranger Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.151 2013/03/05 13:34:34 flameeyes Exp $
+
+*wvstreams-4.6.1-r3 (05 Mar 2013)
+
+  05 Mar 2013; Diego E. Pettenò <flameeyes@g.o>
+  +wvstreams-4.6.1-r3.ebuild, -wvstreams-4.6.1-r1.ebuild, metadata.xml,
+  wvstreams-4.6.1-r2.ebuild:
+  Introduce a new version that handles boost dependency properly; replace
+  dependency on virtual with its own dependency (and as a build-time dependency
+  only). Move maintainership to net-dialup since this is only used by net-
+  dialup/wvdial.
 
   08 Aug 2012; Brent Baude <ranger@g.o> wvstreams-4.6.1-r2.ebuild:
   Marking wvstreams-4.6.1-r2 ppc for bug 421983



1.1                  net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild?rev=1.1&content-type=text/plain

Index: wvstreams-4.6.1-r3.ebuild
===================================================================
# Copyright 1999-2013 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-r3.ebuild,v 1.1 2013/03/05 13:34:34 flameeyes Exp $

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="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 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
	sys-libs/zlib
	dbus? ( >=sys-apps/dbus-1.4.20 )
	dev-libs/openssl:0
	pam? ( virtual/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

	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 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
}