Version bump

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

5 files changed, 155 insertions, 6 deletions

diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index b58b379ea637..f349d454bd8a 100644
--- a/x11-wm/xpra/ChangeLog
+++ b/x11-wm/xpra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/xpra
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.120 2015/06/07 15:51:11 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.121 2015/06/07 17:10:50 xmw Exp $
+
+*xpra-0.15.0 (07 Jun 2015)
+
+  07 Jun 2015; Michael Weber <xmw@gentoo.org> +files/xpra-0.15.0-prefix.patch,
+  +xpra-0.15.0.ebuild, metadata.xml:
+  Version bump
 
 *xpra-0.14.25 (07 Jun 2015)
 
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 8bde0734eb8d..bc532a52660a 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -6,23 +6,26 @@ AUX xpra-0.10.12-launcher.patch 249 SHA256 4e36d4dee91069a952fa155a803103876ccff
 AUX xpra-0.12.0-prefix.patch 995 SHA256 962f39cd5d55eea296f2c94fabf37d99178daea44a897b12ecb30f1a3e453cba SHA512 facc6a0410bd9f2502c02f2992bb4212c4d67f197fa3dc9f91e8b6a3d7683a0c9f47c51b8fe9771b6e2a72430bce0eea79cfab38507a93050009608fc807f677 WHIRLPOOL 03bf0d37d9fd247e6ff7d64e0e912da39a23b753ce3c468f4e2d3b7ec905d39afd8fe0aeab9d7b53427b100027e3a97842beadcc70c929a61c9a31db6d2cad82
 AUX xpra-0.13.1-ignore-gentoo-no-compile.patch 485 SHA256 9cf251f53cc13fc79875928717266a27ee63e61e23331eae4912b21e77242ba5 SHA512 244d6aaa805ef0f99238a0f1ff592efc9fda9d7c3898c0e3ff8a40bfb2d27597737e941b90d1d86c794a50dc61ade8862a4be97ef4938005b0f918565dc7abe9 WHIRLPOOL 101acd539e76d7d036e361c6d1c6af86bacd37c271f01d101efa5fe1fec57c7b2b6106c76a79e6ec6acfab5999837995f17faaf4874b01a906c20050332f3848
 AUX xpra-0.14.0-prefix.patch 945 SHA256 48c5330120c3488e5e348253a9d7042f7c128b9a7b4d5167ae941ea7ef387627 SHA512 03d15bc006b3d808cdb6912c027b095fd0e61ec8a21d861a956bdaedec2efab5dfdab9c6c518cfa5eabe6bbf1917ff25b9dfcbbd1ba02dd5d2adb9f1476c4ea2 WHIRLPOOL 7c60c3c635aa269ef1a21c7982baf8ce89759fa538da1ad92581ace83816d701c91efdc7a274fe5f8e59be2c6246a477ee206cb7188c2f2d5193c6e5c460df50
