Version bump to netsurf-2.9 tarball, drop old

(Portage version: 2.1.11.8/cvs/Linux x86_64)

4 files changed, 140 insertions, 10 deletions

diff --git a/dev-libs/libnsfb/ChangeLog b/dev-libs/libnsfb/ChangeLog
index b394c79f9903..8a039ad62949 100644
--- a/dev-libs/libnsfb/ChangeLog
+++ b/dev-libs/libnsfb/ChangeLog
@@ -1,6 +1,13 @@
 # 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.2 2012/07/18 08:45:18 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/ChangeLog,v 1.3 2012/07/18 16:00:36 xmw Exp $
+
+*libnsfb-0.0.2 (18 Jul 2012)
+
+  18 Jul 2012; Michael Weber <xmw@gentoo.org> +files/libnsfb-0.0.2-unused.patch,
+  +files/libnsfb-0.0.2-xcb-fix.patch, +libnsfb-0.0.2.ebuild,
+  -libnsfb-0.0.2_pre20120629.ebuild:
+  Version bump to netsurf-2.9 tarball, drop old
 
 *libnsfb-0.0.2_pre20120629 (18 Jul 2012)
 
diff --git a/dev-libs/libnsfb/files/libnsfb-0.0.2-unused.patch b/dev-libs/libnsfb/files/libnsfb-0.0.2-unused.patch
new file mode 100644
index 000000000000..16da804f9809
--- /dev/null
+++ b/dev-libs/libnsfb/files/libnsfb-0.0.2-unused.patch
@@ -0,0 +1,19 @@
+--- 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
new file mode 100644
index 000000000000..40c21eb7d497
--- /dev/null
+++ b/dev-libs/libnsfb/files/libnsfb-0.0.2-xcb-fix.patch
@@ -0,0 +1,105 @@
+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/libnsfb-0.0.2_pre20120629.ebuild b/dev-libs/libnsfb/libnsfb-0.0.2.ebuild
index 08f55b6788e0..8c98287ce2e8 100644
--- a/dev-libs/libnsfb/libnsfb-0.0.2_pre20120629.ebuild
+++ b/dev-libs/libnsfb/libnsfb-0.0.2.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2012 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_pre20120629.ebuild,v 1.1 2012/07/18 08:45:18 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/libnsfb-0.0.2.ebuild,v 1.1 2012/07/18 16:00:36 xmw Exp $
 
 EAPI=4
 
-inherit multilib toolchain-funcs
+inherit eutils 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
-	mirror://gentoo/${P}.tar.gz"
+SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-2.9-full-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -30,15 +29,15 @@ RESTRICT="test"
 
 src_unpack() {
 	default
-	mv build "${S}" || die
+	mv netsurf-2.9/${P} . || die
+	rm -r netsurf-2.9 || die
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-xcb-fix.patch
+	epatch "${FILESDIR}"/${P}-unused.patch
+
 	sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \
-		-e "s:-Werror::g" \
-		-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