Dep fixes, various other fixes

Package-Manager: portage-2.1.2-r4

6 files changed, 55 insertions, 37 deletions

diff --git a/xfce-base/libxfce4util/ChangeLog b/xfce-base/libxfce4util/ChangeLog
index 13462786d7b6..24b6beea6ec3 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.73 2007/01/25 19:21:35 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4util/ChangeLog,v 1.74 2007/01/28 14:25:52 welp Exp $
+
+  28 Jan 2007; Peter Weller <welp@gentoo.org> libxfce4util-4.4.0.ebuild:
+  Dep fixes, various other fixes
 
   25 Jan 2007; Peter Weller <welp@gentoo.org> libxfce4util-4.4.0.ebuild:
   fixed deps, removing usage of gnome2-utils, cleanup
diff --git a/xfce-base/libxfce4util/libxfce4util-4.4.0.ebuild b/xfce-base/libxfce4util/libxfce4util-4.4.0.ebuild
index 1f2e5ed3e03b..00ade5c32087 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.4.0.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.4.0.ebuild
@@ -1,20 +1,39 @@
 # 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.2 2007/01/25 19:21:35 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4util/libxfce4util-4.4.0.ebuild,v 1.3 2007/01/28 14:25:52 welp Exp $
 
 inherit xfce44
 
 xfce44
 
-DESCRIPTION="Libraries for Xfce4"
-LICENSE="LGPL-2"
+DESCRIPTION="Core library"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug doc"
 
-RDEPEND=">=dev-libs/glib-2"
+# This library is base of all Xfce packages, so we have blockers here to ensure
+# revdep-rebuild doesn't want 4.2 back and forth.
+
+RDEPEND=">=dev-libs/glib-2.6"
 DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1 )"
+	dev-util/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	!xfce-extra/xfce4-panelmenu
+	!xfce-extra/xfce4-showdesktop
+	!xfce-extra/xfce4-systray
+	!xfce-extra/xfce4-taskbar
+	!xfce-extra/xfce4-toys
+	!xfce-extra/xfce4-windowlist
+	!xfce-extra/xfce4-trigger-launcher
+	!xfce-extra/xfce4-websearch
+	!xfce-extra/xfce4-modemlights
+	!xfce-extra/xfce4-minicmd
+	!xfce-extra/xfce4-megahertz
+	!xfce-extra/xfce4-iconbox
+	!xfce-extra/xfce4-artwork
+	!xfce-base/xffm
+	!xfce-extra/xfcalendar
+	!xfce-extra/xfce4-bglist-editor"
 
-XFCE_CONFIG="${XFCE_CONFIG} $(use_enable doc gtk-doc)"
+DOCS="AUTHORS ChangeLog NEWS README THANKS TODO"
 
 xfce44_core_package
diff --git a/xfce-base/libxfcegui4/ChangeLog b/xfce-base/libxfcegui4/ChangeLog
index c83cd4e9475c..3e07de55862d 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.85 2007/01/25 19:26:07 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.86 2007/01/28 14:24:25 welp Exp $
+
+  28 Jan 2007; Peter Weller <welp@gentoo.org> libxfcegui4-4.4.0.ebuild:
+  Dep fixes, various other fixes
 
   25 Jan 2007; Peter Weller <welp@gentoo.org> libxfcegui4-4.4.0.ebuild:
   fixed deps, removing usage of gnome2-utils, cleanup
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.4.0.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.4.0.ebuild
index add45815fec0..eb3a17e78390 100644
--- a/xfce-base/libxfcegui4/libxfcegui4-4.4.0.ebuild
+++ b/xfce-base/libxfcegui4/libxfcegui4-4.4.0.ebuild
@@ -1,34 +1,26 @@
 # 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.3 2007/01/25 19:26:07 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.4.0.ebuild,v 1.4 2007/01/28 14:24:25 welp Exp $
 
 inherit xfce44
 
 xfce44
 
-DESCRIPTION="Libraries for Xfce4"
-LICENSE="LGPL-2"
+DESCRIPTION="Core library"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug startup-notification"
+IUSE="debug doc startup-notification"
 
-RDEPEND="x11-libs/libICE
-	x11-libs/libSM
+RDEPEND="x11-libs/libSM
 	x11-libs/libX11
-	>=dev-libs/glib-2
-	>=dev-libs/libxml2-2.4
-	>=x11-libs/gtk+-2.2
-	x11-libs/pango
-	startup-notification? ( >=x11-libs/startup-notification-0.5 )
+	>=x11-libs/gtk+-2.6
 	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
-	dev-libs/atk
-	sys-libs/zlib
-	x11-libs/cairo"
+	startup-notification? ( x11-libs/startup-notification )"
 DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( dev-util/gtk-doc )
 	!=xfce-base/xfce-mcs-plugins-4.3*
-	!=xfce-base/xfce4-panel-4.3*
-	>=dev-util/gtk-doc-1
-	x11-proto/xproto"
+	!=xfce-base/xfce4-panel-4.3*"
 
-XFCE_CONFIG="${XFCE_CONFIG} $(use_enable startup-notification)"
+DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 xfce44_core_package
diff --git a/xfce-base/orage/ChangeLog b/xfce-base/orage/ChangeLog
index 7834dd9d0e1c..b264e72d4fe3 100644
--- a/xfce-base/orage/ChangeLog
+++ b/xfce-base/orage/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/orage
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/orage/ChangeLog,v 1.12 2007/01/23 16:46:19 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/orage/ChangeLog,v 1.13 2007/01/28 14:30:21 welp Exp $
+
+  28 Jan 2007; Peter Weller <welp@gentoo.org> orage-4.4.0.ebuild:
+  Dep fixes, various other fixes
 
   23 Jan 2007; Peter Weller <welp@gentoo.org> orage-4.4.0.ebuild:
   Removing usage of virtual/x11,  and hardcoding in depends. Minor clean ups.
diff --git a/xfce-base/orage/orage-4.4.0.ebuild b/xfce-base/orage/orage-4.4.0.ebuild
index b8ce9421efa4..3f4282a882cf 100644
--- a/xfce-base/orage/orage-4.4.0.ebuild
+++ b/xfce-base/orage/orage-4.4.0.ebuild
@@ -1,28 +1,26 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/orage/orage-4.4.0.ebuild,v 1.3 2007/01/23 16:46:19 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/orage/orage-4.4.0.ebuild,v 1.4 2007/01/28 14:30:21 welp Exp $
 
 inherit xfce44
 
 xfce44
 
-DESCRIPTION="Calendar for Xfce4"
+DESCRIPTION="Calendar"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug"
 
-RDEPEND=">=dev-libs/glib-2.2
-	>=x11-libs/gtk+-2.2
+RDEPEND=">=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.6
 	>=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}
-	dev-libs/atk
-	media-libs/libpng
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/pango
 	!xfce-extra/xfcalendar"
 DEPEND="${RDEPEND}
-	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}"
+	dev-util/pkgconfig
+	dev-util/intltool"
+
+DOCS="AUTHORS ChangeLog NEWS README"
 
 xfce44_core_package