Version bump

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

4 files changed, 146 insertions, 5 deletions

diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index ef8f3ab2bcea..041e7c12d694 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.95 2014/03/20 22:55:56 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.96 2014/03/27 00:16:53 xmw Exp $
+
+*xpra-0.12.0 (27 Mar 2014)
+
+  27 Mar 2014; Michael Weber <xmw@gentoo.org> +files/xpra-0.12.0-prefix.patch,
+  +xpra-0.12.0.ebuild:
+  Version bump
 
 *xpra-0.11.6 (20 Mar 2014)
 
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 80ac7019975e..a295be3fbbd9 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX xpra-0.10.1-prefix.patch 1166 SHA256 e2911ac5672e5823ee4a7ce94d9de62f9cf62d6528f91faebe61597416d8ff89 SHA512 923758dcda91f9f1ce9697fbd06cc10029aedd5a630f12ec211633847b4311c61c428e512eff9000bf6263343c49ee5eaed65b486db21595f05d5ddaa8fd90ce WHIRLPOOL 3f30ae5bdebded222e4f0a499a00fd1988aef0d5a1ae6930876632588b567a334d2e70c811a6feb1ecada8d8745e3a2904010590ef130c3fb9e6a2520cd00cb0
 AUX xpra-0.10.12-launcher.patch 249 SHA256 4e36d4dee91069a952fa155a803103876ccffcda41881bfe3041402707e13306 SHA512 70cf3469ee3e11fd9dd01cfbc235f90c0b420e8ce97c1fc43be4bf0ecdfae228843d25df224d51b50165a2f4ca9bf0aaacf6b813a1f5bbfd81c25ff797fdd65b WHIRLPOOL b17cde21d22f56c7a292fe79a3f997dd3aa67b265c1a2ee13d8b841f4caa9847140d65eed33141873e4cfe910d3a6c12e7f1e27ef6a47e4b12a0cefb2c6237ed
+AUX xpra-0.12.0-prefix.patch 995 SHA256 962f39cd5d55eea296f2c94fabf37d99178daea44a897b12ecb30f1a3e453cba SHA512 facc6a0410bd9f2502c02f2992bb4212c4d67f197fa3dc9f91e8b6a3d7683a0c9f47c51b8fe9771b6e2a72430bce0eea79cfab38507a93050009608fc807f677 WHIRLPOOL 03bf0d37d9fd247e6ff7d64e0e912da39a23b753ce3c468f4e2d3b7ec905d39afd8fe0aeab9d7b53427b100027e3a97842beadcc70c929a61c9a31db6d2cad82
 AUX xpra-0.7.1-ignore-gentoo-no-compile.patch 482 SHA256 32c4a3819b0035ecdeeab72a15b183a894226c300bc5159a419251440f070195 SHA512 e22bfbcf6402e179d86fa4128b96d47e2ad4373ea2aa22a877ca3a3573ed56fbbf20ce66c2e94713a1d2d7b53dfa3339fd2f481f57e14770e09e1c0435bbc693 WHIRLPOOL 152c1c9ff623afd1d29dd7678f5ba44524e60b1cdbafd7f5779f1f8e53ea33015afa2476926aa91ef587131e0b1a6504cf9ffa149c3b72fd2fa62e7838152201
 AUX xpra-0.7.4-prefix.patch 478 SHA256 3a3e1914a82c71050891a31aad14360666c73bbc620a5d2da5d24391064bbca4 SHA512 b738ef53d05e2daf101eb2ea68f754db88f16c68e23177bcd87e96a2ce3336c40526bc1bafb25917c349484ac6bb92ff228b686fc6fff4fc281b0b5797b479e4 WHIRLPOOL ffae9d84515ba6784921ae1983c95520384f7dad7795ca1bbdbb4c8f99459633bd6f49b9c4babb2ce5ca7bde553ffb3ee7c64e559867cdb1a8b1e739d3fc5a09
 AUX xpra-0.8.0-prefix.patch 463 SHA256 5c05c47154751e68ea91a3988d17baa06a027370bddaf857f269cc2a0cabde77 SHA512 a18b61923f2ffc34a1a17de20705bee587804e3ed597c6092495f513e061255b0c412873b3c01a849c1fc19ca82a2b4aa95dc9add4e971a9e922074f6abcf0a2 WHIRLPOOL 64471baa063b0a1355b7c110be5f9febe9beaa8416377c98f418e2cf0ad14ecaf37267d3bf1175b0197ee38ecd15dec1da7953415d9818bc2d86fee99334ea56
