Migrate to netsurf.eclass

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

3 files changed, 96 insertions, 125 deletions

diff --git a/www-client/netsurf/ChangeLog b/www-client/netsurf/ChangeLog
index c26e02122d44..01ccb4bd8561 100644
--- a/www-client/netsurf/ChangeLog
+++ b/www-client/netsurf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/netsurf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/ChangeLog,v 1.9 2013/06/19 07:26:45 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/ChangeLog,v 1.10 2013/06/23 16:53:54 xmw Exp $
+
+  23 Jun 2013; Michael Weber <xmw@gentoo.org> +files/netsurf-3.0-CFLAGS.patch,
+  netsurf-3.0.ebuild:
+  Migrate to netsurf.eclass
 
 *netsurf-3.0 (19 Jun 2013)
 
diff --git a/www-client/netsurf/files/netsurf-3.0-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.0-CFLAGS.patch
new file mode 100644
index 000000000000..065148ba15df
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.0-CFLAGS.patch
@@ -0,0 +1,77 @@
+--- netsurf-3.0/Makefile.defaults
++++ netsurf-3.0/Makefile.defaults
+@@ -93,7 +93,6 @@
+ NETSURF_USE_LIBICONV_PLUG := YES
+ 
+ # Initial CFLAGS. Optimisation level etc. tend to be target specific.
+-CFLAGS :=
+ 
+ # Default installation/execution prefix
+ PREFIX ?= /usr/local
+--- netsurf-3.0/framebuffer/Makefile.defaults
++++ netsurf-3.0/framebuffer/Makefile.defaults
+@@ -3,7 +3,6 @@
+ # ----------------------------------------------------------------------------
+ 
+   # Optimisation levels
+-  CFLAGS += -O2
+ 
+   # Framebuffer default surface provider.
+   # Valid values are: x, sdl, linux, vnc, able, 
+--- netsurf-3.0/framebuffer/Makefile.target
++++ netsurf-3.0/framebuffer/Makefile.target
+@@ -47,12 +47,12 @@
+ $(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript))
+ $(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript))
+ 
+-CFLAGS += -std=c99 -g -Dsmall $(WARNFLAGS) 	\
++CFLAGS += -std=c99 -Dsmall $(WARNFLAGS) 	\
+ 	  -D_BSD_SOURCE \
+ 	  -D_XOPEN_SOURCE=600 \
+ 	  -D_POSIX_C_SOURCE=200112L \
+ 	  $(shell $(PKG_CONFIG) --cflags libnsfb libhubbub libcss openssl) \
+-	  $(shell xml2-config --cflags)
++	  $(shell ${PKG_CONFIG} libxml-2.0 --cflags)
+ 
+ LDFLAGS += -lm -Wl,--whole-archive $(shell $(PKG_CONFIG) --libs libnsfb) -Wl,--no-whole-archive 
+ 
+--- netsurf-3.0/gtk/Makefile.defaults
++++ netsurf-3.0/gtk/Makefile.defaults
+@@ -31,4 +31,3 @@
+   NETSURF_GTK_MAJOR := 2
+ 
+   # Optimisation levels
+-  CFLAGS += -O2
+--- netsurf-3.0/gtk/Makefile.target
++++ netsurf-3.0/gtk/Makefile.target
+@@ -51,7 +51,7 @@
+ 		-D_POSIX_C_SOURCE=200112L \
+ 		-D_NETBSD_SOURCE \
+ 		-DGTK_RESPATH=\"$(NETSURF_GTK_RESOURCES)\" \
+-		$(WARNFLAGS) -g
++		$(WARNFLAGS)
+ 
+ # non optional pkg-configed libs
+ $(eval $(call pkg_config_find_and_add,libcss,CSS))
+--- netsurf-3.0/test/Makefile
++++ netsurf-3.0/test/Makefile
+@@ -1,8 +1,8 @@
+-CFLAGS := -std=c99 -g -O0 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \
++CFLAGS := -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \
+ 		$(shell pkg-config --cflags libcurl)
+ LDFLAGS := $(shell pkg-config --libs libcurl) -lz
+ 
+-llcache_CFLAGS := $(shell pkg-config --cflags libparserutils libwapcaplet libdom) -O2
++llcache_CFLAGS := $(shell pkg-config --cflags libparserutils libwapcaplet libdom)
+ llcache_LDFLAGS := $(shell pkg-config --libs libparserutils libwapcaplet libdom)
+ 
+ llcache_SRCS := content/fetch.c content/fetchers/curl.c \
+@@ -19,7 +19,7 @@
+ 		utils/filename.c utils/nsurl.c utils/corestrings.c \
+ 		test/urldbtest.c
+ 
+-urldbtest_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom) -O2
++urldbtest_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom)
+ urldbtest_LDFLAGS := $(shell pkg-config --libs libwapcaplet libdom)
+ 
+ nsurl_SRCS := utils/log.c utils/nsurl.c test/nsurl.c
diff --git a/www-client/netsurf/netsurf-3.0.ebuild b/www-client/netsurf/netsurf-3.0.ebuild
index a98b01ce70e6..6b18e0ab4937 100644
--- a/www-client/netsurf/netsurf-3.0.ebuild
+++ b/www-client/netsurf/netsurf-3.0.ebuild
@@ -1,17 +1,19 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/netsurf-3.0.ebuild,v 1.3 2013/06/19 07:26:45 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/netsurf-3.0.ebuild,v 1.4 2013/06/23 16:53:54 xmw Exp $
 
 EAPI=5
