Version bump. Use upstream patch for XF86WWW and XF86Mail keyboard shortcuts.

(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

3 files changed, 73 insertions, 1 deletions

diff --git a/xfce-base/libxfce4ui/ChangeLog b/xfce-base/libxfce4ui/ChangeLog
index 490cf891657b..0d0826c9beda 100644
--- a/xfce-base/libxfce4ui/ChangeLog
+++ b/xfce-base/libxfce4ui/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/libxfce4ui
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4ui/ChangeLog,v 1.25 2011/12/11 07:15:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4ui/ChangeLog,v 1.26 2011/12/27 12:23:53 ssuominen Exp $
+
+*libxfce4ui-4.8.1 (27 Dec 2011)
+
+  27 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> +libxfce4ui-4.8.1.ebuild,
+  +files/libxfce4ui-4.8.1-keyboard-shortcuts.patch:
+  Version bump. Use upstream patch for XF86WWW and XF86Mail keyboard shortcuts.
 
 *libxfce4ui-4.8.0-r1 (11 Dec 2011)
 
diff --git a/xfce-base/libxfce4ui/files/libxfce4ui-4.8.1-keyboard-shortcuts.patch b/xfce-base/libxfce4ui/files/libxfce4ui-4.8.1-keyboard-shortcuts.patch
new file mode 100644
index 000000000000..874401857c0b
--- /dev/null
+++ b/xfce-base/libxfce4ui/files/libxfce4ui-4.8.1-keyboard-shortcuts.patch
@@ -0,0 +1,21 @@
+From 3130c3c5f96e3ddcff1a6e25598d0d2afe823090 Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick@xfce.org>
+Date: Mon, 12 Dec 2011 19:52:10 +0000
+Subject: Add shortcuts for XF86WWW and XF86Mail.
+
+---
+diff --git a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
+index 2ea386e..60b3b3c 100644
+--- a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
++++ b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
+@@ -10,6 +10,8 @@
+       <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/>
+       <property name="&lt;Super&gt;p" type="string" value="xfce4-display-settings --minimal"/>
+       <property name="&lt;Control&gt;Escape" type="string" value="xfdesktop --menu"/>
++      <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/>
++      <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/>
+     </property>
+   </property>
+   <property name="xfwm4" type="empty">
+--
+cgit v0.9.0.2
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.8.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.8.1.ebuild
new file mode 100644
index 000000000000..ffc0f2e5c488
--- /dev/null
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.8.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4ui/libxfce4ui-4.8.1.ebuild,v 1.1 2011/12/27 12:23:53 ssuominen Exp $
+
+EAPI=4
+inherit xfconf
+
+DESCRIPTION="Unified widgets and session management libraries for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/libxfce4"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug glade startup-notification"
+
+RDEPEND=">=dev-libs/glib-2.16
+	>=x11-libs/gtk+-2.14:2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=xfce-base/libxfce4util-4.8
+	>=xfce-base/xfconf-4.8
+	glade? ( dev-util/glade:3 )
+	startup-notification? ( x11-libs/startup-notification )"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-keyboard-shortcuts.patch ) #392001
+
+	XFCONF=(
+		$(use_enable startup-notification)
+		$(use_enable glade gladeui)
+		$(xfconf_use_debug)
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+		)
+
+	[[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
+
+	DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+}