From b49088575eb777ced2551f484da86317332d6087 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Jul 2021 02:11:45 +0100 Subject: gentoo resync : 24.07.2021 --- x11-wm/xpra/Manifest | 8 +- x11-wm/xpra/files/xpra-2.0-suid-warning.patch | 11 -- x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch | 12 -- x11-wm/xpra/xpra-3.0.5-r2.ebuild | 147 --------------------- x11-wm/xpra/xpra-4.1.3.ebuild | 168 ------------------------ x11-wm/xpra/xpra-4.2.ebuild | 2 +- 6 files changed, 2 insertions(+), 346 deletions(-) delete mode 100644 x11-wm/xpra/files/xpra-2.0-suid-warning.patch delete mode 100644 x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch delete mode 100644 x11-wm/xpra/xpra-3.0.5-r2.ebuild delete mode 100644 x11-wm/xpra/xpra-4.1.3.ebuild (limited to 'x11-wm/xpra') diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest index 97a38c35f6ed..a11ea9f6c1d6 100644 --- a/x11-wm/xpra/Manifest +++ b/x11-wm/xpra/Manifest @@ -1,14 +1,8 @@ -AUX xpra-2.0-suid-warning.patch 617 BLAKE2B dc7f1ba0ec9e30e260601f1151edb43855619a1c34bc29c05536c4dea30c8131179ea17ca30ce3ae2c87d7b374f7a02a5afcde89b6bf29921fc0a9de457e3d54 SHA512 f0d69a6e57435d6c9ef1ecb10e9fa6916b2a8b11f5979b7dffcc37c0a8ec387306b651d50ca3fe10a489cb28f6c2384fbe578510bd7f9bc7a51249e66c4d17ab 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.0.3-suid-warning.patch 731 BLAKE2B 6e576c088bc59ee7a52e15a8fbceb9117a47e4bf818b6777ffe977b5db1f9e72077ffeea07570312603f160d5556d2980914887f56d9733b1b6bf49ae385d0e4 SHA512 d3a3c2a2510159e83d6d6bda11f37b5500ce80d4bac059d3bcee8293caa93652a132d074f46a728204b012c61707994ebb87e0e02afd0c4efeab7a705ba5ea69 AUX xpra-4.2-suid-warning.patch 745 BLAKE2B 58153996d70476058b8daba30e61cbe02a84f10bc61ba79bafa045c1474d8436f4aa7c7e1bfa0ffc92450effca92810016d6afeaf1261cd568b5c9dd9b41f468 SHA512 82e994786967fb258cf273ea69d579207e503af5a53466821d4c155c5c61099468db26b7c31b4e91d343eff8e60cc06a66664e6a7a7e968e8ea7f1b8f862700d -DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681 -DIST xpra-4.1.3.tar.gz 3850971 BLAKE2B b5f5a0546c785762974f27650408cb83fdfa2ac8a5b5dd8c6b08a9978ff17a0dfc85f95fde405689a19517ef66bcc7aefc1dad71acc2dda7883ed38d3c22b91c SHA512 e401793ae9a4539d39bc161be4d34af2dca81c78f189664d8ebdefff99d413d364d4ceb37dd776b027b206119da81957ef7436a727c00d3ad5895a3c90742e39 DIST xpra-4.2.1.tar.gz 3878766 BLAKE2B c537b54b8ea5cc1ad2909eeccf61eba59a518165eb72c7d4984d26f378e4babca997c2f6cf78f5ba947edbc4ad6c4085c86793aad9b01f1fca2b22b1daaabda9 SHA512 553d8c11f1a77a2a58cbad7df0d899c611e21eb01dad3516f99f1fb9cc7a4507ba7557807b62ddea7101ca01bab123962a34b9c3369db06d1bb318debd91dc55 DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353 -EBUILD xpra-3.0.5-r2.ebuild 3834 BLAKE2B 774548ad7f6e2f9f1cf4751d8ef1119e7fb93ac3d1fb9a1d89367e6ec8a20430fd3787a8681b7abd72a2da4e7b05c4f078f92a7a13fcf96b8e448449aa490254 SHA512 f019c875c6e5feffb6ff09d4ef2c3c9cfeb360c98e03a59863e5c3e0b43c4e143d24434559659f5e85577e2e80a332e7fd7889a48041c32b8e97f810c50be598 -EBUILD xpra-4.1.3.ebuild 4103 BLAKE2B d279ddb09bcb0c784d98387b7e4ef61b73a550b865085f9d24f1863902759cff57f573df5fcb1b8e2c0f1e2e93f09b9e49ec95b323157f3d965e41e40e5e0257 SHA512 27330d1b6a9e95ab2c93bf6620fe357b863d3a1493ea129c6d3154ccd953ed4379f4b21fb8858177d040f5bb01bfa205e2aa49d41c72c5a327453be4c0a1d982 EBUILD xpra-4.2.1.ebuild 4174 BLAKE2B 407e6d7a2da77c89bac668cb3708f519cd72133f7cea2cd3c7d039e4706417298929d102d24f13b0392f63b4dedbe4bd66feb838d51d26131fdd7d6f4c1b7bff SHA512 35ae0360bfcd7978c5b38be30498e26c78b7c02a6ffa2c18acb2755c08e70356056ab793b896e6e95cf08c24a6349780560054b5e321f318b1c4f53e5cf3fe65 -EBUILD xpra-4.2.ebuild 4174 BLAKE2B 407e6d7a2da77c89bac668cb3708f519cd72133f7cea2cd3c7d039e4706417298929d102d24f13b0392f63b4dedbe4bd66feb838d51d26131fdd7d6f4c1b7bff SHA512 35ae0360bfcd7978c5b38be30498e26c78b7c02a6ffa2c18acb2755c08e70356056ab793b896e6e95cf08c24a6349780560054b5e321f318b1c4f53e5cf3fe65 +EBUILD xpra-4.2.ebuild 4172 BLAKE2B 0310419a1ce47d0a7b58d141845dbf13609e2633d0fd481e53c091340ec0c643b71095bc39b393a2639a21c61983de03aeb34533b1d8226d35ec6898870f4247 SHA512 54179fbdbfa576c03e0ec1263c453c8f08e0a80d3614cf3b782e2595a8edb4402ee968ffad6d67ba9cd47bdee2bbe172d2860e3a45ace1d2da0b31b9071034ca MISC metadata.xml 1250 BLAKE2B 925a45bc8dccabae8b537ac5b2bc5ed8a1add84a7fb42d69165fe2a79ec38bc87ac264f16649fa37282dfb4a411e2cc5579802f61dde8129df2f5dade3850bf5 SHA512 a4efcabc1ef671a0c47bc4201b2fd89a0452f620e05d3d9419ee6ba19728275ba7405b943e151944939b6e9cba20ed321c6021b84a438bef61094ca0bd05b204 diff --git a/x11-wm/xpra/files/xpra-2.0-suid-warning.patch b/x11-wm/xpra/files/xpra-2.0-suid-warning.patch deleted file mode 100644 index 806694f24312..000000000000 --- a/x11-wm/xpra/files/xpra-2.0-suid-warning.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xpra-2.0/xpra/scripts/config.py -+++ xpra-2.0/xpra/scripts/config.py -@@ -127,7 +127,7 @@ - xorg_stat = os.stat(xorg_bin) - if (xorg_stat.st_mode & stat.S_ISUID)!=0: - if (xorg_stat.st_mode & stat.S_IROTH)==0: -- warn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin) -+ debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin) - return get_Xvfb_command() - debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin) - use_wrapper = True diff --git a/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch b/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch deleted file mode 100644 index ae590110f1c3..000000000000 --- a/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar a/xpra/scripts/config.py b/xpra/scripts/config.py ---- a/xpra/scripts/config.py 2020-05-10 19:00:55.000000000 +0200 -+++ b/xpra/scripts/config.py 2020-06-07 18:35:49.361899872 +0200 -@@ -150,7 +150,7 @@ - if (xorg_stat.st_mode & stat.S_ISUID)!=0: - if (xorg_stat.st_mode & stat.S_IROTH)==0: - if warn: -- warn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin) -+ debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin) - return get_Xvfb_command() - debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin) - use_wrapper = True diff --git a/x11-wm/xpra/xpra-3.0.5-r2.ebuild b/x11-wm/xpra/xpra-3.0.5-r2.ebuild deleted file mode 100644 index 1371e2b78d86..000000000000 --- a/x11-wm/xpra/xpra-3.0.5-r2.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=no -inherit xdg distutils-r1 flag-o-matic user tmpfiles prefix - -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" -IUSE="+client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - || ( client server ) - cups? ( dbus ) - opengl? ( client ) -" - -COMMON_DEPEND="${PYTHON_DEPS} - dev-python/pygobject:3[${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 - csc? ( >=media-video/ffmpeg-1.2.2:0= ) - ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) - jpeg? ( media-libs/libjpeg-turbo ) - opengl? ( dev-python/pyopengl ) - pulseaudio? ( - media-sound/pulseaudio - media-plugins/gst-plugins-pulse:1.0 - ) - sound? ( media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - dev-python/gst-python:1.0 ) - vpx? ( media-libs/libvpx media-video/ffmpeg ) - webp? ( media-libs/libwebp ) -" -RDEPEND="${COMMON_DEPEND} - dev-python/netifaces[${PYTHON_USEDEP}] - dev-python/rencode[${PYTHON_USEDEP}] - dev-python/pillow[jpeg?,${PYTHON_USEDEP}] - virtual/ssh - x11-apps/xmodmap - 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}] ) - ) - server? ( x11-base/xorg-server[-minimal,xvfb] - x11-drivers/xf86-input-void - ) - webcam? ( dev-python/numpy[${PYTHON_USEDEP}] - media-libs/opencv[python] - dev-python/pyinotify[${PYTHON_USEDEP}] )" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - >=dev-python/cython-0.16[${PYTHON_USEDEP}]" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch - "${FILESDIR}"/${PN}-2.0-suid-warning.patch - "${FILESDIR}"/${PN}-3.0.2-ldconfig.patch -) - -src_install() { - distutils-r1_src_install - - mkdir -p "${ED}/usr/share/metainfo" || die - mv "${ED}/usr/share/appdata/"* "${ED}/usr/share/metainfo/" || die - rmdir "${ED}/usr/share/appdata" || die -} - -pkg_postinst() { - enewgroup ${PN} - tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf - - xdg_pkg_postinst -} - -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 - - 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 ffmpeg dec_avcodec2) - $(use_with ffmpeg enc_ffmpeg) - $(use_with ffmpeg enc_x264) - $(use_with ffmpeg enc_x265) - --without-gtk2 - --with-gtk3 - --without-html5 - $(use_with jpeg jpeg_encoder) - $(use_with jpeg jpeg_decoder) - --without-mdns - --without-minify - $(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 - ) - - # see https://www.xpra.org/trac/ticket/1080 - # and http://trac.cython.org/ticket/395 - append-cflags -fno-strict-aliasing - - export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra" -} diff --git a/x11-wm/xpra/xpra-4.1.3.ebuild b/x11-wm/xpra/xpra-4.1.3.ebuild deleted file mode 100644 index db407cd0db72..000000000000 --- a/x11-wm/xpra/xpra-4.1.3.ebuild +++ /dev/null @@ -1,168 +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 +lz4 lzo minimal opengl pillow 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 - 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.0.3-suid-warning.patch -) - -pkg_postinst() { - tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf - - xdg_pkg_postinst -} - -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 -} diff --git a/x11-wm/xpra/xpra-4.2.ebuild b/x11-wm/xpra/xpra-4.2.ebuild index 1f8dc0a75fa6..f79d0e144a07 100644 --- a/x11-wm/xpra/xpra-4.2.ebuild +++ b/x11-wm/xpra/xpra-4.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://xpra.org/src/${P}.tar.gz" LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +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} -- cgit v1.2.3