+AUX xpra-0.15.0-prefix.patch 936 SHA256 5a6abe1542e20925345a0a4cd1346fc98b0094b5a64670442890c6ba0e6e05c6 SHA512 c8ae450d3e07ed6a2c8cccfcae4e6ac489f0399f06f9ad438870f04d51ea30d393dd06e8cc6c55453138f446aa58bde819a7dc66226f352e5bd4c0820032a8e5 WHIRLPOOL dcc50db4a2b082b2be3fe57dcb252eca97b4de996467d2cbbd488e912467cb38d2eb2b7413d234c3e9f7d2bb9960a95c8218a0ada93e52bb504fec525dd4e997
 AUX xpra-0.7.1-ignore-gentoo-no-compile.patch 482 SHA256 32c4a3819b0035ecdeeab72a15b183a894226c300bc5159a419251440f070195 SHA512 e22bfbcf6402e179d86fa4128b96d47e2ad4373ea2aa22a877ca3a3573ed56fbbf20ce66c2e94713a1d2d7b53dfa3339fd2f481f57e14770e09e1c0435bbc693 WHIRLPOOL 152c1c9ff623afd1d29dd7678f5ba44524e60b1cdbafd7f5779f1f8e53ea33015afa2476926aa91ef587131e0b1a6504cf9ffa149c3b72fd2fa62e7838152201
 DIST xpra-0.11.6.tar.xz 928652 SHA256 8e67681bd6313049e2b452734459d65b16e8c08c6273abfccade91d868ce0aea SHA512 4d276d99bdb1c3f9c95e44720552e401d251511f6d90f7cc86cc655b0fd841b7a3fbc919dd091f67e50e2530abb5943c7af9b36477347b013efe58d55b87da30 WHIRLPOOL 5f44b2e850bf0a6d8ae4a25284d7b2adba3e0c50b1211e248472b1fa715ec907cf7e16724a2c89f7bed0e29cb7fd85e219d7aaf0e0b0a6b7daa160a6a1ab570a
 DIST xpra-0.12.7.tar.xz 982888 SHA256 906265da543d4346bfe5c17ea0848368e481c391fbb9583aefb37cafc3db6c32 SHA512 c144df93ba9ef004b8f2966fe7fdaa695342e91b5788e980860b82edd8f624c0dd2df6ad99860fc05e1b586db9223f59d3a04e338aea3bbec111b8abf17f70b1 WHIRLPOOL 139d9ffed14bda69ad3fd2eaf6d99c5d9d769740a5301d25959f192b36ac817cbb57295d03559f5fc7ea82f6613945c9bff19caf4fb63af0aaf910f1e421f172
 DIST xpra-0.13.9.tar.xz 1539976 SHA256 0d9a02c07bb500ad32e9c82d168d1b71d0f77ee070ca18fab0dc6cc2fc970104 SHA512 32d28df224ed6cc0cd4c0e51f58d81ce0a07de4cd09b142b7f09a9d023632e42ba1589f215d57d7e75e8922d0a1c023e0495b07f09aee3899f3cd6ae8de51ca0 WHIRLPOOL a401fa77e3404c6c1d748a02214c060df2078c199de1141c331251d7364028520f3408d99366c063a1fd64f8375037bfcbb89b0bced34477365512acfe69bb7b
 DIST xpra-0.14.18.tar.xz 1138564 SHA256 a1b1fbe1cd19812a0b2c1e3dd7b91b9b01f331117e603bc17b1fbb4f3fc011b0 SHA512 455a78858bc7952bb99263168d872130ef61991977110e5d4e4a6e696482951a9a483b3e13b98d8ba5c0c6ddcb25118b5dd714b09408aacb032ec3b917986813 WHIRLPOOL ce237aac9df4123876ac1ccc70345cdab21419c6748cde8e1414117b0a8ddf9a010e68cf865058ee07cdee20315519d19ba14c50b773e783101847b639b3c9f4
 DIST xpra-0.14.25.tar.xz 1123272 SHA256 a8618a2258bb71f029ac57374ce1dfc37ca15bf222de5f6f4102176cf560f1bb SHA512 fa32b4dca164b06b2228691fb32a62ab874212591aec8298f2096f0172d004cf786b82dc1c6f3c0b2bc841e86f64c548563c9a1a5aaa683c395e244c567d241d WHIRLPOOL 78c4dcdd10c73fb1c2db7ad7d2fb04bcfad224c2cd9f1cbeb84869a1f537f15085d79f61e8f432f9720f6a14887b23e11a734457abd337357c1781eefae2e756
