* [gentoo-commits] gentoo-x86 commit in app-emulation/virt-viewer: virt-viewer-0.4.2.ebuild virt-viewer-0.5.2.ebuild ChangeLog
@ 2012-04-23 9:41 Samuli Suominen (ssuominen)
0 siblings, 0 replies; only message in thread
From: Samuli Suominen (ssuominen) @ 2012-04-23 9:41 UTC (permalink / raw
To: gentoo-commits
ssuominen 12/04/23 09:41:20
Modified: virt-viewer-0.4.2.ebuild virt-viewer-0.5.2.ebuild
ChangeLog
Log:
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)
Revision Changes Path
1.5 app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild?r1=1.4&r2=1.5
Index: virt-viewer-0.4.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- virt-viewer-0.4.2.ebuild 11 Mar 2012 00:50:09 -0000 1.4
+++ virt-viewer-0.4.2.ebuild 23 Apr 2012 09:41:20 -0000 1.5
@@ -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"
1.2 app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild?r1=1.1&r2=1.2
Index: virt-viewer-0.5.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- virt-viewer-0.5.2.ebuild 11 Mar 2012 00:50:09 -0000 1.1
+++ virt-viewer-0.5.2.ebuild 23 Apr 2012 09:41:20 -0000 1.2
@@ -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 @@
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
+}
1.15 app-emulation/virt-viewer/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt-viewer/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt-viewer/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virt-viewer/ChangeLog?r1=1.14&r2=1.15
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog 11 Mar 2012 00:50:09 -0000 1.14
+++ ChangeLog 23 Apr 2012 09:41:20 -0000 1.15
@@ -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)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-04-23 9:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-23 9:41 [gentoo-commits] gentoo-x86 commit in app-emulation/virt-viewer: virt-viewer-0.4.2.ebuild virt-viewer-0.5.2.ebuild ChangeLog Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox