3 files changed, 117 insertions, 5 deletions
diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index 359d63ea0d3f..74e1b775aa54 100644
--- a/x11-wm/xpra/ChangeLog
+++ b/x11-wm/xpra/ChangeLog
@@ -1,6 +1,11 @@
 # 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.102 2014/04/28 13:17:11 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.103 2014/05/08 09:51:54 xmw Exp $
+
+*xpra-0.12.5 (08 May 2014)
+
+  08 May 2014; Michael Weber <xmw@gentoo.org> +xpra-0.12.5.ebuild:
+  Version bump
 
 *xpra-0.12.4 (28 Apr 2014)
 
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 25b855f8c80e..e3feb5e50b69 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -13,20 +13,22 @@ DIST xpra-0.10.12.tar.bz2 673416 SHA256 3ccd3a400b48492f0548ba36e909ec5ce025ef88
 DIST xpra-0.11.6.tar.xz 928652 SHA256 8e67681bd6313049e2b452734459d65b16e8c08c6273abfccade91d868ce0aea SHA512 4d276d99bdb1c3f9c95e44720552e401d251511f6d90f7cc86cc655b0fd841b7a3fbc919dd091f67e50e2530abb5943c7af9b36477347b013efe58d55b87da30 WHIRLPOOL 5f44b2e850bf0a6d8ae4a25284d7b2adba3e0c50b1211e248472b1fa715ec907cf7e16724a2c89f7bed0e29cb7fd85e219d7aaf0e0b0a6b7daa160a6a1ab570a
 DIST xpra-0.12.3.tar.xz 981784 SHA256 0650de45fce3faec8b512a94350453916b56f52f7c47d36e4754a2d745fc6cdc SHA512 88447277468ca22af7adac3d7a847c4c032819f370e7ed6d4f6d58098cd2d42a40635cf15713735008356a5368ad0c02f423c44ef2781fd45102f4c821cbf714 WHIRLPOOL 54319666d2c0deeb1616dc7ea276f9d313760a14e90a6cc1b7d3dd33a8841f2504ee42770fde6359fe41cab396667b0a710892766e3a5e68bc825889cf82a2e9
 DIST xpra-0.12.4.tar.xz 982216 SHA256 3d0dbd518e6f451d2ced6189802c56fe925796fc21e3b69ce9c18188fda0e828 SHA512 09f52a30a91f7f14b5264b0ff150de9c1987a704038e7d6b5cb442dd31c7bb2e7ebe47ac23fa73a835493ef0e7d174ef361b4ba0b817b52b4becfceed35840dc WHIRLPOOL 8efa535844d56f72ab46da3a1ed667e3e074d9dbdb503cbd10fbd2ad6f33b5cf41a363422a04e48f8e82c4f482d81be947e01ccf62d2b36d59defb337b6984f1
+DIST xpra-0.12.5.tar.xz 982416 SHA256 02d3682fa7a4368a8082d877ccc65a308e3926b5af9fab44e809643434a4dc8b SHA512 47ccccf227397ea6c2d2b528a55ce74926eab8aea416d0ed815a2a810f27ea4cd5bff13c29782ef2d5f81204e6460d3ca79e9c0d9a44b74062c1be231d2e4470 WHIRLPOOL ea8cd05b401e160a39e38fcbb7baf18fb37b7b46e94401f1043f04f8f7b416aa6e2ecda9cbb34363f264d6012437a2e3e1ab2d411980029e85f91fce76e52744
 DIST xpra-0.8.8.tar.bz2 581029 SHA256 248bac50c78eccfbc7f728667f9d0ef26b101b288193fa286881cda452e63683 SHA512 b3d2121c13e293cca466997af1b49069ced0012c6692cfac375e9990d62efc916b44f2641a4e9c5e04e425d19c14e85e1521ae1832aa3ea02fcc46ac29672a63 WHIRLPOOL b1f654542e8e89ce89ffb6fac9ee3a42f0c88e6d9ce0fdc1573b28c0b117e970f7e96484eadf7552c35e6dd3064f37495a4eb2cdb1c51c2dc0a8ded8877ba321
 DIST xpra-0.9.8.tar.bz2 607316 SHA256 6c33f2da404209158a4684d26365bac56c77d3f158b95710a482e3a813178884 SHA512 324eeb09a2f948ded76a6cb53180ee68dedbce1c9f11736475e43551f9f27cb09949f1f8c1cdc1f5eb5000070a73e58593fac74d7ca3e24d2ddbc69bdf57d70e WHIRLPOOL 77dc3f3e27e1914d4691eb08247d1025a42d438167db178e59a3befdab44c8c02618f46968f5805af886aafb0129c1461a4843cd753f79d10e4bd9c4a07eeb9a
 EBUILD xpra-0.10.12-r1.ebuild 2932 SHA256 9adbe404b06371353e6611ca8bee87fbe68353ce4b7701e29bd3c0f80d9989cb SHA512 1cc22d2b91931bc82a1e385fdbec278bab85ef902ab624db44b093abf0951df61630fce67f8229d4ce81495cf2c641174c6c6ed01a2c952d674dcfc54966c411 WHIRLPOOL ef94e75641f4a9c25ca50bdcabbcbda98d4abed979d7b05278db886a47528fcb3c15fb704f22564b527aa7059c7d75c52f16dae39316b0667b6a598735b30235
 EBUILD xpra-0.11.6.ebuild 2880 SHA256 5941f8bb11c713fad30a3c4c4f5dedda367b0180b579ed3109b3a9479a304fb3 SHA512 e90e2c030ce66112d2d5b8aa9979947a0b13c37d22345e52f8b4469b672d3aec521aa35f2b8f5a50cb33612990357be37fee94bd73290fa71e60ddef2d4a9aa9 WHIRLPOOL 1929f5491935b4519071fdeee069fe6c5a7c036649f57a1374731c8794d8150230994b394b1db744ae917df0e92b6050f09201b08f60a093e7be47cd446c4114
 EBUILD xpra-0.12.3.ebuild 2880 SHA256 7b6cbef5bb038d71381c812d1f642e7ee021d56de695541e1b3f8627d1319509 SHA512 04d3324a77a35ccde940511ea2d85fb05a59eed5a9f3df8729a2a2a88685ed7952efd34ccefcebebee1ac9a91a70d55855b619ef6366cf8a78f980d8dcc5146b WHIRLPOOL 6070f1c2df8c219f771c04cef791c097d159ac36a840cdddeec08bb024bfe5b6d077ebe9ea55f7cb0554086717973f867e03730d4fa6cd728d7c74a7dab3b4fd
 EBUILD xpra-0.12.4.ebuild 2878 SHA256 6e227a00b62720b20317f1c1949595dc420324a863039ed0c32ad01979122d73 SHA512 7d14fcb0d635e0e42bb325b3170c9b22ae319da34c8481306e3204d8d420d3195f7ecf0355ae11bf88e56a62b507b630e447a4358378b2faa3dc5c0625bcd242 WHIRLPOOL c806d60faaa08235407f7445128523f029b67ee49d5e0c6de2b8ee1981f76a451b7da9d3e75e8c9c8d8a12c20cae46e3c2aeb5e411792a8fb50f13a559d39a1d
