diff options
| -rw-r--r-- | net-misc/spice-gtk/spice-gtk-scm.ebuild | 100 |
1 files changed, 41 insertions, 59 deletions
diff --git a/net-misc/spice-gtk/spice-gtk-scm.ebuild b/net-misc/spice-gtk/spice-gtk-scm.ebuild index fb12644..261b7c1 100644 --- a/net-misc/spice-gtk/spice-gtk-scm.ebuild +++ b/net-misc/spice-gtk/spice-gtk-scm.ebuild @@ -1,25 +1,26 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI=5 GCONF_DEBUG="no" +WANT_AUTOMAKE="1.12" VALA_MIN_API_VERSION="0.14" VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_COMPAT=( python2_7 ) -inherit eutils python-single-r1 vala gnome2-live +inherit eutils python-single-r1 vala gnome2-live multibuild autotools -DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI." +DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk" LICENSE="LGPL-2.1" SLOT="0" EGIT_REPO_URI="git://anongit.freedesktop.org/spice/${PN}" KEYWORDS="" -IUSE="dbus doc gstreamer gtk3 +introspection policykit pulseaudio python sasl smartcard static-libs usbredir vala webdav" +IUSE="doc dbus gstreamer gtk3 +introspection lz4 policykit pulseaudio python sasl smartcard static-libs usbredir vala webdav" REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} + python? ( ${PYTHON_REQUIRED_USE} ) ?? ( pulseaudio gstreamer ) " @@ -30,20 +31,21 @@ RDEPEND=" ${PYTHON_DEPS} pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 ) + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 media-libs/opus - dev-libs/openssl + dev-libs/openssl:= gtk3? ( x11-libs/gtk+:3[introspection?] ) x11-libs/gtk+:2[introspection?] - >=dev-libs/glib-2.26:2 + >=dev-libs/glib-2.28:2 >=x11-libs/cairo-1.2 - virtual/jpeg + virtual/jpeg:= sys-libs/zlib dbus? ( dev-libs/dbus-glib ) introspection? ( dev-libs/gobject-introspection ) + lz4? ( app-arch/lz4 ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) @@ -57,7 +59,10 @@ RDEPEND=" >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) - webdav? ( net-libs/phodav ) + webdav? ( + net-libs/phodav:2.0 + >=dev-libs/glib-2.43.90:2 + >=net-libs/libsoup-2.49.91 ) " DEPEND="${RDEPEND} dev-lang/python @@ -69,18 +74,13 @@ DEPEND="${RDEPEND} vala? ( $(vala_depend) ) " - DEPEND="${DEPEND} - $(vala_depend) - dev-lang/perl - dev-perl/Text-CSV" -GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2" -GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3" src_prepare() { + epatch_user ./autogen.sh + make distclean use vala && vala_src_prepare - mkdir ${GTK2_BUILDDIR} ${GTK3_BUILDDIR} || die } src_configure() { @@ -96,6 +96,7 @@ src_configure() { fi myconf=" + --disable-maintainer-mode \ $(use_enable static-libs static) \ $(use_enable introspection) \ --with-audio=${audio} \ @@ -107,62 +108,43 @@ src_configure() { $(use_with usbredir usb-acl-helper-dir /usr/libexec) \ $(use_enable policykit polkit) \ $(use_enable vala) \ + $(use_enable webdav) \ $(use_enable dbus) \ $(use_enable doc gtk-doc) \ --disable-werror \ --enable-pie" - cd ${GTK2_BUILDDIR} - echo "Running configure in ${GTK2_BUILDDIR}" - ECONF_SOURCE="${S}" econf --disable-maintainer-mode \ - --with-gtk=2.0 \ - ${myconf} - - if use gtk3; then - cd ${GTK3_BUILDDIR} - echo "Running configure in ${GTK3_BUILDDIR}" - ECONF_SOURCE="${S}" econf --disable-maintainer-mode \ - --with-gtk=3.0 \ - ${myconf} - fi + # Parameter of --with-gtk + MULTIBUILD_VARIANTS=( 2.0 ) + use gtk3 && MULTIBUILD_VARIANTS+=( 3.0 ) + + configure() { + local myconf=() + myconf+=( --with-gtk=${MULTIBUILD_VARIANT} ) + + if [[ ${MULTIBUILD_ID} =~ "2.0" ]] ; then + myconf+=( $(use_with python) ) + else + myconf+=( --without-python ) + fi + + ECONF_SOURCE="${S}" econf $@ ${myconf[@]} + } + multibuild_foreach_variant run_in_build_dir configure ${myconf} } src_compile() { - cd ${GTK2_BUILDDIR} - einfo "Running make in ${GTK2_BUILDDIR}" - default - - if use gtk3; then - cd ${GTK3_BUILDDIR} - einfo "Running make in ${GTK3_BUILDDIR}" - default - fi + multibuild_foreach_variant run_in_build_dir default } src_test() { - cd ${GTK2_BUILDDIR} - einfo "Running make check in ${GTK2_BUILDDIR}" - default - - if use gtk3; then - cd ${GTK3_BUILDDIR} - einfo "Running make check in ${GTK3_BUILDDIR}" - default - fi + multibuild_foreach_variant run_in_build_dir default } src_install() { dodoc AUTHORS NEWS README TODO - cd ${GTK2_BUILDDIR} - einfo "Running make check in ${GTK2_BUILDDIR}" - default - - if use gtk3; then - cd ${GTK3_BUILDDIR} - einfo "Running make install in ${GTK3_BUILDDIR}" - default - fi + multibuild_foreach_variant run_in_build_dir default # Remove .la files if they're not needed use static-libs || prune_libtool_files |