From ecdab33ececea00bb71688686b97fbb890de8792 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Wed, 18 Nov 2015 14:36:03 -0600 Subject: app-emulation/spice: Maintenance, drop obsolete USE=client (bug #566086) - The client spicec has been removed from app-emulation/spice in favor of app-emulation/virt-viewer. Thus, remove the now obsolete keyword and associated dependencies. - Remove (already commented out) USE="static" left-overs. This ebuild does not contain any executable any more for which "static" might have made sense. Revision bump and commit straigt to stable as this is purely a cosmetic change. Package-Manager: portage-2.2.24 Signed-off-by: Matthias Maier --- app-emulation/spice/metadata.xml | 1 - app-emulation/spice/spice-0.12.6-r1.ebuild | 85 ------------------------------ app-emulation/spice/spice-0.12.6-r2.ebuild | 71 +++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 86 deletions(-) delete mode 100644 app-emulation/spice/spice-0.12.6-r1.ebuild create mode 100644 app-emulation/spice/spice-0.12.6-r2.ebuild diff --git a/app-emulation/spice/metadata.xml b/app-emulation/spice/metadata.xml index f139eea39762..fc2293f7536a 100644 --- a/app-emulation/spice/metadata.xml +++ b/app-emulation/spice/metadata.xml @@ -7,7 +7,6 @@ Tiziano Müller - Build the spicec client app (does not reduce dependencies at the moment). Enable smartcard remoting using app-emulation/libcacard diff --git a/app-emulation/spice/spice-0.12.6-r1.ebuild b/app-emulation/spice/spice-0.12.6-r1.ebuild deleted file mode 100644 index 852e15e7d7b3..000000000000 --- a/app-emulation/spice/spice-0.12.6-r1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_4 ) - -inherit eutils python-any-r1 - -DESCRIPTION="SPICE server and client" -HOMEPAGE="http://spice-space.org/" -SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="client libressl sasl smartcard static-libs" # static - -# only the client links against libcacard, the libspice-server only uses the headers -# the client cannot be built statically since alsa and qemu[smartcard] are missing static-libs -RDEPEND=" - >=dev-libs/glib-2.22:2[static-libs(+)?] - >=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?] - media-libs/opus[static-libs(+)?] - sys-libs/zlib[static-libs(+)?] - virtual/jpeg:0=[static-libs(+)?] - >=x11-libs/pixman-0.17.7[static-libs(+)?] - !libressl? ( dev-libs/openssl:0[static-libs(+)?] ) - libressl? ( dev-libs/libressl[static-libs(+)?] ) - sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) - client? ( - media-libs/alsa-lib - >=x11-libs/libXrandr-1.2 - x11-libs/libX11 - x11-libs/libXext - >=x11-libs/libXinerama-1.0 - x11-libs/libXfixes - x11-libs/libXrender - smartcard? ( app-emulation/qemu[smartcard] ) - )" - -DEPEND=" - >=app-emulation/spice-protocol-0.12.10 - virtual/pkgconfig - $(python_gen_any_dep ' - >=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - ') - smartcard? ( app-emulation/qemu[smartcard] ) - ${RDEPEND}" - -python_check_deps() { - has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]" - has_version "dev-python/six[${PYTHON_USEDEP}]" -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup -} - -# maintainer notes: -# * opengl support is currently broken - -src_prepare() { - epatch "${FILESDIR}/0.11.0-gold.patch" - - epatch_user -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_enable client) \ - $(use_with sasl) \ - $(use_enable smartcard) \ - --disable-gui \ - --disable-static-linkage -# $(use_enable static static-linkage) \ -} - -src_install() { - default - use static-libs || prune_libtool_files -} diff --git a/app-emulation/spice/spice-0.12.6-r2.ebuild b/app-emulation/spice/spice-0.12.6-r2.ebuild new file mode 100644 index 000000000000..31e8456587fb --- /dev/null +++ b/app-emulation/spice/spice-0.12.6-r2.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_4 ) + +inherit eutils python-any-r1 + +DESCRIPTION="SPICE server" +HOMEPAGE="http://spice-space.org/" +SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="libressl sasl smartcard static-libs" + +# the libspice-server only uses the headers of libcacard +RDEPEND=" + >=dev-libs/glib-2.22:2[static-libs(+)?] + >=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?] + media-libs/opus[static-libs(+)?] + sys-libs/zlib[static-libs(+)?] + virtual/jpeg:0=[static-libs(+)?] + >=x11-libs/pixman-0.17.7[static-libs(+)?] + !libressl? ( dev-libs/openssl:0[static-libs(+)?] ) + libressl? ( dev-libs/libressl[static-libs(+)?] ) + sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )" + +DEPEND=" + >=app-emulation/spice-protocol-0.12.10 + virtual/pkgconfig + $(python_gen_any_dep ' + >=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + ') + smartcard? ( app-emulation/qemu[smartcard] ) + ${RDEPEND}" + +python_check_deps() { + has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]" + has_version "dev-python/six[${PYTHON_USEDEP}]" +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup +} + +# maintainer notes: +# * opengl support is currently broken + +src_prepare() { + epatch "${FILESDIR}/0.11.0-gold.patch" + + epatch_user +} + +src_configure() { + econf \ + $(use_enable static-libs static) \ + $(use_with sasl) \ + $(use_enable smartcard) \ + --disable-gui +} + +src_install() { + default + use static-libs || prune_libtool_files +} -- cgit v1.2.3-65-gdbad