@@ -11,19 +12,21 @@ AUX xpra-0.9.5-opengl-auto.patch 2168 SHA256 69c20c7557af0b4ab532ae505307ef2c289
 DIST xpra-0.10.12.tar.bz2 673416 SHA256 3ccd3a400b48492f0548ba36e909ec5ce025ef88a3ca440aeafd1a73cfbe76b6 SHA512 2cd7c1eab7a0756c1700f71265859908365c463fa3dc2107de12a65674c515d7fdbdb62045c65ff27695939daad4c3da192829ac80d56f997d93d2c9a68ae2c9 WHIRLPOOL 30060b2eb62306262bcb23e3984e7e8bdd81a433306f042b09164255b3e0759339499c29a76ed01ec56f4af9533708372f4653cc4b497b1212b7a04b51e4dad6
 DIST xpra-0.11.4.tar.xz 928208 SHA256 d9ecf1faa67bfcbb5406481f77bda8dd1c6db755eeb1ebbb5ed45a7abf0de71b SHA512 982a36f909b630f442476e7a4c92d986c217e971d010bda25779b04fc75e75ca8c1f3c4802592fca34944ba70c29b28db46b5b0a2f6bb0484d28c2d11ecfd38d WHIRLPOOL ca076975e3c209db877e87ea448fec5d9c695c70ca9fe218c5c29a36de0be7e2b6fab9fcff487dd1f0b196ea9b498f1f804859d342107f92d8b83b973d328bf1
 DIST xpra-0.11.6.tar.xz 928652 SHA256 8e67681bd6313049e2b452734459d65b16e8c08c6273abfccade91d868ce0aea SHA512 4d276d99bdb1c3f9c95e44720552e401d251511f6d90f7cc86cc655b0fd841b7a3fbc919dd091f67e50e2530abb5943c7af9b36477347b013efe58d55b87da30 WHIRLPOOL 5f44b2e850bf0a6d8ae4a25284d7b2adba3e0c50b1211e248472b1fa715ec907cf7e16724a2c89f7bed0e29cb7fd85e219d7aaf0e0b0a6b7daa160a6a1ab570a
+DIST xpra-0.12.0.tar.xz 993808 SHA256 90ac0972602704396f06e40543245f5436e54e1ea4a8f65e70dbcfb2a4253db9 SHA512 71093ce85ba85b0fed33bae73bc6ff532f6cd8c5a5c8d94f0e8d4cf2b61a2aed71d21f6c1e639b56c5616762322550f2f1d87c2ca7f88dbc8396a24a0c09b9e1 WHIRLPOOL c36fe5bd7d3c437cfb6aab82d89b9569826b175f80761f9bcdef74d14103253349177ce6004c43c5b5c7ed471910b8383a2921c5713b7dde7b575f3dd2043fa7
 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 2921 SHA256 01bb1ce9f0a70ef66e51c38f47f86d6afd5b2efd80cb2e9285b6d644a3794008 SHA512 32bd629be054795550707d7b5bb348f27a94af2e4c86c4265da3f98749657bf3e662b76f576aeb98fcd52d79ccced745f628c07993b4a69816ab4d53d09d963c WHIRLPOOL e13d39cef4b634de56d6adcaf5ba813ac1649d62ccc56e9716c010aea53ed0fd987bbde0c386ae1478ae71c6850152d18075c43639285a1efae9f724eb16d48c
 EBUILD xpra-0.11.4.ebuild 2869 SHA256 dece98efb31ca34dfa5b6c2f1ae2711187df98b7b12d99a2b018ca84de5bba13 SHA512 740ed38d5623bf3773e6ce50ccaa190d3447dbfcb3e50e1f965927bd17bd382c71edd1cec1a47f35d599a17e84c84e857e3f292858af2e66adaffc64a2aea406 WHIRLPOOL cef1f0d4cf66938e2835c7e8fa2f8634746a0f4d5ceac0741ea40e494726fd3ec1374624acd36df32f40439c12f413530fb8567d6f2ced0b8a27fac1783f237a
 EBUILD xpra-0.11.6.ebuild 2869 SHA256 2b0908c6d71136a3e54c4ae7a3c7fa71bd96a34c8b99b0dd463cbfd7249b5ae0 SHA512 a80a3217f3c150460eff0c07217e89d8e4f3a4811d9df285be68c35983272eb3dbe5b7ef31b955bd6238afd78f243c8bf37109c3c338253c02e6387dba0bf327 WHIRLPOOL a0053bfaa087ecbf59312d14acc28b0a0fb1b8ccc9f256205087a2750a29e01f118ba35a516c8e714e5437d685b991d25bea979f2997df180fac911666561d2a
