4 files changed, 119 insertions, 7 deletions
diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index 867f56b9199c..37973e377a12 100644
--- a/x11-wm/xpra/ChangeLog
+++ b/x11-wm/xpra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/xpra
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.87 2013/10/22 18:50:06 xmw Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.88 2014/01/14 15:46:45 xmw Exp $
+
+*xpra-0.10.12 (14 Jan 2014)
+
+  14 Jan 2014; Michael Weber <xmw@gentoo.org> +xpra-0.10.12.ebuild,
+  metadata.xml:
+  Version bump
 
 *xpra-0.10.7 (22 Oct 2013)
 
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index d83e9115f563..01e13578ce00 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -7,22 +7,24 @@ AUX xpra-0.7.4-prefix.patch 478 SHA256 3a3e1914a82c71050891a31aad14360666c73bbc6
 AUX xpra-0.8.0-prefix.patch 463 SHA256 5c05c47154751e68ea91a3988d17baa06a027370bddaf857f269cc2a0cabde77 SHA512 a18b61923f2ffc34a1a17de20705bee587804e3ed597c6092495f513e061255b0c412873b3c01a849c1fc19ca82a2b4aa95dc9add4e971a9e922074f6abcf0a2 WHIRLPOOL 64471baa063b0a1355b7c110be5f9febe9beaa8416377c98f418e2cf0ad14ecaf37267d3bf1175b0197ee38ecd15dec1da7953415d9818bc2d86fee99334ea56
 AUX xpra-0.9.5-PIL.patch 4196 SHA256 8e3e9a52a3f2b4721b8980768fbac47c13493631fa6245bba873837f2e23969c SHA512 a247b14526d59e9b10c2ce27545e71f149dec9bc45c50b50840e7ddc524aaca0e25b6e322e55a90992626c2fc1eaf161d70f69a491f62afbee3372212ce70b34 WHIRLPOOL ab14c618adb6b1de786f9cc8d794d8074466bbc77065b65a75281dfb4058a22e948851dfd3587847511bebf412e05780183f68b154545974d9c4bde0606901c3
 AUX xpra-0.9.5-opengl-auto.patch 2168 SHA256 69c20c7557af0b4ab532ae505307ef2c28965e66df03a5f9ce91b9015b707a05 SHA512 72f3d5919802d90bec63f9ab927c19a896b5e17d322832bf130b1b8202452e796b93c653cc0c7293a8e1c535e28738cc0d1b21891d5c788f222e4e79265bf910 WHIRLPOOL ef90c6ca9188e8a647987a685d8aecce895bc36addc90240536929fc9bbf22332fbccb14a4a5309e389eab5b2924009c397973d9d09101d8854e19ebec435e8f
