Introduce USE=libav to control the preferred implementation. Add subslot op to force rebuilds on ABI change.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 137 insertions, 16 deletions

diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index 4d851ac25296..c8839d9a22ba 100644
--- a/x11-wm/xpra/ChangeLog
+++ b/x11-wm/xpra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/xpra
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.114 2014/12/27 19:32:21 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.115 2015/02/01 23:31:53 mgorny Exp $
+
+*xpra-0.14.12-r1 (01 Feb 2015)
+
+  01 Feb 2015; Michał Górny <mgorny@gentoo.org> +xpra-0.14.12-r1.ebuild:
+  Introduce USE=libav to control the preferred implementation. Add subslot op to
+  force rebuilds on ABI change.
 
   27 Dec 2014; Agostino Sarubbo <ago@gentoo.org> xpra-0.11.6.ebuild:
   Stable for amd64, wrt bug #512864
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 3596653ba323..e07453fa5cd8 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -22,25 +22,28 @@ EBUILD xpra-0.10.12-r1.ebuild 2932 SHA256 9adbe404b06371353e6611ca8bee87fbe68353
 EBUILD xpra-0.11.6.ebuild 2876 SHA256 dc56c1ec49b17731541a39d379a394e08c5a07c315e9fb1b85a0ce0419af2d3e SHA512 3ce480e14ac898e832ac610ec614c476cd3d5657e44ab6987d13dfeb5fd43fad1bb2f8f7c81b6e12d1ed2669bb4606b59093580816c627670d937877775b3343 WHIRLPOOL fdc325fcde586c1de8d4d18b36b5d58ae09d57c7f4ae39f56db314ef2a3e625427cbf05e9aa42b81da290853596bac73fd5ad33ac4fc8cf6bf8aff3965dd952e
 EBUILD xpra-0.12.7.ebuild 2878 SHA256 9eebc19e66696d6216ea711889f45fdb252a9f494395511c2c95ee7e11c53c9b SHA512 8cc0d1424aa481fdd744a51e0094a3c368c57922ea6eca25db60d06fa8c14bcb1a06cd8cff5fc9a164e6244f7e8dc8b4c1f88d52beb5523f3b52e79af894d478 WHIRLPOOL 00dcbad9c83deb2cfdd504eb260fe2a98c0c2598583b299382868d0cf2bbe5831bef3d2f8ea5f2500c845f52ec226114e879ac9005bba95e5e508e61902462f4
 EBUILD xpra-0.13.9.ebuild 2981 SHA256 e667115e4b10917997f5fc6297e8035963f23b464dce794bb6fb749d55bacd42 SHA512 177b8df2f2fca4f8fe24546a28c6c8e26abfcf019aa88a949ccdb02ac398b16913150ba65cf352dc5638b7472f1eade3f51ad41ed9eca229848ed03e8e003989 WHIRLPOOL 7d9b923f08f1b64c734652c898e4fe0353e2d9f56e60a6067dd6fd8007780a37c1f4d710247c7dc654501cfceeffe76fa48322ec4679b93614dd163d0802021a
+EBUILD xpra-0.14.12-r1.ebuild 2994 SHA256 c0bcc35eac70c044de5ff0244d2ea9d4b0fb4a7259f670e7342cc3add7637354 SHA512 806a50f78409122d1335e2baf0cb34a6f8b61098ebd5022c3aed441f8f0daa98cd15e22de7c66c4ef26d043d972822934a18a1bcb36d920c596970f97063493c WHIRLPOOL 3b358db4f14a96b4ca2de3291504f59c8f531dd1d705f3b61497bc212f1807828dd4d743619c3f89091e6c825845d2ba452acf8239549ef3a60690d3c8a5908a
 EBUILD xpra-0.14.12.ebuild 2983 SHA256 146242517459c5727112c7395261232d18c71ab8920002b405b541103ad84dc5 SHA512 74be518272baa7d2309c95e1e1e798f0ba1a02e616bd4dc3ecf4643fe48e314c69a0c7f06363d511a4f5df3c992eb44c2536512f7dde5aac80e965a9555a1a7b WHIRLPOOL 7724db2cebc4ef7d0ac83e172be8abe7c8440ca42a44c22cdeca2c04c7c9acf2c5f14bd7e90109ffbd8170a426e9913b729204b39b2448ee8d1af100446d6511
 EBUILD xpra-0.8.8.ebuild 2257 SHA256 c7104143884d38acf3570af333ed58434846c889b4cc0f4810638ef54c24ac29 SHA512 983b7c148c2adf455482243efc9b771fe0154682f842ad0d793e9c0dfc36e2238df08e12581e5ad27140b58c06cd37e8d581dfef41b37ff42a5ecb343f8cfabf WHIRLPOOL 8ab3dcefad02cbb0014d72c49660769431b93d36c30215bc38e0ea4d6b544f9e2538da4b108948ffddc0cfa08660061da58e61a6c0cecb9ed86884ae79019361
 EBUILD xpra-0.9.8.ebuild 2652 SHA256 db0e7dbc949b02906958c820196b8263f69372d28ba7c164ceec66cfd190f76a SHA512 ac9ac8cd1cb17c05f875c19e0d5399aeedfeb3da07a11098dd9de8c56fe91ea219393845c765cb0aea3cb3969be9cd570a74db65c5d49cc765bd56d10e24a400 WHIRLPOOL 8bd6fd335ee9b2d78941cdf61dedc8c540ff7f058cbed53a1e3e338ff89a1fb9b57d6cea01ea0f4fb5552fb49f50f7acc24634f0674d784416e52a6fd9d2936f