+EBUILD xpra-0.12.5.ebuild 2878 SHA256 b1494d2daacf00b8e1d7065778443061da168075ea9675637b2fe55bd3a249a2 SHA512 c907d712795aa29d483e280069be91c612c6f7b5c520d6f25486a9f6386f96e352d07b05fe24252ac125060ad5e18d33f14220efe71e4afb5fdff0114427eab5 WHIRLPOOL 713f0c28ddc0231e8bc9032dd1772ea66dbfaeeec4c142806b6750cec6ab1695cab537161153057af7dd9d89619070a1386776e229f15520f5e07287bc2c39f7
 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 14853 SHA256 19267a1c75facb2e71ed89e3169d9b391ed71004b400d7fdf29b7feded259820 SHA512 5417f51c0b1fc61ec502dbbfca5445397936062d48f33194ebef52b34feba48246d1902af5f4905209a28b02395d73632e8386f4c26dd3a6b888835106ec2463 WHIRLPOOL fba1c8cb844e906e0ebfee65f30fe53b615bebcb625e33b58e09fd7651a997205b62b6bfa4330bfdbd04cabd5bc2b61975764544125a7a5a231ba50794e93759
+MISC ChangeLog 14964 SHA256 3542186a45742822c5f9d2962164c26da00de8f385a6a10eb84196a414220be4 SHA512 627eb455a62ff20672bda071441c207606e1ac633ccf034fbbc1e0b41edc4f2b6fe3c76f89e61ab6a29c76da77cca24a3379fdd8ad70fc47a2a934184239673e WHIRLPOOL b1855c5567cfd77df382411b3d6b87f043afa62d21f2ac9a975f838aa439398f615a8095acf86b3596c3e4ad832d93d2589921ee88b5c7343d74b593742c9a13
 MISC metadata.xml 807 SHA256 f6d1439d6efe3f82dd2d49440d0d44b8d7e01933ea607f46ffb48e43b6a8384c SHA512 38f024193f3101248653f0ecc21f2aff1fc1041a147067ae48e101a4c467da522026dba22e6e4716d1271eef9b064455a007f123d75efad3e0f58604f51ab4c6 WHIRLPOOL 56ea9db2c71b6ff8da6b0dc288ce4e7599cc9b0a38b89fd344e3f0a3f3c27c44e53d993054c99fede4f1541690aae5b2369f67eaa72ac324e9b6624ba5df4685
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlNeVOEACgkQknrdDGLu8JB3PgD/Yd4TCIGTPoz7WXXYD6UefD5l
-gLZaJlpj6P41ngJegZwA/jMRgAu85KvsWyecT1DWpGJOXvXZHm1b407FtoBxTELb
-=cazZ
+iF4EAREIAAYFAlNrU7oACgkQknrdDGLu8JCl3wD7BTEmzx2u1Kkiol43+/m/j8r4
+31SwmFibjiS89JxjacYA/2fd457eIcu6oIzkW0YX7W2+Lzn8VA2NmXDp6+74u2ZK
+=e4sH
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/xpra/xpra-0.12.5.ebuild b/x11-wm/xpra/xpra-0.12.5.ebuild
new file mode 100644
index 000000000000..074108ad85c0
--- /dev/null
+++ b/x11-wm/xpra/xpra-0.12.5.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.12.5.ebuild,v 1.1 2014/05/08 09:51:54 xmw Exp $
+
+EAPI=5
+
+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 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? ( || ( >=media-video/ffmpeg-1.2.2 media-video/libav ) )
+	dec_av? ( || ( >=media-video/ffmpeg-1.2.2 media-video/libav ) )
+	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
+		|| ( >=media-video/ffmpeg-1.0.4:0 media-video/libav ) )"
+
+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.7.1-ignore-gentoo-no-compile.patch \
+		"${FILESDIR}"/${PN}-0.12.0-prefix.patch
+
+	#assuming ffmpeg and libav mutual exclusive installs
+	if has_version "media-video/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 )
+}