+DIST xpra-0.10.12.tar.bz2 673416 SHA256 3ccd3a400b48492f0548ba36e909ec5ce025ef88a3ca440aeafd1a73cfbe76b6 SHA512 2cd7c1eab7a0756c1700f71265859908365c463fa3dc2107de12a65674c515d7fdbdb62045c65ff27695939daad4c3da192829ac80d56f997d93d2c9a68ae2c9 WHIRLPOOL 30060b2eb62306262bcb23e3984e7e8bdd81a433306f042b09164255b3e0759339499c29a76ed01ec56f4af9533708372f4653cc4b497b1212b7a04b51e4dad6
 DIST xpra-0.10.4.tar.bz2 679676 SHA256 dfbe357938790e68a54aee1d7e84e4c82394a9e2e5d9d5b88acbf70b6eac7bed SHA512 f567571cb7d8c73a1bd7a0ebfb3c2b779fe0b6551bb61651ecc736453fce8c2ff76111e8a01d1c01e5ec7293c2be53d3fc1c2c360514e5cfcdcb9871cbe56024 WHIRLPOOL aac715c1c1365de47fd8414fd3d68d42b91469f50e99837a96afc0cd87a056b9c93ca1f6844286e46d1d705bdbe8639bf29bc6d6cc3e873fad9c89dd07fc19d7
 DIST xpra-0.10.7.tar.bz2 679975 SHA256 dcf2da3548f88ea42da0327c10476f2da664aed5ac2f50c27495b26b0d4edc1c SHA512 9ec6df6069b7b286b7c44af2046d7d517aebaceb911f85e3bf16b843fc577ed7d669b53e8fc7c2d978ffb9bce549a1e6f3235f0140b4f48ad45c54fbc325f784 WHIRLPOOL f15cbe1f96a04f188b51f08d489d1d3341f1d995fae6ad193cad23ce9715644204e5512e43521a21b2378568cbabb180c7ec69b5c57b4df3fda497f28804034a
 DIST xpra-0.7.8.tar.bz2 471147 SHA256 27f5d0bc2a369a93076ef90fad46a6354e0327033b9139b659d602e9e32c17cb SHA512 d14fdd75c7fd494f4aaae8740ce1a5a7880ae70109ffa7989d346d1b5add56a8117a5851132140f2e8a3aad0f7f3f4a9fe6e2b2f3e9666e469f35fc179fd0af2 WHIRLPOOL c0ed83f90ade9b3a7b0ab728ab090d73277fecb56edc4943295fa19f211b3e41c12dcad6eec9b01932c0a2bb1a6402f8f88deaf25c7f88be01fcf986778c4fd0
 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.ebuild 2837 SHA256 9d0402fbed915122fc18f209fec78c935c97f18e27104a995fc7592876e4ab7a SHA512 4e211222181cfbf4184be7ff2d96adbfeaa62484cfe7eb4fcee884639c2b9a03d176a9863d1cdc5b9b8b5dc26f53edb333d1f9bebc132ff112b90c14d872a80e WHIRLPOOL 8f2c019d254acdd12341fdef1fb3064228c79b8f538565e4238a1f140314228497d1579a0a2f19ae6d0082eb342e91791f1529d88115251dc87e3a31a87f7479
 EBUILD xpra-0.10.4.ebuild 2831 SHA256 e958ee76ec8227702bfc9c5c409471302fe7e4417952ab09e82bd1bb107d91da SHA512 170c1e47a01790b9cc697210dc27e5210a8cf30eb92073e8f62cf239d9c5abb8599a6227e0653e0c553ae25c2aabaf835741d61e01f03d7a58e629ae240917ad WHIRLPOOL 486deaadec49b93d9ef3370ae3e4aafe87eec0a17a73829c657593dd7ded97120c996e893bde6ee5c0eadfc88dd0a5de5813ee563f1fd16f2d836b58c1e607aa
 EBUILD xpra-0.10.7.ebuild 2831 SHA256 c37864bad9160f70857488af0be9af0c4c3ed0326208c7873634463317aed78c SHA512 dd1c59aaef144275ec8d04ff1c385c4acd59a7bc3a0458a0995d58d2840c593fcfbb8d5f7e2cf9cbd571eb27fbefb813f92d5bf2a08d0cb08ffc60108306e80e WHIRLPOOL efed40a44c9082ca92627f0795887cb90ebc1e0608c54b4d2d524461466b207517530d3d87d9880e3ee828e559d70e9b478fcb58f37adf6744e6b12f5a70b1f8
 EBUILD xpra-0.7.8.ebuild 2520 SHA256 be7b5830ac406d6021ae56feee6549bf1e78f3623109c55d95b55b284bd2fbf3 SHA512 9a94a50c0e4f111e333b4545dbcbfd7b54e24e132e40bf57ab9aab881ea2e45127df71f84341fa5eed8e0aef1a6395861759881e537c97586ff9783c664f9838 WHIRLPOOL 1d00d061266bbd8935d37403a470a863af628127fe23b96ab258ab5595c0e9ad28bc7d7f3f011583b211c3758e320ce6c3c9f2f81e3a7424a753620f841769f5
 EBUILD xpra-0.8.8.ebuild 2257 SHA256 c7104143884d38acf3570af333ed58434846c889b4cc0f4810638ef54c24ac29 SHA512 983b7c148c2adf455482243efc9b771fe0154682f842ad0d793e9c0dfc36e2238df08e12581e5ad27140b58c06cd37e8d581dfef41b37ff42a5ecb343f8cfabf WHIRLPOOL 8ab3dcefad02cbb0014d72c49660769431b93d36c30215bc38e0ea4d6b544f9e2538da4b108948ffddc0cfa08660061da58e61a6c0cecb9ed86884ae79019361
 EBUILD xpra-0.9.8.ebuild 2646 SHA256 d56daad0cdd0ca7a07c98058e95e4a3f447e3866f9af6346782f7062285d6180 SHA512 b768650888ccbf9cbf2f6a2f5bb6e1bcab350d0111e33b178cca75fe80a0bd264ff1abbc1767d573ea0cc93edff6929a2db656360183a15d0618266c379dac49 WHIRLPOOL a57eb703e69b601e4e00506c9fb5cec605879dfa93c8b2b5d91c12f5c1f4dc6ae3b943e3551b44e92d178b264187748c38c09bd0cc8e3baa5010026011eac4e7