+DIST xpra-0.15.0.tar.xz 1191104 SHA256 bfa12806b245697b799a157f7882d0fa6abcb242a9937c3b0837cc779c0c519c SHA512 bd9cac91babbcb4434576bf6f7f8e9d485b8bdd112d13194ccb061e7782f1e60315a4d829988e769397bf9e69b839bd8a9be23634f176ec6687b299dd4945c50 WHIRLPOOL eeccae6900796f1cb113c782f590f12a3aebd4d13255ad54411e35b4ab48a82e90ab85f66ac87f46a706e4eae53ab4d92822dbb10380111acc8e92112fc17213
 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.18.ebuild 2988 SHA256 d8a855158ce5ebeb1c39eed7c4500648e2a7c4f5ecaf8e0b9353794ea4f6aab3 SHA512 c4508ac44ecf01dfee51c3d891b381d8e843d380d79025607cad43148ffd153b098b6961f56775dd82e6cda11fe71f8a55d34d4c36fab8315f9fb8e18d7a18d3 WHIRLPOOL 7941a7419c15c7f14598b60c9ceba53b28b214e2f88b9f6eea3c66a38e571a14097f263c68141b8161a5a9c6a307c2957a0e5a10145c4fb0772a8fcf6f4f52c7
 EBUILD xpra-0.14.25.ebuild 2988 SHA256 f9338dca4647964ce2c0c78f29f6dbb5dd274a7e7db25f84fbdc7ef408e0cc1b SHA512 e1ec8280421b40b3bd1ed825504233f42add679fec93a7183f6ee41b450f397e550aac01612f9aa78fd38afc225385f42072ba0d6096052a19fba6393af889a1 WHIRLPOOL 7be2bcb283760a5dfd3a33ac4eac3ddcf3c0265e02eeee0ada845741cf0472c35e759f3c5a1fe958b00cd2c3f483741f92d02729cff19111f837c496bf83ec0f
