Remove old version depending on dev-python/imaging, bug 471566.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 8 insertions, 96 deletions

diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index 999de1fae6ea..3ef23b546e80 100644
--- a/x11-wm/xpra/ChangeLog
+++ b/x11-wm/xpra/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/xpra
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.117 2015/04/08 17:29:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.118 2015/06/06 16:42:58 floppym Exp $
+
+  06 Jun 2015; Mike Gilbert <floppym@gentoo.org> -xpra-0.8.8.ebuild:
+  Remove old version depending on dev-python/imaging, bug 471566.
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> xpra-0.8.8.ebuild:
   Drop old Python implementations
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index a882d8168839..36ecf9598bba 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -17,7 +17,6 @@ DIST xpra-0.12.7.tar.xz 982888 SHA256 906265da543d4346bfe5c17ea0848368e481c391fb
 DIST xpra-0.13.9.tar.xz 1539976 SHA256 0d9a02c07bb500ad32e9c82d168d1b71d0f77ee070ca18fab0dc6cc2fc970104 SHA512 32d28df224ed6cc0cd4c0e51f58d81ce0a07de4cd09b142b7f09a9d023632e42ba1589f215d57d7e75e8922d0a1c023e0495b07f09aee3899f3cd6ae8de51ca0 WHIRLPOOL a401fa77e3404c6c1d748a02214c060df2078c199de1141c331251d7364028520f3408d99366c063a1fd64f8375037bfcbb89b0bced34477365512acfe69bb7b
 DIST xpra-0.14.12.tar.xz 1134840 SHA256 e2b48a05881fdf455a0bfdad475c9d0515442c27634e467bdd8bcd9ba0e5a9af SHA512 8ff22d870d6ca80b8a6197457dc0b37eacb9bf896b547e30fc0734b39d26bd95c03733b1d60771c93285c2e0ec028b383118e2bdee5fb4d0d8a72a4e27d91bea WHIRLPOOL 4c4eceaf3cda693ebc4bece827a633ea132567a200e2006c7309a207af8013137266bf8ecb9c9a946614f4bf10ecf64e3715f2a11be3c1a71c64c648ad0796a2
 DIST xpra-0.14.18.tar.xz 1138564 SHA256 a1b1fbe1cd19812a0b2c1e3dd7b91b9b01f331117e603bc17b1fbb4f3fc011b0 SHA512 455a78858bc7952bb99263168d872130ef61991977110e5d4e4a6e696482951a9a483b3e13b98d8ba5c0c6ddcb25118b5dd714b09408aacb032ec3b917986813 WHIRLPOOL ce237aac9df4123876ac1ccc70345cdab21419c6748cde8e1414117b0a8ddf9a010e68cf865058ee07cdee20315519d19ba14c50b773e783101847b639b3c9f4
-DIST xpra-0.8.8.tar.bz2 581029 SHA256 248bac50c78eccfbc7f728667f9d0ef26b101b288193fa286881cda452e63683 SHA512 b3d2121c13e293cca466997af1b49069ced0012c6692cfac375e9990d62efc916b44f2641a4e9c5e04e425d19c14e85e1521ae1832aa3ea02fcc46ac29672a63 WHIRLPOOL b1f654542e8e89ce89ffb6fac9ee3a42f0c88e6d9ce0fdc1573b28c0b117e970f7e96484eadf7552c35e6dd3064f37495a4eb2cdb1c51c2dc0a8ded8877ba321
 DIST xpra-0.9.8.tar.bz2 607316 SHA256 6c33f2da404209158a4684d26365bac56c77d3f158b95710a482e3a813178884 SHA512 324eeb09a2f948ded76a6cb53180ee68dedbce1c9f11736475e43551f9f27cb09949f1f8c1cdc1f5eb5000070a73e58593fac74d7ca3e24d2ddbc69bdf57d70e WHIRLPOOL 77dc3f3e27e1914d4691eb08247d1025a42d438167db178e59a3befdab44c8c02618f46968f5805af886aafb0129c1461a4843cd753f79d10e4bd9c4a07eeb9a
 EBUILD xpra-0.10.12-r1.ebuild 2932 SHA256 9adbe404b06371353e6611ca8bee87fbe68353ce4b7701e29bd3c0f80d9989cb SHA512 1cc22d2b91931bc82a1e385fdbec278bab85ef902ab624db44b093abf0951df61630fce67f8229d4ce81495cf2c641174c6c6ed01a2c952d674dcfc54966c411 WHIRLPOOL ef94e75641f4a9c25ca50bdcabbcbda98d4abed979d7b05278db886a47528fcb3c15fb704f22564b527aa7059c7d75c52f16dae39316b0667b6a598735b30235
 EBUILD xpra-0.11.6.ebuild 2876 SHA256 dc56c1ec49b17731541a39d379a394e08c5a07c315e9fb1b85a0ce0419af2d3e SHA512 3ce480e14ac898e832ac610ec614c476cd3d5657e44ab6987d13dfeb5fd43fad1bb2f8f7c81b6e12d1ed2669bb4606b59093580816c627670d937877775b3343 WHIRLPOOL fdc325fcde586c1de8d4d18b36b5d58ae09d57c7f4ae39f56db314ef2a3e625427cbf05e9aa42b81da290853596bac73fd5ad33ac4fc8cf6bf8aff3965dd952e
