From 76952bfde22aef85aff3a87a11854eabfa85653c Mon Sep 17 00:00:00 2001 From: Peter Weller Date: Thu, 25 Jan 2007 19:30:56 +0000 Subject: [PATCH] fixed deps, removing usage of gnome2-utils, cleanup Package-Manager: portage-2.1.2-r1 --- xfce-base/libxfce4util/ChangeLog | 5 ++++- xfce-base/libxfce4util/libxfce4util-4.4.0.ebuild | 7 ++++--- xfce-base/libxfcegui4/ChangeLog | 5 ++++- xfce-base/libxfcegui4/libxfcegui4-4.4.0.ebuild | 5 ++++- xfce-base/xfce-mcs-manager/ChangeLog | 5 ++++- .../xfce-mcs-manager-4.4.0.ebuild | 15 +++------------ xfce-base/xfprint/ChangeLog | 5 ++++- xfce-base/xfprint/xfprint-4.4.0.ebuild | 12 ++---------- 8 files changed, 29 insertions(+), 30 deletions(-) diff --git a/xfce-base/libxfce4util/ChangeLog b/xfce-base/libxfce4util/ChangeLog index a8cb2ec989dc..13462786d7b6 100644 --- a/xfce-base/libxfce4util/ChangeLog +++ b/xfce-base/libxfce4util/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for xfce-base/libxfce4util # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4util/ChangeLog,v 1.72 2007/01/22 02:06:34 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4util/ChangeLog,v 1.73 2007/01/25 19:21:35 welp Exp $ + + 25 Jan 2007; Peter Weller libxfce4util-4.4.0.ebuild: + fixed deps, removing usage of gnome2-utils, cleanup *libxfce4util-4.4.0 (22 Jan 2007) diff --git a/xfce-base/libxfce4util/libxfce4util-4.4.0.ebuild b/xfce-base/libxfce4util/libxfce4util-4.4.0.ebuild index 271dd39c77bb..1f2e5ed3e03b 100644 --- a/xfce-base/libxfce4util/libxfce4util-4.4.0.ebuild +++ b/xfce-base/libxfce4util/libxfce4util-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-base/libxfce4util/libxfce4util-4.4.0.ebuild,v 1.1 2007/01/22 02:06:34 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4util/libxfce4util-4.4.0.ebuild,v 1.2 2007/01/25 19:21:35 welp Exp $ inherit xfce44 @@ -11,9 +11,10 @@ LICENSE="LGPL-2" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="debug doc" -RDEPEND=">=dev-libs/glib-2 +RDEPEND=">=dev-libs/glib-2" +DEPEND="${RDEPEND} doc? ( >=dev-util/gtk-doc-1 )" - XFCE_CONFIG="${XFCE_CONFIG} $(use_enable doc gtk-doc)" + xfce44_core_package diff --git a/xfce-base/libxfcegui4/ChangeLog b/xfce-base/libxfcegui4/ChangeLog index 01409eed0254..c83cd4e9475c 100644 --- a/xfce-base/libxfcegui4/ChangeLog +++ b/xfce-base/libxfcegui4/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for xfce-base/libxfcegui4 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.84 2007/01/23 16:38:08 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.85 2007/01/25 19:26:07 welp Exp $ + + 25 Jan 2007; Peter Weller libxfcegui4-4.4.0.ebuild: + fixed deps, removing usage of gnome2-utils, cleanup 23 Jan 2007; Peter Weller libxfcegui4-4.4.0.ebuild: Removing usage of virtual/x11, and hardcoding in depends. Minor clean ups. diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.4.0.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.4.0.ebuild index fdcebbaa61cc..add45815fec0 100644 --- a/xfce-base/libxfcegui4/libxfcegui4-4.4.0.ebuild +++ b/xfce-base/libxfcegui4/libxfcegui4-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-base/libxfcegui4/libxfcegui4-4.4.0.ebuild,v 1.2 2007/01/23 16:38:08 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.4.0.ebuild,v 1.3 2007/01/25 19:26:07 welp Exp $ inherit xfce44 @@ -24,8 +24,11 @@ RDEPEND="x11-libs/libICE sys-libs/zlib x11-libs/cairo" DEPEND="${RDEPEND} + !=xfce-base/xfce-mcs-plugins-4.3* + !=xfce-base/xfce4-panel-4.3* >=dev-util/gtk-doc-1 x11-proto/xproto" XFCE_CONFIG="${XFCE_CONFIG} $(use_enable startup-notification)" + xfce44_core_package diff --git a/xfce-base/xfce-mcs-manager/ChangeLog b/xfce-base/xfce-mcs-manager/ChangeLog index f285f7b99c14..d981c52ef325 100644 --- a/xfce-base/xfce-mcs-manager/ChangeLog +++ b/xfce-base/xfce-mcs-manager/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for xfce-base/xfce-mcs-manager # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-manager/ChangeLog,v 1.72 2007/01/23 22:38:16 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-manager/ChangeLog,v 1.73 2007/01/25 19:30:56 welp Exp $ + + 25 Jan 2007; Peter Weller xfce-mcs-manager-4.4.0.ebuild: + fixed deps, removing usage of gnome2-utils, cleanup 23 Jan 2007; Peter Weller xfce-mcs-manager-4.4.0.ebuild: Added debug to IUSE diff --git a/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.4.0.ebuild b/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.4.0.ebuild index 26561adfec3e..650cc18a7317 100644 --- a/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.4.0.ebuild +++ b/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.4.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.4.0.ebuild,v 1.3 2007/01/23 22:38:16 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.4.0.ebuild,v 1.4 2007/01/25 19:30:56 welp Exp $ -inherit gnome2-utils xfce44 +inherit xfce44 xfce44 @@ -18,15 +18,6 @@ RDEPEND=">=dev-libs/glib-2 >=xfce-base/libxfce4util-${XFCE_MASTER_VERSION} >=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION} media-libs/libpng" +DEPEND="${RDEPEND}" xfce44_core_package - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} - - diff --git a/xfce-base/xfprint/ChangeLog b/xfce-base/xfprint/ChangeLog index b8b0b728c4d0..d07aa21164f7 100644 --- a/xfce-base/xfprint/ChangeLog +++ b/xfce-base/xfprint/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for xfce-base/xfprint # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/ChangeLog,v 1.77 2007/01/23 18:12:51 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/ChangeLog,v 1.78 2007/01/25 19:27:44 welp Exp $ + + 25 Jan 2007; Peter Weller xfprint-4.4.0.ebuild: + fixed deps, removing usage of gnome2-utils, cleanup 23 Jan 2007; Peter Weller xfprint-4.4.0.ebuild: Removing usage of virtual/x11, and hardcoding in depends. Minor clean ups. diff --git a/xfce-base/xfprint/xfprint-4.4.0.ebuild b/xfce-base/xfprint/xfprint-4.4.0.ebuild index 2d9f3b55bad4..fb26e083158a 100644 --- a/xfce-base/xfprint/xfprint-4.4.0.ebuild +++ b/xfce-base/xfprint/xfprint-4.4.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/xfprint-4.4.0.ebuild,v 1.2 2007/01/23 18:12:51 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/xfprint-4.4.0.ebuild,v 1.3 2007/01/25 19:27:44 welp Exp $ -inherit xfce44 gnome2-utils +inherit xfce44 xfce44 @@ -30,11 +30,3 @@ DEPEND="${RDEPEND} XFCE_CONFIG="--enable-bsdlpr --enable-cups" xfce44_core_package - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} -- 2.26.2