[gentoo-commits] gentoo-x86 commit in dev-libs/libnsfb: libnsfb-9999.ebuild libnsfb-0.0.2.ebuild ChangeLog

[Michael Weber (xmw)]

xmw         13/02/27 08:00:54

  Modified:             libnsfb-9999.ebuild libnsfb-0.0.2.ebuild ChangeLog
  Log:
  Add use flags sdl, vnx, xcb (thanks a.m@××××××××.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)

Revision  Changes    Path
1.2                  dev-libs/libnsfb/libnsfb-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnsfb/libnsfb-9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnsfb/libnsfb-9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnsfb/libnsfb-9999.ebuild?r1=1.1&r2=1.2

Index: libnsfb-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/libnsfb-9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libnsfb-9999.ebuild	18 Jul 2012 08:25:38 -0000	1.1
+++ libnsfb-9999.ebuild	27 Feb 2013 08:00:54 -0000	1.2
@@ -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 @@
 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_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() {



1.2                  dev-libs/libnsfb/libnsfb-0.0.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnsfb/libnsfb-0.0.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnsfb/libnsfb-0.0.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnsfb/libnsfb-0.0.2.ebuild?r1=1.1&r2=1.2

Index: libnsfb-0.0.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/libnsfb-0.0.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libnsfb-0.0.2.ebuild	18 Jul 2012 16:00:36 -0000	1.1
+++ libnsfb-0.0.2.ebuild	27 Feb 2013 08:00:54 -0000	1.2
@@ -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 @@
 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_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() {



1.4                  dev-libs/libnsfb/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnsfb/ChangeLog?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnsfb/ChangeLog?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnsfb/ChangeLog?r1=1.3&r2=1.4

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog	18 Jul 2012 16:00:36 -0000	1.3
+++ ChangeLog	27 Feb 2013 08:00:54 -0000	1.4
@@ -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@g.o> libnsfb-0.0.2.ebuild,
+  +files/libnsfb-0.0.2-autodetect.patch, libnsfb-9999.ebuild:
+  Add use flags sdl, vnx, xcb (thanks a.m@××××××××.hu, bug 458978). Restore
+  cross-compile functionality (thanks James Le Cuirot, bug 431884)
 
 *libnsfb-0.0.2 (18 Jul 2012)