From ae838334efa4ecfd172331e8f5ae4eea8c5dd876 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 29 Aug 2022 16:46:44 +0100 Subject: gentoo auto-resync : 29:08:2022 - 16:46:43 --- x11-wm/Manifest.gz | Bin 9798 -> 9798 bytes x11-wm/xpra/Manifest | 6 +- x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch | 33 ------ x11-wm/xpra/files/xpra-4.2-no-service.patch | 19 ---- x11-wm/xpra/xpra-4.2.ebuild | 170 ---------------------------- x11-wm/xpra/xpra-4.3.3.ebuild | 2 +- 6 files changed, 2 insertions(+), 228 deletions(-) delete mode 100644 x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch delete mode 100644 x11-wm/xpra/files/xpra-4.2-no-service.patch delete mode 100644 x11-wm/xpra/xpra-4.2.ebuild (limited to 'x11-wm') diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz index efac5c84b610..6289777dfb1e 100644 Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest index 3a54a236641a..9f7e6fd7c753 100644 --- a/x11-wm/xpra/Manifest +++ b/x11-wm/xpra/Manifest @@ -1,16 +1,12 @@ -AUX xpra-3.0.2-ldconfig.patch 1270 BLAKE2B b4eaa81610899c16a43b43c5f11f93335ca48add1302ed2bc2d6f1d6a1df3c234a65562c42b19b7ad53b0d267d9763606d43ba3ce18cfb6d70565d2f684dbe7c SHA512 09684ac0ac9626d1a441fb17a61919b3b1685520affcc72aa59e64c24ad55ffc7712af57e2ec392710e7dc412039daa6c76456ee6d5464a3e4057fb61d9ad7b1 AUX xpra-3.0.2_ignore-gentoo-no-compile.patch 610 BLAKE2B 963b3b61602f6a7ad7c8247109932d0da7eeef2762eaa8a987a8f10178a13cec3255000661bc7e3344319a555c9f0ed41b6383be7728af543cb5d2e004c377b2 SHA512 ff16637dca766ba2d36351e1aeeb87f2bab02e73e8da8fdb566051727b0c6fec6df1925318eee8d1c87580196ec78f0303da56d3439b4b4bace3105a914251e8 -AUX xpra-4.2-no-service.patch 786 BLAKE2B 63a53c55335c2aefa5f1345b91dd01bf01340b06f68213f2fb796e6e33ab96bb1c80fbe6e4eedf129c5c06eba97ca080fef5c526ec95236e767bb1ad2ef2049d SHA512 f806b7f3eee1507c83b40f1463659acbcfe907a3e3b80d091d5816483718f295dce760aa3400b5a183a1605ef33092f68d634afaddfb69665f44f86bb3ff3aac AUX xpra-4.2-suid-warning.patch 745 BLAKE2B 58153996d70476058b8daba30e61cbe02a84f10bc61ba79bafa045c1474d8436f4aa7c7e1bfa0ffc92450effca92810016d6afeaf1261cd568b5c9dd9b41f468 SHA512 82e994786967fb258cf273ea69d579207e503af5a53466821d4c155c5c61099468db26b7c31b4e91d343eff8e60cc06a66664e6a7a7e968e8ea7f1b8f862700d AUX xpra-4.3-cpp.patch 1273 BLAKE2B fc7b55d69242a4aaad4692959c67c4b2219b11d6e2cee32f7c6dd23d2efcf0727f7a3299d4f94032ad561876c4148a2c10ac260f9df208fab10766462b1738d7 SHA512 e4a11ef3518037695194e0b15e79dbe4bc2cc8c70780052c5660fd621d682936367fa17a998cc307a629eee5860a8e74cbb82cbfaa46cc2d0e6ec051058a43ec AUX xpra-4.3-no-service.patch 779 BLAKE2B 5232b103b47601b4340d6a863d2cd3cc6641a55d6c252702034902a4d5189c7df45b7d6280ae9bf2a3dbe8c96a73847f936032cc9b58c4bdd91025974fa84005 SHA512 d5045da20f4fdcb2b434f280c42b26ee1c8c280e4037a116c3edd0990a97acc5017bf428c4c222a1c38e23a6dd5709789ac80e62187144d334068deecc99d20e AUX xpra-9999-xdummy.patch 614 BLAKE2B 9b502fa836caea212f90730e0238adb16c74814a55a2a5b32e062880d29b1fa05247fc3c5e8edddf0acdd1d93620dafb507ec9a14996c3aea248d204510a0e2c SHA512 71efb726f50b85890bb3508bd3943b3bb9e34a8f5d3c92c6fa4f7c2ea6b8c51551243ea0d4d52802f17e5aaed7716b9ee0b462cde1941dae9273651dcc461a9a -DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353 DIST xpra-4.3.1-tests.patch 51444 BLAKE2B c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f SHA512 0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c DIST xpra-4.3.3.tar.gz 4180278 BLAKE2B 2fceab6c95efd0bd0390b7965aea588f39e43f86094c1f9921e1f75022f569808e27d7d85adcccfd64ac28889d0f6d2d6afdf4365f8c919bac8b1a14f3919f23 SHA512 c470e892b4b6379b6c9447731ab174e85c26de15fdc9541a199a2f49e45d07942ae8638f8ddf040a22c73422c6e6b262a9066cd8990f182b75163f7d449d91e2 DIST xpra-4.3.4.tar.gz 4184031 BLAKE2B e01e338398f86c80a1092ea3155126ed26eb959ca97790add4cfcdb0ec8a1c6391937ff101c889ec78bb00bbf38ac0c42c5b85d60e72804ffccbbe5f446aaa3e SHA512 93855ff248f135c70a2144a0afbc66e4830b8d214c9c2017dff1d3e3c7902dac15b1cb03670cde8018b40d5c404bd7c243625faeaba712130f5d0082f562c60c -EBUILD xpra-4.2.ebuild 4193 BLAKE2B 1c611de33e8d7f62642d2e06f9ff0714110ef2f1bf436c48f2c9c6ce0a5be54dc5264b67e258e5d21f87393cb18b58866479a8d6f4c55617abaf61d960129862 SHA512 e0a8c60225f6e308bac0670b5b2657156b7f1bb9a04dc5b46cc6a297c68a0d92dbf844945ff376fc53cd13789efccfb474c2f2b852fb7d464c971cf6143c3c5c -EBUILD xpra-4.3.3.ebuild 5291 BLAKE2B bb1884f9766a9433772917278af74e3bc75dccd4a6dc6fce07f8bbe9c0bc4aea541107573074b78e76a8c7ea43bba1cbde332954aa5e944765ac01cb026ea5bb SHA512 c85db59933ddbd2cbc35ac5ab599af2675c680a42cc975b9719d87f26f866921bd1922f79a457c8f89e9aa3521d230d9168e43f8f3cf99202b79e96a564df577 +EBUILD xpra-4.3.3.ebuild 5290 BLAKE2B 85c630de6d7a14d1b4428007d3b94f9afefcc7c631d7d1325389c9adac3e9cb349ddb444d2fe045a6cbc68c0f9cb4d205f8275d8a6b632f95aef2b56e4148dd8 SHA512 090ebe92cbb642b0b5582c98dd4f1afe44af0fee92be579b4861670bb4bc08d1d69185cdc1437f534154af1ca48767294ca97b03dd797b9acba005afd6e49613 EBUILD xpra-4.3.4.ebuild 5213 BLAKE2B a225eeb5ef089e0a8522cfd3c58b7775e51e481cff1b0faac1a06cf35640db5f01f2168717026a7363fe5319ea3392ec0002f9ecbce253eb7bc2e80e0aa4cbfe SHA512 9c63a9e981c7cca9c194a860d17da43760eff4201d44ef525ec0f9e27800c62614366126f7c210cc8cb3827a84c8890e373132d0eddbcec81cbf5d04eecbba7b EBUILD xpra-9999.ebuild 5148 BLAKE2B 192a4458604d74eec4d5b9e2ca50cbfae7d97a3624bbab18c714099630a91034753bffe8c9841f2d0a794581c978e95cb3480f7a0bbe377897caec33a95a7159 SHA512 e51223bd4d28c196da186bcf201b81204224725c13d8a1d2a437ce937a061d0d5085b227d6961c2849564ac01931fdc58a60e503644c550ba8969f7070953d87 MISC metadata.xml 1251 BLAKE2B c34d54c0b030f2b1f6feef9bfaa50718f4931488e948d0179cd1846f2e4b78932c4164f9a3b708b13cd90c71c84cdebc6af2dfa3fbb831eed3fc308c2537ff84 SHA512 465e19a532120ed42187e6e053b77fecad5cad408f4f1a57bcd237b7765bafd2fbff7a6e7e66ee4c9cbf50bd979aa989dd364a042e8ecfe5cd2180f2eeab3ba8 diff --git a/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch b/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch deleted file mode 100644 index 8475d47b8b3c..000000000000 --- a/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ruN xpra-3.0.2.orig/xpra/x11/fakeXinerama.py xpra-3.0.2/xpra/x11/fakeXinerama.py ---- xpra-3.0.2.orig/xpra/x11/fakeXinerama.py 2019-09-24 15:54:02.000000000 +0200 -+++ xpra-3.0.2/xpra/x11/fakeXinerama.py 2020-01-16 12:20:22.620519078 +0100 -@@ -23,29 +23,6 @@ - - def find_libfakeXinerama(): - libname = "fakeXinerama" -- try: -- from ctypes.util import find_library -- flibname = find_library("fakeXinerama") -- if flibname: -- libname = flibname -- except Exception: -- pass -- if POSIX: -- for lib_dir in os.environ.get("LD_LIBRARY_PATH", "/usr/lib").split(os.pathsep): -- lib_path = os.path.join(lib_dir, libname) -- if not os.path.exists(lib_dir): -- continue -- if os.path.exists(lib_path) and os.path.isfile(lib_path): -- return lib_path -- if LINUX: -- try: -- libpath = find_lib_ldconfig("fakeXinerama") -- if libpath: -- return libpath -- except Exception as e: -- log("find_libfakeXinerama()", exc_info=True) -- log.error("Error: cannot launch ldconfig -p to locate libfakeXinerama:") -- log.error(" %s", e) - return find_lib(libname) - - current_xinerama_config = None diff --git a/x11-wm/xpra/files/xpra-4.2-no-service.patch b/x11-wm/xpra/files/xpra-4.2-no-service.patch deleted file mode 100644 index dd85370968ba..000000000000 --- a/x11-wm/xpra/files/xpra-4.2-no-service.patch +++ /dev/null @@ -1,19 +0,0 @@ -Don't install the service files. Auto-detection is used to determine what files -to install, and where, which can be unpredictable on Gentoo. The init.d script -is also not suitable for Gentoo. - -diff --git a/setup.py b/setup.py -index 1718b06a9..b24a5bd1e 100755 ---- a/setup.py -+++ b/setup.py -@@ -139,8 +139,8 @@ from xpra.platform.features import LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED - shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT - server_ENABLED = (LOCAL_SERVERS_SUPPORTED or shadow_ENABLED) and DEFAULT - rfb_ENABLED = server_ENABLED --service_ENABLED = LINUX and server_ENABLED --sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd") -+service_ENABLED = False -+sd_listen_ENABLED = False - proxy_ENABLED = DEFAULT - client_ENABLED = DEFAULT - scripts_ENABLED = not WIN32 diff --git a/x11-wm/xpra/xpra-4.2.ebuild b/x11-wm/xpra/xpra-4.2.ebuild deleted file mode 100644 index c42097bb561a..000000000000 --- a/x11-wm/xpra/xpra-4.2.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_SINGLE_IMPL=yes -DISTUTILS_USE_SETUPTOOLS=no -inherit xdg distutils-r1 tmpfiles prefix udev - -DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" -HOMEPAGE="https://xpra.org/" -SRC_URI="https://xpra.org/src/${P}.tar.gz" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio server sound test vpx webcam webp" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - || ( client server ) - cups? ( dbus ) - opengl? ( client ) -" - -DEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_USEDEP},cairo] - opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] ) - sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] ) - ') - x11-libs/gtk+:3[introspection] - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXtst - x11-libs/libxkbfile - brotli? ( app-arch/brotli ) - csc? ( >=media-video/ffmpeg-1.2.2:0= ) - ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) - jpeg? ( media-libs/libjpeg-turbo ) - pulseaudio? ( - media-sound/pulseaudio - media-plugins/gst-plugins-pulse:1.0 - ) - sound? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - vpx? ( media-libs/libvpx media-video/ffmpeg ) - webp? ( media-libs/libwebp ) -" -RDEPEND=" - ${DEPEND} - $(python_gen_cond_dep ' - dev-python/netifaces[${PYTHON_USEDEP}] - dev-python/rencode[${PYTHON_USEDEP}] - dev-python/pillow[jpeg?,${PYTHON_USEDEP}] - cups? ( dev-python/pycups[${PYTHON_USEDEP}] ) - dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) - lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) - lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] ) - opengl? ( - client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] ) - ) - webcam? ( - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pyinotify[${PYTHON_USEDEP}] - media-libs/opencv[${PYTHON_USEDEP},python] - ) - ') - acct-group/xpra - virtual/ssh - x11-apps/xmodmap - ibus? ( app-i18n/ibus ) - pinentry? ( app-crypt/pinentry ) - server? ( - x11-base/xorg-server[-minimal,xvfb] - x11-drivers/xf86-input-void - ) -" -BDEPEND=" - virtual/pkgconfig - $(python_gen_cond_dep ' - >=dev-python/cython-0.16[${PYTHON_USEDEP}] - ') - doc? ( app-text/pandoc ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch - "${FILESDIR}"/${PN}-3.0.2-ldconfig.patch - "${FILESDIR}"/${PN}-4.2-suid-warning.patch - "${FILESDIR}"/${PN}-4.2-no-service.patch -) - -python_prepare_all() { - hprefixify -w '/os.path/' setup.py - hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \ - xpra/platform{/xposix,}/paths.py xpra/scripts/server.py - - sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \ - -i setup.py || die - - if use minimal; then - sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \ - -i setup.py || die - fi - - distutils-r1_python_prepare_all -} - -python_configure_all() { - sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \ - -i setup.py || die - - mydistutilsargs=( - --without-PIC - --without-Xdummy - $(use_with client) - $(use_with clipboard) - $(use_with csc csc_swscale) - --without-csc_libyuv - --without-cuda_rebuild - --without-cuda_kernels - $(use_with cups printing) - --without-debug - $(use_with dbus) - $(use_with doc docs) - $(use_with ffmpeg dec_avcodec2) - $(use_with ffmpeg enc_ffmpeg) - $(use_with ffmpeg enc_x264) - $(use_with ffmpeg enc_x265) - --with-gtk3 - $(use_with jpeg jpeg_encoder) - $(use_with jpeg jpeg_decoder) - --without-mdns - $(use_with opengl) - $(use_with server shadow) - $(use_with server) - $(use_with sound) - --with-strict - $(use_with vpx) - --with-warn - $(use_with webcam) - $(use_with webp) - --with-x11 - ) - - export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra" -} - -python_install_all() { - distutils-r1_python_prepare_all - - # Move udev dir to the right place. - local dir=$(get_udevdir) - dodir "${dir%/*}" - mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die -} - -pkg_postinst() { - tmpfiles_process xpra.conf - xdg_pkg_postinst -} diff --git a/x11-wm/xpra/xpra-4.3.3.ebuild b/x11-wm/xpra/xpra-4.3.3.ebuild index 0439786ef126..a50b752c6ed4 100644 --- a/x11-wm/xpra/xpra-4.3.3.ebuild +++ b/x11-wm/xpra/xpra-4.3.3.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then else SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch" - KEYWORDS="amd64 ~x86" + KEYWORDS="amd64 x86" fi PYTHON_COMPAT=( python3_{7,8,9,10} ) -- cgit v1.2.3