Version bump to netsurf-2.9 tarball, drop old

Package-Manager: portage-2.1.11.8/cvs/Linux x86_64

5 files changed, 148 insertions, 16 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/Manifest b/dev-libs/libnsfb/Manifest
index bd91d269aa08..2571cee6b84c 100644
--- a/dev-libs/libnsfb/Manifest
+++ b/dev-libs/libnsfb/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST libnsfb-0.0.2_pre20120629.tar.gz 71978 SHA256 5dbdd10d5607913af043c8afb300dc9f98a6621c5562069630c9be3ac02e2a57 SHA512 65c451c9d0437deebe0824e732b41e81e535e2a922ddb3494ef1c0c753aa550dc639913abd564c2bbe3b0ef3d17a76a158e70962290e7937ef4e6bef0057ded1 WHIRLPOOL ed4234490f1df0748fda772e0a8b029779c538018a8d7542a4d67cf9b5a94fc2cff70f3ff1d6fc4de3b85e40f0b1a8d801a1d1760b1dca32f127f95925db1eeb
+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_pre20120629.ebuild 1822 SHA256 48e13c26401250a7534bf547373744b87960212cfebe7387a4852d057414da93 SHA512 59784c5c559110680ff5ec81184cf8e31ad3597107f7e8c0b90cfc8c9a5c8ee2f1948c42b89c078e5849330a4814e7095880066944ad006841c3ab68c85c855a WHIRLPOOL 9eef0847617d77b541dd648fef90bebc623f21657a0eb72d627e95efc9a30be2c74fb4e7fcead79ecc8c8e7b2281ae5ab132389bb298130c59e04f2f2d6cdb9c
+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 596 SHA256 33476e2b910b9562998c9f2aea3ec46ce868e19d8a3c55975511cf6da8e10d60 SHA512 d61d365881be4982831db7e12004fdb864660d4ccdbd109dea4f990472cd39794e7eafdbbd46ef01e8fc10f8d91467d31f28d133fca248c19bd7bb3c87444a61 WHIRLPOOL 68fb50b10a893c6cdcc59f6e8efce7aa330567e4c844cf728cacd7d4566b3eb91a2e62d506780f26961de38a641bbec6f772cd5beca9355892213b4e5ce474a0
+MISC ChangeLog 854 SHA256 375d759442f046701ca798acf44bedc3470c36949aa112bdd0ac10f1103ac99c SHA512 3ddc5f2c071dd7af118fa58d7ec0254ef6529d6c0b06c1017d6b9b2337c18af747188d98b3dab202f2a9b58a30f14d39aa3dd375e3d7295ec9eaa52de67d82b8 WHIRLPOOL ebcd08bc5d9f918b0415e63dc351cd35288671b75f0af76a082e045cb93662deda173c7d58aec2d7f308207f669ae30bf33f859f69ee6e30ea70c20de6480553
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAGd2IACgkQknrdDGLu8JChUgD/cDMhfYacRH2dQIQR+QgRbfBE
-FidphTPYF575zDkmhjsBAIcYq36K+IWSWmx53JpEe4gQ8n19I/t40hD44dVqP0Ob
-=X+P1
+iF4EAREIAAYFAlAG3WcACgkQknrdDGLu8JDqNwD/RAI0Wp5HZ3DfHMeUbNHeB3iM
+YPOpsg9c1lFCoOqDcQQA/A4W9m4S1hIVNe9O44eI876vQPSOGiD5kMaiWPVva/Pw
+=aNXo
 -----END PGP SIGNATURE-----
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