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)

3 files changed, 151 insertions, 3 deletions

diff --git a/dev-libs/libcss/ChangeLog b/dev-libs/libcss/ChangeLog
index cf3b146a1104..6f28d5c58c81 100644
--- a/dev-libs/libcss/ChangeLog
+++ b/dev-libs/libcss/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libcss
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcss/ChangeLog,v 1.8 2013/02/27 09:48:29 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcss/ChangeLog,v 1.9 2013/06/17 17:10:34 xmw Exp $
+
+*libcss-0.2.0 (17 Jun 2013)
+
+  17 Jun 2013; Michael Weber <xmw@gentoo.org> +libcss-0.2.0.ebuild,
+  libcss-0.1.2.ebuild:
+  Version bump (bug 470720), multilib build, preparations for netsurf eclass.
 
   27 Feb 2013; Michael Weber <xmw@gentoo.org> libcss-0.1.2.ebuild:
   Add DEPEND virtual/pkgconfig.
diff --git a/dev-libs/libcss/libcss-0.1.2.ebuild b/dev-libs/libcss/libcss-0.1.2.ebuild
index 33a0799441d2..a3a2422b4ca1 100644
--- a/dev-libs/libcss/libcss-0.1.2.ebuild
+++ b/dev-libs/libcss/libcss-0.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcss/libcss-0.1.2.ebuild,v 1.8 2013/02/27 09:48:29 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcss/libcss-0.1.2.ebuild,v 1.9 2013/06/17 17:10:34 xmw Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="CSS parser and selection engine, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
-SRC_URI="http://download.netsurf-browser.org/libs/releases/libcss-0.1.2-src.tar.gz"
+SRC_URI="http://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/libcss/libcss-0.2.0.ebuild b/dev-libs/libcss/libcss-0.2.0.ebuild
new file mode 100644
index 000000000000..b749b428c0d5
--- /dev/null
+++ b/dev-libs/libcss/libcss-0.2.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcss/libcss-0.2.0.ebuild,v 1.1 2013/06/17 17:10:34 xmw Exp $
+
+EAPI=5
+
+inherit base toolchain-funcs multilib-minimal
+
+DESCRIPTION="CSS parser and selection engine, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="test"
+
+RDEPEND=">=dev-libs/libparserutils-0.1.2[static-libs?,${MULTILIB_USEDEP}]
+	>=dev-libs/libwapcaplet-0.2.0[static-libs?,${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-lang/perl )"
+
+### 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
+}