From 7e795e21dcbb01a1cd457cbb2cb0fe387e1fc735 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tiziano=20M=C3=BCller?= Date: Mon, 19 Sep 2011 10:04:46 +0000 Subject: [PATCH] Added patch from upstream git to fix pkg-config file (bug #378907). Package-Manager: portage-2.1.10.15/cvs/Linux x86_64 --- app-emulation/spice/ChangeLog | 9 ++- app-emulation/spice/Manifest | 10 ++-- ...60470a5aea19f799c5574cc0d4a707696712.patch | 36 ++++++++++++ app-emulation/spice/spice-0.8.2-r1.ebuild | 56 +++++++++++++++++++ 4 files changed, 106 insertions(+), 5 deletions(-) create mode 100644 app-emulation/spice/files/54c660470a5aea19f799c5574cc0d4a707696712.patch create mode 100644 app-emulation/spice/spice-0.8.2-r1.ebuild diff --git a/app-emulation/spice/ChangeLog b/app-emulation/spice/ChangeLog index cc52a34b148f..4aaadc01f8bc 100644 --- a/app-emulation/spice/ChangeLog +++ b/app-emulation/spice/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-emulation/spice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/ChangeLog,v 1.16 2011/09/04 10:18:18 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/ChangeLog,v 1.17 2011/09/19 10:04:46 dev-zero Exp $ + +*spice-0.8.2-r1 (19 Sep 2011) + + 19 Sep 2011; Tiziano Müller + +files/54c660470a5aea19f799c5574cc0d4a707696712.patch, + +spice-0.8.2-r1.ebuild: + Added patch from upstream git to fix pkg-config file (bug #378907). 04 Sep 2011; Markus Meier spice-0.8.1.ebuild: x86 stable, bug #369601 diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest index f17910069be6..d246614a025b 100644 --- a/app-emulation/spice/Manifest +++ b/app-emulation/spice/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX 54c660470a5aea19f799c5574cc0d4a707696712.patch 1047 RMD160 fe499079b209e3c4593f4a451538f05544f62766 SHA1 d17d07a17f44b6aa88473cc72c65463ddf46bfe6 SHA256 6892ec1e02ed5fc1bf64ddad876c2b27385dfcc1369c2497552a5c9daf4f735a DIST spice-0.6.4.tar.bz2 1193919 RMD160 a8441a9a8b6c3c7cd0a04089718e0d917d43cd97 SHA1 e43646ceaba6e569e7add6de8fb84eea3aca6d4f SHA256 eb7028b2ce7370105237cc7c7f1ea4d3cfa40cf226e399de9ddda34b060ed174 DIST spice-0.8.0.tar.bz2 1207151 RMD160 4c631685b71b2cd11d60bd56089f4fe615d8feb5 SHA1 528d4fa01627315b7df2e88d9c4e70c18c848c2f SHA256 60bd182a77196a8e6510dd0f88be4ee5e5f12301c84b3341f73d339c99926059 DIST spice-0.8.1.tar.bz2 1206473 RMD160 c0820d0f8f4216a1185d2397f977c45143acdcf8 SHA1 d9c97586046e476e240e3127475ccf671ecc5046 SHA256 c32ebde71d9dba0a94fbc55204a09d6b9f60837b7daccdf1d943f9e7f8e0f04a @@ -8,13 +9,14 @@ DIST spice-0.8.2.tar.bz2 1238463 RMD160 ff27d81fc7a7918e3899d1c80d9ac7a5345974d8 EBUILD spice-0.6.4.ebuild 1038 RMD160 f844a90d1442aaf86e2500baf4406a1cd2ae2e13 SHA1 1291494af732c4532fb6921f9a2ee26929717840 SHA256 a9b7d36656a294ae34cac3714f1b043fc376cbac73b5b46c03b8716271b4423a EBUILD spice-0.8.0.ebuild 1111 RMD160 a7ec5a5daba4fb2b54c24bc248925f2ee61b2c98 SHA1 bc55ac9f69e05b197fbc606525ad29c1e86e17b4 SHA256 1d59461ebf54aeaa9f91c7c3b0c9a80cd08f6a707fc75606aaac7336f0dd1527 EBUILD spice-0.8.1.ebuild 1111 RMD160 3c7f39d0f094d52eeeaa73ccc35dd5e51a89cfbe SHA1 67706828b96d75f725992fb8beb7d05318282109 SHA256 3c1f7f80189eaacce31891749fe64aee93ecc469b5813b529b3afe019905d73f +EBUILD spice-0.8.2-r1.ebuild 1304 RMD160 19bbf31c8e042ca4a546a42f4046e20d338013ab SHA1 3a1a432a06e621e63dfceda6079fa4b77dd0ace1 SHA256 8bfa872bd5c4d0fe6835a92fcb4b41ac9d1a76e4cb1987b835c458a02e5ec226 EBUILD spice-0.8.2.ebuild 1174 RMD160 a6916fde12e4e92e311b169d34f20d94bd75cc1f SHA1 35941a384613968faf5b0e2ec561f42f242cf126 SHA256 ee37f074742064fd63032b339a0f31af6ab8190feac62d752884bcaa9bf15de5 -MISC ChangeLog 2807 RMD160 fb8baf0d954002c5bc73977cb672e4a96db90b6f SHA1 4fa6b500d863477ab0e66d016150562dd74980fd SHA256 41e8e01733516aea290ec732fc269e3c51495ef30a2dbe4bef30cfe2f76c752f +MISC ChangeLog 3047 RMD160 754f47de7b3e2f1271153a111af201cff9acd540 SHA1 c5cc2443b33ec69656d95e10ede3d3a95f0f8ae9 SHA256 a06907d51aea54506c7a289d9e71ed9f8c686fb7ae588a7f10737cf4d12f68e9 MISC metadata.xml 362 RMD160 fa76aaae634a6de60e65ec65c161581f94ad1ec8 SHA1 59e62bfe42e590fe2c14d16bf72fc53da754c9bc SHA256 393bbd9bd6e028ed393cbaec1c4784c7fb9f25f4c685fe99a49e122721b2b505 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk5jUKAACgkQkKaRLQcq0GLmLgCfbAQIeo7+yq8iF1VzGkm852KG -bpIAoJk8PxPbT3a6DIm6RF3mGsOy9nbb -=tNrV +iEYEARECAAYFAk53EzsACgkQGwVqY66cHjCg7wCeMQP3d7b76cnnzKcrq5c0PyFI +SJgAn2xszqWlEYHpsP8eBYiCG6X/lrR4 +=S0PL -----END PGP SIGNATURE----- diff --git a/app-emulation/spice/files/54c660470a5aea19f799c5574cc0d4a707696712.patch b/app-emulation/spice/files/54c660470a5aea19f799c5574cc0d4a707696712.patch new file mode 100644 index 000000000000..11191b91ef1c --- /dev/null +++ b/app-emulation/spice/files/54c660470a5aea19f799c5574cc0d4a707696712.patch @@ -0,0 +1,36 @@ +From 54c660470a5aea19f799c5574cc0d4a707696712 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Fri, 21 Jan 2011 14:16:11 +0000 +Subject: Drop unnecessary X11 and alsa requires from spice-server.pc + +--- +diff --git a/configure.ac b/configure.ac +index 5828a70..3a86515 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -219,7 +219,6 @@ if test "$os_linux" = yes; then + PKG_CHECK_MODULES(ALSA, alsa) + AC_SUBST(ALSA_CFLAGS) + AC_SUBST(ALSA_LIBS) +- SPICE_REQUIRES+=" alsa" + fi + + PKG_CHECK_MODULES(SSL, openssl) +@@ -253,7 +252,6 @@ if test "$red_target" = "x11"; then + PKG_CHECK_MODULES(XFIXES, xfixes) + AC_SUBST(XRANDR_CFLAGS) + AC_SUBST(XRANDR_LIBS) +- SPICE_REQUIRES+=" xrandr xfixes" + + PKG_CHECK_MODULES(XRANDR12, + xrandr >= 1.2, +@@ -272,7 +270,6 @@ if test "$red_target" = "x11"; then + PKG_CHECK_MODULES(MISC_X, x11 xext xrender) + AC_SUBST(MISC_X_CFLAGS) + AC_SUBST(MISC_X_LIBS) +- SPICE_REQUIRES+=" x11 xext xrender" + fi + + # Add parameter for (partial) static linkage of spice client. +-- +cgit v0.9.0.2-2-gbebe diff --git a/app-emulation/spice/spice-0.8.2-r1.ebuild b/app-emulation/spice/spice-0.8.2-r1.ebuild new file mode 100644 index 000000000000..8ac453b43ac7 --- /dev/null +++ b/app-emulation/spice/spice-0.8.2-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/spice-0.8.2-r1.ebuild,v 1.1 2011/09/19 10:04:46 dev-zero Exp $ + +EAPI=4 + +inherit autotools eutils + +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="+gui sasl static-libs" + +RDEPEND=">=app-emulation/spice-protocol-0.8.1 + >=x11-libs/pixman-0.17.7 + media-libs/alsa-lib + media-libs/celt:0.5.1 + dev-libs/openssl + >=x11-libs/libXrandr-1.2 + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender + x11-libs/libXfixes + virtual/jpeg + sys-libs/zlib + gui? ( =dev-games/cegui-0.6* ) + sasl? ( dev-libs/cyrus-sasl )" +DEPEND="dev-util/pkgconfig + ${RDEPEND}" + +# maintainer notes: +# * opengl support is currently broken +# * add slirp for tunnel-support +# * add libcacard for smartcard support + +src_prepare() { + epatch "${FILESDIR}/54c660470a5aea19f799c5574cc0d4a707696712.patch" + eautoreconf +} + +src_configure() { + local myconf="" + use gui && myconf+="--enable-gui " + econf ${myconf} \ + $(use_enable static-libs static) \ + $(use_with sasl) +} + +src_install() { + default + use static-libs || rm "${D}"/usr/lib*/*.la +} -- 2.26.2