+EBUILD xpra-0.12.0.ebuild 2869 SHA256 9d92afc046a85ff2b137363b62cb3cee1da9c2551943a4cc02552723544dd40f SHA512 ff936b0b057d75f96fb7dc2a889503c2f4709928c2ff002450136281f9d77927298aa72c68cdb3b367ec83877195324e86e2c332dae1e0b13cc9759ff8ad79a1 WHIRLPOOL 099084a5c04657eb9632ab02f67eb130892adcf4b7827671953009bba3aeea75198b44dc70e2f3f993a48f66f146aae6d0672d7c2d3b69aea3a1e7ff11543351
 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 13723 SHA256 91a217a7f1cc28c8aa8d5788e81be71068678b09ddd0f97e2b2cb4d35030bb45 SHA512 c04aead57750ea91a95e9d614c6c5f03fd840905725d1520ed777942a4978f1d02d7404fa37b22f212ded54e6e3697e388dc757d9f1e78d80b874752639b99bd WHIRLPOOL b8082ad59ff34db24fdcebb06cf909a823e26776bdee19ca0d8f69601e01a01cd16802773488262ad0656fddda7bba158f51e832ef8e151434240b3b936ee6fc
+MISC ChangeLog 13869 SHA256 3b749867e68a434894507fa884152ff0c8d9dcc44d61ef59970c866e14ce7173 SHA512 d0771572ca5d73922786117280b59f3ebc6667f861a41ac8c2cd061da93e906e867c592909a239bec194215e5bbdd1cdbc4d7063028206a2e565eb99150b8fe3 WHIRLPOOL 3695a96c2f79d7145ff39421488ffe9859f211e5be79ac46294d30c2c5883e6040b3d139d589ac5731e5aa3caba71d6a0258e452485b0d19e267523403eb4523
 MISC metadata.xml 807 SHA256 f6d1439d6efe3f82dd2d49440d0d44b8d7e01933ea607f46ffb48e43b6a8384c SHA512 38f024193f3101248653f0ecc21f2aff1fc1041a147067ae48e101a4c467da522026dba22e6e4716d1271eef9b064455a007f123d75efad3e0f58604f51ab4c6 WHIRLPOOL 56ea9db2c71b6ff8da6b0dc288ce4e7599cc9b0a38b89fd344e3f0a3f3c27c44e53d993054c99fede4f1541690aae5b2369f67eaa72ac324e9b6624ba5df4685
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlMrcgIACgkQknrdDGLu8JA7PQD+PEeEcBwtO7mHNtXUB052aLoG
-oI0/Jp1e/0wX3cTq8JoA/AtXFHhpxfTYrXWPvZTg3UZWjUd1puP432wzN1Qzi2vR
-=SEyr
+iF4EAREIAAYFAlMzbgcACgkQknrdDGLu8JDHOAD/WTXhajmdS4p83OLH2z4HlZxH
+iWD7mQUuFkqdkv17JI8A/i7Tvx5/+pCe3cu3x6kjjBIwO8BzLZea/wxXo/5Du9pf
+=BtCP
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/xpra/files/xpra-0.12.0-prefix.patch b/x11-wm/xpra/files/xpra-0.12.0-prefix.patch
new file mode 100644
index 000000000000..cce5e9dbfac7
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-0.12.0-prefix.patch
@@ -0,0 +1,27 @@
+--- xpra-0.12.0/xpra/scripts/config.py
++++ xpra-0.12.0/xpra/scripts/config.py
+@@ -188,9 +188,9 @@
+         #OSX and win32 use binary installers,
+         #we must look for the default config in the bundled resource location:
+         conf_dir = get_resources_dir()
+-    elif sys.prefix == '/usr':
++    elif sys.prefix[-4:] == '/usr':
+         #default posix config location:
+-        conf_dir = '/etc/xpra'
++        conf_dir = sys.prefix[:-4] + '/etc/xpra'
+     else:
+         #hope the prefix is something like "/usr/local":
+         conf_dir = sys.prefix + '/etc/xpra/'
+--- xpra-0.12.0/setup.py
++++ xpra-0.12.0/setup.py
+@@ -990,8 +990,8 @@
+             return {}
+     if "install" in sys.argv:
+         #prepare default [/usr/local]/etc configuration files:
+-        if sys.prefix == '/usr':
+-            etc_prefix = '/etc/xpra'
++        if sys.prefix[-4:] == '/usr':
++            etc_prefix = sys.prefix[:-4] + '/etc/xpra'
+         else:
+             etc_prefix = sys.prefix + '/etc/xpra'
+ 
diff --git a/x11-wm/xpra/xpra-0.12.0.ebuild b/x11-wm/xpra/xpra-0.12.0.ebuild
new file mode 100644
index 000000000000..2b365fc0d513
--- /dev/null
+++ b/x11-wm/xpra/xpra-0.12.0.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.0.ebuild,v 1.1 2014/03/27 00:16:53 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.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
+		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.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 )
+}