From 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 19 Apr 2018 14:14:48 +0100 Subject: gentoo resync : 19.04.2018 --- x11-wm/Manifest.gz | Bin 9290 -> 9283 bytes x11-wm/enlightenment/Manifest | 2 +- x11-wm/enlightenment/metadata.xml | 5 +- x11-wm/lwm/Manifest | 4 -- x11-wm/lwm/lwm-1.2.2.ebuild | 44 ------------ x11-wm/lwm/lwm-1.2.3.ebuild | 47 ------------ x11-wm/xpra/Manifest | 4 +- x11-wm/xpra/xpra-2.2.2.ebuild | 2 +- x11-wm/xpra/xpra-2.2.6.ebuild | 148 ++++++++++++++++++++++++++++++++++++++ 9 files changed, 154 insertions(+), 102 deletions(-) delete mode 100644 x11-wm/lwm/lwm-1.2.2.ebuild delete mode 100644 x11-wm/lwm/lwm-1.2.3.ebuild create mode 100644 x11-wm/xpra/xpra-2.2.6.ebuild (limited to 'x11-wm') diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz index 0890e2d436d9..bae011d7cdd4 100644 Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest index b805b57da7c0..f17d542bc5d2 100644 --- a/x11-wm/enlightenment/Manifest +++ b/x11-wm/enlightenment/Manifest @@ -10,4 +10,4 @@ EBUILD enlightenment-0.20.5.ebuild 3258 BLAKE2B a2b3161215d338a21c8fb7eddc7d0639 EBUILD enlightenment-0.20.6.ebuild 3261 BLAKE2B 058d1d18523add195a322ab3835fd468187e05d1985f07262a1679b6456bb55b673a2fc201546a601de8d0e7dd911d2d927df812ae25a0b1722e657b97bf754d SHA512 f172b95540799ee1f098fd4ccff6b3ec8a356c2f31aa8ecee62d3eed2928b5141195c9839e2e36fd8ec66cc16287bb577ea8ac2cef2c48df9c46e38e00105b25 EBUILD enlightenment-0.21.7.ebuild 3551 BLAKE2B 2888568499c2906ca84924c0d78444e3d9c47370f36eb85355a4b4370fe5abc4bf2f720057489a9973e93c296c5ebe632b104a5db0d69e0355b6c838abd726f7 SHA512 5b5a52d62b9bd68520818e6f225a92cb133ee3ff068a07618e73e01c0f2d25c2bf7af443d1df47d4dc0ef82e614dc26cd5d7e72056a590ad89eb6ca8c553b549 EBUILD enlightenment-1.0.17.ebuild 1831 BLAKE2B 8cab55f842085e212d695ba8513416eb4d8280be4a0292fa5073f109b33db90bb1a9759dce5f6c889271fda7c9078f516f108ee21d9cd6adc130ea23780f900e SHA512 37308359aec83a4f7b8640646f24263805f1306e9d1b4d8e8dc0f94990bbbe670298711d611f5a30d798bd69c10b3ead951b4b233b3b39dcbfb4fc9e98e831aa -MISC metadata.xml 7196 BLAKE2B 70cac77f115242bff1a62be45c696b0a736205404281eb0b87bd7fce8bd047a85dc62a58cfc5cdc135ef2e5d685cd5d2a4d2502a7b403912cd7563e0af5c515f SHA512 8548b29c9ae937c7939d16ee753a50624c231ce0ae1ee10dfc749ba6036a34f0db2dc1a9169c375ac4d8298e2d0c81731abc21da9acb41f6fb9bacdf5ec02ed3 +MISC metadata.xml 7104 BLAKE2B 26bd0a360fe1e49b3f3a4c7e053618d6c431c71fe69221808ee90901691919b3761a27351c65b6ac957ad2dd2ca9358dd43804a676d44c0e2a95819eba729f79 SHA512 7a8432fe55f9afdba600a8ced6e3f761994cda8c0c217278f5600f06aabdacebbda4984505f0b093c6aea4afaf21b56cb69b0202489ddfaeafd216c751868d34 diff --git a/x11-wm/enlightenment/metadata.xml b/x11-wm/enlightenment/metadata.xml index 588a737beed5..8d8bf2c557b2 100644 --- a/x11-wm/enlightenment/metadata.xml +++ b/x11-wm/enlightenment/metadata.xml @@ -1,10 +1,7 @@ - - enlightenment@gentoo.org - Project Enlightenment - + Enable pango font rendering Enable support for the X xrandr extension diff --git a/x11-wm/lwm/Manifest b/x11-wm/lwm/Manifest index e3b174c0d4fa..aaf07acc1f2b 100644 --- a/x11-wm/lwm/Manifest +++ b/x11-wm/lwm/Manifest @@ -1,7 +1,3 @@ -DIST lwm-1.2.2.tar.gz 47715 BLAKE2B 409530a1f84ebb6a41b0532aaa4d2c4e27d63924df9910a63a1936e25dcb76c05ec4abb1989dac95e5c8f8a9dc15acab5573607cfc9df2b6dfe2401f376c1e06 SHA512 18d0e9923b8c24164b2a8ecbaf48e0120ae3e9be69a5a43716b45e605e740f19c96586dad64506076affcfba7b4e1eeef547a1cb8239ea108c40f80ef2f90419 -DIST lwm-1.2.3.tar.gz 47253 BLAKE2B 269016589a07783cc74da16e6c24a33e53a5014a2faae53d3869f302407d70c5134bd088e481fda10d63beb4bf6de49e0f0001da1139b1e8402e1b18250aab3d SHA512 2c699050b3d8ade258a5ff21c0f7a427470bee9a5c8a92f031c4e74f3dcd78f00e181c04ea00bbd4d0dafd60eee5e603b247b75c21faf1017d9f61fb49702d03 DIST lwm-1.2.4.tar.gz 47519 BLAKE2B 209cc24e938978489ba33f940dfc2166880d9c150863f8e1982d5ad21f53a76e95fd71ca461e81a7fdb025c0a957ac2c4623e751de250beec1a2a74e570b9687 SHA512 bb4e394c43020b48dedf8c98702b68be7a580f9851d298ba2c6f0aacbd21719d8c772712e56cbbcc400e81a45ad7f4f29cb6e5f17d6dad76aef65029daf812c5 -EBUILD lwm-1.2.2.ebuild 833 BLAKE2B 3d390cc680d5f8e7e07008fd0c6784a2c51ac8c5571c498bb5c36ead0be16e8a41164dd49610f85c5f7d565736ea137a2bd4fd40d40fdeb5784fa4d0ca48bed5 SHA512 0b6d762db5b32cbe130278d75149a728fbbd9da4f270c9ffe0e433c88f046d651159131915ec4951113fcf712f321f393cb02e60f8803e99f1f0a155e8f018ff -EBUILD lwm-1.2.3.ebuild 839 BLAKE2B 32dbfd91115f16e244ecc7cb383471bb82a487b14a007ea7b8e256b00720e774943f451655deb4dd667566ebbcb7c0bcf8c67033da60de3491e7668ec8f19aae SHA512 8a886447290cac165f7dec8bbb46f25bc4ba4a2590c74370e83bbac728ee4540f7ffac542c76ce6fee5783c13b523b91ac1a0fb646f2c49ab0b6b07e178bd7c8 EBUILD lwm-1.2.4.ebuild 864 BLAKE2B 31dcb108554c04799c5b81e448d2a73596c71e06aa70ca75bfe9b7de25a5814de01cd97946987535709720432247db022cb914054ee223bf58d67310813e6e03 SHA512 1cc038c3dcfdc4f3f7ba40b7ae4e2754d908f5919042802307cc03380f499c8b898b302525f6c03c16edebc4d125f11bc7042b12aa8398864dbcfb97b087c848 MISC metadata.xml 355 BLAKE2B 503762328f2c0793a7febe15e4d4ba88a21a6f577ba817df1a5a4ceb53b6969b4e448b98d3ce5665c91a0abfc06deb8bba59323d6dded0e8050a0bf7eee0dd8d SHA512 9bb07654a69afd045464b0ff8190523a21716d53ad309cc87165c82b699ef7db8cb10caf27a6ccf549cb408f7d1af3f263c5a1e57520856dbcf1f3138807f94f diff --git a/x11-wm/lwm/lwm-1.2.2.ebuild b/x11-wm/lwm/lwm-1.2.2.ebuild deleted file mode 100644 index d226e9f1f844..000000000000 --- a/x11-wm/lwm/lwm-1.2.2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit toolchain-funcs - -DESCRIPTION="The ultimate lightweight window manager" -SRC_URI="http://www.jfc.org.uk/files/lwm/${P}.tar.gz" -HOMEPAGE="http://www.jfc.org.uk/software/lwm.html" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd" -IUSE="" - -RDEPEND="x11-libs/libSM - x11-libs/libICE - x11-libs/libX11 - x11-libs/libXext" -DEPEND="${RDEPEND} - x11-proto/xproto - x11-proto/xextproto - x11-misc/imake" - -src_prepare() { - sed -i -e "s/(SMLIB)/& -lICE/g" Imakefile || die #370127 - xmkmf || die -} - -src_compile() { - emake \ - EXTRA_LDOPTIONS="${CFLAGS} ${LDFLAGS}" \ - CFLAGS="${CFLAGS}" \ - CC="$(tc-getCC)" \ - lwm || die -} - -src_install() { - dobin lwm - - newman lwm.man lwm.1 - dodoc AUTHORS BUGS ChangeLog -} diff --git a/x11-wm/lwm/lwm-1.2.3.ebuild b/x11-wm/lwm/lwm-1.2.3.ebuild deleted file mode 100644 index ba61cf658314..000000000000 --- a/x11-wm/lwm/lwm-1.2.3.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit toolchain-funcs - -DESCRIPTION="The ultimate lightweight window manager" -SRC_URI="http://www.jfc.org.uk/files/lwm/${P}.tar.gz" -HOMEPAGE="http://www.jfc.org.uk/software/lwm.html" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" -IUSE="" - -RDEPEND=" - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext -" -DEPEND=" - ${RDEPEND} - x11-misc/imake - x11-proto/xextproto - x11-proto/xproto -" - -src_prepare() { - sed -i -e "s/(SMLIB)/& -lICE/g" Imakefile || die #370127 - xmkmf || die -} - -src_compile() { - emake \ - EXTRA_LDOPTIONS="${CFLAGS} ${LDFLAGS}" \ - CFLAGS="${CFLAGS}" \ - CC="$(tc-getCC)" \ - lwm || die -} - -src_install() { - dobin lwm - - newman lwm.man lwm.1 - dodoc AUTHORS BUGS ChangeLog -} diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest index 5f61b3ef9291..9e70ac5b498d 100644 --- a/x11-wm/xpra/Manifest +++ b/x11-wm/xpra/Manifest @@ -6,8 +6,10 @@ DIST xpra-1.0.9.tar.xz 1899744 BLAKE2B a8577712c29ff637e69f0faf8224c3318397d1043 DIST xpra-2.1.3.tar.xz 2070192 BLAKE2B b1f54705c877317bf0a3397303af2a516f6e7deb6baa252065f768bd3fd07ec87991b04c14a3aa054da0655543185dfdb99fa2972fb1cd8a2a04d72bb31fafc6 SHA512 aa916953d34477c2c80d99a4d5733586b4122edbc18f2c9952a5d3c9581f7b8e8c55cb1ed4077989876a9a7431faa9c4f7f96f82fc007034f92cacad16429ef8 DIST xpra-2.2.1.tar.xz 2195508 BLAKE2B 5f94e96ddce7df0001ca3ffbc64570c59f02b1b49fc45c364999f47d188b1ef349018e36ed070cf8c26f60efc77c24741f44856f307b68535c982e6082dc0d7a SHA512 fca213a72805b6b1d533f91cd5e4186bd881e083663488b697c71c79fb4a3bf312fd1491aef78cf363e429c5841d706e444c9e69c72351b1551ea7fc9395c0c6 DIST xpra-2.2.2.tar.xz 2195836 BLAKE2B 39d8354738df399d98248a0d455c3b7fa6124f374f0f6e0a476bae53b9728b9ab16c11bd759b6ff52a28295445809fb18b3379b7fc620f0916944f738a00b280 SHA512 5c09e29732c9ca7d03557e4e6070517b192484e67944532d5aeca53e518c8617f7d3a5919a2557050fbb9aa4123a0302a53720dd7036823db83588264dd3e6d2 +DIST xpra-2.2.6.tar.xz 2198720 BLAKE2B 41f238e98dbb60598cffcc3960375a525658c72db478acace0acb964fe3ee039acb5e352a76ffb5724b6c4acd63ea510505f6841f688c67d0ae2a3cbc2270642 SHA512 f47b7a8b08fc90bdf3cba91e4f7343785cdf6e24a0979f4564e9f6885b0f36c03ff5656e2d7ac5fd21895faca7b00e8839ebd66c82122a2c7cab2b40bd44e745 EBUILD xpra-1.0.9.ebuild 3998 BLAKE2B 16d1448be9cd206232283ba7b6b31cb2d626f6066fb1c38830f5ad666ff5bd7f106145fa094aca2948598648437a0f6be5c41550416af6c35fc90e3a54770fbd SHA512 51ce11b02cbbd176f0f8ea6e12c2685a3b1a2af8f7a4af768e3756bbd12e58b7234ce63b365c2edf149f3b8d76cb1f4e1cc61064b93d0134e6b60fd6091c004c EBUILD xpra-2.1.3.ebuild 3931 BLAKE2B e140452157211b386f97ee56e01a410bf332b770d4dd3ab47504a7b61635243aa26ba1bf430123bb57687b37cf09cfd660826d33cbae3c66b5aacbea5e2824f4 SHA512 e77c348d3e1facfdfe68a8f2c1b9a6ac4a1f00496c5748c5a372fddfc8f0c3eb269f42e292ba88786bca66dfd1fa5ac9548c8e0384f800565d909d0436ae30a8 EBUILD xpra-2.2.1.ebuild 4090 BLAKE2B ab05de6287b29e3928fba97f27a6637bf83506d8464859b10c7820278c99c5a5354c30be95c32e164c116e88533bdb1afe192cd5521ffbdc2047f73b9170892d SHA512 17d9f938b7d3958a77dfabc519b696a6706722927ebfbbf39b7bda327539a1b789bb857fb86a7bb3f1890a290daff4ee153fe4167b94fb0d861a65b2198c397c -EBUILD xpra-2.2.2.ebuild 4090 BLAKE2B ab05de6287b29e3928fba97f27a6637bf83506d8464859b10c7820278c99c5a5354c30be95c32e164c116e88533bdb1afe192cd5521ffbdc2047f73b9170892d SHA512 17d9f938b7d3958a77dfabc519b696a6706722927ebfbbf39b7bda327539a1b789bb857fb86a7bb3f1890a290daff4ee153fe4167b94fb0d861a65b2198c397c +EBUILD xpra-2.2.2.ebuild 4089 BLAKE2B 629d25362d48f33a23109973182a01e321d0228d68182b1458ad8d76b1f51f78aa364b56dfa95f1bdbdbafb9d3a66d00a46c39d8b8430053383b6ec353e56f6d SHA512 c2dafbbb275b5fba6b4908da7a422c1fbb5155b2b5aa49c0a49dace71c20c5ad112ad57fa7748d219004f11985fbf51d95d3e403f24b3e34e830ba61afdb806b +EBUILD xpra-2.2.6.ebuild 4090 BLAKE2B ab05de6287b29e3928fba97f27a6637bf83506d8464859b10c7820278c99c5a5354c30be95c32e164c116e88533bdb1afe192cd5521ffbdc2047f73b9170892d SHA512 17d9f938b7d3958a77dfabc519b696a6706722927ebfbbf39b7bda327539a1b789bb857fb86a7bb3f1890a290daff4ee153fe4167b94fb0d861a65b2198c397c MISC metadata.xml 1087 BLAKE2B d8378019afa40ddee2d56f31ac3482374a018dbd2294a9163b2e85adbdb65b46d49872948cfc95915d0f1b986266be9c088ba5daf85ae74b9bb76275f3175b10 SHA512 8bf4ba96000fdf8b0c66d655194d4e5bf2f41f3e06754a7411cf5dc9c130d80519419cad73fff69418d01ae59db07b15aa96acd4ec4581958c22572abec6031c diff --git a/x11-wm/xpra/xpra-2.2.2.ebuild b/x11-wm/xpra/xpra-2.2.2.ebuild index 5dcafddd7a59..4bcf9b0bee95 100644 --- a/x11-wm/xpra/xpra-2.2.2.ebuild +++ b/x11-wm/xpra/xpra-2.2.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz" LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux" IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp" REQUIRED_USE="${PYTHON_REQUIRED_USE} diff --git a/x11-wm/xpra/xpra-2.2.6.ebuild b/x11-wm/xpra/xpra-2.2.6.ebuild new file mode 100644 index 000000000000..5dcafddd7a59 --- /dev/null +++ b/x11-wm/xpra/xpra-2.2.6.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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=( python2_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 ~amd64-linux ~x86-linux" +IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg libav +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: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 + x11-libs/libxkbfile + csc? ( + !libav? ( >=media-video/ffmpeg-1.2.2:0= ) + libav? ( media-video/libav:0= ) + ) + dec_avcodec2? ( + !libav? ( >=media-video/ffmpeg-2:0= ) + libav? ( media-video/libav:0= ) + ) + enc_ffmpeg? ( + !libav? ( >=media-video/ffmpeg-3.2.2:0= ) + libav? ( media-video/libav:0= ) + ) + enc_x264? ( media-libs/x264 + !libav? ( >=media-video/ffmpeg-1.0.4:0= ) + libav? ( media-video/libav:0= ) + ) + enc_x265? ( media-libs/x265 + !libav? ( >=media-video/ffmpeg-2:0= ) + libav? ( media-video/libav:0= ) ) + jpeg? ( media-libs/libjpeg-turbo ) + opengl? ( dev-python/pygtkglext ) + 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 virtual/ffmpeg ) + webp? ( media-libs/libwebp )" + +RDEPEND="${COMMON_DEPEND} + dev-python/ipython[${PYTHON_USEDEP}] + dev-python/netifaces[${PYTHON_USEDEP}] + dev-python/rencode[${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}] ) + ) + pillow? ( dev-python/pillow[${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}]" + +PATCHES=( "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch + "${FILESDIR}"/${PN}-2.0-suid-warning.patch ) + +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,socket}_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 + $(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) + --with-gtk2 + --without-gtk3 + --without-html5 + $(use_with jpeg) + --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" +} -- cgit v1.2.3