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

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

4 files changed, 96 insertions, 33 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/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() {