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

5 files changed, 199 insertions, 105 deletions

diff --git a/dev-libs/libnsfb/ChangeLog b/dev-libs/libnsfb/ChangeLog
index 7d6e1f97c43d..e2ebeb729dec 100644
--- a/dev-libs/libnsfb/ChangeLog
+++ b/dev-libs/libnsfb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libnsfb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/ChangeLog,v 1.5 2013/02/28 07:39:57 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/ChangeLog,v 1.6 2013/06/17 19:44:35 xmw Exp $
+
+*libnsfb-0.1.0 (17 Jun 2013)
+
+  17 Jun 2013; Michael Weber <xmw@gentoo.org>
+  +files/libnsfb-0.1.0-autodetect.patch, +libnsfb-0.1.0.ebuild,
+  -libnsfb-9999.ebuild:
+  Version bump (bug 470720), multilib build, preparations for netsurf eclass.
 
   28 Feb 2013; Michael Weber <xmw@gentoo.org> libnsfb-0.0.2.ebuild,
   libnsfb-9999.ebuild:
diff --git a/dev-libs/libnsfb/Manifest b/dev-libs/libnsfb/Manifest
index 9202c4bc7c2e..c3fb1b7f40e8 100644
--- a/dev-libs/libnsfb/Manifest
+++ b/dev-libs/libnsfb/Manifest
@@ -4,16 +4,18 @@ Hash: SHA256
 AUX libnsfb-0.0.2-autodetect.patch 923 SHA256 5289cdc9604e3c244b95090a68be07a02f338e9d6124dea55cc90d12eefbf0ec SHA512 4b8b508edb274307e9dfb89633da2abac90f00b1667a8a82e051e097f0eee46b6efa921b2fed1806bbc7b0cf857e58c65a657758296baae644a45a8b1bfe30fd WHIRLPOOL eefa1ff9f33df47e2aea65230c5280df9bd2e0dcbe85b4a8a690a465fb3b420cdfb5bc9d8c201286b8dfd5d7555184c25bfaf4954d0c9bf74b643345fd6ac321
 AUX libnsfb-0.0.2-unused.patch 501 SHA256 c483458efa08ad0a221732e551f4e202ce9f437d32da068057f5d70d174aa1dd SHA512 d7a707cd1c6273a6dffa8b211dc73563b5b166ca16f86b9341b68caf58907483be4e45faa26e41a432f4868555d6bc065146ada47c74f50fc3bc6057240b95ba WHIRLPOOL d77ba358da7e8fb168248966dec53b26e72f566ecd57c6f1b9e72a5c446e0536fc37f6741f8dd1ad920695098edaddcaa39b689e9bf92239c2553e479154ece7
 AUX libnsfb-0.0.2-xcb-fix.patch 3674 SHA256 e90bb142f69a149df05357f215570f8107ea5d2858560ce3428ee5952ac334ea SHA512 135aaa1f600a8322454fe07234258f725eaf383e2a6e3cb5cca774e79b113423afd9110ad403f363c93bafccc8132a18550bbc983904e8eb712b7fd2e2a6f7bf WHIRLPOOL 5da96e647ec0ef77fd2669f03474390090a7c3921e3bddf5b16d1d9ef6812f6b8b58ba871b8f14f03e653be6fdffbd3aa796990f0d76ef9b27825f4b21cf5955
+AUX libnsfb-0.1.0-autodetect.patch 734 SHA256 b5081541a30d28128863020c28d1a42e7645b5985fe780524b52ef3d18b626da SHA512 72f3af574fadf38a514a6f6d4d24246ad1e76d9c9daa9700f0b37cb465f7afd4e4d7fdde6e53657740db3a6f87f1e8bfaeb1b008c43462d67f224c728af98993 WHIRLPOOL 15ef7180aa4f20377ba05a8f3cf8947e09c5d4dbfcd5b503e0a1d48ee85dfe6e215c7e02906a8addbe4cb4f7a153806efe9aeeb542c17feb170cdcb89847c5bd
+DIST libnsfb-0.1.0-src.tar.gz 79021 SHA256 edda51ae23237bb9bda2ff4ea29b4502e7c8f5ca9356bac27c6a03a8a18deba7 SHA512 3360b78261b99fafa06db6153df86a16e5b2161d8b1a85f395a9ee4493f2734ab1c80a6db92dd44b438dd3e39c40fc3f730854035f4effe7707ed349e2175cb6 WHIRLPOOL 54f5051f494800f6fd890729a99396d172ed762a58e49485c430cae2afd1aade9f93312dd883f8725ce6af6a0094f0a3240ff6c80604b8152b1bf653c972a3c3
 DIST netsurf-2.9-full-src.tar.gz 4621932 SHA256 ade6ade7f66ce2f0a80df724bafefd18c17165166111c490837737aa2e09ae9d SHA512 8dfd4d845f5255ee4420c6d4454594eb34dda129096b4d6acb72bd00e976042e7caf80b075ed39d3d3bf3b070c297f73f889075200bd7fb3d2467ca8154c07f0 WHIRLPOOL dfd1151d1c92cf374f5223113328c43f12537c4bc9b17caa831fb5c1febbf70a27766f20bf333867e5104bb03b1cd39f02eed0d351ceec901f922b759d7b330b
