Add use flags sdl, vnx, xcb (thanks a.m@freemail.hu, bug 458978). Restore cross-compile functionality (thanks James Le Cuirot, bug 431884)

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

5 files changed, 103 insertions, 39 deletions

diff --git a/dev-libs/libnsfb/ChangeLog b/dev-libs/libnsfb/ChangeLog
index 8a039ad62949..a70b4ce45606 100644
--- a/dev-libs/libnsfb/ChangeLog
+++ b/dev-libs/libnsfb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libnsfb
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/ChangeLog,v 1.3 2012/07/18 16:00:36 xmw Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/ChangeLog,v 1.4 2013/02/27 08:00:54 xmw Exp $
+
+  27 Feb 2013; Michael Weber <xmw@gentoo.org> libnsfb-0.0.2.ebuild,
+  +files/libnsfb-0.0.2-autodetect.patch, libnsfb-9999.ebuild:
+  Add use flags sdl, vnx, xcb (thanks a.m@freemail.hu, bug 458978). Restore
+  cross-compile functionality (thanks James Le Cuirot, bug 431884)
 
 *libnsfb-0.0.2 (18 Jul 2012)
 
diff --git a/dev-libs/libnsfb/Manifest b/dev-libs/libnsfb/Manifest
index 2571cee6b84c..005ab5068249 100644
--- a/dev-libs/libnsfb/Manifest
+++ b/dev-libs/libnsfb/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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
 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
