Version bump (bug 470720), multilib build, preparations for netsurf eclass.

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

5 files changed, 315 insertions, 0 deletions

diff --git a/net-libs/libhubbub/ChangeLog b/net-libs/libhubbub/ChangeLog
new file mode 100644
index 000000000000..e5deae2c880d
--- /dev/null
+++ b/net-libs/libhubbub/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for net-libs/libhubbub
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libhubbub/ChangeLog,v 1.1 2013/06/17 17:23:28 xmw Exp $
+
+*libhubbub-0.2.0 (17 Jun 2013)
+
+  17 Jun 2013; Michael Weber <xmw@gentoo.org>
+  +files/libhubbub-0.2.0-error.patch, +libhubbub-0.2.0.ebuild, +metadata.xml:
+  Version bump (bug 470720), multilib build, preparations for netsurf eclass.
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
new file mode 100644
index 000000000000..e9d21d7a0218
--- /dev/null
+++ b/net-libs/libhubbub/Manifest
@@ -0,0 +1,5 @@
+AUX libhubbub-0.2.0-error.patch 3543 SHA256 36bfac73273396b08eb282c16fc368fe88daf2755daa7cf135e871d12bea6e8a SHA512 dba570ae89d87b1ba410119c651f48989c1c09425a803736c423aec031303506a45a0a554a39667779451738045102aa81100a63d060db69680e628319a7a7d2 WHIRLPOOL 939891ae4b91fa44d67dd42bbc1478ea06b600a14752fad283d6245b54a4292ef8e07b9fc229aaa3f7093d77c9848391e619a1c305bb63eed8d2491bc44df710
+DIST libhubbub-0.2.0-src.tar.gz 792718 SHA256 91c90965fdbbfb9137c7881b33736a03fc80bd16f5cd7808e1efff3d63000eaf SHA512 4309490fd9c4d7f368a85a16b74ce0b2274f85d4a557c1dbcd69f2836be8f54c6e592b31582c3c17ab1227fc13a6cdf012f3494cc13ae9b6b4242886dade3c8b WHIRLPOOL 7b60ede859856eb5a0fa57bdb7ac8d3dd93326460300a8f259d6b3eae72fbc17706c1380691939beec564260cf42c3f0d35005a3d79dfeae86b4f3ae3b2181be
+DIST netsurf-buildsystem-1.0.tar.gz 37026 SHA256 4495e8e12faf0ace668ab80401064ce7f65a195efe63c924c066a109649ff146 SHA512 763e10766ab16be375c40a226e36a95df5740ac62b5bbc4eb6d52693b83284d2e71d9a3d797f55c28853a5d2565182759ffa9bfb3d736daf21b347f418661c47 WHIRLPOOL a65d53424a34a796a1f85ed5d4a9ca9bf58eaba7246e5ea20bc7da09e0e8ab60e156ce47da521660d5567c6358fda0da744e56ccf52cda6e0db92b19a6055d38
+EBUILD libhubbub-0.2.0.ebuild 3057 SHA256 e2959558507ff49c84a5ceefcc35a90a036632df9a7a2095757be58c954f5c60 SHA512 5e7cfac8cab006da76ec22d46bb7ec5c21e9ce17947d8088fffe7e153406f81b831102a720ba7776ef70e55c6b4eb0d916ea0530d6625059710c2cae18b18e4d WHIRLPOOL 1e572351a25ffcba68d849f4416509c97bee3cd2bd9f324eb319a12ba901e46ca955296d23448262a45e4f21c126fee354942fdf70e25a739ba1280d2e5481d2
+MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
diff --git a/net-libs/libhubbub/files/libhubbub-0.2.0-error.patch b/net-libs/libhubbub/files/libhubbub-0.2.0-error.patch
new file mode 100644
index 000000000000..f0e7110db510
--- /dev/null
+++ b/net-libs/libhubbub/files/libhubbub-0.2.0-error.patch
@@ -0,0 +1,141 @@
+--- hubbub-0.1.2/test/csdetect.c
++++ hubbub-0.1.2/test/csdetect.c
+@@ -108,7 +108,7 @@
+ 	static int testnum;
+ 
+ 	assert(hubbub_charset_extract(data, len,
+-			&mibenum, &source) == HUBBUB_OK);
++			&mibenum, &source) == (parserutils_error)HUBBUB_OK);
+ 
+ 	assert(mibenum != 0);
+ 
+--- hubbub-0.1.2/test/parser.c
++++ hubbub-0.1.2/test/parser.c
+@@ -24,7 +24,7 @@
+ 	hubbub_parser *parser;
+ 	hubbub_parser_optparams params;
+ 	FILE *fp;
+-	size_t len, origlen;
++	size_t len;
+ 	uint8_t *buf = alloca(CHUNK_SIZE);
+ 	const char *charset;
+ 	hubbub_charset_source cssource;
+@@ -46,7 +46,7 @@
+ 	}
+ 
+ 	fseek(fp, 0, SEEK_END);
+-	origlen = len = ftell(fp);
++	len = ftell(fp);
+ 	fseek(fp, 0, SEEK_SET);
+ 
+ 	while (len > 0) {
+--- hubbub-0.1.2/test/tokeniser.c
++++ hubbub-0.1.2/test/tokeniser.c
+@@ -26,7 +26,7 @@
+ 	hubbub_tokeniser *tok;
+ 	hubbub_tokeniser_optparams params;
+ 	FILE *fp;
+-	size_t len, origlen;
++	size_t len;
+ #define CHUNK_SIZE (4096)
+ 	uint8_t buf[CHUNK_SIZE];
+ 
+@@ -44,7 +44,7 @@
+ 	params.token_handler.handler = token_handler;
+ 	params.token_handler.pw = NULL;
+ 	assert(hubbub_tokeniser_setopt(tok, HUBBUB_TOKENISER_TOKEN_HANDLER,
+-			&params) == HUBBUB_OK);
++			&params) == (hubbub_error)HUBBUB_OK);
+ 
+ 	fp = fopen(argv[1], "rb");
+ 	if (fp == NULL) {
+@@ -53,7 +53,7 @@
+ 	}
+ 
+ 	fseek(fp, 0, SEEK_END);
+-	origlen = len = ftell(fp);
++	len = ftell(fp);
+ 	fseek(fp, 0, SEEK_SET);
+ 
+ 	while (len > 0) {
+@@ -63,7 +63,7 @@
+                         break;
+                 
+ 		assert(parserutils_inputstream_append(stream,
+-				buf, bytes_read) == HUBBUB_OK);
++				buf, bytes_read) == (parserutils_error)HUBBUB_OK);
+
+ 
+ 		len -= bytes_read;
+ 
+--- hubbub-0.1.2/test/tokeniser2.c
++++ hubbub-0.1.2/test/tokeniser2.c
+@@ -151,7 +149,7 @@
+ 					ctx->last_start_tag);
+ 
+ 			assert(parserutils_inputstream_append(stream,
+-				buf, len - 1) == HUBBUB_OK);
++				buf, len - 1) == (parserutils_error)HUBBUB_OK);
+ 
+ 			assert(hubbub_tokeniser_run(tok) == HUBBUB_OK);
+ 		}
+@@ -196,10 +194,10 @@
+ 				&params) == HUBBUB_OK);
+ 
+ 		assert(parserutils_inputstream_append(stream,
+-				ctx->input, ctx->input_len) == HUBBUB_OK);
++				ctx->input, ctx->input_len) == (parserutils_error)HUBBUB_OK);
+ 
+ 		assert(parserutils_inputstream_append(stream, NULL, 0) ==
+-				HUBBUB_OK);
++				(parserutils_error)HUBBUB_OK);
+ 
+ 		printf("Input: '%.*s' (%d)\n", (int) ctx->input_len,
+ 				(const char *) ctx->input, 
+--- hubbub-0.1.2/test/tokeniser3.c
++++ hubbub-0.1.2/test/tokeniser3.c
+@@ -148,7 +146,7 @@
+ 					ctx->last_start_tag);
+ 
+ 			assert(parserutils_inputstream_append(stream,
+-				buf, len - 1) == HUBBUB_OK);
++				buf, len - 1) == (parserutils_error)HUBBUB_OK);
+ 
+ 			assert(hubbub_tokeniser_run(tok) == HUBBUB_OK);
+ 		}
+@@ -197,13 +197,13 @@
+ 		for (j = 0; j < ctx->input_len; j++) {
+ 			assert(parserutils_inputstream_append(stream,
+ 					ctx->input + j, 1) ==
+-							HUBBUB_OK);
++						(parserutils_error)HUBBUB_OK);
+ 
+ 			assert(hubbub_tokeniser_run(tok) == HUBBUB_OK);
+ 		}
+ 
+ 		assert(parserutils_inputstream_append(stream, NULL, 0) ==
+-				HUBBUB_OK);
++				(parserutils_error)HUBBUB_OK);
+ 
+ 		assert(hubbub_tokeniser_run(tok) == HUBBUB_OK);
+ 
+--- hubbub-0.1.2/test/tree.c
++++ hubbub-0.1.2/test/tree.c
+@@ -88,7 +88,7 @@
+ 	hubbub_parser *parser;
+ 	hubbub_parser_optparams params;
+ 	FILE *fp;
+-	size_t len, origlen;
++	size_t len;
+ 	uint8_t *buf = alloca(CHUNK_SIZE);
+ 	const char *charset;
+ 	hubbub_charset_source cssource;
+@@ -123,7 +123,7 @@
+ 	}
+ 
+ 	fseek(fp, 0, SEEK_END);
+-	origlen = len = ftell(fp);
++	len = ftell(fp);
+ 	fseek(fp, 0, SEEK_SET);
+ 
+ 	while (len > 0) {
diff --git a/net-libs/libhubbub/libhubbub-0.2.0.ebuild b/net-libs/libhubbub/libhubbub-0.2.0.ebuild
new file mode 100644
index 000000000000..1f033f811e97
--- /dev/null
+++ b/net-libs/libhubbub/libhubbub-0.2.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libhubbub/libhubbub-0.2.0.ebuild,v 1.1 2013/06/17 17:23:28 xmw Exp $
+
+EAPI=5
+
+inherit base toolchain-funcs multilib-minimal
+
+DESCRIPTION="HTML5 compliant parsing library, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="doc test"
+
+#libjson.so.0.0.1 from app-emulation/emul-linux-x86-baselibs is outdated
+REQUIRED_USE="amd64? ( abi_x86_32? ( !test ) )"
+
+RDEPEND=">=dev-libs/libparserutils-0.1.2[static-libs?,${MULTILIB_USEDEP}]
+	!net-libs/hubbub"
+DEPEND="${RDEPEND}
+	test? ( dev-lang/perl
+		dev-libs/json-c )"
+
+PATCHES=( "${FILESDIR}"/${P}-error.patch )
+DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} )
+
+RESTRICT=test
+
+### future context of netsurf.eclass
+
+NETSURF_BUILDSYSTEM="${NETSURF_BUILDSYSTEM:-buildsystem-1.0}"
+SRC_URI=${SRC_URI:-http://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz}
+SRC_URI+="
+	http://download.netsurf-browser.org/libs/releases/${NETSURF_BUILDSYSTEM}.tar.gz -> netsurf-${NETSURF_BUILDSYSTEM}.tar.gz"
+IUSE+=" debug static-libs"
+if has doc ${IUSE} ; then
+	DEPEND+="
+	doc? ( app-doc/doxygen )"
+fi
+DEPEND+="
+	virtual/pkgconfig"
+pkg_setup(){
+	netsurf_src_prepare() {
+		if [ -f docs/doxygen.conf ] ; then
+			if ! has doc ${IUSE} ; then
+				if [ -z "${NETSURF_IGNORE_DOXYGEN}" ] ; then
+					die "Missing IUSE=doc"
+				fi
+			fi
+		fi
+
+		base_src_prepare
+
+		multilib_copy_sources
+	}
+
+	netsurf_src_configure() {
+		netsurf_makeconf=(
+			NSSHARED=${WORKDIR}/${NETSURF_BUILDSYSTEM}
+			Q=
+			CCOPT=
+			CCNOOPT=
+			CCDBG=
+			LDDBG=
+			AR="$(tc-getAR)"
+			BUILD=$(usex debug debug release)
+			DESTDIR="${D}"
+			PREFIX="${EROOT}"usr
+		)
+
+		multilib-minimal_src_configure
+	}
+
+	netsurf_src_compile() {
+		multilib-minimal_src_compile
+
+		if has doc ${IUSE} ; then
+			use doc && netsurf_make docs
+		fi
+	}
+
+	netsurf_src_test() {
+		multilib-minimal_src_test
+	}
+
+	netsurf_src_install() {
+		multilib-minimal_src_install
+	}
+
+	multilib_src_configure() {
+		sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \
+			-i Makefile || die
+		if [ -f ${PN}.pc.in ] ; then
+			sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
+				-i ${PN}.pc.in || die
+		fi
+	}
+
+	netsurf_make() {
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" "${netsurf_makeconf[@]}" \
+			COMPONENT_TYPE=lib-shared "$@"
+		if use static-libs ; then
+			emake CC="$(tc-getCC)" LD="$(tc-getLD)" "${netsurf_makeconf[@]}" \
+				COMPONENT_TYPE=lib-static "$@"
+		fi
+	}
+
+	multilib_src_compile() {
+		netsurf_make
+	}
+
+	multilib_src_test() {
+		netsurf_make test
+	}
+
+	multilib_src_test() {
+		netsurf_make test
+	}
+
+	multilib_src_install() {
+		netsurf_make install
+	}
+
+	multilib_src_install_all() {
+		if has doc ${IUSE} ; then
+			use doc && dohtml -r build/docs/html/*
+		fi
+	}
+}
+
+src_prepare() {
+	netsurf_src_prepare
+}
+
+src_configure() {
+	netsurf_src_configure
+}
+
+src_compile() {
+	netsurf_src_compile
+}
+
+src_test() {
+	netsurf_src_test
+}
+
+src_install() {
+	netsurf_src_install
+}
diff --git a/net-libs/libhubbub/metadata.xml b/net-libs/libhubbub/metadata.xml
new file mode 100644
index 000000000000..59acc2cc580e
--- /dev/null
+++ b/net-libs/libhubbub/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
+