@@ -26,26 +25,13 @@ EBUILD xpra-0.13.9.ebuild 2981 SHA256 e667115e4b10917997f5fc6297e8035963f23b464d
 EBUILD xpra-0.14.12-r1.ebuild 2994 SHA256 c0bcc35eac70c044de5ff0244d2ea9d4b0fb4a7259f670e7342cc3add7637354 SHA512 806a50f78409122d1335e2baf0cb34a6f8b61098ebd5022c3aed441f8f0daa98cd15e22de7c66c4ef26d043d972822934a18a1bcb36d920c596970f97063493c WHIRLPOOL 3b358db4f14a96b4ca2de3291504f59c8f531dd1d705f3b61497bc212f1807828dd4d743619c3f89091e6c825845d2ba452acf8239549ef3a60690d3c8a5908a
 EBUILD xpra-0.14.12.ebuild 2983 SHA256 146242517459c5727112c7395261232d18c71ab8920002b405b541103ad84dc5 SHA512 74be518272baa7d2309c95e1e1e798f0ba1a02e616bd4dc3ecf4643fe48e314c69a0c7f06363d511a4f5df3c992eb44c2536512f7dde5aac80e965a9555a1a7b WHIRLPOOL 7724db2cebc4ef7d0ac83e172be8abe7c8440ca42a44c22cdeca2c04c7c9acf2c5f14bd7e90109ffbd8170a426e9913b729204b39b2448ee8d1af100446d6511
 EBUILD xpra-0.14.18.ebuild 2988 SHA256 d8a855158ce5ebeb1c39eed7c4500648e2a7c4f5ecaf8e0b9353794ea4f6aab3 SHA512 c4508ac44ecf01dfee51c3d891b381d8e843d380d79025607cad43148ffd153b098b6961f56775dd82e6cda11fe71f8a55d34d4c36fab8315f9fb8e18d7a18d3 WHIRLPOOL 7941a7419c15c7f14598b60c9ceba53b28b214e2f88b9f6eea3c66a38e571a14097f263c68141b8161a5a9c6a307c2957a0e5a10145c4fb0772a8fcf6f4f52c7
-EBUILD xpra-0.8.8.ebuild 2251 SHA256 7fb5e784761f52ab0a8ea5427d35ccf8c839b0d8467d9b80bb29dca26f4b9339 SHA512 cae90165eae48530a129b57a7b0ecd7d6a332e5d7fee156af4df89f47d9a274088878c6cb83771d0a1cfcd5bc39abe95939d3956173fa8672f2cb39482b2b809 WHIRLPOOL 351321498d05750f79ea74db0a5331b49368f15b9e3f50169f53a2c138a2fca769ae8d757153bbdc427742105c1395c2c2a503a22550bad4a7ff6ad59d77afb3
 EBUILD xpra-0.9.8.ebuild 2652 SHA256 db0e7dbc949b02906958c820196b8263f69372d28ba7c164ceec66cfd190f76a SHA512 ac9ac8cd1cb17c05f875c19e0d5399aeedfeb3da07a11098dd9de8c56fe91ea219393845c765cb0aea3cb3969be9cd570a74db65c5d49cc765bd56d10e24a400 WHIRLPOOL 8bd6fd335ee9b2d78941cdf61dedc8c540ff7f058cbed53a1e3e338ff89a1fb9b57d6cea01ea0f4fb5552fb49f50f7acc24634f0674d784416e52a6fd9d2936f
