Fix xfce4-tips

Package-Manager: portage-2.2_rc41/cvs/Linux i686

4 files changed, 72 insertions, 3 deletions

diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index ff1be48caff2..2cd1de07e152 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/xfce4-session
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.99 2009/10/06 21:18:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.100 2009/10/19 21:13:27 sping Exp $
+
+*xfce4-session-4.6.1-r1 (19 Oct 2009)
+
+  19 Oct 2009; Sebastian Pipping <sping@gentoo.org>
+  +xfce4-session-4.6.1-r1.ebuild, metadata.xml:
+  Fix xfce4-tips: it relies on fortune to display tips, not just fortunes
 
   06 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-session-4.6.1.ebuild:
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index f7a6f1d8137c..33769e71f928 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,4 +1,5 @@
 DIST xfce4-session-4.6.1.tar.bz2 1365247 RMD160 0cab4a0ca2b0d7718cde546d98bac1c87a7ba4f0 SHA1 760e05bf73783521b3ce34e91aa187c74018ab8c SHA256 feed3f9053b83233697223a20f95ca0ad6efe9fedffcc098e4935a425e8f9f0e
+EBUILD xfce4-session-4.6.1-r1.ebuild 1706 RMD160 4f0095e7f46089193a9ca3df822bd4bfcbae1780 SHA1 68ec8063ad495afc8e5305ba3b2bc87091b019c2 SHA256 a016a91880393c039c7a60ef27537803b364a42b7a2aefb5c48d17bc09e7a570
 EBUILD xfce4-session-4.6.1.ebuild 1470 RMD160 c467cefc5fcf761eced114c6e90771e7748056f7 SHA1 f609ed34a967d74a18402d646083ba0904dc5f62 SHA256 a50da3ac13529e10597943837833c67414e2234b38f31367fc256d89e5544690
-MISC ChangeLog 12459 RMD160 d61f73cdbf91964f87ca6d49b7dae44caf640cd3 SHA1 552778d6b9bcd597953e7d540277ae4712727cd2 SHA256 fb64f77aa0467adc9ad8569aaff43bf3e4b5b18e79b7188bddfd1ffd3f61b627
-MISC metadata.xml 244 RMD160 90c73dd09b35d530e6f4378748de35cde85f10fa SHA1 95958bea917e628d01b3e458d65dab0ce1950613 SHA256 f0402278ccebaff50df5e59436d57de8bc99581ceb131ec48ef1347fa482127f
+MISC ChangeLog 12670 RMD160 346b8301b833efc6d9f9c9177df310114569c5ab SHA1 17979167a0b61a6ab91f9a6301b17088a083489d SHA256 452f03d032886d213c7645807a722427ab0f3a5bc7b37e24baec3892f003c954
+MISC metadata.xml 358 RMD160 3edf1bf231ed48c0fb27ef83dca673dac59c0869 SHA1 428b5bbb2f51d2859bfffb36096a7a1fa1eaa988 SHA256 50af989b0194207f07e605baf7ea025b2c022c602f64d3d6fafbf1c82453f2c0
diff --git a/xfce-base/xfce4-session/metadata.xml b/xfce-base/xfce4-session/metadata.xml
index 83abf5f159ed..9a21c71866d3 100644
--- a/xfce-base/xfce4-session/metadata.xml
+++ b/xfce-base/xfce4-session/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<herd>xfce</herd>
 	<use>
+		<flag name="fortune">Install tips and tricks app (xfce4-tips), adds dependency on games-misc/fortune-mod</flag>
 		<flag name="gnome-keyring">Support for storing your password.</flag>
 	</use>
 </pkgmetadata>
diff --git a/xfce-base/xfce4-session/xfce4-session-4.6.1-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.6.1-r1.ebuild
new file mode 100644
index 000000000000..871561c1928f
--- /dev/null
+++ b/xfce-base/xfce4-session/xfce4-session-4.6.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2009 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.6.1-r1.ebuild,v 1.1 2009/10/19 21:13:27 sping Exp $
+
+EAPI=2
+inherit flag-o-matic xfconf
+
+DESCRIPTION="Session manager for Xfce4"
+HOMEPAGE="http://www.xfce.org/projects/xfce4-session/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug +fortune gnome gnome-keyring profile"
+
+RDEPEND="gnome-base/libglade
+	>=dev-libs/dbus-glib-0.73
+	x11-libs/libX11
+	x11-libs/libSM
+	>=x11-libs/libwnck-2.12
+	x11-apps/iceauth
+	>=xfce-base/libxfce4util-4.6
+	>=xfce-base/libxfcegui4-4.6
+	>=xfce-base/xfconf-4.6
+	>=xfce-base/xfce-utils-4.6
+	gnome? ( gnome-base/gconf )
+	gnome-keyring? ( gnome-base/gnome-keyring )
+	fortune? ( games-misc/fortune-mod )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+pkg_setup() {
+	XFCONF="--disable-dependency-tracking
+		--disable-static
+		$(use_enable gnome)
+		$(use_enable gnome-keyring libgnome-keyring)
+		$(use_enable debug)
+		$(use_enable profile profiling)
+		$(use_enable profile gcov)"
+	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+}
+
+src_configure() {
+	use profile && filter-flags -fomit-frame-pointer
+	xfconf_src_configure
+}
+
+src_install() {
+	xfconf_src_install
+
+	if ! use fortune ; then
+		# Wipe away unusable xfce4-tips
+		rm -Rf "${D}"/usr/share/xfce4/tips
+		rm -f "${D}"/usr/bin/xfce4-tips \
+			"${D}"/usr/lib/debug/usr/bin/xfce4-tips.debug \
+			"${D}"/etc/xdg/autostart/xfce4-tips-autostart.desktop
+		rmdir -p "${D}"/etc/xdg/autostart
+	fi
+}