From a38deebb7dbaddcdf257676c166e4e0f331f00cb Mon Sep 17 00:00:00 2001 From: Tiziano Müller Date: Sun, 10 Aug 2014 13:13:52 +0000 Subject: Rev.bump to pull in media-libs/opus to avoid automagic dep (bug #518546). (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x1A5D023975B0583D!) --- net-misc/spice-gtk/ChangeLog | 8 +- net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild | 180 ++++++++++++++++++++++++++++ net-misc/spice-gtk/spice-gtk-0.25.ebuild | 179 --------------------------- 3 files changed, 187 insertions(+), 180 deletions(-) create mode 100644 net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild delete mode 100644 net-misc/spice-gtk/spice-gtk-0.25.ebuild (limited to 'net-misc/spice-gtk') diff --git a/net-misc/spice-gtk/ChangeLog b/net-misc/spice-gtk/ChangeLog index a61581459bc7..0d2233bdf976 100644 --- a/net-misc/spice-gtk/ChangeLog +++ b/net-misc/spice-gtk/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/spice-gtk # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/ChangeLog,v 1.85 2014/07/24 18:15:33 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/ChangeLog,v 1.86 2014/08/10 13:13:52 dev-zero Exp $ + +*spice-gtk-0.25-r1 (10 Aug 2014) + + 10 Aug 2014; Tiziano Müller +spice-gtk-0.25-r1.ebuild, + -spice-gtk-0.25.ebuild: + Rev.bump to pull in media-libs/opus to avoid automagic dep (bug #518546). 24 Jul 2014; Ian Stakenvicius (_AxS_) spice-gtk-0.20-r1.ebuild, spice-gtk-0.21.ebuild, spice-gtk-0.25.ebuild: diff --git a/net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild new file mode 100644 index 000000000000..9178f68b61de --- /dev/null +++ b/net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2014 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.25-r1.ebuild,v 1.1 2014/08/10 13:13:52 dev-zero Exp $ + +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} ) + +inherit autotools eutils python-single-r1 vala + +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" +SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2" +KEYWORDS="~amd64 ~arm" +IUSE="dbus doc gstreamer gtk3 +introspection policykit pulseaudio +python sasl smartcard static-libs usbredir vala webdav" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ?? ( pulseaudio gstreamer )" + +# TODO: +# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h +# * use external pnp.ids as soon as that means not pulling in gnome-desktop +RDEPEND="${PYTHON_DEPS} + pulseaudio? ( media-sound/pulseaudio[glib] ) + gstreamer? ( + media-libs/gstreamer:0.10 + media-libs/gst-plugins-base:0.10 ) + >=x11-libs/pixman-0.17.7 + >=media-libs/celt-0.5.1.1:0.5.1 + media-libs/opus + dev-libs/openssl + gtk3? ( x11-libs/gtk+:3[introspection?] ) + x11-libs/gtk+:2[introspection?] + >=dev-libs/glib-2.26:2 + >=x11-libs/cairo-1.2 + virtual/jpeg + sys-libs/zlib + dbus? ( dev-libs/dbus-glib ) + introspection? ( dev-libs/gobject-introspection ) + python? ( dev-python/pygtk:2 ) + sasl? ( dev-libs/cyrus-sasl ) + smartcard? ( app-emulation/qemu[smartcard] ) + usbredir? ( + sys-apps/hwids + >=sys-apps/usbredir-0.4.2 + virtual/libusb:1 + virtual/libgudev:= + policykit? ( + sys-apps/acl + >=sys-auth/polkit-0.110-r1 + !~sys-auth/polkit-0.111 ) + ) + webdav? ( net-libs/phodav )" +DEPEND="${RDEPEND} + dev-lang/python + dev-python/pyparsing + dev-perl/Text-CSV + >=dev-util/intltool-0.40.0 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + vala? ( $(vala_depend) )" + +# Hard-deps while building from git: +# dev-lang/vala:0.14 +# dev-lang/perl + +GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2" +GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3" + +src_prepare() { + epatch \ + "${FILESDIR}/${P}-Introduce-enable-disable-webdav-option.patch" \ + "${FILESDIR}/${P}-Do-not-depend-on-libsoup-directly.patch" \ + "${FILESDIR}/${P}-missing_gio_libs.patch" + epatch_user + + AT_NO_RECURSIVE="yes" eautoreconf + + use vala && vala_src_prepare + mkdir ${GTK2_BUILDDIR} ${GTK3_BUILDDIR} || die +} + +src_configure() { + local myconf + local audio="no" + + use gstreamer && audio="gstreamer" + use pulseaudio && audio="pulse" + + if use vala ; then + # force vala regen for MinGW, etc + rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c + fi + + myconf=" + $(use_enable static-libs static) \ + $(use_enable introspection) \ + --with-audio=${audio} \ + $(use_with python) \ + $(use_with sasl) \ + $(use_enable smartcard) \ + $(use_enable usbredir) \ + $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \ + $(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 +} + +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 +} + +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 +} + +src_install() { + dodoc AUTHORS ChangeLog NEWS README THANKS 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 + + # Remove .la files if they're not needed + use static-libs || prune_libtool_files + + use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la + + make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" +} diff --git a/net-misc/spice-gtk/spice-gtk-0.25.ebuild b/net-misc/spice-gtk/spice-gtk-0.25.ebuild deleted file mode 100644 index 6fb3776cd0b0..000000000000 --- a/net-misc/spice-gtk/spice-gtk-0.25.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2014 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.25.ebuild,v 1.3 2014/07/24 18:15:33 axs Exp $ - -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} ) - -inherit autotools eutils python-single-r1 vala - -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" -SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2" -KEYWORDS="~amd64 ~arm" -IUSE="dbus doc gstreamer gtk3 +introspection policykit pulseaudio -python sasl smartcard static-libs usbredir vala webdav" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ?? ( pulseaudio gstreamer )" - -# TODO: -# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h -# * use external pnp.ids as soon as that means not pulling in gnome-desktop -RDEPEND="${PYTHON_DEPS} - pulseaudio? ( media-sound/pulseaudio[glib] ) - gstreamer? ( - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 ) - >=x11-libs/pixman-0.17.7 - >=media-libs/celt-0.5.1.1:0.5.1 - dev-libs/openssl - gtk3? ( x11-libs/gtk+:3[introspection?] ) - x11-libs/gtk+:2[introspection?] - >=dev-libs/glib-2.26:2 - >=x11-libs/cairo-1.2 - virtual/jpeg - sys-libs/zlib - dbus? ( dev-libs/dbus-glib ) - introspection? ( dev-libs/gobject-introspection ) - python? ( dev-python/pygtk:2 ) - sasl? ( dev-libs/cyrus-sasl ) - smartcard? ( app-emulation/qemu[smartcard] ) - usbredir? ( - sys-apps/hwids - >=sys-apps/usbredir-0.4.2 - virtual/libusb:1 - virtual/libgudev:= - policykit? ( - sys-apps/acl - >=sys-auth/polkit-0.110-r1 - !~sys-auth/polkit-0.111 ) - ) - webdav? ( net-libs/phodav )" -DEPEND="${RDEPEND} - dev-lang/python - dev-python/pyparsing - dev-perl/Text-CSV - >=dev-util/intltool-0.40.0 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - vala? ( $(vala_depend) )" - -# Hard-deps while building from git: -# dev-lang/vala:0.14 -# dev-lang/perl - -GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2" -GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3" - -src_prepare() { - epatch \ - "${FILESDIR}/${P}-Introduce-enable-disable-webdav-option.patch" \ - "${FILESDIR}/${P}-Do-not-depend-on-libsoup-directly.patch" \ - "${FILESDIR}/${P}-missing_gio_libs.patch" - epatch_user - - AT_NO_RECURSIVE="yes" eautoreconf - - use vala && vala_src_prepare - mkdir ${GTK2_BUILDDIR} ${GTK3_BUILDDIR} || die -} - -src_configure() { - local myconf - local audio="no" - - use gstreamer && audio="gstreamer" - use pulseaudio && audio="pulse" - - if use vala ; then - # force vala regen for MinGW, etc - rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c - fi - - myconf=" - $(use_enable static-libs static) \ - $(use_enable introspection) \ - --with-audio=${audio} \ - $(use_with python) \ - $(use_with sasl) \ - $(use_enable smartcard) \ - $(use_enable usbredir) \ - $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \ - $(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 -} - -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 -} - -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 -} - -src_install() { - dodoc AUTHORS ChangeLog NEWS README THANKS 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 - - # Remove .la files if they're not needed - use static-libs || prune_libtool_files - - use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la - - make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" -} -- cgit v1.2.3-65-gdbad