| 1 |
commit: db75ee79722700299a45b254c89007270d24689b |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 29 14:05:49 2022 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 29 14:05:49 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db75ee79 |
| 7 |
|
| 8 |
x11-wm/xpra: Drop old 4.2 |
| 9 |
|
| 10 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 11 |
|
| 12 |
x11-wm/xpra/Manifest | 1 - |
| 13 |
x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch | 33 ------ |
| 14 |
x11-wm/xpra/files/xpra-4.2-no-service.patch | 19 ---- |
| 15 |
x11-wm/xpra/xpra-4.2.ebuild | 170 ---------------------------- |
| 16 |
4 files changed, 223 deletions(-) |
| 17 |
|
| 18 |
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest |
| 19 |
index 310851c94a31..1b68b101e872 100644 |
| 20 |
--- a/x11-wm/xpra/Manifest |
| 21 |
+++ b/x11-wm/xpra/Manifest |
| 22 |
@@ -1,4 +1,3 @@ |
| 23 |
-DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353 |
| 24 |
DIST xpra-4.3.1-tests.patch 51444 BLAKE2B c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f SHA512 0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c |
| 25 |
DIST xpra-4.3.3.tar.gz 4180278 BLAKE2B 2fceab6c95efd0bd0390b7965aea588f39e43f86094c1f9921e1f75022f569808e27d7d85adcccfd64ac28889d0f6d2d6afdf4365f8c919bac8b1a14f3919f23 SHA512 c470e892b4b6379b6c9447731ab174e85c26de15fdc9541a199a2f49e45d07942ae8638f8ddf040a22c73422c6e6b262a9066cd8990f182b75163f7d449d91e2 |
| 26 |
DIST xpra-4.3.4.tar.gz 4184031 BLAKE2B e01e338398f86c80a1092ea3155126ed26eb959ca97790add4cfcdb0ec8a1c6391937ff101c889ec78bb00bbf38ac0c42c5b85d60e72804ffccbbe5f446aaa3e SHA512 93855ff248f135c70a2144a0afbc66e4830b8d214c9c2017dff1d3e3c7902dac15b1cb03670cde8018b40d5c404bd7c243625faeaba712130f5d0082f562c60c |
| 27 |
|
| 28 |
diff --git a/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch b/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch |
| 29 |
deleted file mode 100644 |
| 30 |
index 8475d47b8b3c..000000000000 |
| 31 |
--- a/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,33 +0,0 @@ |
| 34 |
-diff -ruN xpra-3.0.2.orig/xpra/x11/fakeXinerama.py xpra-3.0.2/xpra/x11/fakeXinerama.py |
| 35 |
---- xpra-3.0.2.orig/xpra/x11/fakeXinerama.py 2019-09-24 15:54:02.000000000 +0200 |
| 36 |
-+++ xpra-3.0.2/xpra/x11/fakeXinerama.py 2020-01-16 12:20:22.620519078 +0100 |
| 37 |
-@@ -23,29 +23,6 @@ |
| 38 |
- |
| 39 |
- def find_libfakeXinerama(): |
| 40 |
- libname = "fakeXinerama" |
| 41 |
-- try: |
| 42 |
-- from ctypes.util import find_library |
| 43 |
-- flibname = find_library("fakeXinerama") |
| 44 |
-- if flibname: |
| 45 |
-- libname = flibname |
| 46 |
-- except Exception: |
| 47 |
-- pass |
| 48 |
-- if POSIX: |
| 49 |
-- for lib_dir in os.environ.get("LD_LIBRARY_PATH", "/usr/lib").split(os.pathsep): |
| 50 |
-- lib_path = os.path.join(lib_dir, libname) |
| 51 |
-- if not os.path.exists(lib_dir): |
| 52 |
-- continue |
| 53 |
-- if os.path.exists(lib_path) and os.path.isfile(lib_path): |
| 54 |
-- return lib_path |
| 55 |
-- if LINUX: |
| 56 |
-- try: |
| 57 |
-- libpath = find_lib_ldconfig("fakeXinerama") |
| 58 |
-- if libpath: |
| 59 |
-- return libpath |
| 60 |
-- except Exception as e: |
| 61 |
-- log("find_libfakeXinerama()", exc_info=True) |
| 62 |
-- log.error("Error: cannot launch ldconfig -p to locate libfakeXinerama:") |
| 63 |
-- log.error(" %s", e) |
| 64 |
- return find_lib(libname) |
| 65 |
- |
| 66 |
- current_xinerama_config = None |
| 67 |
|
| 68 |
diff --git a/x11-wm/xpra/files/xpra-4.2-no-service.patch b/x11-wm/xpra/files/xpra-4.2-no-service.patch |
| 69 |
deleted file mode 100644 |
| 70 |
index dd85370968ba..000000000000 |
| 71 |
--- a/x11-wm/xpra/files/xpra-4.2-no-service.patch |
| 72 |
+++ /dev/null |
| 73 |
@@ -1,19 +0,0 @@ |
| 74 |
-Don't install the service files. Auto-detection is used to determine what files |
| 75 |
-to install, and where, which can be unpredictable on Gentoo. The init.d script |
| 76 |
-is also not suitable for Gentoo. |
| 77 |
- |
| 78 |
-diff --git a/setup.py b/setup.py |
| 79 |
-index 1718b06a9..b24a5bd1e 100755 |
| 80 |
---- a/setup.py |
| 81 |
-+++ b/setup.py |
| 82 |
-@@ -139,8 +139,8 @@ from xpra.platform.features import LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED |
| 83 |
- shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT |
| 84 |
- server_ENABLED = (LOCAL_SERVERS_SUPPORTED or shadow_ENABLED) and DEFAULT |
| 85 |
- rfb_ENABLED = server_ENABLED |
| 86 |
--service_ENABLED = LINUX and server_ENABLED |
| 87 |
--sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd") |
| 88 |
-+service_ENABLED = False |
| 89 |
-+sd_listen_ENABLED = False |
| 90 |
- proxy_ENABLED = DEFAULT |
| 91 |
- client_ENABLED = DEFAULT |
| 92 |
- scripts_ENABLED = not WIN32 |
| 93 |
|
| 94 |
diff --git a/x11-wm/xpra/xpra-4.2.ebuild b/x11-wm/xpra/xpra-4.2.ebuild |
| 95 |
deleted file mode 100644 |
| 96 |
index c42097bb561a..000000000000 |
| 97 |
--- a/x11-wm/xpra/xpra-4.2.ebuild |
| 98 |
+++ /dev/null |
| 99 |
@@ -1,170 +0,0 @@ |
| 100 |
-# Copyright 1999-2021 Gentoo Authors |
| 101 |
-# Distributed under the terms of the GNU General Public License v2 |
| 102 |
- |
| 103 |
-EAPI=7 |
| 104 |
- |
| 105 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
| 106 |
-DISTUTILS_SINGLE_IMPL=yes |
| 107 |
-DISTUTILS_USE_SETUPTOOLS=no |
| 108 |
-inherit xdg distutils-r1 tmpfiles prefix udev |
| 109 |
- |
| 110 |
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" |
| 111 |
-HOMEPAGE="https://xpra.org/" |
| 112 |
-SRC_URI="https://xpra.org/src/${P}.tar.gz" |
| 113 |
- |
| 114 |
-LICENSE="GPL-2 BSD" |
| 115 |
-SLOT="0" |
| 116 |
-KEYWORDS="amd64 x86" |
| 117 |
-IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio server sound test vpx webcam webp" |
| 118 |
- |
| 119 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 120 |
- || ( client server ) |
| 121 |
- cups? ( dbus ) |
| 122 |
- opengl? ( client ) |
| 123 |
-" |
| 124 |
- |
| 125 |
-DEPEND=" |
| 126 |
- ${PYTHON_DEPS} |
| 127 |
- $(python_gen_cond_dep ' |
| 128 |
- dev-python/pygobject:3[${PYTHON_USEDEP},cairo] |
| 129 |
- opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] ) |
| 130 |
- sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] ) |
| 131 |
- ') |
| 132 |
- x11-libs/gtk+:3[introspection] |
| 133 |
- x11-libs/libX11 |
| 134 |
- x11-libs/libXcomposite |
| 135 |
- x11-libs/libXdamage |
| 136 |
- x11-libs/libXfixes |
| 137 |
- x11-libs/libXrandr |
| 138 |
- x11-libs/libXtst |
| 139 |
- x11-libs/libxkbfile |
| 140 |
- brotli? ( app-arch/brotli ) |
| 141 |
- csc? ( >=media-video/ffmpeg-1.2.2:0= ) |
| 142 |
- ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) |
| 143 |
- jpeg? ( media-libs/libjpeg-turbo ) |
| 144 |
- pulseaudio? ( |
| 145 |
- media-sound/pulseaudio |
| 146 |
- media-plugins/gst-plugins-pulse:1.0 |
| 147 |
- ) |
| 148 |
- sound? ( |
| 149 |
- media-libs/gstreamer:1.0 |
| 150 |
- media-libs/gst-plugins-base:1.0 |
| 151 |
- ) |
| 152 |
- vpx? ( media-libs/libvpx media-video/ffmpeg ) |
| 153 |
- webp? ( media-libs/libwebp ) |
| 154 |
-" |
| 155 |
-RDEPEND=" |
| 156 |
- ${DEPEND} |
| 157 |
- $(python_gen_cond_dep ' |
| 158 |
- dev-python/netifaces[${PYTHON_USEDEP}] |
| 159 |
- dev-python/rencode[${PYTHON_USEDEP}] |
| 160 |
- dev-python/pillow[jpeg?,${PYTHON_USEDEP}] |
| 161 |
- cups? ( dev-python/pycups[${PYTHON_USEDEP}] ) |
| 162 |
- dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) |
| 163 |
- lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) |
| 164 |
- lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] ) |
| 165 |
- opengl? ( |
| 166 |
- client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] ) |
| 167 |
- ) |
| 168 |
- webcam? ( |
| 169 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 170 |
- dev-python/pyinotify[${PYTHON_USEDEP}] |
| 171 |
- media-libs/opencv[${PYTHON_USEDEP},python] |
| 172 |
- ) |
| 173 |
- ') |
| 174 |
- acct-group/xpra |
| 175 |
- virtual/ssh |
| 176 |
- x11-apps/xmodmap |
| 177 |
- ibus? ( app-i18n/ibus ) |
| 178 |
- pinentry? ( app-crypt/pinentry ) |
| 179 |
- server? ( |
| 180 |
- x11-base/xorg-server[-minimal,xvfb] |
| 181 |
- x11-drivers/xf86-input-void |
| 182 |
- ) |
| 183 |
-" |
| 184 |
-BDEPEND=" |
| 185 |
- virtual/pkgconfig |
| 186 |
- $(python_gen_cond_dep ' |
| 187 |
- >=dev-python/cython-0.16[${PYTHON_USEDEP}] |
| 188 |
- ') |
| 189 |
- doc? ( app-text/pandoc ) |
| 190 |
-" |
| 191 |
- |
| 192 |
-RESTRICT="!test? ( test )" |
| 193 |
- |
| 194 |
-PATCHES=( |
| 195 |
- "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch |
| 196 |
- "${FILESDIR}"/${PN}-3.0.2-ldconfig.patch |
| 197 |
- "${FILESDIR}"/${PN}-4.2-suid-warning.patch |
| 198 |
- "${FILESDIR}"/${PN}-4.2-no-service.patch |
| 199 |
-) |
| 200 |
- |
| 201 |
-python_prepare_all() { |
| 202 |
- hprefixify -w '/os.path/' setup.py |
| 203 |
- hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \ |
| 204 |
- xpra/platform{/xposix,}/paths.py xpra/scripts/server.py |
| 205 |
- |
| 206 |
- sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \ |
| 207 |
- -i setup.py || die |
| 208 |
- |
| 209 |
- if use minimal; then |
| 210 |
- sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \ |
| 211 |
- -i setup.py || die |
| 212 |
- fi |
| 213 |
- |
| 214 |
- distutils-r1_python_prepare_all |
| 215 |
-} |
| 216 |
- |
| 217 |
-python_configure_all() { |
| 218 |
- sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \ |
| 219 |
- -i setup.py || die |
| 220 |
- |
| 221 |
- mydistutilsargs=( |
| 222 |
- --without-PIC |
| 223 |
- --without-Xdummy |
| 224 |
- $(use_with client) |
| 225 |
- $(use_with clipboard) |
| 226 |
- $(use_with csc csc_swscale) |
| 227 |
- --without-csc_libyuv |
| 228 |
- --without-cuda_rebuild |
| 229 |
- --without-cuda_kernels |
| 230 |
- $(use_with cups printing) |
| 231 |
- --without-debug |
| 232 |
- $(use_with dbus) |
| 233 |
- $(use_with doc docs) |
| 234 |
- $(use_with ffmpeg dec_avcodec2) |
| 235 |
- $(use_with ffmpeg enc_ffmpeg) |
| 236 |
- $(use_with ffmpeg enc_x264) |
| 237 |
- $(use_with ffmpeg enc_x265) |
| 238 |
- --with-gtk3 |
| 239 |
- $(use_with jpeg jpeg_encoder) |
| 240 |
- $(use_with jpeg jpeg_decoder) |
| 241 |
- --without-mdns |
| 242 |
- $(use_with opengl) |
| 243 |
- $(use_with server shadow) |
| 244 |
- $(use_with server) |
| 245 |
- $(use_with sound) |
| 246 |
- --with-strict |
| 247 |
- $(use_with vpx) |
| 248 |
- --with-warn |
| 249 |
- $(use_with webcam) |
| 250 |
- $(use_with webp) |
| 251 |
- --with-x11 |
| 252 |
- ) |
| 253 |
- |
| 254 |
- export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra" |
| 255 |
-} |
| 256 |
- |
| 257 |
-python_install_all() { |
| 258 |
- distutils-r1_python_prepare_all |
| 259 |
- |
| 260 |
- # Move udev dir to the right place. |
| 261 |
- local dir=$(get_udevdir) |
| 262 |
- dodir "${dir%/*}" |
| 263 |
- mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die |
| 264 |
-} |
| 265 |
- |
| 266 |
-pkg_postinst() { |
| 267 |
- tmpfiles_process xpra.conf |
| 268 |
- xdg_pkg_postinst |
| 269 |
-} |
Archives