Revbump fo multilib fix (bug 545758, thanks Kobboi), fix multilib bin install.

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

2 files changed, 37 insertions, 25 deletions

diff --git a/www-client/netsurf/ChangeLog b/www-client/netsurf/ChangeLog
index cc36b18a4c30..57c1d8a9ea45 100644
--- a/www-client/netsurf/ChangeLog
+++ b/www-client/netsurf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/netsurf
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/ChangeLog,v 1.19 2015/06/08 12:44:19 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/ChangeLog,v 1.20 2015/06/09 22:12:42 xmw Exp $
+
+*netsurf-3.3-r1 (09 Jun 2015)
+
+  09 Jun 2015; Michael Weber <xmw@gentoo.org> +netsurf-3.3-r1.ebuild,
+  -netsurf-3.3.ebuild:
+  Revbump fo multilib fix (bug 545758, thanks Kobboi), fix multilib bin install.
 
 *netsurf-3.3 (08 Jun 2015)
 
diff --git a/www-client/netsurf/netsurf-3.3.ebuild b/www-client/netsurf/netsurf-3.3-r1.ebuild
index 560367a8ce32..0951c3d9c659 100644
--- a/www-client/netsurf/netsurf-3.3.ebuild
+++ b/www-client/netsurf/netsurf-3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/netsurf-3.3.ebuild,v 1.1 2015/06/08 12:44:19 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/netsurf-3.3-r1.ebuild,v 1.1 2015/06/09 22:12:42 xmw Exp $
 
 EAPI=5
 
@@ -22,38 +22,37 @@ IUSE="+bmp fbcon truetype +gif gstreamer gtk javascript +jpeg +mng pdf-writer
 	fbcon_frontend_sdl fbcon_frontend_vnc fbcon_frontend_x"
 
 REQUIRED_USE="|| ( fbcon gtk )
-	amd64? ( abi_x86_32? (
-		!gstreamer !javascript !pdf-writer svg? ( svgtiny ) !truetype ) )
+	amd64? ( abi_x86_32? ( !javascript ) )
 	fbcon? ( ^^ ( fbcon_frontend_able fbcon_frontend_linux fbcon_frontend_sdl
 		fbcon_frontend_vnc fbcon_frontend_x ) )"
 
-RDEPEND="dev-libs/libnsutils
-	dev-libs/libutf8proc
-	dev-libs/libxml2
-	net-misc/curl
-	>=dev-libs/libcss-0.4.0[${MULTILIB_USEDEP}]
-	>=net-libs/libhubbub-0.3.0-r1[${MULTILIB_USEDEP}]
-	bmp? ( >=media-libs/libnsbmp-0.1.1[${MULTILIB_USEDEP}] )
-	fbcon? ( >=dev-libs/libnsfb-0.1.2[${MULTILIB_USEDEP}]
+RDEPEND="=dev-libs/libnsutils-0.0.1-r1[${MULTILIB_USEDEP}]
+	=dev-libs/libutf8proc-1.1.6-r1[${MULTILIB_USEDEP}]
+	dev-libs/libxml2:2[${MULTILIB_USEDEP}]
+	net-misc/curl[${MULTILIB_USEDEP}]
+	>=dev-libs/libcss-0.5.0-r1[${MULTILIB_USEDEP}]
+	>=net-libs/libhubbub-0.3.1-r1[${MULTILIB_USEDEP}]
+	bmp? ( >=media-libs/libnsbmp-0.1.2-r1[${MULTILIB_USEDEP}] )
+	fbcon? ( >=dev-libs/libnsfb-0.1.3-r1[${MULTILIB_USEDEP}]
 		truetype? ( media-fonts/dejavu
 			>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
 	)
-	gif? ( >=media-libs/libnsgif-0.1.1[${MULTILIB_USEDEP}] )
+	gif? ( >=media-libs/libnsgif-0.1.2-r1[${MULTILIB_USEDEP}] )
 	gtk? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-		gnome-base/libglade:2.0
+		gnome-base/libglade:2.0[${MULTILIB_USEDEP}]
 		>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
-	gstreamer? ( media-libs/gstreamer:0.10 )
-	javascript? ( >=dev-libs/nsgenbind-0.1.1[${MULTILIB_USEDEP}]
+	gstreamer? ( media-libs/gstreamer:0.10[${MULTILIB_USEDEP}] )
+	javascript? ( >=dev-libs/nsgenbind-0.1.2-r1[${MULTILIB_USEDEP}]
 		dev-lang/spidermonkey:0= )
 	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
 	mng? ( >=media-libs/libmng-1.0.10-r2[${MULTILIB_USEDEP}] )
-	pdf-writer? ( media-libs/libharu )
+	pdf-writer? ( media-libs/libharu[${MULTILIB_USEDEP}] )
 	png? ( >=media-libs/libpng-1.2.51:0[${MULTILIB_USEDEP}] )
-	svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.2[${MULTILIB_USEDEP}] )
-		!svgtiny? ( gnome-base/librsvg:2 ) )
+	svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1[${MULTILIB_USEDEP}] )
+		!svgtiny? ( gnome-base/librsvg:2[${MULTILIB_USEDEP}] ) )
 	webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	rosprite? ( >=media-libs/librosprite-0.1.1[${MULTILIB_USEDEP}] )"
+	rosprite? ( >=media-libs/librosprite-0.1.2-r1[${MULTILIB_USEDEP}] )"
 
 PATCHES=( "${FILESDIR}"/${P}-CFLAGS.patch
 	"${FILESDIR}"/${PN}-3.0-framebuffer-pkgconfig.patch
@@ -118,9 +117,12 @@ src_install() {
 		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
 		netsurf_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-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
-
+		pushd "${ED}"usr/bin >/dev/null || die
+		for f in netsurf{,.*} ; do
+			mv -v $f ${f/netsurf/netsurf-fb} || die
+			make_desktop_entry "${EROOT}"usr/bin/${f/netsurf/netsurf-fb} NetSurf-framebuffer${f/netsurf} netsurf "Network;WebBrowser"
+		done
+		popd >/dev/null || die
 		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."
@@ -130,8 +132,12 @@ src_install() {
 		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
 		netsurf_src_install
 		elog "netsurf gtk version has been installed as netsurf-gtk"
-		mv -v "${ED}"/usr/bin/netsurf{,-gtk} || die
-		make_desktop_entry "${EROOT}"usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
+		pushd "${ED}"usr/bin >/dev/null || die
+		for f in netsurf{,.*} ; do
+			mv -v $f ${f/netsurf/netsurf-gtk} || die
+			make_desktop_entry "${EROOT}"usr/bin/${f/netsurf/netsurf-gtk} NetSurf-gtk${f/netsurf} netsurf "Network;WebBrowser"
+		done
+		popd >/dev/null || die
 	fi
 
 	insinto /usr/share/pixmaps