-EBUILD libnsfb-0.0.2.ebuild 1679 SHA256 da36443732da991091dfbda45512b0627fe52afac1c57a317bbcba8d9aa49826 SHA512 384c488862fbfed3f1f69feacc1ed66b20a4d1695a4bd84c4e8058c37d436efba4abe784514a2c7b128c8364e4b358808f2605340afd03c7792d9d374ee879e6 WHIRLPOOL 9b70c073d738567174f7fe26e9cc089e066aeabb7191e5d97b5be5fe66b2ca7bc0b14db56459c009103d3b4153bb6abec273e1322622f6667906b520c78fbaad
-EBUILD libnsfb-9999.ebuild 1851 SHA256 90062170bbdb1b3af4a67a886dfeff3cf2d9705352a6b3b1b160592a0e39c7d0 SHA512 9984005f312a3833afa25345e8702fb7cbe771db2179959373d017df67d3cff3ec042e1e2ce4eed2c740cbf5f39eef5425191ce8bf5a08749d43c49402d4b87f WHIRLPOOL 9ae2cccac19185b3eb40edf65a57db04e263d120ac376831648ceb5fda54aaba407305772e254d647e19af9f7210a798ccedf717d0b58a272c8910efd0db250c
-MISC ChangeLog 854 SHA256 375d759442f046701ca798acf44bedc3470c36949aa112bdd0ac10f1103ac99c SHA512 3ddc5f2c071dd7af118fa58d7ec0254ef6529d6c0b06c1017d6b9b2337c18af747188d98b3dab202f2a9b58a30f14d39aa3dd375e3d7295ec9eaa52de67d82b8 WHIRLPOOL ebcd08bc5d9f918b0415e63dc351cd35288671b75f0af76a082e045cb93662deda173c7d58aec2d7f308207f669ae30bf33f859f69ee6e30ea70c20de6480553
+EBUILD libnsfb-0.0.2.ebuild 2122 SHA256 0abc244c867ec402b8030bfe37426a4184eec548e804b75421b5622542bb8a43 SHA512 e7337e7b2178d59ebf2dfbdddfbd029939f5976003bbc43cafe7732861d01f1520a0d5a6be7f067878b8814dd4cf5b169a10d7096292cd4270b3e3816fe28b05 WHIRLPOOL 72f2ab5bd675a1d167939a9e767ae9454824578827f92676682679c54b97e8aef4565df664a22d7ad02f46ea081c7ce8e0e2491036807fd0b4b5fa1fe96bbb12
+EBUILD libnsfb-9999.ebuild 2337 SHA256 5173c857efbbb7356812c938d41f488fb0473fb079904d4a0bb8859f52aeb650 SHA512 9b29478669dea4c2e56fb13a484afdb43e79e643f45d8d02a33c91b115dc9b95dd566db20662bd598c78e84eb8c4ebd28946350734b3afde809b4acb17b3de34 WHIRLPOOL 83a58913317d759d0b0e07cb66941c4cbb344ff1f469e584c8ebb524a0220f329b157c98e2ce4701b8ae2140c623ac0f93a628be72e47ea65514a53f1e30fc51
+MISC ChangeLog 1128 SHA256 76142790df98d1e618fd62d69a6a2bd7711721158d9d01153737a523880c2f97 SHA512 4a58a47111492d529f760f38cd60b147451b148dd4e7dda02262cb8ab18108e02bc530fdea6577be76c8bb3e8f661a4554a49190cd0232c45a049f71dd3a6b43 WHIRLPOOL b031cd76680f87c2ae8bf918270c5179f558f03517fe943aacc1422276dbfea9f4e39b0fbe448659c070882591f88f19f4d037fca288cd7cc32768b8da8dfe08
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAG3WcACgkQknrdDGLu8JDqNwD/RAI0Wp5HZ3DfHMeUbNHeB3iM
-YPOpsg9c1lFCoOqDcQQA/A4W9m4S1hIVNe9O44eI876vQPSOGiD5kMaiWPVva/Pw
-=aNXo
+iF4EAREIAAYFAlEtvWEACgkQknrdDGLu8JAtlAD9HZ4QgIBUXU1FTtVY9qbKDnKp
+ZK6ZBscDEprOtpWaQw8BAJUGdoGNtpZ70wqdIiCk/chQQ5KSoS6B52sq/nNL8teT
+=jiKK
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libnsfb/files/libnsfb-0.0.2-autodetect.patch b/dev-libs/libnsfb/files/libnsfb-0.0.2-autodetect.patch
new file mode 100644
index 000000000000..86b1d032529e
--- /dev/null
+++ b/dev-libs/libnsfb/files/libnsfb-0.0.2-autodetect.patch
@@ -0,0 +1,33 @@
+Michael Weber https://bugs.gentoo.org/458978
+
+--- libnsfb-0.0.2/Makefile
++++ libnsfb-0.0.2/Makefile
+@@ -20,9 +20,17 @@
+ 
+ NSFB_XCB_PKG_NAMES := xcb xcb-icccm xcb-image xcb-keysyms
+ 
++ifndef NSFB_VNC_AVAILABLE
+ $(eval $(call pkg_config_package_available,NSFB_VNC_AVAILABLE,libvncserver))
++endif
++
++ifndef NSFB_SDL_AVAILABLE
+ $(eval $(call pkg_config_package_available,NSFB_SDL_AVAILABLE,sdl))
++endif
++
++ifndef NSFB_XCB_AVAILABLE
+ $(eval $(call pkg_config_package_available,NSFB_XCB_AVAILABLE,$(NSFB_XCB_PKG_NAMES)))
++endif
+ 
+ ifeq ($(NSFB_SDL_AVAILABLE),yes)
+   $(eval $(call pkg_config_package_add_flags,sdl,CFLAGS))
+@@ -63,7 +71,10 @@
+ 
+   REQUIRED_PKGS := $(REQUIRED_PKGS) $(NSFB_XCB_PKG_NAMES)
+ 
++  ifndef NSFB_XCB_UTIL_AVAILABLE
+   $(eval $(call pkg_config_package_available,NSFB_XCB_UTIL_AVAILABLE,xcb-util))
++  endif
++
+   ifeq ($(NSFB_XCB_UTIL_AVAILABLE),yes)
+     REQUIRED_PKGS := $(REQUIRED_PKGS) xcb-util
+   endif
diff --git a/dev-libs/libnsfb/libnsfb-0.0.2.ebuild b/dev-libs/libnsfb/libnsfb-0.0.2.ebuild
index 8c98287ce2e8..f0a0bbf5a77b 100644
--- a/dev-libs/libnsfb/libnsfb-0.0.2.ebuild
+++ b/dev-libs/libnsfb/libnsfb-0.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.0.2.ebuild,v 1.1 2012/07/18 16:00:36 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/libnsfb-0.0.2.ebuild,v 1.2 2013/02/27 08:00:54 xmw Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils multilib toolchain-funcs
 
