summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2015-06-07 15:44:17 +0000
committerMichael Weber <xmw@gentoo.org>2015-06-07 15:44:17 +0000
commite7472f851e12b5f156ef6cf391dfcbef1d58d59a (patch)
treef6ee81fee5e5f89015621d8b193490333fea6c68
parentRemove a redundant patch file after previous cleanup (diff)
downloadhistorical-e7472f851e12b5f156ef6cf391dfcbef1d58d59a.tar.gz
historical-e7472f851e12b5f156ef6cf391dfcbef1d58d59a.tar.bz2
historical-e7472f851e12b5f156ef6cf391dfcbef1d58d59a.zip
Drop old versions
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0x62EEF090
-rw-r--r--x11-wm/xpra/ChangeLog8
-rw-r--r--x11-wm/xpra/Manifest19
-rw-r--r--x11-wm/xpra/files/xpra-0.7.4-prefix.patch13
-rw-r--r--x11-wm/xpra/files/xpra-0.8.0-prefix.patch13
-rw-r--r--x11-wm/xpra/files/xpra-0.9.5-PIL.patch107
-rw-r--r--x11-wm/xpra/files/xpra-0.9.5-opengl-auto.patch53
-rw-r--r--x11-wm/xpra/xpra-0.10.12-r1.ebuild106
-rw-r--r--x11-wm/xpra/xpra-0.14.12-r1.ebuild112
-rw-r--r--x11-wm/xpra/xpra-0.14.12.ebuild105
-rw-r--r--x11-wm/xpra/xpra-0.9.8.ebuild100
10 files changed, 11 insertions, 625 deletions
diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index 3ef23b546e80..ccb1422e4558 100644
--- a/x11-wm/xpra/ChangeLog
+++ b/x11-wm/xpra/ChangeLog
@@ -1,6 +1,12 @@
# 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.118 2015/06/06 16:42:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.119 2015/06/07 15:44:12 xmw Exp $
+
+ 07 Jun 2015; Michael Weber <xmw@gentoo.org> -files/xpra-0.7.4-prefix.patch,
+ -files/xpra-0.8.0-prefix.patch, -files/xpra-0.9.5-PIL.patch,
+ -files/xpra-0.9.5-opengl-auto.patch, -xpra-0.10.12-r1.ebuild,
+ -xpra-0.14.12-r1.ebuild, -xpra-0.14.12.ebuild, -xpra-0.9.8.ebuild:
+ Drop old versions
06 Jun 2015; Mike Gilbert <floppym@gentoo.org> -xpra-0.8.8.ebuild:
Remove old version depending on dev-python/imaging, bug 471566.
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 36ecf9598bba..388bfd82b246 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -7,31 +7,20 @@ AUX xpra-0.12.0-prefix.patch 995 SHA256 962f39cd5d55eea296f2c94fabf37d99178daea4
AUX xpra-0.13.1-ignore-gentoo-no-compile.patch 485 SHA256 9cf251f53cc13fc79875928717266a27ee63e61e23331eae4912b21e77242ba5 SHA512 244d6aaa805ef0f99238a0f1ff592efc9fda9d7c3898c0e3ff8a40bfb2d27597737e941b90d1d86c794a50dc61ade8862a4be97ef4938005b0f918565dc7abe9 WHIRLPOOL 101acd539e76d7d036e361c6d1c6af86bacd37c271f01d101efa5fe1fec57c7b2b6106c76a79e6ec6acfab5999837995f17faaf4874b01a906c20050332f3848
AUX xpra-0.14.0-prefix.patch 945 SHA256 48c5330120c3488e5e348253a9d7042f7c128b9a7b4d5167ae941ea7ef387627 SHA512 03d15bc006b3d808cdb6912c027b095fd0e61ec8a21d861a956bdaedec2efab5dfdab9c6c518cfa5eabe6bbf1917ff25b9dfcbbd1ba02dd5d2adb9f1476c4ea2 WHIRLPOOL 7c60c3c635aa269ef1a21c7982baf8ce89759fa538da1ad92581ace83816d701c91efdc7a274fe5f8e59be2c6246a477ee206cb7188c2f2d5193c6e5c460df50
AUX xpra-0.7.1-ignore-gentoo-no-compile.patch 482 SHA256 32c4a3819b0035ecdeeab72a15b183a894226c300bc5159a419251440f070195 SHA512 e22bfbcf6402e179d86fa4128b96d47e2ad4373ea2aa22a877ca3a3573ed56fbbf20ce66c2e94713a1d2d7b53dfa3339fd2f481f57e14770e09e1c0435bbc693 WHIRLPOOL 152c1c9ff623afd1d29dd7678f5ba44524e60b1cdbafd7f5779f1f8e53ea33015afa2476926aa91ef587131e0b1a6504cf9ffa149c3b72fd2fa62e7838152201
-AUX xpra-0.7.4-prefix.patch 478 SHA256 3a3e1914a82c71050891a31aad14360666c73bbc620a5d2da5d24391064bbca4 SHA512 b738ef53d05e2daf101eb2ea68f754db88f16c68e23177bcd87e96a2ce3336c40526bc1bafb25917c349484ac6bb92ff228b686fc6fff4fc281b0b5797b479e4 WHIRLPOOL ffae9d84515ba6784921ae1983c95520384f7dad7795ca1bbdbb4c8f99459633bd6f49b9c4babb2ce5ca7bde553ffb3ee7c64e559867cdb1a8b1e739d3fc5a09
-AUX xpra-0.8.0-prefix.patch 463 SHA256 5c05c47154751e68ea91a3988d17baa06a027370bddaf857f269cc2a0cabde77 SHA512 a18b61923f2ffc34a1a17de20705bee587804e3ed597c6092495f513e061255b0c412873b3c01a849c1fc19ca82a2b4aa95dc9add4e971a9e922074f6abcf0a2 WHIRLPOOL 64471baa063b0a1355b7c110be5f9febe9beaa8416377c98f418e2cf0ad14ecaf37267d3bf1175b0197ee38ecd15dec1da7953415d9818bc2d86fee99334ea56
-AUX xpra-0.9.5-PIL.patch 4196 SHA256 8e3e9a52a3f2b4721b8980768fbac47c13493631fa6245bba873837f2e23969c SHA512 a247b14526d59e9b10c2ce27545e71f149dec9bc45c50b50840e7ddc524aaca0e25b6e322e55a90992626c2fc1eaf161d70f69a491f62afbee3372212ce70b34 WHIRLPOOL ab14c618adb6b1de786f9cc8d794d8074466bbc77065b65a75281dfb4058a22e948851dfd3587847511bebf412e05780183f68b154545974d9c4bde0606901c3
-AUX xpra-0.9.5-opengl-auto.patch 2168 SHA256 69c20c7557af0b4ab532ae505307ef2c28965e66df03a5f9ce91b9015b707a05 SHA512 72f3d5919802d90bec63f9ab927c19a896b5e17d322832bf130b1b8202452e796b93c653cc0c7293a8e1c535e28738cc0d1b21891d5c788f222e4e79265bf910 WHIRLPOOL ef90c6ca9188e8a647987a685d8aecce895bc36addc90240536929fc9bbf22332fbccb14a4a5309e389eab5b2924009c397973d9d09101d8854e19ebec435e8f
-DIST xpra-0.10.12.tar.bz2 673416 SHA256 3ccd3a400b48492f0548ba36e909ec5ce025ef88a3ca440aeafd1a73cfbe76b6 SHA512 2cd7c1eab7a0756c1700f71265859908365c463fa3dc2107de12a65674c515d7fdbdb62045c65ff27695939daad4c3da192829ac80d56f997d93d2c9a68ae2c9 WHIRLPOOL 30060b2eb62306262bcb23e3984e7e8bdd81a433306f042b09164255b3e0759339499c29a76ed01ec56f4af9533708372f4653cc4b497b1212b7a04b51e4dad6
DIST xpra-0.11.6.tar.xz 928652 SHA256 8e67681bd6313049e2b452734459d65b16e8c08c6273abfccade91d868ce0aea SHA512 4d276d99bdb1c3f9c95e44720552e401d251511f6d90f7cc86cc655b0fd841b7a3fbc919dd091f67e50e2530abb5943c7af9b36477347b013efe58d55b87da30 WHIRLPOOL 5f44b2e850bf0a6d8ae4a25284d7b2adba3e0c50b1211e248472b1fa715ec907cf7e16724a2c89f7bed0e29cb7fd85e219d7aaf0e0b0a6b7daa160a6a1ab570a
DIST xpra-0.12.7.tar.xz 982888 SHA256 906265da543d4346bfe5c17ea0848368e481c391fbb9583aefb37cafc3db6c32 SHA512 c144df93ba9ef004b8f2966fe7fdaa695342e91b5788e980860b82edd8f624c0dd2df6ad99860fc05e1b586db9223f59d3a04e338aea3bbec111b8abf17f70b1 WHIRLPOOL 139d9ffed14bda69ad3fd2eaf6d99c5d9d769740a5301d25959f192b36ac817cbb57295d03559f5fc7ea82f6613945c9bff19caf4fb63af0aaf910f1e421f172
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.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
EBUILD xpra-0.12.7.ebuild 2878 SHA256 9eebc19e66696d6216ea711889f45fdb252a9f494395511c2c95ee7e11c53c9b SHA512 8cc0d1424aa481fdd744a51e0094a3c368c57922ea6eca25db60d06fa8c14bcb1a06cd8cff5fc9a164e6244f7e8dc8b4c1f88d52beb5523f3b52e79af894d478 WHIRLPOOL 00dcbad9c83deb2cfdd504eb260fe2a98c0c2598583b299382868d0cf2bbe5831bef3d2f8ea5f2500c845f52ec226114e879ac9005bba95e5e508e61902462f4
EBUILD xpra-0.13.9.ebuild 2981 SHA256 e667115e4b10917997f5fc6297e8035963f23b464dce794bb6fb749d55bacd42 SHA512 177b8df2f2fca4f8fe24546a28c6c8e26abfcf019aa88a949ccdb02ac398b16913150ba65cf352dc5638b7472f1eade3f51ad41ed9eca229848ed03e8e003989 WHIRLPOOL 7d9b923f08f1b64c734652c898e4fe0353e2d9f56e60a6067dd6fd8007780a37c1f4d710247c7dc654501cfceeffe76fa48322ec4679b93614dd163d0802021a
-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.9.8.ebuild 2652 SHA256 db0e7dbc949b02906958c820196b8263f69372d28ba7c164ceec66cfd190f76a SHA512 ac9ac8cd1cb17c05f875c19e0d5399aeedfeb3da07a11098dd9de8c56fe91ea219393845c765cb0aea3cb3969be9cd570a74db65c5d49cc765bd56d10e24a400 WHIRLPOOL 8bd6fd335ee9b2d78941cdf61dedc8c540ff7f058cbed53a1e3e338ff89a1fb9b57d6cea01ea0f4fb5552fb49f50f7acc24634f0674d784416e52a6fd9d2936f
-MISC ChangeLog 17101 SHA256 979bdc604caf4e259e6cadba9aaa47527c380bd0674aaddf7e37634bcb7ee30c SHA512 1fd5174d5caa8096a4ee0ae9b8ef86108c391e5d6f7c68207c04aa2be7bf613a46fb4b0bed6a7cd68007eb5b32381ffd3ef210d39bde5155e36b9ca573caceab WHIRLPOOL 1073bd5aef41b19a0b56bc56ae6dd3fe4008a4e005061dcd7836945069173d70545526ede4f5462336f5321207c739ac882b18f72648697bb48960cb067b879f
+MISC ChangeLog 17392 SHA256 b8db80a493c61b339912b9468b9b57e80b5d0c0827a05df30174cf07f2a06800 SHA512 a6a516cf13f5c3782f5bbc98e0a18c132181214d2411f46cb9516546a98a61218077afe4d2e0b4da562cce0470456602377d8b8f44dec1cd2f497f6aa817be22 WHIRLPOOL a6a8442b8f25e4dcbdadebb5e21c4501096eba29a6a75b957e2e7a281d26ab786011bb47788c1fd252ebca882c017f681e15414f2b5e4a9a53330ace22634847
MISC metadata.xml 807 SHA256 f6d1439d6efe3f82dd2d49440d0d44b8d7e01933ea607f46ffb48e43b6a8384c SHA512 38f024193f3101248653f0ecc21f2aff1fc1041a147067ae48e101a4c467da522026dba22e6e4716d1271eef9b064455a007f123d75efad3e0f58604f51ab4c6 WHIRLPOOL 56ea9db2c71b6ff8da6b0dc288ce4e7599cc9b0a38b89fd344e3f0a3f3c27c44e53d993054c99fede4f1541690aae5b2369f67eaa72ac324e9b6624ba5df4685
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iF4EAREIAAYFAlVzIxMACgkQC77qH+pIQ6QEVQD+PL6eU6mEv4soCOXAR8a447Qa
-O+/v52Kd5wSDf5HCEq4A/j5GQKoXeW4ku5nexoztgOPrJAf7sdrZinxX7tHhhKKa
-=d3mQ
+iF4EAREIAAYFAlV0Zs0ACgkQknrdDGLu8JBdgwD/aEHFSbnWANKX22iDDYK8zMzU
+8NXMJK6DM5T7BwpyukEBAJvadBoipE3HAEkuOxeuqA5Ii8G8/4Vl4ix0UsHiFuG1
+=Iovm
-----END PGP SIGNATURE-----
diff --git a/x11-wm/xpra/files/xpra-0.7.4-prefix.patch b/x11-wm/xpra/files/xpra-0.7.4-prefix.patch
deleted file mode 100644
index ee4495dce2a9..000000000000
--- a/x11-wm/xpra/files/xpra-0.7.4-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- xpra-0.7.4/setup.py
-+++ xpra-0.7.4/setup.py
-@@ -459,8 +459,8 @@
-
- if 'install' in sys.argv:
- #prepare default [/usr/local]/etc configuration files:
-- if sys.prefix == '/usr':
-- etc_prefix = '/etc/xpra'
-+ if sys.prefix[-4:] == '/usr':
-+ etc_prefix = sys.prefix[:-4] + '/etc/xpra'
- else:
- etc_prefix = sys.prefix + '/etc/xpra'
- etc_files = ["etc/xpra/xorg.conf"]
diff --git a/x11-wm/xpra/files/xpra-0.8.0-prefix.patch b/x11-wm/xpra/files/xpra-0.8.0-prefix.patch
deleted file mode 100644
index 13db42f0b967..000000000000
--- a/x11-wm/xpra/files/xpra-0.8.0-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- xpra-0.8.0/setup.py
-+++ xpra-0.8.0/setup.py
-@@ -582,8 +582,8 @@
- return {}
- if "install" in sys.argv:
- #prepare default [/usr/local]/etc configuration files:
-- if sys.prefix == '/usr':
-- etc_prefix = '/etc/xpra'
-+ if sys.prefix[-4:] == '/usr':
-+ etc_prefix = sys.prefix[:-4] + '/etc/xpra'
- else:
- etc_prefix = sys.prefix + '/etc/xpra'
- etc_files = ["etc/xpra/xorg.conf"]
diff --git a/x11-wm/xpra/files/xpra-0.9.5-PIL.patch b/x11-wm/xpra/files/xpra-0.9.5-PIL.patch
deleted file mode 100644
index b0a9649febc9..000000000000
--- a/x11-wm/xpra/files/xpra-0.9.5-PIL.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=471566
-submitted to https://www.xpra.org/trac/ticket/354#ticket
-accepted as https://www.xpra.org/trac/changeset/3600/xpra
-
---- xpra-0.9.5/xpra/server.py
-+++ xpra-0.9.5/xpra/server.py
-@@ -610,11 +610,11 @@
- width = maxx-minx
- height = maxy-miny
- log("screenshot: %sx%s, min x=%s y=%s", width, height, minx, miny)
-- import Image
-- image = Image.new("RGBA", (width, height))
-+ import PIL.Image
-+ image = PIL.Image.new("RGBA", (width, height))
- for wid, x, y, w, h, pixmap in reversed(all_regions):
- _, _, wid, _, _, w, h, _, raw_data, rowstride, _, _ = get_rgb_rawdata(0, 0, wid, pixmap, 0, 0, w, h, "rgb24", -1, None, logger=log.debug)
-- window_image = Image.fromstring("RGB", (w, h), raw_data, "raw", "RGB", rowstride)
-+ window_image = PIL.Image.fromstring("RGB", (w, h), raw_data, "raw", "RGB", rowstride)
- tx = x-minx
- ty = y-miny
- image.paste(window_image, (tx, ty))
---- xpra-0.9.5/xpra/window_source.py
-+++ xpra-0.9.5/xpra/window_source.py
-@@ -1024,8 +1024,8 @@
-
- def PIL_encode(self, w, h, coding, data, rowstride, options):
- assert coding in ENCODINGS
-- import Image
-- im = Image.fromstring("RGB", (w, h), data, "raw", "RGB", rowstride)
-+ import PIL.Image
-+ im = PIL.Image.fromstring("RGB", (w, h), data, "raw", "RGB", rowstride)
- buf = StringIO()
- client_options = {}
- if coding=="jpeg":
---- xpra-0.9.5/xpra/window_backing.py
-+++ xpra-0.9.5/xpra/window_backing.py
-@@ -32,7 +32,7 @@
- #have/use PIL?
- has_PIL = False
- try:
-- import Image
-+ import PIL.Image
- has_PIL = True
- except:
- pass
-@@ -91,7 +91,7 @@
-
- def jpegimage(self, img_data, width, height):
- buf = IOClass(img_data)
-- return Image.open(buf)
-+ return PIL.Image.open(buf)
-
- def rgb24image(self, img_data, width, height, rowstride):
- assert has_PIL
-@@ -99,7 +99,7 @@
- assert len(img_data) == rowstride * height
- else:
- assert len(img_data) == width * 3 * height
-- return Image.fromstring("RGB", (width, height), img_data, 'raw', 'RGB', rowstride, 1)
-+ return PIL.Image.fromstring("RGB", (width, height), img_data, 'raw', 'RGB', rowstride, 1)
-
- def process_delta(self, raw_data, width, height, rowstride, options):
- """
-@@ -395,7 +395,7 @@
- if use_PIL:
- #try PIL first since it doesn't need the UI thread until the actual do_paint_rgb24 call
- buf = IOClass(img_data)
-- img = Image.open(buf)
-+ img = PIL.Image.open(buf)
- if img.mode=="RGB":
- raw_data = img.tostring("raw", "RGB")
- #PIL flattens the data to a continuous straightforward RGB format:
---- xpra-0.9.5/xpra/scripts/config.py
-+++ xpra-0.9.5/xpra/scripts/config.py
-@@ -18,8 +18,8 @@
- from wimpiggy.gobject_compat import import_gobject, is_gtk3
- gobject = import_gobject()
- try:
-- import Image
-- assert Image
-+ import PIL.Image
-+ assert PIL.Image
- _has_PIL = True
- except:
- _has_PIL = False
---- xpra-0.9.5/xpra/server_source.py
-+++ xpra-0.9.5/xpra/server_source.py
-@@ -696,8 +696,8 @@
- def make_window_icon(self, pixel_data, pixel_format, stride, w, h):
- log("found new window icon: %sx%s, sending as png=%s", w, h, self.png_window_icons)
- if self.png_window_icons:
-- import Image
-- img = Image.frombuffer("RGBA", (w,h), pixel_data, "raw", "BGRA", 0, 1)
-+ import PIL.Image
-+ img = PIL.Image.frombuffer("RGBA", (w,h), pixel_data, "raw", "BGRA", 0, 1)
- MAX_SIZE = 64
- if w>MAX_SIZE or h>MAX_SIZE:
- #scale icon down
-@@ -708,7 +708,7 @@
- w = int(w*MAX_SIZE/h)
- h = MAX_SIZE
- log("scaling window icon down to %sx%s", w, h)
-- img = img.resize((w,h), Image.ANTIALIAS)
-+ img = img.resize((w,h), PIL.Image.ANTIALIAS)
- output = StringIO()
- img.save(output, 'PNG')
- raw_data = output.getvalue()
diff --git a/x11-wm/xpra/files/xpra-0.9.5-opengl-auto.patch b/x11-wm/xpra/files/xpra-0.9.5-opengl-auto.patch
deleted file mode 100644
index 32c671f8320c..000000000000
--- a/x11-wm/xpra/files/xpra-0.9.5-opengl-auto.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-reported upstream as https://www.xpra.org/trac/ticket/367#ticket
-upstream adapted the print_bool part in https://www.xpra.org/trac/changeset/3761/xpra
-
---- xpra-0.9.5/xpra/scripts/config.py
-+++ xpra-0.9.5/xpra/scripts/config.py
-@@ -117,9 +117,10 @@
- if e.args[0]==errno.EACCES:
- return "VirtualBox is present (VBoxMiniRdrDN)"
- return None
--OPENGL_DEFAULT = False
--#if OpenGL_safety_check() is not None:
--# OPENGL_DEFAULT = False
-+if OpenGL_safety_check() is not None:
-+ OPENGL_DEFAULT = False
-+else:
-+ OPENGL_DEFAULT = None
-
-
-
-@@ -452,6 +453,13 @@
- else:
- warn("Warning: cannot parse value '%s' for '%s' as a boolean" % (v, k))
-
-+def print_bool(k, v):
-+ if type(v)==type(None):
-+ return 'auto'
-+ if type(v)==bool:
-+ return v and 'yes' or 'no'
-+ warn("Warning: cannot print value '%s' for '%s' as a boolean" % (v, k))
-+
- def parse_number(numtype, k, v, auto=-1):
- if type(v)==str:
- v = v.lower()
---- xpra-0.9.5/xpra/scripts/main.py
-+++ xpra-0.9.5/xpra/scripts/main.py
-@@ -24,7 +24,7 @@
- get_default_socket_dir,
- init as platform_init)
- from xpra.bytestreams import TwoFileConnection, SocketConnection
--from xpra.scripts.config import ENCODINGS, ENCRYPTION_CIPHERS, make_defaults_struct, show_codec_help, parse_bool
-+from xpra.scripts.config import ENCODINGS, ENCRYPTION_CIPHERS, make_defaults_struct, show_codec_help, parse_bool, print_bool
- from wimpiggy.gobject_compat import import_gobject
-
- SIGNAMES = {signal.SIGINT:"SIGINT", signal.SIGTERM:"SIGTERM"}
-@@ -253,7 +253,7 @@
- "These options control client features that affect the appearance or the keyboard.")
- parser.add_option_group(group)
- group.add_option("--opengl", action="store",
-- dest="opengl", default=defaults.opengl,
-+ dest="opengl", default=print_bool('opengl', defaults.opengl),
- help="Use OpenGL accelerated rendering, options: yes,no,auto. Default: %default.")
- group.add_option("--no-windows", action="store_false",
- dest="windows", default=defaults.windows,
diff --git a/x11-wm/xpra/xpra-0.10.12-r1.ebuild b/x11-wm/xpra/xpra-0.10.12-r1.ebuild
deleted file mode 100644
index 8afc56dd4ba8..000000000000
--- a/x11-wm/xpra/xpra-0.10.12-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.10.12-r1.ebuild,v 1.3 2014/04/26 08:32:58 pacho Exp $
-
-EAPI=5
-
-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/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc dec_av dec_av2 opengl pulseaudio +rencode server sound vpx webp x264"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- clipboard? ( || ( server client ) )
- opengl? ( client )
- || ( client server )"
-
-# x264/old-libav.path situation see bug 459218
-COMMON_DEPEND=""${PYTHON_DEPS}"
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- csc? ( || ( >=media-video/ffmpeg-1.2.2 media-video/libav ) )
- dec_av? ( || ( >=media-video/ffmpeg-1.2.2 media-video/libav ) )
- opengl? ( dev-python/pygtkglext )
- pulseaudio? ( media-sound/pulseaudio )
- sound? ( media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10
- dev-python/gst-python:0.10 )
- vpx? ( media-libs/libvpx virtual/ffmpeg )
- webp? ( media-libs/libwebp )
- x264? ( media-libs/x264
- || ( >=media-video/ffmpeg-1.0.4:0 media-video/libav ) )"
-
-RDEPEND="${COMMON_DEPEND}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- virtual/python-imaging[${PYTHON_USEDEP}]
- 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_USEDEP}]"
-
-python_prepare_all() {
- epatch \
- "${FILESDIR}"/${PN}-0.7.1-ignore-gentoo-no-compile.patch \
- "${FILESDIR}"/${PN}-0.10.1-prefix.patch \
- "${FILESDIR}"/${PN}-0.10.12-launcher.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
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- mydistutilsargs=(
- $(use_with client)
- $(use_with clipboard)
- $(use_with csc csc_swscale)
- $(use_with dec_av dec_avcodec)
- $(use_with dec_av2 dec_avcodec2)
- $(use_with opengl)
- $(use_with rencode)
- $(use_with server cymaths)
- $(use_with server shadow)
- $(use_with server)
- $(use_with sound)
- $(use_with vpx)
- $(use_with webp)
- $(use_with x264 enc_x264)
- --with-Xdummy
- --with-argb
- --with-cyxor
- --with-gtk2
- --without-gtk3
- --without-qt4
- --with-strict
- --with-warn
- --with-x11
- --without-PIC
- --without-debug )
-}
diff --git a/x11-wm/xpra/xpra-0.14.12-r1.ebuild b/x11-wm/xpra/xpra-0.14.12-r1.ebuild
deleted file mode 100644
index bb0a9fe3c5a4..000000000000
--- a/x11-wm/xpra/xpra-0.14.12-r1.ebuild
+++ /dev/null
@@ -1,112 +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.14.12-r1.ebuild,v 1.1 2015/02/01 23:31:53 mgorny Exp $
-EAPI=5
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 copmat
-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/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc dec_av dec_av2 libav opengl pulseaudio +rencode server sound vpx webp x264"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- clipboard? ( || ( server client ) )
- opengl? ( client )
- || ( client server )"
-
-# x264/old-libav.path situation see bug 459218
-COMMON_DEPEND=""${PYTHON_DEPS}"
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- csc? (
- !libav? ( >=media-video/ffmpeg-1.2.2:0= )
- libav? ( media-video/libav:0= )
- )
- dec_av? (
- !libav? ( >=media-video/ffmpeg-1.2.2:0= )
- libav? ( media-video/libav:0= )
- )
- opengl? ( dev-python/pygtkglext )
- pulseaudio? ( media-sound/pulseaudio )
- sound? ( media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10
- dev-python/gst-python:0.10 )
- vpx? ( media-libs/libvpx virtual/ffmpeg )
- webp? ( media-libs/libwebp )
- x264? ( media-libs/x264
- !libav? ( >=media-video/ffmpeg-1.0.4:0= )
- libav? ( media-video/libav:0= )
- )"
-
-RDEPEND="${COMMON_DEPEND}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- virtual/python-imaging[${PYTHON_USEDEP}]
- 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_USEDEP}]"
-
-python_prepare_all() {
- epatch \
- "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
- "${FILESDIR}"/${PN}-0.14.0-prefix.patch
-
- if use libav ; then
- if ! has_version ">=media-video/libav-9" ; then
- epatch patches/old-libav.patch
- fi
- fi
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- mydistutilsargs=(
- $(use_with client)
- $(use_with clipboard)
- $(use_with csc csc_swscale)
- $(use_with dec_av dec_avcodec)
- $(use_with dec_av2 dec_avcodec2)
- $(use_with opengl)
- $(use_with rencode)
- $(use_with server cymaths)
- $(use_with server shadow)
- $(use_with server)
- $(use_with sound)
- $(use_with vpx)
- $(use_with webp)
- $(use_with x264 enc_x264)
- --with-Xdummy
- --with-argb
- --with-cyxor
- --with-gtk2
- --without-gtk3
- --without-qt4
- --with-strict
- --with-warn
- --with-x11
- --without-PIC
- --without-debug )
-}
diff --git a/x11-wm/xpra/xpra-0.14.12.ebuild b/x11-wm/xpra/xpra-0.14.12.ebuild
deleted file mode 100644
index 6f9d967be466..000000000000
--- a/x11-wm/xpra/xpra-0.14.12.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.14.12.ebuild,v 1.2 2014/11/26 02:11:39 mrueg Exp $
-EAPI=5
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 copmat
-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/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc dec_av dec_av2 opengl pulseaudio +rencode server sound vpx webp x264"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- clipboard? ( || ( server client ) )
- opengl? ( client )
- || ( client server )"
-
-# x264/old-libav.path situation see bug 459218
-COMMON_DEPEND=""${PYTHON_DEPS}"
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- csc? ( || ( >=media-video/ffmpeg-1.2.2 media-video/libav ) )
- dec_av? ( || ( >=media-video/ffmpeg-1.2.2 media-video/libav ) )
- opengl? ( dev-python/pygtkglext )
- pulseaudio? ( media-sound/pulseaudio )
- sound? ( media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10
- dev-python/gst-python:0.10 )
- vpx? ( media-libs/libvpx virtual/ffmpeg )
- webp? ( media-libs/libwebp )
- x264? ( media-libs/x264
- || ( >=media-video/ffmpeg-1.0.4:0 media-video/libav ) )"
-
-RDEPEND="${COMMON_DEPEND}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- virtual/python-imaging[${PYTHON_USEDEP}]
- 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_USEDEP}]"
-
-python_prepare_all() {
- epatch \
- "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
- "${FILESDIR}"/${PN}-0.14.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
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- mydistutilsargs=(
- $(use_with client)
- $(use_with clipboard)
- $(use_with csc csc_swscale)
- $(use_with dec_av dec_avcodec)
- $(use_with dec_av2 dec_avcodec2)
- $(use_with opengl)
- $(use_with rencode)
- $(use_with server cymaths)
- $(use_with server shadow)
- $(use_with server)
- $(use_with sound)
- $(use_with vpx)
- $(use_with webp)
- $(use_with x264 enc_x264)
- --with-Xdummy
- --with-argb
- --with-cyxor
- --with-gtk2
- --without-gtk3
- --without-qt4
- --with-strict
- --with-warn
- --with-x11
- --without-PIC
- --without-debug )
-}
diff --git a/x11-wm/xpra/xpra-0.9.8.ebuild b/x11-wm/xpra/xpra-0.9.8.ebuild
deleted file mode 100644
index 1751d629df00..000000000000
--- a/x11-wm/xpra/xpra-0.9.8.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.9.8.ebuild,v 1.4 2014/04/26 08:32:58 pacho Exp $
-
-EAPI=5
-
-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 opengl pulseaudio +rencode server sound vpx webp x264"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# x264/old-libav.path situation see bug 459218
-COMMON_DEPEND=""${PYTHON_DEPS}"
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- opengl? ( dev-python/pygtkglext )
- pulseaudio? ( media-sound/pulseaudio )
- sound? ( media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10
- dev-python/gst-python:0.10 )
- 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[${PYTHON_USEDEP}]
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- virtual/python-imaging[${PYTHON_USEDEP}]
- 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_USEDEP}]"
-
-python_prepare_all() {
- epatch \
- "${FILESDIR}"/${PN}-0.7.1-ignore-gentoo-no-compile.patch \
- "${FILESDIR}"/${PN}-0.8.0-prefix.patch \
- "${FILESDIR}"/${PN}-0.9.5-opengl-auto.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
-}
-
-python_configure_all() {
- mydistutilsargs=(
- $(use_with clipboard)
- $(use_with opengl)
- $(use_with rencode)
- $(use_with server)
- $(use_with sound)
- $(use_with vpx)
- $(use_with webp)
- $(use_with x264)
- --with-cymaths
- --with-cyxor
- --with-parti
- --with-shadow
- --with-strict
- --with-warn
- --without-PIC
- --without-debug )
-}
-
-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
-}