diff options
| author |   Michael Weber <xmw@gentoo.org> | 2014-11-25 21:02:15 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2014-11-25 21:02:15 +0000 |
| commit | d428506b05c220f32ddf91f91e2572994fcc546c (patch) | |
| tree | 78c07505cebdeeec8ca00ab62573b887ef6ba032 | |
| parent | dev-python/html2text: Remove myself as a maintainer (diff) | |
| download | gentoo-2-d428506b05c220f32ddf91f91e2572994fcc546c.tar.gz gentoo-2-d428506b05c220f32ddf91f91e2572994fcc546c.tar.bz2 gentoo-2-d428506b05c220f32ddf91f91e2572994fcc546c.zip | |
Version bump (thanks Christohper Harrington, bug 522488).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
| -rw-r--r-- | x11-wm/xpra/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-wm/xpra/files/xpra-0.14.0-prefix.patch | 27 | ||||
| -rw-r--r-- | x11-wm/xpra/xpra-0.14.12.ebuild (renamed from x11-wm/xpra/xpra-0.13.7.ebuild) | 3 |
3 files changed, 35 insertions, 3 deletions
diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog index 39b4be3efaf8..6e76598647fb 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.111 2014/08/19 17:14:52 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.112 2014/11/25 21:02:15 xmw Exp $ + +*xpra-0.14.12 (25 Nov 2014) + + 25 Nov 2014; Michael Weber <xmw@gentoo.org> +files/xpra-0.14.0-prefix.patch, + +xpra-0.14.12.ebuild, +xpra-0.14.3.ebuild, -xpra-0.13.7.ebuild: + Version bump (thanks Christohper Harrington, bug 522488). *xpra-0.13.9 (19 Aug 2014) diff --git a/x11-wm/xpra/files/xpra-0.14.0-prefix.patch b/x11-wm/xpra/files/xpra-0.14.0-prefix.patch new file mode 100644 index 000000000000..140abbbbbc0b --- /dev/null +++ b/x11-wm/xpra/files/xpra-0.14.0-prefix.patch @@ -0,0 +1,27 @@ +--- xpra-0.14.0/xpra/platform/paths.py ++++ xpra-0.14.0/xpra/platform/paths.py +@@ -22,9 +22,9 @@ + + def get_system_conf_dir(): + #the system wide configuration directory +- if sys.prefix == '/usr': ++ if sys.prefix[-4:] == '/usr': + #default posix config location: +- default_conf_dir = '/etc/xpra' ++ default_conf_dir = sys.prefix[:-4] + '/etc/xpra' + else: + #hope the prefix is something like "/usr/local": + default_conf_dir = sys.prefix + '/etc/xpra/' +--- xpra-0.14.0/setup.py ++++ xpra-0.14.0/setup.py +@@ -1470,8 +1470,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' + diff --git a/x11-wm/xpra/xpra-0.13.7.ebuild b/x11-wm/xpra/xpra-0.14.12.ebuild index 061136e1f474..3876cbbc698a 100644 --- a/x11-wm/xpra/xpra-0.13.7.ebuild +++ b/x11-wm/xpra/xpra-0.14.12.ebuild @@ -1,6 +1,5 @@ # 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.13.7.ebuild,v 1.1 2014/07/12 00:28:12 xmw Exp $ EAPI=5 @@ -64,7 +63,7 @@ DEPEND="${COMMON_DEPEND} python_prepare_all() { epatch \ "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \ - "${FILESDIR}"/${PN}-0.12.0-prefix.patch + "${FILESDIR}"/${PN}-0.14.0-prefix.patch #assuming ffmpeg and libav mutual exclusive installs if has_version "media-video/libav" ; then |