From: Michael Sterrett Date: Fri, 27 Mar 2015 06:22:14 +0000 (+0000) Subject: old; per dev-zero X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8be8dc858b013059557020041c9362bec46609d6;p=gentoo.git old; per dev-zero Package-Manager: portage-2.2.14/cvs/Linux x86_64 --- diff --git a/app-emulation/spice/ChangeLog b/app-emulation/spice/ChangeLog index 580cc9219def..07376d0d5ee2 100644 --- a/app-emulation/spice/ChangeLog +++ b/app-emulation/spice/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/spice # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/ChangeLog,v 1.65 2015/03/25 13:43:05 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/ChangeLog,v 1.66 2015/03/27 06:22:07 mr_bones_ Exp $ + + 27 Mar 2015; Michael Sterrett + -files/spice-0.12.3-CVE-2013-4130.patch, + -files/spice-0.12.4-alsa-conditional.patch, -spice-0.12.2.ebuild, + -spice-0.12.3-r1.ebuild, -spice-0.12.4-r1.ebuild: + old; per dev-zero 25 Mar 2015; Agostino Sarubbo spice-0.12.5-r1.ebuild: Stable for x86, wrt bug #542722 diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest index 9983d4985620..b850113082ff 100644 --- a/app-emulation/spice/Manifest +++ b/app-emulation/spice/Manifest @@ -1,36 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX 0.11.0-gold.patch 989 SHA256 195835efd27a7f41896380b1543ed044d1e82dc501eb35932adb8730136fa2e4 SHA512 e115fcab5a87e5d54b7fd6fbef4a8dae635780410b206d8fc2a46fd52c1bb87378efc0b60fcb9f13127f713e36402b531e09579abe2390eaedf2744ff128b0d1 WHIRLPOOL 6a5574eef98bb3867442a7f9689cb620e6f74266ddc736b6a6c58bc5a795b4d7fb30a49fb49c0883608bc1db22e831c0dfb9913dfc8c96361a320c6f42e67960 -AUX spice-0.12.3-CVE-2013-4130.patch 2719 SHA256 942ec8c1d5c420f7667f220be87b1df293488dfc7ce717f3c5162f70f4014dae SHA512 2272b12b3204dc0a1403b2cd96d06e938c501a044f979594f0f18d43a36f4c3584b1aafa1a3a911c7a3326df2af2675aa437a69a10ac9d42f6ac827fb6bdc7f1 WHIRLPOOL 9719a2764a5961faa586cfc396657df50eac76e1b717da744cdc9f1b011747a3306403a99ff617b51f90ca0b525736bf5d5d6617ebfeea9fb1ff79d4c5ba6aa6 -AUX spice-0.12.4-alsa-conditional.patch 1363 SHA256 8c40ec5bce3298988e34ace8f928cda0e053abfd6d6d683f1e3fc326b3a6d945 SHA512 e19de0199e6a3d19bb63eb2ee3ece5e8d0126b441c98dd0606144d52162ad0ce8501011ff0a5fc23155824981b67eaa144ce2b330c3f65824aa592fd5002371c WHIRLPOOL 6a23c847574b0edef07c6883b9d2c5776258ea928de87765988eb0ed2167af4874731016b328ad4ca961d83593092caa933bbce25a71c616e630f648e1bcb661 AUX spice-0.12.5-fix-assert-in-mjpeg_encoder_adjust_params_to_bit_rate.patch 1151 SHA256 d32faf4a039513c61994eb324305fdd3976921e05fa59155f23d78240fa0d295 SHA512 099c1fc2be0129af3773f22acd4159b031fb886e538871d1758ad6e4c5c7f9f3f8e2bc054eb89fafe926dc52bc1c6c29d1d4332064bbf8f23d7ca2dfa7061043 WHIRLPOOL c5e6b6db00bea69649f2611288ac7f030cb40aed6b056106fc2fd609caf00633bfe22605504b5ff94792daebf72724c3a1f449e60e4dd8fab602e5b4cf7d0cb5 AUX spice-0.12.5-fix-crash-when-clearing-surface-memory.patch 1188 SHA256 ca70fdc7add8e5005098235b3193b00718fe126efdaedce6386272f999c97a28 SHA512 5ff6eb5a81425b5830fa4728927d977fa0b2d96a42c9a17daad08781d02d6849e8106a3f1717649e8bc8de00c8b6dfe9f28d3088572c9d430dd7acb74991c6e1 WHIRLPOOL 95a2c447a9fb2e9baf502f784fde2b702429c84e076d7a5dc0bf1e3c3a704d30aacda27a431281d83454a1f6b72e92ca79e7c247dca47170edb37c70b789a378 AUX spice-0.12.5-server-dont-assert-on-invalid-client-message.patch 1073 SHA256 751fd57a99558e3c1c0764fcaa38589e9794542b95f369018cb346231772c4d3 SHA512 79f253fdeeac771f8f5087c15fb6f474a5ee540bc8350415a72edf408753dabd7ea9b37cfc50dddee5a285e32ef495980bb0e3b88efc5a59fdb38e595c0b2dd3 WHIRLPOOL 489921567064b36b0626a297f7a69487f461124e22d1b29b20ec9861466e2f68776518abe7091a7fe8c613eb3b661f38241168613219fd52dab91bdbc66dc052 -DIST spice-0.12.2.tar.bz2 1685684 SHA256 5654fac02f5568088ea01979088d539f4e95551568dd709ec197e965cf8612d5 SHA512 5381ab15568d0bbe998dfa2e4bab64ea2255664f466545c16d77708fbe8b9c4627e837c4c4d229fed501665c90b38e8c31f12ccb434f5c7e96eb89ac61bd9a9b WHIRLPOOL 6ae9fcb5b6cd89176cc657f8c19e6424c1c85624229eff7ec168db57a580680042c22e8daf43a78ccd5076568a1db91dc7a3dfcfc6b9f24380af04ab0f4e44b7 -DIST spice-0.12.3.tar.bz2 1606683 SHA256 bfd65e1c466524f9469cb58764904eeec1dae27c4901c4dbd0bf1ec419048546 SHA512 92d5871cd154d863ee54657e8064f6093bd5ab47e277a1398fed46b8592f44416d6d04be2d85a4ada90d4bfb5ef94dbc618a818219023416d3f8a82acbd3009e WHIRLPOOL bd431acefde4a3dd9c2fea5fa31c1ab2e1b2a34a1021d401510cb98307f8703922015d10db09795f26d514dbd49b147cd598dca2df16c784780530ab960a181b -DIST spice-0.12.4.tar.bz2 1718655 SHA256 cf063e7df42e331a835529d2f613d8a01f8cb2963e8edaadf73a8d65c46fb387 SHA512 9867c2ace6205b606eef4a04a7e1fa0533c8d419cbb063edf4ded12db24f76237487d3e9dd57dec0f5b952eef399aa395d8591e2d82cab4d13e0d3ce6c7fba74 WHIRLPOOL 73c81bc1481c33512805c19934b4b4de92024cb2c5c0409ae34f2a926056ba970d2deb7ec4a13685e7b1854ca2c505f2b87b6ccd1e4d3454a65146c16c933de7 DIST spice-0.12.5.tar.bz2 1737169 SHA256 4209a20d8f67cb99a8a6ac499cfe79a18d4ca226360457954a223d6795c2f581 SHA512 1501c913ba3b1856444536a9bfda7a2138a96088f940b483e963df342b91deb945d77bfb3c83ebddfcd7c3008695c0dd7df30ff9fd8502cbbcac1c610a273572 WHIRLPOOL 8f50a91febb0d2279ac867ae31cb14f996106625f0f26ba1bb8b5b576eedce6839f52c70e19a03f03be209f695c36b3ba1d94fadee6c9f134e2afffd5b99c476 -EBUILD spice-0.12.2.ebuild 2122 SHA256 e98d078d1dc722a858267b06b4393cb02a1f7a638aee44a3f90b80453844175b SHA512 907ae09a59a1eedc93c8616502bbf47eec0a30b855df1f465fc563d8d9abd4f2a9008c266c0e9f286bb1782fce0736295838421c280fd54ab63ecc0a65cd9c0d WHIRLPOOL 6cec63b6ba27ffb28908cb95f46b065980515fa8519ecac345c10c60c10f0817e9b6277cd4d70d07704a58241ac964aed6996cdf9d79d2ae0fc154e6feff9ed8 -EBUILD spice-0.12.3-r1.ebuild 2593 SHA256 7225642808e5aaa4519ac0424ee1cf4e15f43a871b99c4668a3d7db90661c63f SHA512 f69bb38c0f4fa8fe337d36b1e8ac67ace00e334b6d08a5dd4aeda903919e044aa15dd5f61607cc01f7a733fd6d7daa4bea4e369d7c218368570ebfd5258d1da2 WHIRLPOOL 44edd838f52dd442519791d09bdcdbd66ac63f2e7cb41fdb1482c81ca7ab33316d40aa7109d5f85f43ec20dc1048b404710c0d79a7f7a6a63f7b6f13d9c7fbc3 -EBUILD spice-0.12.4-r1.ebuild 2332 SHA256 508e2b79792f867e10f2a9656463e6ba031e1a75e1f4121d5142ff58f7053f73 SHA512 51f78690c7377b811df503b08c987f243aabaa117b9b0ebb71397f7f43086543a2e7421f2e57cf55edf194329ca61c479d917b919cafea21f9e339921c099c12 WHIRLPOOL d62c4ad471c2175b4931ff303654d39d35a808b4bb829a5a5b9abc6b4c25509ab54c12790d0e6e8031aa55b5ac8e99015db724a483e682f761934e951218f72a EBUILD spice-0.12.5-r1.ebuild 2250 SHA256 c244a877bac7ebbc20b07139aceda92c82fc8ce110184de9aa511784f1598874 SHA512 a7a8fff3ec19501ccab1a1a7e9317585c35d26d2efd7855d9596d63b0af1dda32c596852a2740d1f4c12425382e2420e4a7fb44f0c3f075dfadf3996b41e722e WHIRLPOOL 1e68a2593ad40474cfb0f65bc3a0ed19f384a02eec741242dabdc53bc4533a8b191b2b5113f53fdcab8acf2610d5d72bbe3062cf8175deaf54d8c071f4c4b245 -MISC ChangeLog 10859 SHA256 bcf6de2230b3b403dc34b77fcc59d6a8f2ed4f53fdf3e5d2920f0c6474538905 SHA512 b90a80ab71f7680afe3dc1809e96a881bc70018872b31926d3c6d2d7f5e54f098892478dc3b573344c97e77548193ac00886f5016d1628226c63ca2fa59fcae7 WHIRLPOOL d7344ffed583a206220d7e844a95e0d303ca61ace45e17565ccb9e10248407a3562ef657e73dd8f2562e675637854a73dcad7248b149b851a2995f5886f5e5b2 +MISC ChangeLog 11104 SHA256 5b48cd124140f35c2d9eba626e5c40ad93079f8fa9983b4ecbacdf281c2b3c82 SHA512 d5892f034f18bdf7665dd963bc27c238ee7c9bcae5ee5c04dabb1c1ef677f8d0f048acf584ae06167f45bd7c2f039eaa4aeba9a4b682e1d7f75055c46daaf5f0 WHIRLPOOL 4b83c016e66353227e4d72bfb0aaf82cf50552c1f29bd567056e56683f97b8ade81c57ed57f8792e0de63c7b86aa3af18537ef84b9cc75176c5c2b02b8f973c3 MISC metadata.xml 561 SHA256 ac20a9018d473e0ac3aa7e0cb80bc542dd1a9b704b843e09a17b16b706fa339f SHA512 bb22c2e14eca34330891a56add2a39a2debc65fb0d9d037fd4b27be15adf5be2667166fff123e0e5e3cb5e201b523172737f537d2258216106c1e2dd86703bae WHIRLPOOL da950e23ccd706f068478c1e7d4de70dc3c871f9784a55af8db5061ce28ecede29e6153b6325818a301b9cab10059d380e9c93881c9df75815cd5eaa1f3c8d66 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJVErtqAAoJELp701BxlEWf4BUQAK/pmnJq3oIXMhRBhrKRmXtE -KcOSPFKXapHbh1eeBL31N8v5eBNeK7WGQVHnnqLH81oyKgcrX0prPVdc+n6p8zcF -HRkOY1AEpWd6k8JJjKVBD59KEQ6CHfZ9doFrjFFEnW9fKUBo//pzyxunvFM5NR/y -Huq32ds461wTjXgwHjSMnor4KA1AbMm6SE8sBeih7Kc5reZodUbHVbZCJYmBhwWu -Q01HqhbO49cBKf85SWQ7J2gN2xdEryfzD9VxsHmRJYAMuLq6Wlir+ui4ci3a0ffK -NASkBRqtFTswz1DEpYStZw8VtpSLIa9RxA1z7W7a+rp0Z0j2TBosix3Ka1UnU2fL -A6bZBI/4AL1g9muOYAtt6TGNYFXrrJUn06Q57waX+zl/16VrO0GDJBTU91xadt0K -a8f4GfRN7O0z7oC+8uoSx9WdqCmTQPeG/heuMF06Qc4VJfvBgz9u8R29u6HIfgPC -SZHXipI/z5MKjq/LwLAJC4B0RnXvPjLO1P5Ld9S41LIYEFp8yl7peSv4vBK8Pin3 -N3/rHMSpeQf9nkf+kiCKhQ6LxhyJ9VnByx9x71+L7sTdpwQU8vgoMFMqtD+mPK3D -uOw7uGtiRXweR0e44z3j008IFNUPJ9oxKK9G/9lBjBVFRpZLuduwp/1vDme76gld -Dbn0X1P65lNFyn5CouhM -=t4bY ------END PGP SIGNATURE----- diff --git a/app-emulation/spice/files/spice-0.12.3-CVE-2013-4130.patch b/app-emulation/spice/files/spice-0.12.3-CVE-2013-4130.patch deleted file mode 100644 index f18b40fe7707..000000000000 --- a/app-emulation/spice/files/spice-0.12.3-CVE-2013-4130.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 53488f0275d6c8a121af49f7ac817d09ce68090d Mon Sep 17 00:00:00 2001 -From: David Gibson -Date: Fri, 05 Jul 2013 07:11:46 +0000 -Subject: Use RING_FOREACH_SAFE in red_channel.c functions which are missing it - -Currently, both red_channel_pipes_add_type() and -red_channel_pipes_add_empty_msg() use plaing RING_FOREACH() which is not -safe versus removals from the ring within the loop body. - -Although it's rare, such a removal can occur in both cases. In the case -of red_channel_pipes_add_type() we have: - red_channel_pipes_add_type() - -> red_channel_client_pipe_add_type() - -> red_channel_client_push() - -And in the case of red_channel_client_pipes_add_empty_msg() we have: - red_channel_client_pipes_add_empty_msg() - -> red_channel_client_pipe_add_empty_msg() - -> red_channel_client_push() - -But red_channel_client_push() can cause a removal from the clients ring if -a network error occurs: - red_channel_client_push() - -> red_channel_client_send() - -> red_peer_handle_outgoing() - -> handler->cb->on_error callback - = red_channel_client_default_peer_on_error() - -> red_channel_client_disconnect() - -> red_channel_remove_client() - -> ring_remove() - -When this error path does occur, the assertion in RING_FOREACH()'s -ring_next() trips, and the process containing the spice server is aborted. -i.e. your whole VM dies, as a result of an unfortunately timed network -error on the spice channel. - -Please apply. - -Signed-off-by: David Gibson ---- -diff --git a/server/red_channel.c b/server/red_channel.c -index c0b1781..8742008 100644 ---- a/server/red_channel.c -+++ b/server/red_channel.c -@@ -1572,9 +1572,9 @@ void red_channel_client_pipe_add_type(RedChannelClient *rcc, int pipe_item_type) - - void red_channel_pipes_add_type(RedChannel *channel, int pipe_item_type) - { -- RingItem *link; -+ RingItem *link, *next; - -- RING_FOREACH(link, &channel->clients) { -+ RING_FOREACH_SAFE(link, next, &channel->clients) { - red_channel_client_pipe_add_type( - SPICE_CONTAINEROF(link, RedChannelClient, channel_link), - pipe_item_type); -@@ -1593,9 +1593,9 @@ void red_channel_client_pipe_add_empty_msg(RedChannelClient *rcc, int msg_type) - - void red_channel_pipes_add_empty_msg(RedChannel *channel, int msg_type) - { -- RingItem *link; -+ RingItem *link, *next; - -- RING_FOREACH(link, &channel->clients) { -+ RING_FOREACH_SAFE(link, next, &channel->clients) { - red_channel_client_pipe_add_empty_msg( - SPICE_CONTAINEROF(link, RedChannelClient, channel_link), - msg_type); --- -cgit v0.9.0.2-2-gbebe diff --git a/app-emulation/spice/files/spice-0.12.4-alsa-conditional.patch b/app-emulation/spice/files/spice-0.12.4-alsa-conditional.patch deleted file mode 100644 index 82abb37c61d1..000000000000 --- a/app-emulation/spice/files/spice-0.12.4-alsa-conditional.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 58195c195110f0dbb24d831b5eefb2f094848b26 Mon Sep 17 00:00:00 2001 -From: Christian Ruppert -Date: Sun, 03 Nov 2013 17:38:55 +0000 -Subject: Require alsa only with --enable-client - -Hey guys, - -the alsa libraries/header seem to be required only when configured with ---enable-client so I wrote a patch to make configure respect it. - --- -Regards, -Christian Ruppert - -From 53683cc75ba092799f856f710cb45b2aacfb6123 Mon Sep 17 00:00:00 2001 -From: Christian Ruppert -Date: Sun, 3 Nov 2013 18:36:26 +0100 -Subject: [PATCH] Require alsa only with --enable-client ---- -diff --git a/configure.ac b/configure.ac -index 7e81329..882bf1b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -246,12 +246,6 @@ fi - AC_MSG_RESULT([found]) - fi - --if test "$os_linux" = yes; then -- PKG_CHECK_MODULES(ALSA, alsa) -- AC_SUBST(ALSA_CFLAGS) -- AC_SUBST(ALSA_LIBS) --fi -- - PKG_CHECK_MODULES(SSL, openssl) - AC_SUBST(SSL_CFLAGS) - AC_SUBST(SSL_LIBS) -@@ -280,6 +274,12 @@ AC_SUBST(GL_LIBS) - SPICE_NONPKGCONFIG_LIBS+=" $GL_LIBS" - - if test "x$red_target" = "xx11" && test "x$enable_client" = "xyes" ; then -+ if test "$os_linux" = yes; then -+ PKG_CHECK_MODULES(ALSA, alsa) -+ AC_SUBST(ALSA_CFLAGS) -+ AC_SUBST(ALSA_LIBS) -+ fi -+ - PKG_CHECK_MODULES(XRANDR, xrandr) - PKG_CHECK_MODULES(XFIXES, xfixes) - PKG_CHECK_MODULES(MISC_X, x11 xext xrender) --- -cgit v0.9.0.2-2-gbebe diff --git a/app-emulation/spice/spice-0.12.2.ebuild b/app-emulation/spice/spice-0.12.2.ebuild deleted file mode 100644 index aef1395123aa..000000000000 --- a/app-emulation/spice/spice-0.12.2.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/spice-0.12.2.ebuild,v 1.6 2014/08/06 06:44:37 patrick Exp $ - -EAPI=5 - -PYTHON_DEPEND="2" - -inherit eutils python - -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 +gui sasl smartcard static-libs" # static - -RDEPEND=">=x11-libs/pixman-0.17.7 - media-libs/alsa-lib - media-libs/celt:0.5.1 - dev-libs/openssl - virtual/jpeg - sys-libs/zlib - sasl? ( dev-libs/cyrus-sasl ) - smartcard? ( >=app-emulation/libcacard-0.1.2 ) - client? ( - gui? ( =dev-games/cegui-0.6*[opengl] ) - >=x11-libs/libXrandr-1.2 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXfixes - x11-libs/libXrender - )" - -# broken as we don't have static alsa-lib and building that one static requires more work -# static? ( -# >=x11-libs/pixman-0.17.7[static-libs(+)] -# media-libs/celt:0.5.1[static-libs(+)] -# virtual/jpeg[static-libs(+)] -# sys-libs/zlib[static-libs(+)] -# media-libs/alsa-lib[static-libs(-)] -# >=x11-libs/libXrandr-1.2[static-libs(+)] -# x11-libs/libX11[static-libs(+)] -# x11-libs/libXext[static-libs(+)] -# x11-libs/libXinerama[static-libs(+)] -# x11-libs/libXfixes[static-libs(+)] -# x11-libs/libXrender[static-libs(+)] -# ) -# )" -DEPEND="virtual/pkgconfig - dev-python/pyparsing - ${RDEPEND}" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -# maintainer notes: -# * opengl support is currently broken -# * TODO: add slirp for tunnel-support - -src_prepare() { - epatch \ - "${FILESDIR}/0.11.0-gold.patch" -} - -src_configure() { - python_convert_shebangs 2 spice-common/spice_codegen.py - - econf \ - $(use_enable static-libs static) \ - --disable-tunnel \ - $(use_enable client) \ - $(use_enable gui) \ - $(use_with sasl) \ - $(use_enable smartcard) \ - --disable-static-linkage -# $(use_enable static static-linkage) \ -} - -src_install() { - default - use static-libs || rm "${D}"/usr/lib*/*.la -} diff --git a/app-emulation/spice/spice-0.12.3-r1.ebuild b/app-emulation/spice/spice-0.12.3-r1.ebuild deleted file mode 100644 index e8ead8f8ec8d..000000000000 --- a/app-emulation/spice/spice-0.12.3-r1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/spice-0.12.3-r1.ebuild,v 1.9 2014/08/06 06:44:37 patrick Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 ) - -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 gui sasl smartcard static-libs" # static - -RDEPEND=">=x11-libs/pixman-0.17.7 - >=dev-libs/glib-2.22:2 - media-libs/alsa-lib - >=media-libs/celt-0.5.1.1:0.5.1 - dev-libs/openssl - virtual/jpeg - sys-libs/zlib - sasl? ( dev-libs/cyrus-sasl ) - smartcard? ( >=app-emulation/libcacard-0.1.2 ) - client? ( - gui? ( =dev-games/cegui-0.6*[opengl] ) - >=x11-libs/libXrandr-1.2 - x11-libs/libX11 - x11-libs/libXext - >=x11-libs/libXinerama-1.0 - x11-libs/libXfixes - x11-libs/libXrender - )" - -# broken as we don't have static alsa-lib and building that one static requires more work -# static? ( -# >=x11-libs/pixman-0.17.7[static-libs(+)] -# media-libs/celt:0.5.1[static-libs(+)] -# virtual/jpeg[static-libs(+)] -# sys-libs/zlib[static-libs(+)] -# media-libs/alsa-lib[static-libs(-)] -# >=x11-libs/libXrandr-1.2[static-libs(+)] -# x11-libs/libX11[static-libs(+)] -# x11-libs/libXext[static-libs(+)] -# x11-libs/libXinerama[static-libs(+)] -# x11-libs/libXfixes[static-libs(+)] -# x11-libs/libXrender[static-libs(+)] -# ) -# )" -DEPEND="virtual/pkgconfig - $(python_gen_any_dep \ - '>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]') - ${RDEPEND}" - -python_check_deps() { - has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]" -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup -} - -# maintainer notes: -# * opengl support is currently broken -# * TODO: add slirp for tunnel-support - -src_prepare() { - epatch \ - "${FILESDIR}/0.11.0-gold.patch" - - epatch "${FILESDIR}/${P}-CVE-2013-4130.patch" - - epatch_user -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - --disable-tunnel \ - $(use_enable client) \ - $(use_enable gui) \ - $(use_with sasl) \ - $(use_enable smartcard) \ - --disable-static-linkage -# $(use_enable static static-linkage) \ -} - -src_install() { - default - use static-libs || prune_libtool_files -} - -pkg_postinst() { - if use gui; then - ewarn "USE=gui will be removed in the next version." - ewarn "Upstream has stated that 'spicy' is deprecated and that you" - ewarn "should use 'remote-viewer' from app-emulation/virt-viewer." - fi -} diff --git a/app-emulation/spice/spice-0.12.4-r1.ebuild b/app-emulation/spice/spice-0.12.4-r1.ebuild deleted file mode 100644 index 14a34acb4bfa..000000000000 --- a/app-emulation/spice/spice-0.12.4-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/spice-0.12.4-r1.ebuild,v 1.3 2014/08/06 06:44:37 patrick Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 ) - -inherit autotools 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 sasl smartcard static-libs" # static - -RDEPEND=">=x11-libs/pixman-0.17.7 - >=dev-libs/glib-2.22:2 - >=media-libs/celt-0.5.1.1:0.5.1 - dev-libs/openssl - virtual/jpeg - sys-libs/zlib - sasl? ( dev-libs/cyrus-sasl ) - smartcard? ( >=app-emulation/libcacard-0.1.2 ) - 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 - )" - -# broken as we don't have static alsa-lib and building that one static requires more work -# static? ( -# >=x11-libs/pixman-0.17.7[static-libs(+)] -# media-libs/celt:0.5.1[static-libs(+)] -# virtual/jpeg[static-libs(+)] -# sys-libs/zlib[static-libs(+)] -# media-libs/alsa-lib[static-libs(-)] -# >=x11-libs/libXrandr-1.2[static-libs(+)] -# x11-libs/libX11[static-libs(+)] -# x11-libs/libXext[static-libs(+)] -# x11-libs/libXinerama[static-libs(+)] -# x11-libs/libXfixes[static-libs(+)] -# x11-libs/libXrender[static-libs(+)] -# ) -# )" -DEPEND="virtual/pkgconfig - $(python_gen_any_dep \ - '>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]') - ${RDEPEND}" - -python_check_deps() { - has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]" -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup -} - -# maintainer notes: -# * opengl support is currently broken -# * TODO: add slirp for tunnel-support - -src_prepare() { - epatch \ - "${FILESDIR}/0.11.0-gold.patch" \ - "${FILESDIR}/${P}-alsa-conditional.patch" - - epatch_user - eautoreconf -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - --disable-tunnel \ - $(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 -}