+NETSURF_COMPONENT_TYPE=binary
 
-inherit eutils base toolchain-funcs multilib-minimal
+inherit netsurf
 
 DESCRIPTION="a free, open source web browser"
 HOMEPAGE="http://www.netsurf-browser.org/"
 SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.tar.gz
-	http://xmw.de/mirror/netsurf-fb.modes-example.gz"
+	http://xmw.de/mirror/netsurf-fb.modes-example.gz
+	${NETSURF_BUILDSYSTEM_SRC_URI}"
 
-LICENSE="GPL-2 MIT-with-advertising"
+LICENSE="GPL-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm"
 IUSE="+bmp fbcon truetype +gif gstreamer gtk javascript +jpeg +mng pdf-writer
@@ -41,7 +43,7 @@ RDEPEND="dev-libs/libxml2
 		amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs
 				app-emulation/emul-linux-x86-gtklibs ) ) )
 	gstreamer? ( media-libs/gstreamer:0.10 )
-	javascript? ( dev-lang/spidermonkey:0/mozjs185 )
+	javascript? ( dev-libs/nsgenbind )
 	jpeg? ( virtual/jpeg
 		amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs ) ) )
 	mng? ( media-libs/libmng
@@ -53,129 +55,17 @@ RDEPEND="dev-libs/libxml2
 		!svgtiny? ( gnome-base/librsvg:2 ) )
 	webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
+	javascript? ( dev-libs/nsgenbind )
 	rosprite? ( >=media-libs/librosprite-0.1.0[${MULTILIB_USEDEP}] )"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.9-conditionally-include-image-headers.patch
-	"${FILESDIR}"/${P}-framebuffer-pkgconfig.patch )
+PATCHES=( "${FILESDIR}"/${P}-CFLAGS.patch
+	"${FILESDIR}"/${P}-framebuffer-pkgconfig.patch
+	"${FILESDIR}"/${PN}-2.9-conditionally-include-image-headers.patch )
 DOCS=( fb.modes README Docs/USING-Framebuffer
 	Docs/ideas/{cache,css-engine,render-library}.txt )
