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, 225 insertions, 0 deletions

diff --git a/dev-libs/nsgenbind/ChangeLog b/dev-libs/nsgenbind/ChangeLog
new file mode 100644
index 000000000000..61863a980dc3
--- /dev/null
+++ b/dev-libs/nsgenbind/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for dev-libs/nsgenbind
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nsgenbind/ChangeLog,v 1.1 2013/06/18 09:42:58 xmw Exp $
+
+*nsgenbind-0.0.1 (18 Jun 2013)
+
+  18 Jun 2013; Michael Weber <xmw@gentoo.org>
+  +files/nsgenbind-0.0.1-bison-2.6.patch, +metadata.xml,
+  +nsgenbind-0.0.1.ebuild:
+  Version bump (bug 470720), multilib build, preparations for netsurf eclass.
diff --git a/dev-libs/nsgenbind/Manifest b/dev-libs/nsgenbind/Manifest
new file mode 100644
index 000000000000..ad409a7b53ba
--- /dev/null
+++ b/dev-libs/nsgenbind/Manifest
@@ -0,0 +1,5 @@
+AUX nsgenbind-0.0.1-bison-2.6.patch 1548 SHA256 eb9c48fb9c2efb078e47423286fb8de5452d5b5d7afba9402d1e4cb60b7074af SHA512 e797cbf7b47c7df15368d73a4f655c14331e1af86c301de328eb6c2b6de7648d7cc85a0598887f6b339a17a14d598dd1ec2d7ec5e4bd44cdb45fe461053d3d24 WHIRLPOOL f96a59adc87c42def8195001188e1e1078b9e88bd9538981574b1e1f25ff664f1dff683983d2767f37d9e6103c14f3f821356bad6ec658c85221dc5419099493
+DIST netsurf-buildsystem-1.0.tar.gz 37026 SHA256 4495e8e12faf0ace668ab80401064ce7f65a195efe63c924c066a109649ff146 SHA512 763e10766ab16be375c40a226e36a95df5740ac62b5bbc4eb6d52693b83284d2e71d9a3d797f55c28853a5d2565182759ffa9bfb3d736daf21b347f418661c47 WHIRLPOOL a65d53424a34a796a1f85ed5d4a9ca9bf58eaba7246e5ea20bc7da09e0e8ab60e156ce47da521660d5567c6358fda0da744e56ccf52cda6e0db92b19a6055d38
+DIST nsgenbind-0.0.1-src.tar.gz 50210 SHA256 05eb57a0b6de8ae094826e39620cee9ef9b672e79f755e7810ca98c0a3989552 SHA512 108f9ac066f780dac16123d5c043d4e29a1a9666b38e4180000a3bb3db60d5038176e40cea7e5fcc357f3e30b6d34d90fd06b2d4945d755b404a966fcc12c38c WHIRLPOOL c1a6789dfcd4d0cce04b59abff0663b6390d9f8d7eeec1045ec9c9f27bb7c45a2388128050237fd91460175d49718f6b64b3b573b35890a0d97afed796e969b8
+EBUILD nsgenbind-0.0.1.ebuild 3229 SHA256 0cd49ece82421faca2cbdd83e7e3c8e747f022dfab885ef412fc69a2d93c4da2 SHA512 50ee70d6efefb4807eae1702d6832b0cd8225fb78e920c9862f4763e29495a015868b363081fbed1c457b0489c87c11c12953cf845b2d9bb021d457af1ab5b79 WHIRLPOOL 75b0f8fd45ddc70d6eb32852855ea920aacdb21a6632f8af0f5caa189323cf4cc3e249b57bdc8ebcfbf83f61bc40b5aa65ce679598314d22157f099a31056510
+MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
diff --git a/dev-libs/nsgenbind/files/nsgenbind-0.0.1-bison-2.6.patch b/dev-libs/nsgenbind/files/nsgenbind-0.0.1-bison-2.6.patch
new file mode 100644
index 000000000000..9503eb300f33
--- /dev/null
+++ b/dev-libs/nsgenbind/files/nsgenbind-0.0.1-bison-2.6.patch
@@ -0,0 +1,51 @@
+http://git.netsurf-browser.org/nsgenbind.git/patch/?id=51bd18034c510a6d4711823e08b69af2f7aa063e
+
+From 51bd18034c510a6d4711823e08b69af2f7aa063e Mon Sep 17 00:00:00 2001
+From: Vincent Sanders <vincent.sanders@collabora.co.uk>
+Date: Fri, 03 May 2013 10:39:49 +0000
+Subject: fix building teh lexers with bison versions at and after 2.6
+
+---
+diff --git a/src/nsgenbind-lexer.l b/src/nsgenbind-lexer.l
+index b257c83..8189a72 100644
+--- a/src/nsgenbind-lexer.l
++++ b/src/nsgenbind-lexer.l
+@@ -19,6 +19,16 @@
+     yylloc->first_column = yylloc->last_column + 1; \
+     yylloc->last_column += yyleng;
+ 
++
++/* Ensure compatability with bison 2.6 and later */
++#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED && defined NSGENBIND_STYPE_IS_DECLARED
++#define YYSTYPE NSGENBIND_STYPE
++#endif
++
++#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED && defined NSGENBIND_LTYPE_IS_DECLARED
++#define YYLTYPE NSGENBIND_LTYPE
++#endif
++
+ %}
+ 
+ /* lexer options */
+diff --git a/src/webidl-lexer.l b/src/webidl-lexer.l
+index 5369d99..74b9bb8 100644
+--- a/src/webidl-lexer.l
++++ b/src/webidl-lexer.l
+@@ -27,6 +27,15 @@
+     yylloc->first_column = yylloc->last_column + 1; \
+     yylloc->last_column += yyleng;
+ 
++/* Ensure compatability with bison 2.6 and later */
++#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED && defined WEBIDL_STYPE_IS_DECLARED
++#define YYSTYPE WEBIDL_STYPE
++#endif
++
++#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED && defined WEBIDL_LTYPE_IS_DECLARED
++#define YYLTYPE WEBIDL_LTYPE
++#endif
++
+ %}
+ 
+ 
+--
+cgit v0.9.0.3-65-g4555
diff --git a/dev-libs/nsgenbind/metadata.xml b/dev-libs/nsgenbind/metadata.xml
new file mode 100644
index 000000000000..59acc2cc580e
--- /dev/null
+++ b/dev-libs/nsgenbind/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>
+
diff --git a/dev-libs/nsgenbind/nsgenbind-0.0.1.ebuild b/dev-libs/nsgenbind/nsgenbind-0.0.1.ebuild
new file mode 100644
index 000000000000..ab750144aec2
--- /dev/null
+++ b/dev-libs/nsgenbind/nsgenbind-0.0.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nsgenbind/nsgenbind-0.0.1.ebuild,v 1.1 2013/06/18 09:42:58 xmw Exp $
+
+EAPI=5
+
+inherit base toolchain-funcs multilib-minimal
+
+DESCRIPTION="generate javascript to dom bindings from w3c webidl files"
+HOMEPAGE="http://www.netsurf-browser.org/"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/yacc"
+
+PATCHES=( "${FILESDIR}"/${P}-bison-2.6.patch )
+NETSURF_COMPONENT_TYPE=binary
+
+### future context of netsurf.eclass
+
+NETSURF_BUILDSYSTEM=${NETSURF_BUILDSYSTEM:-buildsystem-1.0}
+NETSURF_COMPONENT_TYPE=${NETSURF_COMPONENT_TYPE:-lib-shared lib-static}
+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"
+if has lib-static ${NETSURF_COMPONENT_TYPE} ; then
+	IUSE+=" static-libs"
+fi
+if has doc ${IUSE} ; then
+	DEPEND+="
+	doc? ( app-doc/doxygen )"
+fi
+DEPEND+="
+	virtual/pkgconfig"
+pkg_setup(){
+	netsurf_src_prepare() {
+		base_src_prepare
+
+		multilib_copy_sources
+	}
+
+	netsurf_src_configure() {
+		netsurf_makeconf=(
+			NSSHARED=${WORKDIR}/${NETSURF_BUILDSYSTEM}
+			Q=
+			HOST_CC="\$(CC)"
+			CCOPT=
+			CCNOOPT=
+			CCDBG=
+			LDDBG=
+			AR="$(tc-getAR)"
+			BUILD=$(usex debug debug release)
+			PREFIX="${EROOT}"usr
+		)
+
+		multilib-minimal_src_configure
+	}
+
+	netsurf_src_compile() {
+		multilib-minimal_src_compile "$@"
+
+		if has doc ${USE} ; then
+			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() {
+		for COMPONENT_TYPE in ${NETSURF_COMPONENT_TYPE} ; do
+			if [ "${COMPONENT_TYPE}" == "lib-static" ] ; then
+				if ! use static-libs ; then
+					continue
+				fi
+			fi
+			emake CC="$(tc-getCC)" LD="$(tc-getLD)" "${netsurf_makeconf[@]}" \
+				COMPONENT_TYPE=${COMPONENT_TYPE} "$@"
+		done
+	}
+
+	multilib_src_compile() {
+		netsurf_make "$@"
+	}
+
+	multilib_src_test() {
+		netsurf_make test "$@"
+	}
+
+	multilib_src_install() {
+		#DEFAULT_ABI may not be the last.
+		#install to clean dir, rename binaries, move everything back
+		if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+			netsurf_make DESTDIR="${D}"${ABI} install "$@"
+			if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+				find "${D}"${ABI}/usr/bin -type f -exec mv {} {}.${ABI} \;
+			fi
+			mv "${D}"${ABI}/* "${D}" || die
+			rmdir "${D}"${ABI} || die
+		else
+			netsurf_make DESTDIR="${D}" install "$@"
+		fi
+	}
+
+	multilib_src_install_all() {
+		if has doc ${USE} ; then
+			dohtml -r build/docs/html/*
+		fi
+	}
+}
+
+src_prepare() {
+	sed -e '/CFLAGS := -/s|:=|+=|' \
+		-i Makefile || die
+	sed -e '/CFLAGS/s: -g : :' \
+		-i src/Makefile || die
+
+	netsurf_src_prepare
+}
+
+src_configure() {
+	netsurf_src_configure
+}
+
+src_compile() {
+	netsurf_src_compile
+}
+
+src_install() {
+	netsurf_src_install
+}