Version bump

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

4 files changed, 147 insertions, 1 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/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 )
+}