@@ -13,14 +13,14 @@ SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source-full/netsur
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm"
-IUSE="static-libs"
+IUSE="sdl static-libs vnc xcb"
 
-RDEPEND="media-libs/libsdl
-	net-libs/libvncserver
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms"
+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"
 
@@ -34,16 +34,28 @@ src_unpack() {
 }
 
 src_prepare() {
+	#backported from vcs
 	epatch "${FILESDIR}"/${P}-xcb-fix.patch
+
 	epatch "${FILESDIR}"/${P}-unused.patch
+	epatch "${FILESDIR}"/${P}-autodetect.patch
 
-	sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \
+	sed -e "/^CCOPT :=/s:=.*:=:" \
+		-i build/makefiles/Makefile.{gcc,clang} || die
+	sed -e '/^CFLAGS/s: -g : :' \
+		-e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \
 		-i Makefile || die
 	sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
 		-i ${PN}.pc.in || die
-	echo "Q := " >> Makefile.config.override
-	echo "CC := $(tc-getCC)" >> Makefile.config.override
-	echo "AR := $(tc-getAR)" >> Makefile.config.override
+
+	echo "Q  := " >> Makefile.config
+	echo "CC := $(tc-getCC)" >> Makefile.config
+	echo "AR := $(tc-getAR)" >> Makefile.config
+
+	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() {
diff --git a/dev-libs/libnsfb/libnsfb-9999.ebuild b/dev-libs/libnsfb/libnsfb-9999.ebuild
index 4ceaa48d91ec..0b82774fdbc9 100644
--- a/dev-libs/libnsfb/libnsfb-9999.ebuild
+++ b/dev-libs/libnsfb/libnsfb-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.1 2012/07/18 08:25:38 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/libnsfb-9999.ebuild,v 1.2 2013/02/27 08:00:54 xmw Exp $
 
-EAPI=4
+EAPI=5
 
-inherit git-2 multilib toolchain-funcs
+inherit eutils git-2 multilib toolchain-funcs
 
 DESCRIPTION="framebuffer abstraction library, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/libnsfb/"
@@ -14,14 +14,14 @@ EGIT_REPO_URI="git://git.netsurf-browser.org/libnsfb.git"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="static-libs"
+IUSE="sdl static-libs vnc xcb"
 
-RDEPEND="media-libs/libsdl
-	net-libs/libvncserver
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms"
+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"
 
@@ -35,17 +35,30 @@ src_unpack() {
 }
 
 src_prepare() {
-	sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \
-		-e "s:-Werror::g" \
+	epatch "${FILESDIR}"/${PN}-0.0.2-unused.patch
+
+	#patch buildsystem from SRC_URI
+	epatch "${FILESDIR}"/${PN}-0.0.2-autodetect.patch
+
+	sed -e "/^CCOPT :=/s:=.*:=:" \
+		-i build/makefiles/Makefile.gcc || die
+	sed -e '/^CFLAGS/s: -g : :' \
+		-e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):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" \
-		-e "s/\$(eval \$(call pkg_config_get_variable,NSFB_XCBPROTO_VERSION,xcb,xcbproto_version))/NSFB_XCBPROTO_VERSION := $(pkg-config --variable=xcbproto_version xcb)/" \
 		-i Makefile || die
 	sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
 		-i ${PN}.pc.in || die
-	echo "Q := " >> Makefile.config.override
-	echo "CC := $(tc-getCC)" >> Makefile.config.override
-	echo "AR := $(tc-getAR)" >> Makefile.config.override
+
+	echo "Q  := " >> Makefile.config
+	echo "CC := $(tc-getCC)" >> Makefile.config
+	echo "AR := $(tc-getAR)" >> Makefile.config
+
+	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() {