diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2015-01-03 13:39:14 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2015-01-03 13:39:14 +0000 |
| commit | d084ba810846499aed7db0f38d1a636db3b771bb (patch) | |
| tree | eb7f19edd8216b09ea33afbe4c3c770cc7b35c3b /dev-vcs | |
| parent | Add PYTHON_REQ_USE as necessary for waf. (diff) | |
| download | gentoo-2-d084ba810846499aed7db0f38d1a636db3b771bb.tar.gz gentoo-2-d084ba810846499aed7db0f38d1a636db3b771bb.tar.bz2 gentoo-2-d084ba810846499aed7db0f38d1a636db3b771bb.zip | |
Fixed compilation with "gnome-keyring" USE flag (bug #534384)
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/subversion/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-vcs/subversion/subversion-1.7.19.ebuild | 6 | ||||
| -rw-r--r-- | dev-vcs/subversion/subversion-1.8.11.ebuild | 6 |
3 files changed, 13 insertions, 8 deletions
diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog index 975a342229d7..50d63fd69c37 100644 --- a/dev-vcs/subversion/ChangeLog +++ b/dev-vcs/subversion/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-vcs/subversion -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.220 2015/01/01 14:44:04 dilfridge Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.221 2015/01/03 13:39:14 polynomial-c Exp $ + + 03 Jan 2015; Lars Wendler <polynomial-c@gentoo.org> subversion-1.7.19.ebuild, + subversion-1.8.11.ebuild: + Fixed compilation with "gnome-keyring" USE flag (bug #534384 and patch by + Andrew Savchenko). 01 Jan 2015; Andreas K. Huettel <dilfridge@gentoo.org> +ChangeLog-2014, ChangeLog: Split ChangeLog diff --git a/dev-vcs/subversion/subversion-1.7.19.ebuild b/dev-vcs/subversion/subversion-1.7.19.ebuild index cdf7bd94860a..c4d18481886c 100644 --- a/dev-vcs/subversion/subversion-1.7.19.ebuild +++ b/dev-vcs/subversion/subversion-1.7.19.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.19.ebuild,v 1.10 2014/12/26 09:29:04 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.19.ebuild,v 1.11 2015/01/03 13:39:14 polynomial-c Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) @@ -28,7 +28,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.6.18[threadsafe(+)] sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14 ) ctypes-python? ( ${PYTHON_DEPS} ) - gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) + gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) diff --git a/dev-vcs/subversion/subversion-1.8.11.ebuild b/dev-vcs/subversion/subversion-1.8.11.ebuild index 206399cf938d..2e9e4f3ba3a8 100644 --- a/dev-vcs/subversion/subversion-1.8.11.ebuild +++ b/dev-vcs/subversion/subversion-1.8.11.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.11.ebuild,v 1.10 2014/12/26 09:29:04 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.11.ebuild,v 1.11 2015/01/03 13:39:14 polynomial-c Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) @@ -29,7 +29,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12 app-arch/bzip2 berkdb? ( >=sys-libs/db-4.0.14 ) ctypes-python? ( ${PYTHON_DEPS} ) - gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) + gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) |