-MISC ChangeLog 17506 SHA256 bb8c0ebfc08719fc7d21fd222cce7c15fa136a34ce7715efea001012b8863666 SHA512 25349101fa7f0e26329e204211ffc2775ccf8a782691c125c815f463874645956539cd3887a5aa204fc7c892717faa4a70b6dbb836cda763d39a747cc748a38c WHIRLPOOL c7946fef82edddaa3baabc5e78f87cb8c513553552745f168bcec3fdd3189abcec802939696a67c71decf2731ad59f993fe763792ef45f007dab9fad8e901fab
-MISC metadata.xml 807 SHA256 f6d1439d6efe3f82dd2d49440d0d44b8d7e01933ea607f46ffb48e43b6a8384c SHA512 38f024193f3101248653f0ecc21f2aff1fc1041a147067ae48e101a4c467da522026dba22e6e4716d1271eef9b064455a007f123d75efad3e0f58604f51ab4c6 WHIRLPOOL 56ea9db2c71b6ff8da6b0dc288ce4e7599cc9b0a38b89fd344e3f0a3f3c27c44e53d993054c99fede4f1541690aae5b2369f67eaa72ac324e9b6624ba5df4685
+EBUILD xpra-0.15.0.ebuild 3007 SHA256 63690094c25771782aa55b2a6a419998a0e55c4614f72fea95592ba1cf04aa20 SHA512 b81e7ebe856e93e3e7d650282d4ba12e500c63c324c6287a332ace488a5523bcd8d8f84de7e17a70fb653c3b5683e67e875ebc51846599404c415951a4187242 WHIRLPOOL 8e2eb434f488d1e81511d93ac380be10ed5b113f5800a8a4ab47dcc8ff63f41200f218c37e88a74dddf1edcd9d9700939904d72d94d7a4411954eadc1db82b75
+MISC ChangeLog 17666 SHA256 41740ec2da3b3adc19869d4231f91df21d5516b61e1bb2741234c571cb3e4d6d SHA512 29ca55537f4444bdff36499fe067921dd2284fa9315b741f0437a98899179f707af1a30d3372b390608d36b12c533c0fd0a5dd51c2afab8d3f6475e47954cd7b WHIRLPOOL a9844d9387683a46b301872beaa03c9db19c6a3c980d35877a9f9e96e2811cb712ee26b8ad8c60c75c54a56627d8892e70c514f50f0ef375572caa62fc19ab5e
+MISC metadata.xml 853 SHA256 c29a9046fff1e889093e621b484997e5f5f3519794740cb4880dd8145303e9ba SHA512 04692e1628751d7ae39e9d1beddeae2f2ace4f0f3e5f18c8a1161392357937886b40f9f4b2836b4a98e6eb7c3ac5bd22e55f7fa2796654afd4916563cd698454 WHIRLPOOL 26f22f086bd1add71159d2491200b896c870cfce22fbf19c26d3e04b249be4d07a9a639baff5962aca69874430e0d4e0e8cd2875a92ce361ba61730ea7155de3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlV0aHAACgkQknrdDGLu8JCp6QD5AVGqsSAwI9GiHl81FrQCaqo1
-kIlFsx8p0YNYJibDpBcA/0DcQNqAgfILn7fBZEgCWKf4tRSO4kS1w6F+wLLUpmPA
-=0dxZ
+iF4EAREIAAYFAlV0exsACgkQknrdDGLu8JACYAD/dWG6NGC1ErwhmYFItPQ/My/R
+xQ6tlQOeXzE4e2v+71cA/R7sb3a0qpR792lPUBhrgBIe4NiD1p0TB1ZEDDBtaRUY
+=BO8s
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/xpra/files/xpra-0.15.0-prefix.patch b/x11-wm/xpra/files/xpra-0.15.0-prefix.patch
new file mode 100644
index 000000000000..32e8be80dd46
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-0.15.0-prefix.patch
@@ -0,0 +1,27 @@
+--- xpra-0.15.0/setup.py
++++ xpra-0.15.0/setup.py
+@@ -1612,8 +1612,8 @@
+         #prepare default [/usr/local]/etc configuration files:
+         if '--user' in sys.argv:
+             etc_prefix = 'etc/xpra'
+-        elif sys.prefix == '/usr':
+-            etc_prefix = '/etc/xpra'
++        elif sys.prefix[-4:] == '/usr':
++            etc_prefix = sys.prefix[:-4] + '/etc/xpra'
+         else:
+             etc_prefix = sys.prefix + '/etc/xpra'
+ 
+--- xpra-0.15.0/xpra/platform/paths.py
++++ xpra-0.15.0/xpra/platform/paths.py
+@@ -30,9 +30,9 @@
+         return env_conf_dir
+     prefix = get_install_prefix()
+     #the system wide configuration directory
+-    if prefix == '/usr':
++    if sys.prefix[-4:] == '/usr':
+         #default posix config location:
+-        return '/etc/xpra'
++        return sys.prefix[:-4] + '/etc/xpra'
+     #hope the prefix is something like "/usr/local" or "$HOME/.local":
+     return prefix + '/etc/xpra/'
+ 
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index 601118510cb5..e5c0aae227a7 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -18,5 +18,6 @@
 	<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>
+	<flag name='x265'>Enable x265 support</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-wm/xpra/xpra-0.15.0.ebuild b/x11-wm/xpra/xpra-0.15.0.ebuild
new file mode 100644
index 000000000000..c2016731257b
--- /dev/null
+++ b/x11-wm/xpra/xpra-0.15.0.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.15.0.ebuild,v 1.1 2015/06/07 17:10:50 xmw 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 cups dec_av2 libav opengl pulseaudio server sound vpx webp x264 x265"
+
+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_av2? (
+		!libav? ( >=media-video/ffmpeg-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= )
+	)
+	x265? ( media-libs/x265
+		!libav? ( >=media-video/ffmpeg-2: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.15.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 cups printing)
+		$(use_with dec_av2 dec_avcodec2)
+		$(use_with opengl)
+		$(use_with server shadow)
+		$(use_with server)
+		$(use_with sound)
+		$(use_with vpx)
+		$(use_with webp)
+		$(use_with x264 enc_x264)
+		$(use_with x265 enc_x265)
+		--with-Xdummy
+		--with-gtk2
+		--without-gtk3
+		--with-strict
+		--with-warn
+		--with-x11
+		--without-PIC
+		--without-debug )
+}