-DIST netsurf-buildsystem-0_p20120717.tar.gz 12371 SHA256 ef2c931fcb14c7b4759c0868fd4e8f4fa730558d1b5b769ad46d557f3b66e7fe SHA512 349ce6995993aedb64a45539aab734248779fc581741ea4463a06b9f36bab49edf02af4281f8a25ce796ce08c8477635ad8e88505a57ea66d03d9b734a33bc77 WHIRLPOOL bdd7a68482671eb18e48cf549710ab095ecdd90bd7880400c56e0a71a534b043f49a0b597043e4b5bb93235154586bcf7a4d92e261fe159b6d53c05bd5d6f713
+DIST netsurf-buildsystem-1.0.tar.gz 37026 SHA256 4495e8e12faf0ace668ab80401064ce7f65a195efe63c924c066a109649ff146 SHA512 763e10766ab16be375c40a226e36a95df5740ac62b5bbc4eb6d52693b83284d2e71d9a3d797f55c28853a5d2565182759ffa9bfb3d736daf21b347f418661c47 WHIRLPOOL a65d53424a34a796a1f85ed5d4a9ca9bf58eaba7246e5ea20bc7da09e0e8ab60e156ce47da521660d5567c6358fda0da744e56ccf52cda6e0db92b19a6055d38
 EBUILD libnsfb-0.0.2.ebuild 2251 SHA256 099bae4c97777f7986f3c6c13e7f5a767821c5b734db723a66e84c870d77df54 SHA512 3027433c2ba7656a591b1bac9c21257ba387b9558d16bb39bec1ec7ed8228eca70c3203ba32618374a97602a0966397eda82b69a0595d20006ace638b9647786 WHIRLPOOL 486b433e8554d7f87c689c878d76eb2eae8d985b77beda5df0ea0de8ef62d571ed635a249c76531492a758a9a45c3627b0babd2d77901677b3b3ece3f4aaf115
-EBUILD libnsfb-9999.ebuild 2527 SHA256 a6156ed86a7f8fefd88ed96d71238e276687b02235a090c829bb446adab67dcc SHA512 cf14d70ef284a9e666834dfb30b733c33a3e39db79142c76092f05748eb93e3927b72629a0d03f7cb0edb503d18515c87bbbc906267f0c3167ef314e0717e4e9 WHIRLPOOL 4d617bdefa2b87577b77237a72fc62bef93d71a76f5ec9ba63b5c88e3db111fd33c6d9cff7c1115e9fff8ac246661ef97ef75b72b8457fdab4a3b43085ceb2b3
-MISC ChangeLog 1250 SHA256 8fc1c2ce0a229c7025e89243ad5d46711c22b907ce1cefe63a38ed13c41dd458 SHA512 88802bb81414408a5efb7eec4e4ef2976a2146802fe485c272c27d3c45b3b2b7b4a03671d810bc2e67725679a8fd8d97f550534cc828a2ce14cf92760cc461e3 WHIRLPOOL 739f955d73b9e425b72d77e47f783140e8a50b149c90edfd3eca9c48ec16a3f12ef321a6e9f8bcb9d9d1275e6ecd40549ccab4d6957884e2c417fb86af9a6591
+EBUILD libnsfb-0.1.0.ebuild 3390 SHA256 1fa0c641c423a8738bf3936fffe9183b47df92f2cce1c8bf89f62ae5d9cf69d7 SHA512 f2b940545470baa40401e852356e1338bca811bbf81b7067c5ec5a5dc815f5bbffdc596e7808d86fdbb7b8f5419078ec628242cb2e7dbfa80c7b230c275c83ef WHIRLPOOL dea33cdc72e7eeb23ebb98ee93ef680e96fa64e5712070aec82e481db35701e31c0e0718483491c32a3df3f9a709345e6105a120296b52c590f08f7513001089
+MISC ChangeLog 1493 SHA256 ed5e4191fb0e79ac612bef3b7e92cf60b4d8ae3eec0f018fd1ada3be500e126b SHA512 93774bd469db67932ee701f049b93ef65b0ce0e85c6cb3df433a6a8064a866a783a761a7fa2096571493cbf626072ef3622b2d808fe90ab1c9960ce81f8fe7f7 WHIRLPOOL c6b7a5804bba24a43cc2ad05a9823be299605e8ddaf7572760c330a6d091d19c1f1a5b72704a3d714b402044f8069a986bc97aa0a8993ff4c94d10c82f3042c5
 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)
 
