commit: 31776efc4ea73f03c05e368548e74d720ade0872
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 22:37:19 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 22:38:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31776efc
x11-wm/xpra: Drop old 3.0.2-r1 and 4.0.4
Package-Manager: Portage-3.0.14, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
x11-wm/xpra/Manifest | 2 -
x11-wm/xpra/files/xpra-3.0.2-dbus.patch | 29 -------
x11-wm/xpra/metadata.xml | 4 -
x11-wm/xpra/xpra-3.0.2-r1.ebuild | 144 --------------------------------
x11-wm/xpra/xpra-4.0.4.ebuild | 139 ------------------------------
5 files changed, 318 deletions(-)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 836f937897f..50c37163f42 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,5 +1,3 @@
-DIST xpra-3.0.2.tar.xz 2749196 BLAKE2B
3c8745657a12637704fb88ac7b867ab387ef7ed2250396d9e534aecf81e40f85332a2c51ba49638834012f4a4d85c03bd7e49ee259bb2400aeb60fb06abf8b59
SHA512
115f606ff5886d99a906f318cb1a7a4a86e80ebf23e4336e67938267d92ef624de577cc8fc06c6ce541b7c44a0cef58d930b5928f32e24dfc67c72127c7b623c
DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B
a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647
SHA512
3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
-DIST xpra-4.0.4.tar.xz 2792512 BLAKE2B
e16c47e82cf9f8712521c8f9c436b7bb819d9469fc0135ade1f2c9fc6f2a8a0fecf417caae87a1eca9c4b6daec1a82add5d6547208caee1a1d681ebc7b3d3d3b
SHA512
91a90cdab775ec2501ef1601188b97ca4aa741e541f8d941add8d509767790a144b67f094177dda7539eff305710f2c834b90a93e9441437dac615677963094c
DIST xpra-4.0.5.tar.xz 2795828 BLAKE2B
fed6514d75dbb08f386325e30e375fd2077db1dad91602e575e3955a622a52ade2fc8e0c6c823d8a495684afb3a2f55f27e28abdf8734d0eca25275a3d358193
SHA512
d2aa2b70b6ec702bca5b0c2b06378107d45c4cad79f83ee2a1ed27fd5f66474e2d8e1d28d5111e60417ed089f91bab0b1566b0c9b3dcf6f0cb5e204ff5c42c92
DIST xpra-4.0.6.tar.xz 2797752 BLAKE2B
3f2d4108fec1f1b5c0cd38a26f1a2c41af253fd234427e8e54104ff3742b9f7ae3e1863db837addd76acc6856b6f3cfcbde97edc2bc75314b215d4ca46a816f8
SHA512
e3dc66040898ed40ef12b8cdb89e5f42c2f36edc071afb435334389e727f376ddc116dbee47018468bff24f2cdd7be35750b58bc108ba73c5558bd9eccbd04ea
diff --git a/x11-wm/xpra/files/xpra-3.0.2-dbus.patch
b/x11-wm/xpra/files/xpra-3.0.2-dbus.patch
deleted file mode 100644
index e0f14b8ba59..00000000000
--- a/x11-wm/xpra/files/xpra-3.0.2-dbus.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Remove dbus functionality if USE=dbus is not specified.
-
-Index: xpra-3.0.2/xpra/scripts/server.py
-===================================================================
---- xpra-3.0.2.orig/xpra/scripts/server.py
-+++ xpra-3.0.2/xpra/scripts/server.py
-@@ -748,14 +748,9 @@ def do_run_server(error_cb, opts, mode,
- log("chdir(%s)", opts.chdir)
- os.chdir(opts.chdir)
-
-- dbus_pid, dbus_env = 0, {}
- if not shadowing and POSIX and not OSX and not clobber:
- no_gtk()
- assert starting or starting_desktop or proxying
-- from xpra.server.dbus.dbus_start import start_dbus
-- dbus_pid, dbus_env = start_dbus(opts.dbus_launch)
-- if dbus_env:
-- os.environ.update(dbus_env)
-
- display = None
- if not proxying:
-@@ -835,7 +830,6 @@ def do_run_server(error_cb, opts, mode,
- app.display_name = display_name
- app.init(opts)
- app.init_sockets(sockets)
-- app.init_dbus(dbus_pid, dbus_env)
- if not shadowing and (xvfb_pid or clobber):
- app.init_display_pid(xvfb_pid)
- app.original_desktop_display = desktop_display
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index 4f4e62d12f5..ce472786e3a 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -25,10 +25,6 @@
<flag name="client">Build client-side code</flag>
<flag name="clipboard">Enable clipboard support</flag>
<flag name="csc">Enable csc softscaler support</flag>
- <flag name="dec_avcodec2">Enable avcodec2 decoder support</flag>
- <flag name="enc_ffmpeg">Enable advanced ffmpeg/libav encoder
support</flag>
- <flag name="enc_x264">Enable x264 encoder support</flag>
- <flag name="enc_x265">Enable x265 encoder support</flag>
<flag name="pillow">Enable pillow support</flag>
<flag name="server">Build server-side code</flag>
<flag name="vpx">Enable vpx image format support</flag>
diff --git a/x11-wm/xpra/xpra-3.0.2-r1.ebuild b/x11-wm/xpra/xpra-3.0.2-r1.ebuild
deleted file mode 100644
index f518280f02d..00000000000
--- a/x11-wm/xpra/xpra-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3
-PYTHON_COMPAT=( python3_{6,7} )
-inherit xdg distutils-r1 eutils 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 dec_avcodec2 enc_ffmpeg enc_x264
enc_x265 jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam
webp"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- clipboard? ( || ( server client ) )
- cups? ( dbus )
- opengl? ( client )
- || ( client server )
- client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) )"
-
-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= )
- dec_avcodec2? ( >=media-video/ffmpeg-2:0=[x264,x265] )
- enc_ffmpeg? ( >=media-video/ffmpeg-3.2.2:0= )
- enc_x264? ( media-libs/x264
- >=media-video/ffmpeg-1.0.4:0=[x264] )
- enc_x265? ( media-libs/x265
- >=media-video/ffmpeg-2:0=[x264] )
- jpeg? ( media-libs/libjpeg-turbo )
- opengl? ( dev-python/pyopengl )
- pulseaudio? ( media-sound/pulseaudio )
- 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
-)
-
-pkg_postinst() {
- enewgroup ${PN}
- tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
-
- xdg_pkg_postinst
-}
-
-python_prepare_all() {
- use dbus || eapply "${FILESDIR}/${PN}-3.0.2-dbus.patch"
-
- 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 dec_avcodec2)
- $(use_with enc_ffmpeg)
- $(use_with enc_x264)
- $(use_with 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.0.4.ebuild b/x11-wm/xpra/xpra-4.0.4.ebuild
deleted file mode 100644
index ff3e6b93213..00000000000
--- a/x11-wm/xpra/xpra-4.0.4.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 eutils flag-o-matic 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="brotli +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
- 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 )
- 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}
- acct-group/xpra
- 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}-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
-
- 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)
- --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"
-}
