From: Peter Weller Date: Sun, 28 Jan 2007 15:37:31 +0000 (+0000) Subject: Dep fixes, various other fixes X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=546dc82e5ed432000ed2e776ae3f2aaa1b0cc9ce;p=gentoo.git Dep fixes, various other fixes Package-Manager: portage-2.1.2-r4 --- diff --git a/xfce-base/xfce-mcs-manager/ChangeLog b/xfce-base/xfce-mcs-manager/ChangeLog index d981c52ef325..6e72d3f4ac4f 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.73 2007/01/25 19:30:56 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-manager/ChangeLog,v 1.74 2007/01/28 15:11:28 welp Exp $ + + 28 Jan 2007; Peter Weller xfce-mcs-manager-4.4.0.ebuild: + Dep fixes, various other fixes 25 Jan 2007; Peter Weller xfce-mcs-manager-4.4.0.ebuild: fixed deps, removing usage of gnome2-utils, cleanup 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 650cc18a7317..57c8421e16c7 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,23 +1,25 @@ # 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.4 2007/01/25 19:30:56 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.4.0.ebuild,v 1.5 2007/01/28 15:11:28 welp Exp $ inherit xfce44 xfce44 -DESCRIPTION="Xfce4 MCS Manager" -LICENSE="LGPL-2" +DESCRIPTION="Settings manager" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - IUSE="debug" -RDEPEND=">=dev-libs/glib-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} - media-libs/libpng" -DEPEND="${RDEPEND}" + >=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +# There are no gtk-doc for this package. + +DOCS="AUTHORS ChangeLog NEWS README TODO" xfce44_core_package diff --git a/xfce-base/xfce-mcs-plugins/ChangeLog b/xfce-base/xfce-mcs-plugins/ChangeLog index b186a0ae1ae1..2e9ea5550592 100644 --- a/xfce-base/xfce-mcs-plugins/ChangeLog +++ b/xfce-base/xfce-mcs-plugins/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for xfce-base/xfce-mcs-plugins # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-plugins/ChangeLog,v 1.76 2007/01/23 22:41:35 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-plugins/ChangeLog,v 1.77 2007/01/28 15:14:43 welp Exp $ + + 28 Jan 2007; Peter Weller xfce-mcs-plugins-4.4.0.ebuild: + Dep fixes, various other fixes 23 Jan 2007; Peter Weller xfce-mcs-plugins-4.4.0.ebuild: Added debug to IUSE diff --git a/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.0.ebuild b/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.0.ebuild index 6a8761e16c5a..88b8254b1044 100644 --- a/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.0.ebuild +++ b/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.0.ebuild @@ -1,12 +1,12 @@ # 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-plugins/xfce-mcs-plugins-4.4.0.ebuild,v 1.4 2007/01/23 22:41:35 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.0.ebuild,v 1.5 2007/01/28 15:14:43 welp Exp $ inherit xfce44 xfce44 -DESCRIPTION="Xfce4 MCS Plugins" +DESCRIPTION="Setting plugins" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="debug" @@ -20,17 +20,17 @@ RDEPEND="x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86misc x11-libs/libXxf86vm - >=dev-libs/glib-2 + >=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/xfce-mcs-manager-${XFCE_MASTER_VERSION}" DEPEND="${RDEPEND} - x11-proto/xf86miscproto - x11-proto/xf86vidmodeproto - x11-proto/xproto" + dev-util/pkgconfig" + +# There are no gtk-doc for this package. XFCE_CONFIG="${XFCE_CONFIG} --enable-xf86misc --enable-xkb --enable-randr --enable-xf86vm" +DOCS="AUTHORS ChangeLog NEWS README" + xfce44_core_package diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog index 27850e18b216..21b715e643a0 100644 --- a/xfce-base/xfce-utils/ChangeLog +++ b/xfce-base/xfce-utils/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for xfce-base/xfce-utils # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.81 2007/01/23 17:23:48 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.82 2007/01/28 15:17:41 welp Exp $ + + 28 Jan 2007; Peter Weller xfce-utils-4.4.0.ebuild: + Dep fixes, various other fixes 23 Jan 2007; Peter Weller xfce-utils-4.4.0.ebuild: Removing usage of virtual/x11, and hardcoding in depends. Minor clean ups. diff --git a/xfce-base/xfce-utils/xfce-utils-4.4.0.ebuild b/xfce-base/xfce-utils/xfce-utils-4.4.0.ebuild index b333fff8a3ff..a3fe2b735131 100644 --- a/xfce-base/xfce-utils/xfce-utils-4.4.0.ebuild +++ b/xfce-base/xfce-utils/xfce-utils-4.4.0.ebuild @@ -1,36 +1,35 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.4.0.ebuild,v 1.2 2007/01/23 17:23:48 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.4.0.ebuild,v 1.3 2007/01/28 15:17:41 welp Exp $ inherit xfce44 xfce44 -DESCRIPTION="Utilities for Xfce4" +DESCRIPTION="Utils package" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc debug" +IUSE="dbus debug" RDEPEND="x11-apps/xrdb - >=dev-libs/glib-2.2 - >=x11-libs/gtk+-2.2 - media-libs/libpng - >=xfce-base/libxfce4util-${XFCE_MASTER_VERSION} + x11-libs/libX11 + >=dev-libs/glib-2.6 + >=x11-libs/gtk+-2.6 >=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION} >=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION} >=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + dev-util/pkgconfig" -XFCE_CONFIG="${XFCE_CONFIG} --enable-gdm --with-vendor-info=Gentoo" +XFCE_CONFIG="${XFCE_CONFIG} $(use_enable dbus) --enable-gdm --with-vendor-info=Gentoo" + +DOCS="AUTHORS ChangeLog NEWS README TODO" xfce44_core_package src_install() { xfce44_src_install + # Install vendor info. insinto /usr/share/xfce4 newins ${FILESDIR}/Gentoo Gentoo - - if use doc; then - dodoc AUTHORS README ChangeLog HACKING NEWS THANKS TODO - fi } diff --git a/xfce-base/xfce4-panel/ChangeLog b/xfce-base/xfce4-panel/ChangeLog index cc058456dda0..5137a942db8f 100644 --- a/xfce-base/xfce4-panel/ChangeLog +++ b/xfce-base/xfce4-panel/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for xfce-base/xfce4-panel # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.79 2007/01/23 21:36:05 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.80 2007/01/28 15:26:06 welp Exp $ + + 28 Jan 2007; Peter Weller xfce4-panel-4.4.0.ebuild: + Dep fixes, various other fixes 23 Jan 2007; Peter Weller xfce4-panel-4.4.0.ebuild: Added block due to issues reported in #gentoo-xfce diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.4.0.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.4.0.ebuild index d2146e208f81..0822221c2701 100644 --- a/xfce-base/xfce4-panel/xfce4-panel-4.4.0.ebuild +++ b/xfce-base/xfce4-panel/xfce4-panel-4.4.0.ebuild @@ -1,36 +1,28 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.4.0.ebuild,v 1.4 2007/01/23 21:36:05 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.4.0.ebuild,v 1.5 2007/01/28 15:26:06 welp Exp $ inherit xfce44 xfce44 -DESCRIPTION="Xfce4 panel" +DESCRIPTION="Panel" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug startup-notification" +IUSE="debug doc startup-notification" RDEPEND="x11-libs/libX11 - x11-libs/libICE x11-libs/libSM - >=dev-libs/glib-2 + gnome-base/librsvg >=x11-libs/gtk+-2.6 >=xfce-base/libxfce4util-${XFCE_MASTER_VERSION} >=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION} >=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION} - media-libs/libpng - startup-notification? ( >=x11-libs/startup-notification-0.5 )" + startup-notification? ( x11-libs/startup-notification )" DEPEND="${RDEPEND} - !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 - >=dev-util/gtk-doc-1" + dev-util/pkgconfig + doc? ( dev-util/gtk-doc )" -XFCE_CONFIG="${XFCE_CONFIG} $(use_enable startup-notification)" +DOCS="AUTHORS ChangeLog HACKING NEWS README README.Plugins" xfce44_core_package diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog index ec25ea04a519..42d021574445 100644 --- a/xfce-base/xfce4-session/ChangeLog +++ b/xfce-base/xfce4-session/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for xfce-base/xfce4-session # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.47 2007/01/23 17:57:02 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.48 2007/01/28 15:28:02 welp Exp $ + + 28 Jan 2007; Peter Weller xfce4-session-4.4.0.ebuild: + Dep fixes, various other fixes 23 Jan 2007; Peter Weller xfce4-session-4.4.0.ebuild: Removing usage of virtual/x11, and hardcoding in depends. Minor clean ups. diff --git a/xfce-base/xfce4-session/xfce4-session-4.4.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.4.0.ebuild index 64014707f2ca..19cf91e22ea8 100644 --- a/xfce-base/xfce4-session/xfce4-session-4.4.0.ebuild +++ b/xfce-base/xfce4-session/xfce4-session-4.4.0.ebuild @@ -1,23 +1,31 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.4.0.ebuild,v 1.2 2007/01/23 17:57:02 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.4.0.ebuild,v 1.3 2007/01/28 15:28:02 welp Exp $ inherit xfce44 xfce44 -DESCRIPTION="Xfce4 session manager" +DESCRIPTION="Session manager" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug hal" +IUSE="dbus debug gnome" RDEPEND="x11-libs/libX11 x11-libs/libSM x11-apps/iceauth + >=xfce-base/libxfce4util-${XFCE_MASTER_VERSION} + >=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION} + >=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION} + >=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION} >=xfce-base/xfce-utils-${XFCE_MASTER_VERSION} games-misc/fortune-mod - hal? ( sys-apps/hal )" + gnome? ( gnome-base/gconf ) + dbus? ( sys-apps/dbus )" DEPEND="${RDEPEND} - x11-libs/libXt" + dev-util/pkgconfig" + +XFCE_CONFIG="${XFCE_CONFIG} $(use_enable gnome) $(use_enable dbus)" + +DOCS="AUTHORS BUGS ChangeLog NEWS README TODO" -XFCE_CONFIG="${XFCE_CONFIG} $(use_with hal shutdown-style hal)" xfce44_core_package diff --git a/xfce-base/xfce4/ChangeLog b/xfce-base/xfce4/ChangeLog index a1e47a016e2b..d7c6f71ddd0a 100644 --- a/xfce-base/xfce4/ChangeLog +++ b/xfce-base/xfce4/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for xfce-base/xfce4 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/ChangeLog,v 1.79 2007/01/25 19:15:42 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/ChangeLog,v 1.80 2007/01/28 15:22:41 welp Exp $ + + 28 Jan 2007; Peter Weller xfce4-4.4.0.ebuild: + Dep fixes, various other fixes 25 Jan 2007; Peter Weller xfce4-4.4.0.ebuild: fixed deps, removing usage of gnome2-utils, cleanup diff --git a/xfce-base/xfce4/xfce4-4.4.0.ebuild b/xfce-base/xfce4/xfce4-4.4.0.ebuild index c0f1e53f497a..dbdff418f565 100644 --- a/xfce-base/xfce4/xfce4-4.4.0.ebuild +++ b/xfce-base/xfce4/xfce4-4.4.0.ebuild @@ -1,21 +1,17 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/xfce4-4.4.0.ebuild,v 1.4 2007/01/25 19:15:42 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/xfce4-4.4.0.ebuild,v 1.5 2007/01/28 15:22:41 welp Exp $ inherit xfce44 xfce44 -DESCRIPTION="Meta package for Xfce4 desktop, merge this package to install" HOMEPAGE="http://www.xfce.org/" -LICENSE="GPL-2 BSD LGPL-2" +DESCRIPTION="Meta package for Xfce4 desktop, merge this package to install" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -SLOT="0" IUSE="alsa cups minimal oss svg" -DEPEND="svg? ( gnome-base/librsvg )" -RDEPEND="${DEPEND} - >=x11-themes/gtk-engines-xfce-2.4 +RDEPEND=">=x11-themes/gtk-engines-xfce-2.4 >=xfce-base/thunar-${THUNAR_MASTER_VERSION} >=xfce-base/xfce-mcs-plugins-${XFCE_MASTER_VERSION} >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} @@ -32,6 +28,7 @@ RDEPEND="${DEPEND} >=xfce-extra/mousepad-0.2.12 >=xfce-extra/xfwm4-themes-${XFCE_MASTER_VERSION} >=xfce-extra/terminal-0.2.6 )" +DEPEND="${RDEPEND}" # hack to avoid exporting function from eclass. # we need eclass to get _MASTER_VERSION. diff --git a/xfce-base/xfdesktop/ChangeLog b/xfce-base/xfdesktop/ChangeLog index 7bb489dfb061..dcec2ebcbda7 100644 --- a/xfce-base/xfdesktop/ChangeLog +++ b/xfce-base/xfdesktop/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for xfce-base/xfdesktop # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.76 2007/01/23 18:03:35 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.77 2007/01/28 15:30:18 welp Exp $ + + 28 Jan 2007; Peter Weller xfdesktop-4.4.0.ebuild: + Dep fixes, various other fixes 23 Jan 2007; Peter Weller xfdesktop-4.4.0.ebuild: Removing usage of virtual/x11, and hardcoding in depends. Minor clean ups. diff --git a/xfce-base/xfdesktop/xfdesktop-4.4.0.ebuild b/xfce-base/xfdesktop/xfdesktop-4.4.0.ebuild index 24464f6488a5..6f74e5b9016f 100644 --- a/xfce-base/xfdesktop/xfdesktop-4.4.0.ebuild +++ b/xfce-base/xfdesktop/xfdesktop-4.4.0.ebuild @@ -1,42 +1,41 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.4.0.ebuild,v 1.2 2007/01/23 18:03:35 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.4.0.ebuild,v 1.3 2007/01/28 15:30:18 welp Exp $ inherit xfce44 xfce44 -DESCRIPTION="Xfce4 desktop manager" +DESCRIPTION="Desktop manager" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug doc plugins thunar-vfs" -IUSE="debug exo panel-plugin thunar-vfs" - -RDEPEND="sys-apps/dbus - x11-libs/libX11 - x11-libs/libICE +RDEPEND="x11-libs/libX11 x11-libs/libSM - >=dev-libs/glib-2.2 - >=x11-libs/gtk+-2.2 + >=dev-libs/glib-2.6 + >=x11-libs/gtk+-2.6 + gnome-base/librsvg >=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION} >=xfce-base/libxfce4util-${XFCE_MASTER_VERSION} >=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION} - thunar-vfs? ( >=xfce-base/thunar-${THUNAR_MASTER_VERSION} ) - panel-plugin? ( >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} ) + plugins? ( dev-libs/dbus-glib >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} ) >=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION} - media-libs/libpng - exo? ( >=xfce-extra/exo-0.3.2 )" -DEPEND="${RDEPEND}" - -if ! use thunar-vfs; then - XFCE_CONFIG="${XFCE_CONFIG} --disable-thunar-vfs --disable-thunarx" + thunar-vfs? ( >=xfce-base/thunar-${THUNAR_MASTER_VERSION} + >=xfce-extra/exo-0.3.2 dev-libs/dbus-glib )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + dev-util/intltool" + +XFCE_CONFIG="${XFCE_CONFIG} $(use_enable plugins panel-plugin) $(use_enable doc xsltproc)" + +if use thunar-vfs; then + XFCE_CONFIG="${XFCE_CONFIG} --enable-thunarx --enable-desktop-icons \ + --enable-file-icons --enable-exo" +else + XFCE_CONFIG="${XFCE_CONFIG} --disable-thunarx --disable-desktop-icons \ + --disable-file-icons --disable-exo" fi -if ! use exo; then - XFCE_CONFIG="${XFCE_CONFIG} --disable-exo" -fi - -if ! use panel-plugin; then - XFCE_CONFIG="${XFCE_CONFIG} --disable-panel-plugin" -fi +DOCS="AUTHORS ChangeLog NEWS TODO README" xfce44_core_package diff --git a/xfce-base/xfprint/ChangeLog b/xfce-base/xfprint/ChangeLog index d07aa21164f7..3a59fc0d160a 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.78 2007/01/25 19:27:44 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/ChangeLog,v 1.79 2007/01/28 15:33:25 welp Exp $ + + 28 Jan 2007; Peter Weller xfprint-4.4.0.ebuild: + Dep fixes, various other fixes 25 Jan 2007; Peter Weller xfprint-4.4.0.ebuild: fixed deps, removing usage of gnome2-utils, cleanup diff --git a/xfce-base/xfprint/xfprint-4.4.0.ebuild b/xfce-base/xfprint/xfprint-4.4.0.ebuild index fb26e083158a..0f77f683565a 100644 --- a/xfce-base/xfprint/xfprint-4.4.0.ebuild +++ b/xfce-base/xfprint/xfprint-4.4.0.ebuild @@ -1,20 +1,18 @@ # 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.3 2007/01/25 19:27:44 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/xfprint-4.4.0.ebuild,v 1.4 2007/01/28 15:33:25 welp Exp $ inherit xfce44 xfce44 -DESCRIPTION="Xfce4 Printing System" -LICENSE="BSD" +DESCRIPTION="Printer manager" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - -IUSE="debug" +IUSE="debug doc" RDEPEND="net-print/cups - >=dev-libs/glib-2.2 - >=x11-libs/gtk+-2.2 + >=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} @@ -24,9 +22,12 @@ RDEPEND="net-print/cups net-libs/gnutls app-text/a2ps" DEPEND="${RDEPEND} - >=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}" + dev-util/intltool + doc? ( dev-util/gtk-doc )" # CUPS includes support for LPR -XFCE_CONFIG="--enable-bsdlpr --enable-cups" +XFCE_CONFIG="${XFCE_CONFIG} --enable-bsdlpr --enable-cups" + +DOCS="AUTHORS ChangeLog NEWS README TODO" xfce44_core_package diff --git a/xfce-base/xfwm4/ChangeLog b/xfce-base/xfwm4/ChangeLog index 43ddfc8948f9..03ad6dc4d1d5 100644 --- a/xfce-base/xfwm4/ChangeLog +++ b/xfce-base/xfwm4/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for xfce-base/xfwm4 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.76 2007/01/23 18:31:48 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.77 2007/01/28 15:37:31 welp Exp $ + + 28 Jan 2007; Peter Weller xfwm4-4.4.0.ebuild: + Dep fixes, various other fixes 23 Jan 2007; Peter Weller xfwm4-4.4.0.ebuild: Removing usage of virtual/x11, and hardcoding in depends. Minor clean ups. diff --git a/xfce-base/xfwm4/xfwm4-4.4.0.ebuild b/xfce-base/xfwm4/xfwm4-4.4.0.ebuild index 7a3c98e75bb0..17fbb5b456d2 100644 --- a/xfce-base/xfwm4/xfwm4-4.4.0.ebuild +++ b/xfce-base/xfwm4/xfwm4-4.4.0.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.4.0.ebuild,v 1.2 2007/01/23 18:31:48 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.4.0.ebuild,v 1.3 2007/01/28 15:37:31 welp Exp $ inherit xfce44 xfce44 -DESCRIPTION="Window Manager for Xfce4" +DESCRIPTION="Window manager" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="debug startup-notification xcomposite" @@ -21,19 +21,20 @@ RDEPEND="x11-libs/libX11 xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes ) - >=dev-libs/glib-2 + >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6 x11-libs/pango - startup-notification? ( >=x11-libs/startup-notification-0.5 ) + startup-notification? ( x11-libs/startup-notification ) >=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION} >=xfce-base/libxfce4util-${XFCE_MASTER_VERSION} >=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}" DEPEND="${RDEPEND} - x11-proto/xextproto - x11-proto/xproto - >=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}" + dev-util/pkgconfig + dev-util/intltool" -XFCE_CONFIG="${XFCE_CONFIG} --enable-randr $(use_enable xcomposite compositor) \ - $(use_enable startup-notification)" +XFCE_CONFIG="${XFCE_CONFIG} --enable-xsync --enable-render --enable-randr \ + $(use_enable xcomposite compositor)" + +DOCS="AUTHORS ChangeLog COMPOSITOR NEWS README TODO" xfce44_core_package