-NETSURF_COMPONENT_TYPE=binary
-
-### future context of netsurf.eclass
-
-NETSURF_BUILDSYSTEM="${NETSURF_BUILDSYSTEM:-buildsystem-1.0}"
-NETSURF_COMPONENT_TYPE="${NETSURF_COMPONENT_TYPE:-lib-static lib-shared}"
-SRC_URI=${SRC_URI:-http://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz}
-SRC_URI+="
-	http://download.netsurf-browser.org/libs/releases/${NETSURF_BUILDSYSTEM}.tar.gz -> netsurf-${NETSURF_BUILDSYSTEM}.tar.gz"
-IUSE+=" debug"
-if has lib-static ${NETSURF_COMPONENT_TYPE} ; then
-	IUSE+=" static-libs"
-fi
-if has doc ${IUSE} ; then
-	DEPEND+="
-	doc? ( app-doc/doxygen )"
-fi
-DEPEND+="
-	virtual/pkgconfig"
-pkg_setup(){
-	netsurf_src_prepare() {
-		base_src_prepare
-
-		multilib_copy_sources
-	}
-
-	netsurf_src_configure() {
-		netsurf_makeconf=(
-			NSSHARED=${WORKDIR}/${NETSURF_BUILDSYSTEM}
-			Q=
-			HOST_CC="\$(CC)"
-			CCOPT=
-			CCNOOPT=
-			CCDBG=
-			LDDBG=
-			AR="$(tc-getAR)"
-			BUILD=$(usex debug debug release)
-			PREFIX="${EROOT}"usr
-		)
-
-		multilib-minimal_src_configure
-	}
-
-	netsurf_src_compile() {
-		multilib-minimal_src_compile "$@"
-
-		if has doc ${USE} ; then
-			netsurf_make "$@" docs
-		fi
-	}
-
-	netsurf_src_test() {
-		multilib-minimal_src_test "$@"
-	}
-
-	netsurf_src_install() {
-		multilib-minimal_src_install "$@"
-	}
-
-	multilib_src_configure() {
-		sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \
-			-i Makefile || die
-		if [ -f ${PN}.pc.in ] ; then
-			sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
-				-i ${PN}.pc.in || die
-		fi
-	}
-
-	netsurf_make() {
-		for COMPONENT_TYPE in ${NETSURF_COMPONENT_TYPE} ; do
-			if [ "${COMPONENT_TYPE}" == "lib-static" ] ; then
-				if ! use static-libs ; then
-					continue
-				fi
-			fi
-			emake CC="$(tc-getCC)" LD="$(tc-getLD)" "${netsurf_makeconf[@]}" \
-				COMPONENT_TYPE=${COMPONENT_TYPE} "$@"
-		done
-	}
-
-	multilib_src_compile() {
-		netsurf_make "$@"
-	}
-
-	multilib_src_test() {
-		netsurf_make test "$@"
-	}
-
-	multilib_src_install() {
-		#DEFAULT_ABI may not be the last.
-		#install to clean dir, rename binaries, move everything back
-		if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
-			netsurf_make DESTDIR="${D}"${ABI} install "$@"
-			if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
-				find "${D}"${ABI}/usr/bin -type f -exec mv {} {}.${ABI} \;
-			fi
-			mv "${D}"${ABI}/* "${D}" || die
-			rmdir "${D}"${ABI} || die
-		else
-			netsurf_make DESTDIR="${D}" install "$@"
-		fi
-	}
-
-	multilib_src_install_all() {
-		if has doc ${USE} ; then
-			dohtml -r build/docs/html/*
-		fi
-	}
-}
 
 src_prepare() {
-	sed -e '/CFLAGS \(:\|+\)=/d' \
-		-i {,framebuffer/,gtk/}Makefile.defaults || die
-	sed -e 's/xml2-config/${PKG_CONFIG} libxml-2.0/g' \
-		-i */Makefile.target || die
-	sed -e '/CFLAGS/s: -g : :' \
-		-i framebuffer/Makefile.target || die
+	rm -rf amiga atari beos cocoa monkey riscos windows  || die
 
 	mv "${WORKDIR}"/netsurf-fb.modes-example fb.modes
 
@@ -233,7 +123,7 @@ src_install() {
 		elog "framebuffer binary has been installed as netsurf-fb"
 		mv -v "${ED}"usr/bin/netsurf{,-fb} || die
 		make_desktop_entry "${EROOT}"usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
-	
+
 		elog "In order to setup the framebuffer console, netsurf needs an /etc/fb.modes"
 		elog "You can use an example from /usr/share/doc/${PF}/fb.modes.* (bug 427092)."
 		elog "Please make /etc/input/mice readable to the account using netsurf-fb."
@@ -246,7 +136,7 @@ src_install() {
 		mv -v "${ED}"/usr/bin/netsurf{,-gtk} || die
 		make_desktop_entry "${EROOT}"usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
 	fi
+
 	insinto /usr/share/pixmaps
 	doins gtk/res/netsurf.xpm
-
 }