diff options
| author |   Jason Zaman <perfinion@gentoo.org> | 2015-05-31 13:33:04 +0000 |
|---|---|---|
| committer | Jason Zaman <perfinion@gentoo.org> | 2015-05-31 13:33:04 +0000 |
| commit | 7c5654fa677d940e9dfab968e2eb717f86bf0b18 (patch) | |
| tree | 4765fe5551b4ec650ed8027dcc016aae14cf8955 /xfce-base | |
| parent | Remove offending version wrt bug #546516. (diff) | |
| download | gentoo-2-7c5654fa677d940e9dfab968e2eb717f86bf0b18.tar.gz gentoo-2-7c5654fa677d940e9dfab968e2eb717f86bf0b18.tar.bz2 gentoo-2-7c5654fa677d940e9dfab968e2eb717f86bf0b18.zip | |
pin dep <libxfce4ui-4.12 bug 549780
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x7EF137EC935B0EAF)
Diffstat (limited to 'xfce-base')
| -rw-r--r-- | xfce-base/xfce4-settings/ChangeLog | 5 | ||||
| -rw-r--r-- | xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog index a94315cf83c6..7d8f394dceeb 100644 --- a/xfce-base/xfce4-settings/ChangeLog +++ b/xfce-base/xfce4-settings/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for xfce-base/xfce4-settings # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.127 2015/03/08 15:06:38 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.128 2015/05/31 13:33:04 perfinion Exp $ + + 31 May 2015; Jason Zaman <perfinion@gentoo.org> xfce4-settings-4.10.1.ebuild: + pin dep <libxfce4ui-4.12 bug 549780 *xfce4-settings-4.12.0 (08 Mar 2015) diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild index b8e36327df79..150b7bdd1507 100644 --- a/xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild +++ b/xfce-base/xfce4-settings/xfce4-settings-4.10.1.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/xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild,v 1.10 2014/04/19 17:46:13 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.10.1.ebuild,v 1.11 2015/05/31 13:33:04 perfinion Exp $ EAPI=5 inherit xfconf @@ -14,6 +14,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux" IUSE="debug libcanberra libnotify +xklavier" +# <libxfce4ui-4.12 - bug 549780 RDEPEND=">=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 media-libs/fontconfig @@ -25,6 +26,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.100 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.8 >=xfce-base/libxfce4ui-4.10 + <xfce-base/libxfce4ui-4.12 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) |