diff options
| -rw-r--r-- | net-libs/wvstreams/ChangeLog | 10 | ||||
| -rw-r--r-- | net-libs/wvstreams/Manifest | 5 | ||||
| -rw-r--r-- | net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch | 58 | ||||
| -rw-r--r-- | net-libs/wvstreams/wvstreams-4.6.1.ebuild | 89 |
4 files changed, 159 insertions, 3 deletions
diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog index 30245943765a..782e672d1f94 100644 --- a/net-libs/wvstreams/ChangeLog +++ b/net-libs/wvstreams/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-libs/wvstreams -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.128 2009/06/28 08:58:12 patrick Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.129 2010/01/04 16:07:38 ssuominen Exp $ + +*wvstreams-4.6.1 (04 Jan 2010) + + 04 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> + +wvstreams-4.6.1.ebuild, +files/wvstreams-4.6.1-parallel-make.patch: + Version bump wrt #274620, thanks to Fabian Fingerle for reporting. 28 Jun 2009; Patrick Lauer <patrick@gentoo.org> wvstreams-4.5.ebuild, +files/wvstreams-4.5-glibc.patch: diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest index 5f87fdda05e2..e86921cdd792 100644 --- a/net-libs/wvstreams/Manifest +++ b/net-libs/wvstreams/Manifest @@ -19,9 +19,12 @@ AUX wvstreams-4.5-no_sarestorer.patch 642 RMD160 96b677c8a8cd930f80f6a235bf9e209 AUX wvstreams-4.5-parallel-make.patch 2168 RMD160 ac2362b49f536c2e3d9ca5e8973886afe359040e SHA1 c249e7b9b48e7f92c5f9c51b6d268933e7475308 SHA256 7be478e1c35a1bca912966f7f77485f571d04395098950ce3eaf13c9ff8e65fa AUX wvstreams-4.5-qt-fixup.patch 824 RMD160 f8fd56ab82198660af76d85419fedbb52b5fae67 SHA1 ad0472b4bf2973d1fcbcdd3f32295e08d3ba769c SHA256 20059308afe2e4ad501b6f4f575f9d3bd8b42c6fe357d755c4f9815632665c6c AUX wvstreams-4.5-valgrind-optional.patch 1263 RMD160 d40fe9430e5692c9955488b73b3c3019191b6911 SHA1 fb3f08c3122c5a5efa2921da6706812a99731ac0 SHA256 ffac9d6172556280d764e5d3491fb3d7081a60aa9532b2c5eb5f324bae1028dd +AUX wvstreams-4.6.1-parallel-make.patch 2236 RMD160 fc1082804587b0f392e4cc358fb56d0a4aba2801 SHA1 3c57a5a237059616fcc1cc76b6f08a35a39dc019 SHA256 aaefbb5aa45a7f377b91a11671d25cfe62856a5c801271b1be783eccc1acd7a0 DIST wvstreams-4.4.tar.gz 1296853 RMD160 82ad9584d586895612f42dcb1709edb8a7fcb6a6 SHA1 8a7ec82c0c4002bec16ec521747a689fb50d8f27 SHA256 c478eb0755b383baebe66e55135257eebbdb113e194946a40be0c765e14fb4d6 DIST wvstreams-4.5.tar.gz 1076353 RMD160 615a17b95f09a10f315daf01639179bcfdc0f5c6 SHA1 237bda88c417432be52b7a792065a35beb5f671c SHA256 fb67df069c647420908da62697587e115a27a2a760d5710e1e40494c21902268 +DIST wvstreams-4.6.1.tar.gz 1118456 RMD160 55550608ccfa53c7daf0ee195466f077b3540acb SHA1 1431efc3f46a13b6a8dbcad4123e19473369f767 SHA256 8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633 EBUILD wvstreams-4.4.ebuild 2643 RMD160 fa37f5baff469f16652ab358362b296d3e4af4c4 SHA1 98ce57a3e59c423477bf3666a9466099b69118d7 SHA256 4cff001652d308b0495a898149fe78f7a3d8267b586570acd68ab2643481bf6a EBUILD wvstreams-4.5.ebuild 2637 RMD160 16b38ddf4abffa1fd8b29a1a2feb2fbf9e3faab3 SHA1 90f6ae45f75a537c7cfd41def200277fad4139a1 SHA256 3b35d6f317917e0c69fd89a11ea81775d4de60d68788a5258ea2245f1e5d46fa -MISC ChangeLog 23227 RMD160 6578d9316f70825ad534a6e7952a90f97e189cfa SHA1 a2a2566889720661c6d859b43dd37d28fe5fe239 SHA256 d4175704a5ae31559dd907ee0a08ada6358d851cea89fa7eb9a1c7dc9b73e84b +EBUILD wvstreams-4.6.1.ebuild 2080 RMD160 a5f2513fab3b5e254b121dbcd7efebf06492c567 SHA1 cee5d261b0c4540cf709f12a60d325a1cd28ce23 SHA256 89e416fd0ef0cb66f25c924ce71884dc8049cf0cebd3d89b163a025b6375b0df +MISC ChangeLog 23456 RMD160 a9f530d13c19f515918df617b2aa745e56b08fe6 SHA1 34b33b8ef4cab41076f1ffd92a25b1e404c1b7bf SHA256 ec452b2104f9bd0e0bf4483057fedd5f94eccb524cea7b1a57bc95de17328adc MISC metadata.xml 228 RMD160 62154bc737c6b25b3d4d0b938cb62a241c83ad15 SHA1 0bb4f84f2396dc72009f54c9efdadf50e203ae8e SHA256 98b56a813b3de314223d7193a3a055e191c9647a2f6887bf8dc7b05f8d0ec610 diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch new file mode 100644 index 000000000000..5ad79fd7a9a6 --- /dev/null +++ b/net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch @@ -0,0 +1,58 @@ +diff -ur wvstreams-4.6.1.orig/Makefile wvstreams-4.6.1/Makefile +--- wvstreams-4.6.1.orig/Makefile 2009-09-16 00:26:50.000000000 +0300 ++++ wvstreams-4.6.1/Makefile 2010-01-04 18:06:15.000000000 +0200 +@@ -131,12 +131,19 @@ + # libwvstreams: stream/event handling library + # + TARGETS += libwvstreams.so +-TARGETS += crypto/tests/ssltest ipstreams/tests/unixtest ++TARGETS += crypto/tests/ssltest ++crypto/tests/ssltest: $(LIBWVSTREAMS) ++ ++TARGETS += ipstreams/tests/unixtest ++ipstreams/tests/unixtest: $(LIBWVSTREAMS) ++ + TARGETS += crypto/tests/printcert ++crypto/tests/printcert: $(LIBWVSTREAMS) + + ifndef _MACOS + ifneq ("$(with_readline)", "no") + TARGETS += ipstreams/tests/wsd ++ ipstreams/tests/wsd: $(LIBWVSTREAMS) + ipstreams/tests/wsd-LIBS += -lreadline + else + TEST_SKIP_OBJS += ipstreams/tests/wsd +@@ -179,7 +186,11 @@ + # + ifneq ("$(with_dbus)", "no") + TARGETS += libwvdbus.so +- TARGETS += dbus/tests/wvdbus dbus/tests/wvdbusd ++ TARGETS += dbus/tests/wvdbus ++ dbus/tests/wvdbus: $(LIBWVDBUS) ++ ++ TARGETS += dbus/tests/wvdbusd ++ dbus/tests/wvdbusd: $(LIBWVDBUS) + TESTS += $(call tests_cc,dbus/tests) + libwvdbus_OBJS += $(call objects,dbus) + libwvdbus.so: $(libwvdbus_OBJS) $(LIBWVSTREAMS) +diff -ur wvstreams-4.6.1.orig/wvrules-posix.mk wvstreams-4.6.1/wvrules-posix.mk +--- wvstreams-4.6.1.orig/wvrules-posix.mk 2008-10-21 18:31:58.000000000 +0300 ++++ wvstreams-4.6.1/wvrules-posix.mk 2010-01-04 18:04:00.000000000 +0200 +@@ -85,12 +85,15 @@ + $(AR) s $1 + endef + +-CC: FORCE ++CC: + @CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ + $(WVSTREAMS)/gen-cc CC c + +-CXX: FORCE ++CXX: + @CC="$(CXX)" CFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ + $(WVSTREAMS)/gen-cc CXX cc + ++#All files must depend on the above two rules. This is a godawful hack. ++$(shell find -type f '(' -name '*.c' -o -name '*.cc' ')' ): CC CXX ++ + wvlink=$(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -o $1 $(filter %.o %.a %.so, $2) $($1-LIBS) $(XX_LIBS) $(LDLIBS) $(PRELIBS) $(LIBS) diff --git a/net-libs/wvstreams/wvstreams-4.6.1.ebuild b/net-libs/wvstreams/wvstreams-4.6.1.ebuild new file mode 100644 index 000000000000..8048ce4897bf --- /dev/null +++ b/net-libs/wvstreams/wvstreams-4.6.1.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2010 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.ebuild,v 1.1 2010/01/04 16:07:38 ssuominen Exp $ + +EAPI=2 +inherit autotools 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 ) + dev-libs/openssl + pam? ( sys-libs/pam ) + virtual/c++-tr1-functional" +DEPEND="${RDEPEND} + dev-util/pkgconfig + doc? ( app-doc/doxygen )" + +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 + eautoreconf + cd argp + eautoreconf +} + +src_configure() { + export CXX="$(tc-getCXX)" + + econf \ + $(use_enable debug) \ + --disable-optimization \ + $(use_with dbus) \ + --with-openssl \ + $(use_with pam) \ + --without-tcl \ + --without-qt \ + --with-zlib \ + --without-valgrind +} + +src_compile() { + emake || die + + if use doc; then + doxygen || die + fi +} + +src_test() { + emake test || die +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc ChangeLog README* + + if use doc; then + #the list of files is too big for dohtml -r Docs/doxy-html/* + cd Docs/doxy-html + dohtml -r * + fi +} |