Version bump (bug 543846).

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

7 files changed, 47 insertions, 253 deletions

diff --git a/dev-libs/libnsfb/ChangeLog b/dev-libs/libnsfb/ChangeLog
index 55694b82fade..b5aa21d5bdb1 100644
--- a/dev-libs/libnsfb/ChangeLog
+++ b/dev-libs/libnsfb/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/libnsfb
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/ChangeLog,v 1.12 2014/11/18 13:51:26 xmw Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/ChangeLog,v 1.13 2015/03/22 00:11:05 xmw Exp $
+
+*libnsfb-0.1.3 (22 Mar 2015)
+
+  22 Mar 2015; Michael Weber <xmw@gentoo.org>
+  +files/libnsfb-0.1.3-glibc2.20.patch, +libnsfb-0.1.3.ebuild,
+  -files/libnsfb-0.0.2-autodetect.patch, -files/libnsfb-0.0.2-unused.patch,
+  -files/libnsfb-0.0.2-xcb-fix.patch, -libnsfb-0.0.2.ebuild,
+  -libnsfb-0.1.0.ebuild:
+  Version bump (bug 543846).
 
   18 Nov 2014; Michael Weber <xmw@gentoo.org>
   +files/libnsfb-0.1.2-glibc2.20.patch, libnsfb-0.1.2.ebuild:
