From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rkpvo-0002LY-GS for garchives@archives.gentoo.org; Wed, 11 Jan 2012 04:37:00 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4628721C03D; Wed, 11 Jan 2012 04:36:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0286121C03D for ; Wed, 11 Jan 2012 04:36:50 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 423301B400A for ; Wed, 11 Jan 2012 04:36:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A167980044 for ; Wed, 11 Jan 2012 04:36:49 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <4b7437c00b4e5673711e520dfc0538a0c6c7d5df.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-misc/spice-gtk/ X-VCS-Repository: proj/gnome X-VCS-Files: net-misc/spice-gtk/spice-gtk-0.7.159.ebuild net-misc/spice-gtk/spice-gtk-9999.ebuild X-VCS-Directories: net-misc/spice-gtk/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 4b7437c00b4e5673711e520dfc0538a0c6c7d5df Date: Wed, 11 Jan 2012 04:36:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ae690fde-5aae-4787-9ae9-60a947169fde X-Archives-Hash: 8841ebd1e16ee38bf2ade8247a1ed5c5 commit: 4b7437c00b4e5673711e520dfc0538a0c6c7d5df Author: Nirbheek Chauhan gentoo org> AuthorDate: Wed Jan 11 03:59:41 2012 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Wed Jan 11 03:59:41 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D4b7437c0 net-misc/spice-gtk: moved to tree, sync 9999 with tree --- net-misc/spice-gtk/spice-gtk-0.7.159.ebuild | 123 ---------------------= ------ net-misc/spice-gtk/spice-gtk-9999.ebuild | 41 ++++++--- 2 files changed, 28 insertions(+), 136 deletions(-) diff --git a/net-misc/spice-gtk/spice-gtk-0.7.159.ebuild b/net-misc/spice= -gtk/spice-gtk-0.7.159.ebuild deleted file mode 100644 index e3c9bef..0000000 --- a/net-misc/spice-gtk/spice-gtk-0.7.159.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/spice-gtk-0.7.ebui= ld,v 1.2 2011/10/19 08:37:10 dev-zero Exp $ - -EAPI=3D"4" -GCONF_DEBUG=3D"no" - -inherit eutils python gnome2-utils -if [[ ${PV} =3D 9999 ]]; then - inherit gnome2-live -fi - -PYTHON_DEPEND=3D"python? 2" - -DESCRIPTION=3D"Set of GObject and Gtk objects for connecting to Spice se= rvers and a client GUI." -HOMEPAGE=3D"http://spice-space.org http://gitorious.org/spice-gtk" - -LICENSE=3D"LGPL-2.1" -SLOT=3D"0" -if [[ ${PV} =3D 9999 ]]; then - EGIT_REPO_URI=3D"git://anongit.freedesktop.org/spice/${PN}" - KEYWORDS=3D"" -else - SRC_URI=3D"http://spice-space.org/download/gtk/${P}.tar.bz2" - KEYWORDS=3D"~amd64 ~x86" -fi -IUSE=3D"+cairo doc gnome gstreamer gtk3 +introspection kde +pulseaudio p= ython sasl static-libs vala" - -RDEPEND=3D"pulseaudio? ( !gstreamer? ( media-sound/pulseaudio ) ) - gstreamer? ( - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 ) - >=3Dapp-emulation/spice-protocol-0.9.1 - >=3Dx11-libs/pixman-0.17.7 - >=3Dmedia-libs/celt-0.5.1.1:0.5.1 - dev-libs/openssl - gtk3? ( x11-libs/gtk+:3[introspection?] ) - !gtk3? ( x11-libs/gtk+:2[introspection?] ) - >=3Ddev-libs/glib-2.26:2 - >=3Dx11-libs/cairo-1.2 - virtual/jpeg - sys-libs/zlib - introspection? ( dev-libs/gobject-introspection ) - python? ( dev-python/pygtk:2 ) - sasl? ( dev-libs/cyrus-sasl ) - gnome? ( gnome-base/gconf )" -DEPEND=3D"${RDEPEND} - vala? ( dev-lang/vala:0.14 ) - dev-lang/python - dev-lang/perl - dev-perl/Text-CSV - dev-python/pyparsing - dev-util/pkgconfig" - -pkg_setup() { - if use gstreamer && use pulseaudio ; then - ewarn "spice-gtk can use only one audio backend: gstreamer will be use= d since you enabled both." - fi -} - -src_configure() { - local audio=3D"no" - local gtk=3D"2.0" - - use pulseaudio && audio=3D"pulse" - use gstreamer && audio=3D"gstreamer" - # TODO: do a double build like gtk-vnc does to install both gtk2 & gtk3= libs - use gtk3 && gtk=3D"3.0" - if use vala ; then - rm -vf gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c = # force vala regen - fi - - # TODO: usbredirection support - # needs libusbredirhost, newer libusb, policykit, libacl - econf \ - VALAC=3D$(type -P valac-0.14) \ - VAPIGEN=3D$(type -P vapigen-0.14) \ - $(use_enable static-libs static) \ - $(use_enable introspection) \ - --with-audio=3D"${audio}" \ - $(use_with !cairo x11) \ - $(use_with python) \ - $(use_with sasl) \ - $(use_enable vala) \ - --with-gtk=3D"${gtk}" \ - --disable-smartcard \ - --disable-usbredir \ - --disable-werror -} - -src_install() { - emake -j1 DESTDIR=3D"${D}" install || die "emake install failed" - - use static-libs || rm -rf "${D}"/usr/lib*/*.la - use python && rm -rf "${D}"/usr/lib*/python*/site-packages/*.la - use doc || rm -rf "${D}/usr/share/gtk-doc" - - dodoc AUTHORS NEWS README TODO - - make_desktop_entry spicy Spicy "" net - - if use gnome ; then - insinto /etc/gconf/schemas - doins "${FILESDIR}/spice.schemas" - fi - if use kde ; then - insinto /usr/share/kde4/services - doins "${FILESDIR}/spice.protocol" - fi - -} - -pkg_preinst() { - use gnome && gnome2_gconf_savelist -} - -pkg_postinst() { - use gnome && gnome2_gconf_install -} - -pkg_prerm() { - use gnome && gnome2_gconf_uninstall -} diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gt= k/spice-gtk-9999.ebuild index e3c9bef..fc11a65 100644 --- a/net-misc/spice-gtk/spice-gtk-9999.ebuild +++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild @@ -24,8 +24,10 @@ else SRC_URI=3D"http://spice-space.org/download/gtk/${P}.tar.bz2" KEYWORDS=3D"~amd64 ~x86" fi -IUSE=3D"+cairo doc gnome gstreamer gtk3 +introspection kde +pulseaudio p= ython sasl static-libs vala" +IUSE=3D"doc gnome gstreamer gtk3 +introspection kde policykit +pulseaudi= o +python sasl static-libs usbredir vala" =20 +# TODO: check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl= /libacl.h RDEPEND=3D"pulseaudio? ( !gstreamer? ( media-sound/pulseaudio ) ) gstreamer? ( media-libs/gstreamer:0.10 @@ -43,14 +45,28 @@ RDEPEND=3D"pulseaudio? ( !gstreamer? ( media-sound/pu= lseaudio ) ) introspection? ( dev-libs/gobject-introspection ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) - gnome? ( gnome-base/gconf )" + gnome? ( gnome-base/gconf ) + usbredir? ( + policykit? ( + sys-auth/polkit + sys-apps/acl ) + >=3Ddev-libs/libusb-1.0.9_rc1 + >=3Dsys-apps/usbredir-0.3.1 + sys-fs/udev[gudev] )" DEPEND=3D"${RDEPEND} vala? ( dev-lang/vala:0.14 ) dev-lang/python - dev-lang/perl - dev-perl/Text-CSV dev-python/pyparsing - dev-util/pkgconfig" + dev-util/pkgconfig + >=3Ddev-util/intltool-0.40.0 + >=3Dsys-devel/gettext-0.17" + +if [[ ${PV} =3D 9999 ]]; then + DEPEND=3D"${DEPEND} + dev-lang/vala:0.14 + dev-lang/perl + dev-perl/Text-CSV" +fi =20 pkg_setup() { if use gstreamer && use pulseaudio ; then @@ -67,35 +83,34 @@ src_configure() { # TODO: do a double build like gtk-vnc does to install both gtk2 & gtk3= libs use gtk3 && gtk=3D"3.0" if use vala ; then - rm -vf gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c = # force vala regen + # force vala regen for MinGW, etc + rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c fi =20 - # TODO: usbredirection support - # needs libusbredirhost, newer libusb, policykit, libacl - econf \ + econf --disable-maintainer-mode \ VALAC=3D$(type -P valac-0.14) \ VAPIGEN=3D$(type -P vapigen-0.14) \ $(use_enable static-libs static) \ $(use_enable introspection) \ --with-audio=3D"${audio}" \ - $(use_with !cairo x11) \ $(use_with python) \ $(use_with sasl) \ + $(use_enable usbredir) \ + $(use_enable policykit polkit) \ $(use_enable vala) \ --with-gtk=3D"${gtk}" \ --disable-smartcard \ - --disable-usbredir \ --disable-werror } =20 src_install() { - emake -j1 DESTDIR=3D"${D}" install || die "emake install failed" + emake -j1 DESTDIR=3D"${D}" install =20 use static-libs || rm -rf "${D}"/usr/lib*/*.la use python && rm -rf "${D}"/usr/lib*/python*/site-packages/*.la use doc || rm -rf "${D}/usr/share/gtk-doc" =20 - dodoc AUTHORS NEWS README TODO + dodoc AUTHORS NEWS README THANKS TODO =20 make_desktop_entry spicy Spicy "" net =20