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

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

4 files changed, 160 insertions, 9 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/Manifest b/dev-libs/libcss/Manifest
index 48dd72568343..ac911accfec9 100644
--- a/dev-libs/libcss/Manifest
+++ b/dev-libs/libcss/Manifest
@@ -3,13 +3,16 @@ Hash: SHA256
 
 AUX libcss-0.1.2-enum-compare.patch 5422 SHA256 0a01977625900939cd278e095183c2068ed8a810c3d29f2a0b1968c834078f77 SHA512 0a2eb24e4595984805a21b01e27af3d9954dbeb312824862fe593af272de678b4738594c783e258c732fc77312469792f8eb5430888a8325465806db6d133deb WHIRLPOOL eacc63831323a2560fa134ffc8e23d1dd12f8c044da48eaf7bb20e42fe322ff1e103c08c7d3e372b5d70578c5870f11fb5733859538d4567645a9a6e712c41fa
 DIST libcss-0.1.2-src.tar.gz 474621 SHA256 92c112a059bc5ae490392439401005b47ca5c270f891f6317b64aac738ae1f5e SHA512 b3015ffed496115856c2939c0635c60716ccf784f22029512643531e7e04d77e00ea4251ebfe2870afd51fc7a8ba8289ef70aee32d63b9d1404eed6ffa37f0be WHIRLPOOL 2b75ffca5c0ff598f99074df3e619e9a324b0f8a5e0594de7de83d9615f88cd2f81334505d6a4a3bf6b02cc2b3a93d1a587e51fccbbdc4aa9f94bc55ae18ef3d
-EBUILD libcss-0.1.2.ebuild 1721 SHA256 73bbedd531b90d90e1633a7b1a65620e47bc95e92a4eaddd7838dfe16efdcacc SHA512 c20cfcf6c55c66f023503609c6be658dd9f2f65c7cfd6893c26f9eda1ca36633b0b2afecd8d3a42b9bbf0b8ab531f86148bf0eace25259d91ab96487904a8211 WHIRLPOOL 01ba37cf56bdf9b681304c6509c7efa844540bdf5a8b2aaff520f5fc9a318662d438534e64e7ed24673fed8feb0395dcb427a64589a7f5e948d1d95aad4b546f
-MISC ChangeLog 1097 SHA256 cfac61353b77a00e06d7921bd1bd0845783338c10738b7a7d096cc47c0380a0d SHA512 66df6c5f44330adf33f9ff6cea13e2a9775014964c55a8682046c85b1131407867d1aeb184d7944ee15c87270c0744ce1f80789bc2256d4c72fa35f82a111cd4 WHIRLPOOL 1d21ce84b8a98aea5e1ed427134df4169401cb9584d55fe048367a8aa1ccefe4cc8a341ef132b142156d7ad3d043a0a9a788cb76f4c815326bf6ed32fd923e6c
+DIST libcss-0.2.0-src.tar.gz 460004 SHA256 31b08f6f2259366ccad8b455440f364dc33e7dc78cdb0cf4905da56d5372f613 SHA512 dbb076dbf2c91835e8514732307fc72cdc393a244e5d80b38366388ae9214e6072152920a8eac4020873ce9153a5cc17ea616ebc1a926fc097e4a00c0b837f40 WHIRLPOOL 884549f15702e3efdbc043a60bbca75c15370a0b79bc33becc807d5a1b4ef2129107f05720168a2d739a21d484e44c2456b82cc6e768d78a0715cb960a869163
+DIST netsurf-buildsystem-1.0.tar.gz 37026 SHA256 4495e8e12faf0ace668ab80401064ce7f65a195efe63c924c066a109649ff146 SHA512 763e10766ab16be375c40a226e36a95df5740ac62b5bbc4eb6d52693b83284d2e71d9a3d797f55c28853a5d2565182759ffa9bfb3d736daf21b347f418661c47 WHIRLPOOL a65d53424a34a796a1f85ed5d4a9ca9bf58eaba7246e5ea20bc7da09e0e8ab60e156ce47da521660d5567c6358fda0da744e56ccf52cda6e0db92b19a6055d38
+EBUILD libcss-0.1.2.ebuild 1713 SHA256 478494b30ee5b1e8e11b7ab58d0a5e0f6a2cb1104b2964bd366d0ebf43c2a055 SHA512 ad0e7185ca529939402263b5fb155d2c2157869226bdf128d457ea8f2658123203338e44aa915f7a4cef13fe24b30190789b6956752381efe758a18de2c53ee0 WHIRLPOOL c08ada3ea5f64dab1b3a1840fa9a7e0849eed723cdfcda0e0209a7daf038b0c82e1d15d9196cd965ef0dba1e378e8950b2b7189011dfd5140c96ea615e469bdd
+EBUILD libcss-0.2.0.ebuild 2832 SHA256 1a1b66838095a51876b5a527653d661c50badd96c520980ea359402768b32d2a SHA512 c9252eb9c41a0e3de9c9e5677580ec25c2ce7dc2df58f255d924cb4193fb2d06b72bc18de2843d8dfb373ff6e20df4d4ffa55096fbed23a4f3fabcd6708239b3 WHIRLPOOL 1947985ddf66aab572d278caeeff4ccf9b3f63b6dbf833bdc50d9786a58b8dd3be596ae7bb0ef0522b9b7b2507a2b1b33c26ef9cb06dc98d18cd61fd9a656efd
+MISC ChangeLog 1296 SHA256 e3506b632eda0fec59c2bf741706aa811897b191e81145489118d645604bb605 SHA512 91441fef4952b2c32f4ad5bedb3716a8030470e34572c6f93570b21377536e3d1eaef6f0d8b0601a9fc93b07983f25f5fae8511e73513a09213a96040c3c6266 WHIRLPOOL b27e893153c382476cc346779c10df706eb26371c7b888cd3f656b546ec0a1b7c0e0d3ae0ea0486e620bc4b0ef9b6fb245193882f2ddb613b5898c0ff4227e66
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlEt1nAACgkQknrdDGLu8JDUxwD+JKBI68cqWUg/nZRKuycmklyp
-Dk/KXHdhfLEO+90Y2zwA/3gqr0o4JtYcfV/3scRewpo4m7c1QHQn0yazLR7BUIoC
-=zEPy
+iF4EAREIAAYFAlG/Qw0ACgkQknrdDGLu8JBq4wEAlrv1vKHK/+PXN5RaO5yTRWmj
+gFlQXtenf9o45EcrCFgA/0gB/uHNU5W+gx+o1qCJuBhk+dNX5pWE99/Ww7AyTn3b
+=sVpS
 -----END PGP SIGNATURE-----
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
+}