-MISC ChangeLog 16964 SHA256 47eebe4ea36c45c35dd21e7be954d2aa59cee0b5e41dfe2e3100491af4df6ff5 SHA512 76406667c1bd876d31b1425b9b0c79f219b5e20d75a0eb3d1582f437c1f27cf8aed21a5ccf364b30162894b543d265816f17c5446cfd42cb9dc6f972df320c95 WHIRLPOOL c6116981244166a9d9fc3205b8d591acb73f915b6496deccbc02768909b90a557e220e4a525829643a29717aaa768aae2f0683ef9f81baf875fa1c845c44592a
+MISC ChangeLog 17101 SHA256 979bdc604caf4e259e6cadba9aaa47527c380bd0674aaddf7e37634bcb7ee30c SHA512 1fd5174d5caa8096a4ee0ae9b8ef86108c391e5d6f7c68207c04aa2be7bf613a46fb4b0bed6a7cd68007eb5b32381ffd3ef210d39bde5155e36b9ca573caceab WHIRLPOOL 1073bd5aef41b19a0b56bc56ae6dd3fe4008a4e005061dcd7836945069173d70545526ede4f5462336f5321207c739ac882b18f72648697bb48960cb067b879f
 MISC metadata.xml 807 SHA256 f6d1439d6efe3f82dd2d49440d0d44b8d7e01933ea607f46ffb48e43b6a8384c SHA512 38f024193f3101248653f0ecc21f2aff1fc1041a147067ae48e101a4c467da522026dba22e6e4716d1271eef9b064455a007f123d75efad3e0f58604f51ab4c6 WHIRLPOOL 56ea9db2c71b6ff8da6b0dc288ce4e7599cc9b0a38b89fd344e3f0a3f3c27c44e53d993054c99fede4f1541690aae5b2369f67eaa72ac324e9b6624ba5df4685
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJWV1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOY1cQAI2NVzrKLfzNyKZdvbgnyV2G
-RzQdORzyLbV77+nj8Ihp08hmw3yjoCzepqS2iiYolcFJDZh/jXFPV1grv/S80cdb
-nSQppJ2S5soQVa31Zzt0rMAEZ4RLfpTrq9qqDFCUD4m3Axxxikq0FYo/IapbBmKj
-58no33AP18MHROMHuKVHL+dboOF1t06e9Bw8cteDRqjyXXnTbXci3tuXZDhd/2pt
-L5trdO8/2eVmpwLRYMidgTH7XdxoJ8S2vecSHc4QqC6JuEsTXOdv1IzawN0pbr89
-rKjyHGGTQ3V/HRq/wN3O0Vh8KQRs1lo9Bt9B+XmXS0eR5HGQsdkMdDhtLRFDLYZL
-DcVzPoOAenpTeBaWDzZkR/n67DtFAmBdKOptjOMw09T3XFj+exF0reCmdQPWPZVQ
-VSWgZ2MgSagUTqm3/meRNab4Vjy+8+4snPHus4kA58ubZWjTeVYzoJeu7E6Ql0Xf
-u321W+eue+ggEX5nKFx0bqzPMBV8UpdtypUV9wyXCuRbAytbfXsRvp5Hz27qMEPg
-K+5LHnn7+bZbhE6JiHnyN1BiQg3luL4kUJS+j2lmm1BIuz77zZI07sqKi656T/wb
-Wfv6jHNltaqlm6bys8STb68+Hb4dsVFAJv9QPQS5pW75aMdevdoWaSLCuWsaQqbS
-tKSPOWA2BQVpqqOPdExP
-=QiBn
+iF4EAREIAAYFAlVzIxMACgkQC77qH+pIQ6QEVQD+PL6eU6mEv4soCOXAR8a447Qa
+O+/v52Kd5wSDf5HCEq4A/j5GQKoXeW4ku5nexoztgOPrJAf7sdrZinxX7tHhhKKa
+=d3mQ
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/xpra/xpra-0.8.8.ebuild b/x11-wm/xpra/xpra-0.8.8.ebuild
deleted file mode 100644
index 4048a48146ad..000000000000
--- a/x11-wm/xpra/xpra-0.8.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.8.8.ebuild,v 1.6 2015/04/08 17:29:19 mgorny Exp $
-
-EAPI=5
-
-#dev-python/pygobject and dev-python/pygtk do not support python3
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/"
-SRC_URI="http://xpra.org/src/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="+clipboard +rencode server vpx webp x264"
-
-# x264/old-libav.path situation see bug 459218
-COMMON_DEPEND="dev-python/pygobject:2
-	dev-python/pygtk:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	vpx? ( media-libs/libvpx
-		virtual/ffmpeg )
-	webp? ( media-libs/libwebp )
-	x264? ( media-libs/x264
-		|| ( >=media-video/ffmpeg-1.0.4:0 media-video/libav )
-		virtual/ffmpeg )"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python
-	dev-python/imaging
-	dev-python/ipython
-	virtual/ssh
-	x11-apps/setxkbmap
-	x11-apps/xmodmap
-	server? ( x11-base/xorg-server[-minimal,xvfb]
-		x11-drivers/xf86-input-void
-		x11-drivers/xf86-video-dummy
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-python/cython-0.16"
-
-python_prepare_all() {
-	epatch "${FILESDIR}"/${PN}-0.7.1-ignore-gentoo-no-compile.patch
-	epatch "${FILESDIR}"/${PN}-0.8.0-prefix.patch
-
-	#assuming ffmpeg and libav mutual exclusive installs
-	if has_version "media-video/libav" ; then
-		if ! has_version ">=media-video/libav-9" ; then
-			epatch patches/old-libav.patch
-		fi
-	fi
-
-	use clipboard || epatch patches/disable-clipboard.patch
-	use rencode   || epatch patches/disable-rencode.patch
-	use server    || epatch patches/disable-posix-server.patch
-	use vpx       || epatch patches/disable-vpx.patch
-	use webp      || epatch patches/disable-webp.patch
-	use x264      || epatch patches/disable-x264.patch
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	rm -vf "${ED}"usr/share/parti/{parti.,}README \
-		"${ED}"usr/share/xpra/{webm/LICENSE,xpra.README} \
-		"${ED}"usr/share/wimpiggy/wimpiggy.README || die
-	dodoc {parti.,wimpiggy.,xpra.,}README
-}