-iF4EAREIAAYFAlEvCdMACgkQknrdDGLu8JCtwgEAkKzRnJyCCFXZ5sNkWj5M5RvK
-IBEBBmvKMRDcjCu6F48A/j1eAT+nGYN3B6DiWBK8EUaaZFCwiQyUASPlwmFVcIhr
-=3HcK
+iF4EAREIAAYFAlG/Zy8ACgkQknrdDGLu8JCIOAEAjHw7P/uE/2O5IX9Tri4Ey51B
+ycUCdwnERlwgJn/57WkA/2AzoWP7EMQdMpgqdpDkMEJvJaVyNrcfZ+UIDirxjVCc
+=f+OX
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libnsfb/files/libnsfb-0.1.0-autodetect.patch b/dev-libs/libnsfb/files/libnsfb-0.1.0-autodetect.patch
new file mode 100644
index 000000000000..88a776dd85b8
--- /dev/null
+++ b/dev-libs/libnsfb/files/libnsfb-0.1.0-autodetect.patch
@@ -0,0 +1,21 @@
+--- libnsfb-0.1.0/Makefile
++++ libnsfb-0.1.0/Makefile
+@@ -23,10 +23,18 @@
+ NSFB_XCB_PKG_NAMES := xcb xcb-icccm xcb-image xcb-keysyms xcb-atom
+ 
+ # determine which surface handlers can be compiled based upon avalable library
++ifeq ($(WITH_VNC),yes)
+ $(eval $(call pkg_config_package_available,NSFB_VNC_AVAILABLE,libvncserver))
++endif
++ifeq ($(WITH_SDL),yes)
+ $(eval $(call pkg_config_package_available,NSFB_SDL_AVAILABLE,sdl))
++endif
++ifeq ($(WITH_XCB),yes)
+ $(eval $(call pkg_config_package_available,NSFB_XCB_AVAILABLE,$(NSFB_XCB_PKG_NAMES)))
++endif
++ifeq ($(WITH_WLD),yes)
+ $(eval $(call pkg_config_package_available,NSFB_WLD_AVAILABLE,wayland-client))
++endif
+ 
+ # surfaces not detectable via pkg-config 
+ NSFB_ABLE_AVAILABLE := no
diff --git a/dev-libs/libnsfb/libnsfb-0.1.0.ebuild b/dev-libs/libnsfb/libnsfb-0.1.0.ebuild
new file mode 100644
index 000000000000..49c0a2c2d18e
--- /dev/null
+++ b/dev-libs/libnsfb/libnsfb-0.1.0.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/libnsfb-0.1.0.ebuild,v 1.1 2013/06/17 19:44:35 xmw Exp $
+
+EAPI=5
+
+inherit base toolchain-funcs multilib-minimal
+
+DESCRIPTION="framebuffer abstraction library, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libnsfb/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="sdl test vnc wayland xcb"
+
+RDEPEND="sdl? ( media-libs/libsdl[static-libs?]
+		amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-sdl[development] ) ) )
+	vnc? ( net-libs/libvncserver[static-libs?] )
+	wayland? ( dev-libs/wayland[static-libs?] )
+	xcb? ( x11-libs/libxcb[static-libs?,${MULTILIB_USEDEP}]
+		x11-libs/xcb-util[static-libs?]
+		x11-libs/xcb-util-image[static-libs?]
+		x11-libs/xcb-util-keysyms[static-libs?] )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="amd64? ( abi_x86_32? ( !vnc !wayland !xcb ) )"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.1.0-autodetect.patch )
+DOCS=( usage )
+
+### 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
+
+	netsurf_makeconf+=(
+		WITH_SDL=$(usex sdl)
+		WITH_VNC=$(usex vnc)
+		WITH_XCB=$(usex xcb)
+		WITH_WLD=$(usex wayland)
+		NSFB_ABLE_AVAILABLE=yes
+		NSFB_LINUX_AVAILABLE=yes
+	)
+}
+
+src_compile() {
+	netsurf_src_compile
+}
+
+src_test() {
+	netsurf_src_test
+}
+
+src_install() {
+	netsurf_src_install
+}
diff --git a/dev-libs/libnsfb/libnsfb-9999.ebuild b/dev-libs/libnsfb/libnsfb-9999.ebuild
deleted file mode 100644
index 68895db3e195..000000000000
--- a/dev-libs/libnsfb/libnsfb-9999.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/libnsfb-9999.ebuild,v 1.3 2013/02/28 07:39:57 xmw Exp $
-
-EAPI=5
-
-inherit eutils git-2 multilib toolchain-funcs
-
-DESCRIPTION="framebuffer abstraction library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libnsfb/"
-SRC_URI="mirror://gentoo/netsurf-buildsystem-0_p20120717.tar.gz"
-EGIT_REPO_URI="git://git.netsurf-browser.org/libnsfb.git"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug sdl static-libs vnc xcb"
-
-RDEPEND="sdl? ( media-libs/libsdl )
-	vnc? ( net-libs/libvncserver )
-	xcb? ( x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# we don't allow access to /dev/fb0
-RESTRICT="test"
-
-pkg_setup(){
-	netsurf_src_prepare() {
-		sed -e "/^CCOPT :=/s:=.*:=:" \
-			-e "/^CCNOOPT :=/s:=.*:=:" \
-			-e "/^CCDBG :=/s:=.*:=:" \
-			-i build/makefiles/Makefile.{gcc,clang}
-		sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \
-			-i Makefile || die
-		sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
-			-i ${NETSURF_PKGCONFIG:-${PN}}.pc.in || die
-	}
-	netsurf_src_configure() {
-		echo "Q := " >> Makefile.config
-		echo "CC := $(tc-getCC)" >> Makefile.config
-		echo "AR := $(tc-getAR)" >> Makefile.config
-	}
-
-	netsurf_make() {
-		emake COMPONENT_TYPE=lib-shared BUILD=$(usex debug debug release) "$@"
-		use static-libs && \
-			emake COMPONENT_TYPE=lib-static BUILD=$(usex debug debug release) "$@"
-	}
-}
-
-src_unpack() {
-	default
-	git-2_src_unpack
-	mv build "${S}" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.0.2-unused.patch
-
-	#patch buildsystem from SRC_URI
-	epatch "${FILESDIR}"/${PN}-0.0.2-autodetect.patch
-
-	netsurf_src_prepare
-
-	sed -e '/^CFLAGS/s: -g : :' \
-		-e "s/\$(eval \$(call pkg_config_get_variable,NSFB_XCBPROTO_VERSION,xcb,xcbproto_version))/NSFB_XCBPROTO_VERSION := $(pkg-config --variable=xcbproto_version xcb)/" \
-		-e "1iNSSHARED=${S}/build" \
-		-e "1iNSBUILD=${S}/build/makefiles" \
-		-i Makefile || die
-}
-
-src_configure() {
-	netsurf_src_configure
-
-	echo "NSFB_SDL_AVAILABLE := $(usex sdl)" >> Makefile.config
-	echo "NSFB_VNC_AVAILABLE := $(usex vnc)" >> Makefile.config
-	echo "NSFB_XCB_AVAILABLE := $(usex xcb)" >> Makefile.config
-	echo "NSFB_XCB_UTIL_AVAILABLE := $(usex xcb)" >> Makefile.config
-}
-
-src_compile() {
-	netsurf_make
-}
-
-src_test() {
-	netsurf_make test
-}
-
-src_install() {
-	netsurf_make DESTDIR="${D}" PREFIX=/usr install
-
-	dodoc usage
-}