-MISC ChangeLog 12454 SHA256 4a0c354e699e7d6bb4f03605688ad53e498b1e34e5139ecccec54e37f5b37b8f SHA512 1acd9400c1903c491b3a17c8e3461a2a6f6d47d5141b2c907523889b97f4b2bad06e02ac8200b84534827aedc428d1bf8e741533f91a8071d009814d2ba4b847 WHIRLPOOL 1dc8e3c0ab8fa9e4490238be882f6f15e20e2aa41de50e08ac709a05c0a57fda6e6788cc45df6c826b3e6887c4f7941e8d4dbe3d269d9a196c92b818e1f79331
-MISC metadata.xml 750 SHA256 520a2fa41f7d77740b88be12b182f4eb4bbd38b2e8fcbc7e3b6fee104febe4d6 SHA512 3a8bcebe6a9c51100166601bdbdfab2cd67c455ef1f549ce3014dd2a17109273ba7849bdf70ae2077d48cb957b2f7a27e9d6213017fec6db6a5ef509985d8281 WHIRLPOOL cfd580b41e3eec89c58a7b6da0788b61906f91dd673eccd2b9b0219edbb328780cd6294958fb68f52e0dfffdf52c60d9454dd02dfd996644b9b2e2ca3014edd0
+MISC ChangeLog 12583 SHA256 789c00d88100bf9f7bfd7f8e7996e09010a6a7697b490924aeff2866cd26c273 SHA512 68db6ad9df2703c07b052e3551c002bde7350d4f548a323c68cb8ac20736ae87d1218e89bf52ef9b5820a58454d301617038e368269f8218eac8c7310351e09f WHIRLPOOL 30cef2e9979979133a45d73ceff2347447ad1d26df9608a8c5fef3b9a04816720168a9801835cb751f8ec2a737882daca34dd0dd91cc032bf38e265dedd24d5f
+MISC metadata.xml 807 SHA256 f6d1439d6efe3f82dd2d49440d0d44b8d7e01933ea607f46ffb48e43b6a8384c SHA512 38f024193f3101248653f0ecc21f2aff1fc1041a147067ae48e101a4c467da522026dba22e6e4716d1271eef9b064455a007f123d75efad3e0f58604f51ab4c6 WHIRLPOOL 56ea9db2c71b6ff8da6b0dc288ce4e7599cc9b0a38b89fd344e3f0a3f3c27c44e53d993054c99fede4f1541690aae5b2369f67eaa72ac324e9b6624ba5df4685
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlJmyOQACgkQknrdDGLu8JCeKQD+IRqyEjq3vgUCXpj4pdGpQCIE
-ge28HBjrmtXOeAWF1sEA/iTIVsydy5yh9onB/hgYBRddHUCHUduvtP8YlFqAFiwM
-=k5z7
+iF4EAREIAAYFAlLVXBkACgkQknrdDGLu8JBX7QEAlg90sfUTZ0zMvISbB7pwhd1S
+n0oMmmybsDJvhPvzMXwBAIcIijaD+G5ttPHhWN2Fp93EdlZEdjr0MJpaRwsnSoA4
+=5HTw
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index ea5be32cab12..601118510cb5 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -17,5 +17,6 @@
 	<flag name='webp'>Enable webp image format support</flag>
 	<flag name='csc'>Enable csc softscaler support</flag>
 	<flag name='dec_av'>Enable dec_avcodec support</flag>
+	<flag name='dec_av2'>Enable dec_avcodec2 support</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-wm/xpra/xpra-0.10.12.ebuild b/x11-wm/xpra/xpra-0.10.12.ebuild
new file mode 100644
index 000000000000..e35ffd257c80
--- /dev/null
+++ b/x11-wm/xpra/xpra-0.10.12.ebuild
@@ -0,0 +1,103 @@
+# 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.10.12.ebuild,v 1.1 2014/01/14 15:46:45 xmw Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_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.bz2"
+
+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
+		media-libs/gst-plugins-base
+		dev-python/gst-python )
+	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.10.1-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
+}
+
+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 )
+}