-MISC ChangeLog 16523 SHA256 17c56f6ec49418766bff37ded591989182b42f9207351220009f4b6e3f2b8025 SHA512 2e27ec165b0957eaa968327c4c55d460a2fe3bdb1b1391f73532242c15a7aad2935d4f6fb00c7b4b0f5e369aa0864a2753cbae7eb7bc08fd86a73b251732b634 WHIRLPOOL a36e17669fb8780b2658c0ebf22ea6ea9df505ddd988be442ecfc65f871e0be4b5db5350bafb45d6d9eee1f2bf284585998466752593d222c2f378a8ad23b50e
+MISC ChangeLog 16747 SHA256 1a6c0e2a7d3d073cd1d16bf5d8b9ba5419872b2e5a660086f58a6ce2f0847d0f SHA512 95a0f89642c23afaa36973a9079c2873647bd6ac0e5e51aaab388c0bb019ce55072b1d95ee4510966e39c03f18f2dac8319a3c397b7f626c7e2593512c4921db WHIRLPOOL 82743e5e187b1660f811c2bfb1620f243181e4ed04e905e8bf0a2d6ff513376c8b3df12f7a04ab9ef6102cfadfaa76bbdf82e7f7250ccbdb0d13b16e9c1cee53
 MISC metadata.xml 807 SHA256 f6d1439d6efe3f82dd2d49440d0d44b8d7e01933ea607f46ffb48e43b6a8384c SHA512 38f024193f3101248653f0ecc21f2aff1fc1041a147067ae48e101a4c467da522026dba22e6e4716d1271eef9b064455a007f123d75efad3e0f58604f51ab4c6 WHIRLPOOL 56ea9db2c71b6ff8da6b0dc288ce4e7599cc9b0a38b89fd344e3f0a3f3c27c44e53d993054c99fede4f1541690aae5b2369f67eaa72ac324e9b6624ba5df4685
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUnwlGAAoJELp701BxlEWfzpUP/1L/A5/PRdUk6W1KRyB4wwRE
-Q6Zu5Q7nnNYGI7EyAaJeXmNOFkhSomcsOVZu2xwfZR8bkvMrN2qTAHlA433Us10V
-4HkvBelM/Ntda9+cW525b8w18HMp6R1hWX8j29RXpjqCBI1i/W5m5mrpvpMEu0wY
-fd9qMW4FAEpEEc68iQaMpOTMGl9xijCicjpCXCZ8Z0BBRPSZy8oQkm/W2WNLMY8m
-pvy8JjBqG0A07/a/I7e+SIrs76Q/zwwuqwMlQdv1qQe4+Msz+mu6FIDbvgCRj4dG
-B78PuNCTUEjYuTxK/mgxS/EW0kz5FbhrSmNXaCEZevZ0m3L1h6gDAWyfFvd4051h
-jJEVtb5vQsj9vDrugy1bhgBc+1DbOJujRHv8T+OkQyJZJphp+KWn1JGN/dPoBUTi
-XeLR0hF/umZZTRBIPKXSdDj2teo+Admwjb/XceiliWNySmyUSvxHz8qHD5qjBpqF
-hHmw/RfRD22KFV0Tj4bnfdQ+gp/XF75JvBuzdE2YkFqkORIJbHVIjPMDpYR89EZb
-1O18eYuXE/Ma2Jn/2TSlQYy5vK5znGDuavFW7Ij7vhg3ZpZmL8K32Xh9G8iYV0Vx
-st/FWSF13n1/iUacxqg25niuhfV17z4Z8pUpMPMcbMESSF6HNuDMwcMNdXczYEuK
-D7NRLJDuKTLeIXrBWbVN
-=93T7
+iQJ8BAEBCABmBQJUzrdqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOWUUQAInF5iwP7n0WxcBNFoxsOoJQ
+JxNVV1PBtdvInIXnmuLlbnSN6OqjKdTzvRjHhvsech2wpMhhW2Sao1fTi4Rc5VdF
+n9ZNRltmSweYAoM6OAofqWHH56wIcZ4BWt5NNN48WpY9GmaPzXMEx4noVlh3GupM
+2ME6soC5F+GmrWa9pVRfylTWMQ8Ot4rL6SDwWtNvFRD+9PFN6/+GnTkNkFR9BjZz
+DnbjzVj0O1BvYRacjIkh0l0fxcFTmDCrLfNvHY7/V47/AsskbHBMK0ukRM7hi2e8
+MUwxUfj/2bVGOwkhFYupYcJBkf+oKv9PYiGJbAtKiCveRP8dxUkZ8dEdYOTSy5xA
+Ck428ePIfGuKUmfE0naYZKvdu3IuA0MOEHKdOBR5AOhSGZfNll6JXf1EySxeL3Im
+kkJbyMGN2N4O/5SjZ7/FKNMz1UZY5JKtWnOxDz5khZlGstdWQWqy9gXDrwOqsGkZ
+wTsNRc7aRtsXj0EX1nvx1bDfpk3p8oyThPj8m8hf3BFKcIJYyS47IodMKIeJgCXj
+/dq3LMuBFABO87yQ8UHRlD2EkqAIdrRZfcndyuneh3FKGLLa0Rrk0kofbo0x/iBQ
+q8UDptpCe7k8GuyO4UgipeW3dz6lU8wlgwJ4nxjAFYhsBCFrKRzCCmBFBEi6zHSO
+948I8YjP6AZmFvdywH+I
+=mLBr
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/xpra/xpra-0.14.12-r1.ebuild b/x11-wm/xpra/xpra-0.14.12-r1.ebuild
new file mode 100644
index 000000000000..bb0a9fe3c5a4
--- /dev/null
+++ b/x11-wm/xpra/xpra-0.14.12-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.14.12-r1.ebuild,v 1.1 2015/02/01 23:31:53 mgorny Exp $
+EAPI=5
+
+# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 copmat
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 eutils
+
+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 dec_av dec_av2 libav opengl pulseaudio +rencode server sound vpx webp x264"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	clipboard? ( || ( server client ) )
+	opengl? ( client )
+	|| ( client server )"
+
+# x264/old-libav.path situation see bug 459218
+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
+	csc? (
+		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	dec_av? (
+		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	opengl? ( dev-python/pygtkglext )
+	pulseaudio? ( media-sound/pulseaudio )
+	sound? ( media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10
+		dev-python/gst-python:0.10 )
+	vpx? ( media-libs/libvpx virtual/ffmpeg )
+	webp? ( media-libs/libwebp )
+	x264? ( media-libs/x264
+		!libav? ( >=media-video/ffmpeg-1.0.4:0= )
+		libav? ( media-video/libav:0= )
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	virtual/python-imaging[${PYTHON_USEDEP}]
+	virtual/ssh
+	x11-apps/setxkbmap
+	x11-apps/xmodmap
+	server? ( x11-base/xorg-server[-minimal,xvfb]
+		x11-drivers/xf86-input-void
+		x11-drivers/xf86-video-dummy
+	)"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
+		"${FILESDIR}"/${PN}-0.14.0-prefix.patch
+
+	if use libav ; then
+		if ! has_version ">=media-video/libav-9" ; then
+			epatch patches/old-libav.patch
+		fi
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=(
+		$(use_with client)
+		$(use_with clipboard)
+		$(use_with csc csc_swscale)
+		$(use_with dec_av dec_avcodec)
+		$(use_with dec_av2 dec_avcodec2)
+		$(use_with opengl)
+		$(use_with rencode)
+		$(use_with server cymaths)
+		$(use_with server shadow)
+		$(use_with server)
+		$(use_with sound)
+		$(use_with vpx)
+		$(use_with webp)
+		$(use_with x264 enc_x264)
+		--with-Xdummy
+		--with-argb
+		--with-cyxor
+		--with-gtk2
+		--without-gtk3
+		--without-qt4
+		--with-strict
+		--with-warn
+		--with-x11
+		--without-PIC
+		--without-debug )
+}