Support building against net-misc/npapi-sdk instead of obsolete net-libs/xulrunner wrt #383145 by Michał Górny

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

4 files changed, 93 insertions, 29 deletions

diff --git a/app-emulation/virt-viewer/ChangeLog b/app-emulation/virt-viewer/ChangeLog
index d76d81521baa..03f1c74eb42a 100644
--- a/app-emulation/virt-viewer/ChangeLog
+++ b/app-emulation/virt-viewer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/virt-viewer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/ChangeLog,v 1.14 2012/03/11 00:50:09 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/ChangeLog,v 1.15 2012/04/23 09:41:20 ssuominen Exp $
+
+  23 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> virt-viewer-0.4.2.ebuild,
+  virt-viewer-0.5.2.ebuild, +files/virt-viewer-0.5.x-npapi-sdk.patch:
+  Support building against net-misc/npapi-sdk instead of obsolete
+  net-libs/xulrunner wrt #383145 by Michał Górny
 
 *virt-viewer-0.5.2 (10 Mar 2012)
 
diff --git a/app-emulation/virt-viewer/files/virt-viewer-0.5.x-npapi-sdk.patch b/app-emulation/virt-viewer/files/virt-viewer-0.5.x-npapi-sdk.patch
new file mode 100644
index 000000000000..a945872782a4
--- /dev/null
+++ b/app-emulation/virt-viewer/files/virt-viewer-0.5.x-npapi-sdk.patch
@@ -0,0 +1,42 @@
+This patch is expecting result of `pkg-config --cflags npapi-sdk nspr` passed to the compiler.
+
+http://bugs.gentoo.org/383145
+
+--- plugin/npshell.c
++++ plugin/npshell.c
+@@ -83,8 +83,9 @@
+ #include <string.h>
+ #include <strings.h>
+ 
++#include <nspr.h>
+ #include <npapi.h>
+-#include <npupp.h>
++#include <npfunctions.h>
+ 
+ #include "virt-viewer-plugin.h"
+ 
+--- plugin/npunix.c
++++ plugin/npunix.c
+@@ -56,8 +56,9 @@
+ #define XP_UNIX 1
+ 
+ #include <stdio.h>
++#include <nspr.h>
+ #include <npapi.h>
+-#include <npupp.h>
++#include <npfunctions.h>
+ 
+ #include <glib.h>               /* just for G_GNUC_UNUSED */
+ 
+--- plugin/virt-viewer-plugin.h
++++ plugin/virt-viewer-plugin.h
+@@ -36,7 +36,9 @@
+ #ifndef VIRT_VIEWER_PLUGIN_H
+ #define VIRT_VIEWER_PLUGIN_H
+ 
++#include <nspr.h>
+ #include <npapi.h>
++#include <npfunctions.h>
+ #include <gtk/gtk.h>
+ #include <X11/Xlib.h>
+ #include "virt-viewer-app.h"
diff --git a/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild b/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild
index d7e2e426ffe1..42e88cbe0e93 100644
--- a/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild
@@ -1,37 +1,35 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild,v 1.4 2012/03/11 00:50:09 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild,v 1.5 2012/04/23 09:41:20 ssuominen Exp $
 
 EAPI=4
-
-inherit eutils gnome2
+inherit gnome2
 
 DESCRIPTION="Graphical console client for connecting to virtual machines"
 HOMEPAGE="http://virt-manager.org/"
 SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gtk3 nsplugin sasl spice +vnc"
-RDEPEND=">=app-emulation/libvirt-0.6.0
-	>=dev-libs/libxml2-2.6.0:2
+IUSE="gtk3 sasl spice +vnc"
+
+RDEPEND=">=app-emulation/libvirt-0.6
+	>=dev-libs/libxml2-2.6
 	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( >=x11-libs/gtk+-2.10.0:2
-			>=gnome-base/libglade-2.6.0:2.0 )
-	nsplugin? ( >=dev-libs/nspr-4.0.0
-				>=net-libs/xulrunner-1.9.1:1.9
-				>=x11-libs/gtk+-2.10.0:2
-				>=gnome-base/libglade-2.6.0:2.0 )
+	!gtk3? (
+		>=x11-libs/gtk+-2.10:2
+		>=gnome-base/libglade-2.6
+		)
 	spice? ( >=net-misc/spice-gtk-0.6[sasl?,gtk3?] )
 	vnc? ( >=net-libs/gtk-vnc-0.4.3 )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
-REQUIRED_USE="|| ( spice vnc )
-	nsplugin? ( !gtk3 )
-	gtk3? ( !nsplugin )"
+REQUIRED_USE="|| ( spice vnc )"
 
 pkg_setup() {
-	G2CONF="$(use_enable nsplugin plugin) $(use_with spice spice-gtk)"
+	G2CONF="--disable-plugin $(use_with spice spice-gtk)"
 	G2CONF="${G2CONF} $(use_with vnc gtk-vnc)"
 	use gtk3 && G2CONF="${G2CONF} --with-gtk=3.0"
 	use gtk3 || G2CONF="${G2CONF} --with-gtk=2.0"
diff --git a/app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild b/app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild
index c11ffeb87363..307a1b49dcc4 100644
--- a/app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild
@@ -1,30 +1,36 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild,v 1.1 2012/03/11 00:50:09 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild,v 1.2 2012/04/23 09:41:20 ssuominen Exp $
 
 EAPI=4
-
-inherit eutils gnome2
+inherit eutils gnome2 toolchain-funcs
 
 DESCRIPTION="Graphical console client for connecting to virtual machines"
 HOMEPAGE="http://virt-manager.org/"
 SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gtk3 nsplugin sasl +spice +vnc"
+
 RDEPEND=">=app-emulation/libvirt-0.9.7
-	>=dev-libs/libxml2-2.6.0:2
+	>=dev-libs/libxml2-2.6
 	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( >=x11-libs/gtk+-2.18.0:2
-			>=gnome-base/libglade-2.6.0:2.0 )
-	nsplugin? ( >=dev-libs/nspr-4.0.0
-				>=net-libs/xulrunner-1.9.1:1.9
-				>=x11-libs/gtk+-2.18.0:2
-				>=gnome-base/libglade-2.6.0:2.0 )
+	!gtk3? (
+		>=x11-libs/gtk+-2.18:2
+		>=gnome-base/libglade-2.6
+		)
+	nsplugin? (
+		>=dev-libs/nspr-4
+		>=x11-libs/gtk+-2.18:2
+		>=gnome-base/libglade-2.6
+		)
 	spice? ( >=net-misc/spice-gtk-0.11[sasl?,gtk3?] )
 	vnc? ( >=net-libs/gtk-vnc-0.4.3 )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nsplugin? ( >=net-misc/npapi-sdk-0.27 )"
 
 REQUIRED_USE="|| ( spice vnc )
 	nsplugin? ( !gtk3 )
@@ -36,3 +42,16 @@ pkg_setup() {
 	use gtk3 && G2CONF="${G2CONF} --with-gtk=3.0"
 	use gtk3 || G2CONF="${G2CONF} --with-gtk=2.0"
 }
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.5.x-npapi-sdk.patch
+}
+
+src_configure() {
+	if use nsplugin; then
+		export MOZILLA_PLUGIN_CFLAGS="$($(tc-getPKG_CONFIG) --cflags npapi-sdk nspr)"
+		export MOZILLA_PLUGIN_LIBS="$($(tc-getPKG_CONFIG) --libs npapi-sdk nspr)"
+	fi
+
+	gnome2_src_configure
+}