From e1eabc2defd7a4226d265171055619fa42eecad0 Mon Sep 17 00:00:00 2001 From: Peter Weller Date: Tue, 23 Jan 2007 18:58:40 +0000 Subject: [PATCH] Removing usage of virtual/x11, and hardcoding in depends. Minor clean ups. Package-Manager: portage-2.1.2-r1 --- xfce-extra/xfce4-mixer/ChangeLog | 5 ++++- xfce-extra/xfce4-mixer/xfce4-mixer-4.4.0.ebuild | 14 +++++++------- xfce-extra/xfwm4-themes/ChangeLog | 5 ++++- xfce-extra/xfwm4-themes/xfwm4-themes-4.4.0.ebuild | 4 ++-- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/xfce-extra/xfce4-mixer/ChangeLog b/xfce-extra/xfce4-mixer/ChangeLog index cc3eb3262afa..9d42cb1e04c4 100644 --- a/xfce-extra/xfce4-mixer/ChangeLog +++ b/xfce-extra/xfce4-mixer/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for xfce-extra/xfce4-mixer # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/ChangeLog,v 1.70 2007/01/22 02:15:47 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/ChangeLog,v 1.71 2007/01/23 18:54:17 welp Exp $ + + 23 Jan 2007; Peter Weller xfce4-mixer-4.4.0.ebuild: + Removing usage of virtual/x11, and hardcoding in depends. Minor clean ups. *xfce4-mixer-4.4.0 (22 Jan 2007) diff --git a/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.0.ebuild b/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.0.ebuild index ed28ed1ba8f0..01782240541c 100644 --- a/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.0.ebuild +++ b/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.0.ebuild,v 1.1 2007/01/22 02:15:47 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.0.ebuild,v 1.2 2007/01/23 18:54:17 welp Exp $ inherit xfce44 @@ -14,15 +14,15 @@ IUSE="alsa" RDEPEND=">=dev-libs/glib-2 dev-libs/libxml2 >=x11-libs/gtk+-2.2 - >=xfce-base/libxfce4mcs-${PV} - >=xfce-base/libxfce4util-${PV} - >=xfce-base/libxfcegui4-${PV} - >=xfce-base/xfce4-panel-${PV} + >=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION} + >=xfce-base/libxfce4util-${XFCE_MASTER_VERSION} + >=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION} + >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} media-libs/libpng alsa? ( media-libs/alsa-lib )" DEPEND="${RDEPEND} - || ( x11-proto/xproto virtual/x11 ) - >=xfce-base/xfce-mcs-manager-${PV}" + x11-proto/xproto + >=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}" if use alsa; then XFCE_CONFIG="--with-sound=alsa" diff --git a/xfce-extra/xfwm4-themes/ChangeLog b/xfce-extra/xfwm4-themes/ChangeLog index 2032280be12c..1ffe30cf6528 100644 --- a/xfce-extra/xfwm4-themes/ChangeLog +++ b/xfce-extra/xfwm4-themes/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for xfce-extra/xfwm4-themes # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfwm4-themes/ChangeLog,v 1.68 2007/01/22 02:16:45 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfwm4-themes/ChangeLog,v 1.69 2007/01/23 18:58:40 welp Exp $ + + 23 Jan 2007; Peter Weller xfwm4-themes-4.4.0.ebuild: + Removing usage of virtual/x11, and hardcoding in depends. Minor clean ups. *xfwm4-themes-4.4.0 (22 Jan 2007) diff --git a/xfce-extra/xfwm4-themes/xfwm4-themes-4.4.0.ebuild b/xfce-extra/xfwm4-themes/xfwm4-themes-4.4.0.ebuild index 7e3fa889902a..c7568f324a07 100644 --- a/xfce-extra/xfwm4-themes/xfwm4-themes-4.4.0.ebuild +++ b/xfce-extra/xfwm4-themes/xfwm4-themes-4.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfwm4-themes/xfwm4-themes-4.4.0.ebuild,v 1.1 2007/01/22 02:16:45 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfwm4-themes/xfwm4-themes-4.4.0.ebuild,v 1.2 2007/01/23 18:58:40 welp Exp $ inherit xfce44 @@ -9,6 +9,6 @@ xfce44 DESCRIPTION="Xfce4 window manager themes" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -RDEPEND=">=xfce-base/xfwm4-${PV}" +RDEPEND=">=xfce-base/xfwm4-${XFCE_MASTER_VERSION}" xfce44_core_package -- 2.26.2