diff --git a/dev-libs/libnsfb/files/libnsfb-0.0.2-autodetect.patch b/dev-libs/libnsfb/files/libnsfb-0.0.2-autodetect.patch
deleted file mode 100644
index 86b1d032529e..000000000000
--- a/dev-libs/libnsfb/files/libnsfb-0.0.2-autodetect.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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/files/libnsfb-0.0.2-unused.patch b/dev-libs/libnsfb/files/libnsfb-0.0.2-unused.patch
deleted file mode 100644
index 16da804f9809..000000000000
--- a/dev-libs/libnsfb/files/libnsfb-0.0.2-unused.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- libnsfb-0.0.2/src/surface/vnc.c
-+++ libnsfb-0.0.2/src/surface/vnc.c
-@@ -486,7 +486,6 @@
- static bool vnc_input(nsfb_t *nsfb, nsfb_event_t *event, int timeout)
- {
-     rfbScreenInfoPtr vncscreen = nsfb->surface_priv;
--    int ret;
- 
-     if (vncscreen != NULL) {
- 
-@@ -496,7 +495,7 @@
- 	event->type = NSFB_EVENT_CONTROL;
- 	event->value.controlcode = NSFB_CONTROL_TIMEOUT;
- 
--	ret = rfbProcessEvents(vncscreen, timeout * 1000);
-+	rfbProcessEvents(vncscreen, timeout * 1000);
- 	return true;
-     }
- 
diff --git a/dev-libs/libnsfb/files/libnsfb-0.0.2-xcb-fix.patch b/dev-libs/libnsfb/files/libnsfb-0.0.2-xcb-fix.patch
deleted file mode 100644
index 40c21eb7d497..000000000000
--- a/dev-libs/libnsfb/files/libnsfb-0.0.2-xcb-fix.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From http://patch-tracker.debian.org/package/netsurf/2.9-2
-
---- libnsfb-0.0.2/Makefile
-+++ libnsfb-0.0.2/Makefile
-@@ -32,16 +32,41 @@
- endif 
- 
- ifeq ($(NSFB_XCB_AVAILABLE),yes)
--  $(eval $(call pkg_config_package_min_version,NSFB_XCB_NEW_API,xcb,0.23))
-+  # Size hint allocators were removed in xcb-icccm 0.3.0
-+  $(eval $(call pkg_config_package_min_version,NSFB_XCB_ICCCM_SIZE_HINTS,xcb-icccm,0.3.0))
-+  ifeq ($(NSFB_XCB_ICCCM_SIZE_HINTS),yes)
-+    CFLAGS := $(CFLAGS) -DNSFB_NEED_HINTS_ALLOC
-+  endif
-+
-+  # xcb-icccm 0.3.8 introduced an additional "icccm_" in function names
-+  $(eval $(call pkg_config_package_min_version,NSFB_XCB_ICCCM_API_PREFIX,xcb-icccm,0.3.8))
-+  ifeq ($(NSFB_XCB_ICCCM_API_PREFIX),yes)
-+    CFLAGS := $(CFLAGS) -DNSFB_NEED_ICCCM_API_PREFIX
-+  endif
- 
--  ifeq ($(NSFB_XCB_NEW_API),yes)
--    CFLAGS := $(CFLAGS) -DNEED_HINTS_ALLOC
-+  # xcbproto 1.6 incorporated atoms previously found in xcb_atom
-+  # However, libxcb <1.3 did not report xcbproto versions. Assume xcbproto 1.5 in this case.
-+  $(eval $(call pkg_config_package_min_version,NSFB_HAVE_MODERN_XCB,xcb,1.3))
-+  ifeq ($(NSFB_HAVE_MODERN_XCB),yes)
-+    $(eval $(call pkg_config_get_variable,NSFB_XCBPROTO_VERSION,xcb,xcbproto_version))
-+    NSFB_XCBPROTO_MAJOR_VERSION := $(word 1,$(subst ., ,$(NSFB_XCBPROTO_VERSION)))
-+    NSFB_XCBPROTO_MINOR_VERSION := $(word 2,$(subst ., ,$(NSFB_XCBPROTO_VERSION)))
-+    CFLAGS := $(CFLAGS) -DNSFB_XCBPROTO_MAJOR_VERSION=$(NSFB_XCBPROTO_MAJOR_VERSION)
-+    CFLAGS := $(CFLAGS) -DNSFB_XCBPROTO_MINOR_VERSION=$(NSFB_XCBPROTO_MINOR_VERSION)
-+  else
-+    CFLAGS := $(CFLAGS) -DNSFB_XCBPROTO_MAJOR_VERSION=1
-+    CFLAGS := $(CFLAGS) -DNSFB_XCBPROTO_MINOR_VERSION=5
-   endif
- 
-   $(eval $(call pkg_config_package_add_flags,$(NSFB_XCB_PKG_NAMES),CFLAGS))
-   $(eval $(call pkg_config_package_add_flags,$(NSFB_XCB_PKG_NAMES),TESTCFLAGS,TESTLDFLAGS))
- 
-   REQUIRED_PKGS := $(REQUIRED_PKGS) $(NSFB_XCB_PKG_NAMES)
-+
-+  $(eval $(call pkg_config_package_available,NSFB_XCB_UTIL_AVAILABLE,xcb-util))
-+  ifeq ($(NSFB_XCB_UTIL_AVAILABLE),yes)
-+    REQUIRED_PKGS := $(REQUIRED_PKGS) xcb-util
-+  endif
- endif
- 
- ifeq ($(NSFB_VNC_AVAILABLE),yes)
---- libnsfb-0.0.2/src/surface/x.c
-+++ libnsfb-0.0.2/src/surface/x.c
-@@ -33,7 +33,7 @@
- #include "plot.h"
- #include "cursor.h"
- 
--#if defined(NEED_HINTS_ALLOC)
-+#if defined(NSFB_NEED_HINTS_ALLOC)
- static xcb_size_hints_t *
- xcb_alloc_size_hints(void)
- {
-@@ -47,6 +47,17 @@
- }
- #endif
- 
-+#if defined(NSFB_NEED_ICCCM_API_PREFIX)
-+#define xcb_size_hints_set_max_size xcb_icccm_size_hints_set_max_size
-+#define xcb_size_hints_set_min_size xcb_icccm_size_hints_set_min_size
-+#define xcb_set_wm_size_hints       xcb_icccm_set_wm_size_hints
-+#endif
-+
-+#if (NSFB_XCBPROTO_MAJOR_VERSION > 1) || \
-+    (NSFB_XCBPROTO_MAJOR_VERSION == 1 && NSFB_XCBPROTO_MINOR_VERSION >= 6)
-+#define WM_NORMAL_HINTS XCB_ATOM_WM_NORMAL_HINTS
-+#endif
-+
- #define X_BUTTON_LEFT 1
- #define X_BUTTON_MIDDLE 2
- #define X_BUTTON_RIGHT 3
---- libnsfb-0.0.2/build/makefiles/Makefile.pkgconfig
-+++ libnsfb-0.0.2/build/makefiles/Makefile.pkgconfig
-@@ -24,7 +24,7 @@
-     $$(error pkg-config is required to auto-detect package version)
-   endif
- 
--  $(1) := $$(shell $$(PKGCONFIG) --version $(2))
-+  $(1) := $$(shell $$(PKGCONFIG) --modversion $(2))
- 
- endef
- 
-@@ -86,3 +86,15 @@
- 
- endef
- 
-+# Obtain the value of a pkg-config variable
-+# 1: Name of variable to assign result into
-+# 2: Name of package to search for
-+# 3: Name of pkg-config variable to retrieve
-+define pkg_config_get_variable
-+  ifeq ($$(PKGCONFIG),)
-+    $$(error pkg-config is required to auto-detect package version)
-+  endif
-+
-+  $(1) := $$(shell $$(PKGCONFIG) --variable=$(3) $(2))
-+
-+endef
diff --git a/dev-libs/libnsfb/files/libnsfb-0.1.3-glibc2.20.patch b/dev-libs/libnsfb/files/libnsfb-0.1.3-glibc2.20.patch
new file mode 100644
index 000000000000..0c7eb7548ad4
--- /dev/null
+++ b/dev-libs/libnsfb/files/libnsfb-0.1.3-glibc2.20.patch
@@ -0,0 +1,19 @@
+--- libnsfb-0.1.3/Makefile
++++ libnsfb-0.1.3/Makefile
+@@ -15,13 +15,13 @@
+ # Toolchain flags
+ WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
+ 	-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
+-	-Wmissing-declarations -Wnested-externs -Werror
++	-Wmissing-declarations -Wnested-externs
+ 
+ # would like these flags but gcc earlier than 4.4 fail
+ #-pedantic -Wno-overlength-strings # For nsglobe.c
+ 
+-CFLAGS := -g -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE=200112L \
+-	-I$(CURDIR)/include/ -I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS) -Wno-error
++CFLAGS := -g -std=c99 -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200112L \
++	-I$(CURDIR)/include/ -I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS)
+ 
+ NSFB_XCB_PKG_NAMES := xcb xcb-icccm xcb-image xcb-keysyms xcb-atom
+ 
diff --git a/dev-libs/libnsfb/libnsfb-0.0.2.ebuild b/dev-libs/libnsfb/libnsfb-0.0.2.ebuild
deleted file mode 100644
index 6598642eb595..000000000000
--- a/dev-libs/libnsfb/libnsfb-0.0.2.ebuild
+++ /dev/null
@@ -1,91 +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-0.0.2.ebuild,v 1.3 2013/02/28 07:39:57 xmw Exp $
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="framebuffer abstraction library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libnsfb/"
-SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-2.9-full-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-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
-	mv netsurf-2.9/${P} . || die
-	rm -r netsurf-2.9 || die
-}
-
-src_prepare() {
-	#backported from vcs
-	epatch "${FILESDIR}"/${P}-xcb-fix.patch
-
-	epatch "${FILESDIR}"/${P}-unused.patch
-	epatch "${FILESDIR}"/${P}-autodetect.patch
-
-	netsurf_src_prepare
-}
-
-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
-}
diff --git a/dev-libs/libnsfb/libnsfb-0.1.0.ebuild b/dev-libs/libnsfb/libnsfb-0.1.3.ebuild
index 1ac85d1040c5..e77af3282d64 100644
--- a/dev-libs/libnsfb/libnsfb-0.1.0.ebuild
+++ b/dev-libs/libnsfb/libnsfb-0.1.3.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.4 2014/06/18 19:13:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/libnsfb-0.1.3.ebuild,v 1.1 2015/03/22 00:11:05 xmw Exp $
 
 EAPI=5
 
+NETSURF_BUILDSYSTEM=buildsystem-1.3
 inherit netsurf
 
 DESCRIPTION="framebuffer abstraction library, written in C"
@@ -23,5 +24,18 @@ RDEPEND="sdl? ( >=media-libs/libsdl-1.2.15-r4[static-libs?,${MULTILIB_USEDEP}] )
 		>=x11-libs/xcb-util-keysyms-0.3.9-r1[static-libs?,${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.1.0-autodetect.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.1.0-autodetect.patch
+	"${FILESDIR}"/${P}-glibc2.20.patch )
+
 DOCS=( usage )
+
+src_configure() {
+	netsurf_src_configure
+
+	netsurf_makeconf+=(
+		WITH_VNC=$(usex vnc)
+		WITH_SDL=$(usex sdl)
+		WITH_XCB=$(usex xcb)
+		WITH_WLD=$(usex wayland)
+	)
+}