diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-11-06 12:57:37 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-11-06 12:57:37 +0000 |
| commit | 0f3134e7253d6aac611dcb8498ea0da2c8a20b33 (patch) | |
| tree | 2f44e2bea4f4f20a80f3d5b79987d656d4b86a79 | |
| parent | Block <libxfcegui4-4.7.0 to avoid conflict with function xfce_shortcuts_provi... (diff) | |
| download | historical-0f3134e7253d6aac611dcb8498ea0da2c8a20b33.tar.gz historical-0f3134e7253d6aac611dcb8498ea0da2c8a20b33.tar.bz2 historical-0f3134e7253d6aac611dcb8498ea0da2c8a20b33.zip | |
revert
Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64
| -rw-r--r-- | xfce-base/xfce4-settings/ChangeLog | 7 | ||||
| -rw-r--r-- | xfce-base/xfce4-settings/xfce4-settings-4.7.3.ebuild | 5 | ||||
| -rw-r--r-- | xfce-base/xfwm4/ChangeLog | 6 | ||||
| -rw-r--r-- | xfce-base/xfwm4/xfwm4-4.7.1.ebuild | 5 |
4 files changed, 6 insertions, 17 deletions
diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog index a72ffe97477a..da3c9b6eb02a 100644 --- a/xfce-base/xfce4-settings/ChangeLog +++ b/xfce-base/xfce4-settings/ChangeLog @@ -1,11 +1,6 @@ # ChangeLog for xfce-base/xfce4-settings # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.56 2010/11/04 15:54:21 ssuominen Exp $ - - 04 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> - xfce4-settings-4.7.3.ebuild: - Block <libxfcegui4-4.7.0 to avoid conflict with function - xfce_shortcuts_provider_set_shortcut. +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.57 2010/11/06 12:57:37 ssuominen Exp $ *xfce4-settings-4.7.3 (03 Nov 2010) diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.7.3.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.7.3.ebuild index 7d0510ba5df9..1401849f0af6 100644 --- a/xfce-base/xfce4-settings/xfce4-settings-4.7.3.ebuild +++ b/xfce-base/xfce4-settings/xfce4-settings-4.7.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.7.3.ebuild,v 1.2 2010/11/04 15:54:21 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.7.3.ebuild,v 1.3 2010/11/06 12:57:37 ssuominen Exp $ EAPI=3 inherit xfconf @@ -29,8 +29,7 @@ RDEPEND=">=dev-libs/glib-2.16:2 libnotify? ( >=x11-libs/libnotify-0.1.3 ) keyboard? ( >=x11-libs/libxklavier-0.3 ) sound? ( >=media-libs/libcanberra-0.25[sound] ) - !<x11-base/xorg-server-1.5.3 - !<xfce-base/libxfcegui4-4.7.0" + !<x11-base/xorg-server-1.5.3" DEPEND="${RDEPEND} dev-util/intltool sys-devel/gettext diff --git a/xfce-base/xfwm4/ChangeLog b/xfce-base/xfwm4/ChangeLog index e32253010535..2353cd63ce42 100644 --- a/xfce-base/xfwm4/ChangeLog +++ b/xfce-base/xfwm4/ChangeLog @@ -1,10 +1,6 @@ # ChangeLog for xfce-base/xfwm4 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.153 2010/11/04 14:59:43 ssuominen Exp $ - - 04 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> xfwm4-4.7.1.ebuild: - Block <libxfcegui4-4.7.0 to avoid conflict with function - xfce_shortcuts_provider_set_shortcut. +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.154 2010/11/06 12:57:15 ssuominen Exp $ *xfwm4-4.7.1 (03 Nov 2010) diff --git a/xfce-base/xfwm4/xfwm4-4.7.1.ebuild b/xfce-base/xfwm4/xfwm4-4.7.1.ebuild index 7d4adcd12935..11dbfc989be8 100644 --- a/xfce-base/xfwm4/xfwm4-4.7.1.ebuild +++ b/xfce-base/xfwm4/xfwm4-4.7.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.7.1.ebuild,v 1.2 2010/11/04 14:59:43 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.7.1.ebuild,v 1.3 2010/11/06 12:57:15 ssuominen Exp $ EAPI=3 inherit xfconf @@ -31,8 +31,7 @@ RDEPEND=">=dev-libs/glib-2.10:2 startup-notification? ( x11-libs/startup-notification ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage - x11-libs/libXfixes ) - !<xfce-base/libxfcegui4-4.7.0" + x11-libs/libXfixes )" DEPEND="${RDEPEND} dev-util/intltool dev-util/pkgconfig |