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

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

4 files changed, 84 insertions, 9 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/Manifest b/xfce-base/libxfce4ui/Manifest
index b7d2000bf150..b626d3e949a5 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -2,19 +2,22 @@
 Hash: SHA1
 
 AUX libxfce4ui-4.8.0-keyboard-shortcuts.patch 1807 RMD160 918d2effaa0f4ab844bdb9455e1704cc87b83ee8 SHA1 1100264d34f27951637c81b15719c5f585902607 SHA256 31723ea52e88ea892b713ced575daffdc78c8b168706874cb0dbd9c567bf4970
+AUX libxfce4ui-4.8.1-keyboard-shortcuts.patch 1006 RMD160 7f55919838dd41af6c62164a1f40867fac73fdb2 SHA1 7bfc5f6b383e2be29ca114e0575c43829bc787ba SHA256 6487e33d4adae7cf7fa1bc7df04fa0358b0ce259be510b25eb6ce2a5fadf0420
 DIST libxfce4ui-4.8.0.tar.bz2 434180 RMD160 60ab88a663b1f1a41967837ecc6630fd0fb2a3a8 SHA1 107f9d8e3e583f3cf5330074e89ea72eb2a82888 SHA256 21f67fd004653440bfdb44874ed69c9806b4784978ec068d0b1c7012864ba339
+DIST libxfce4ui-4.8.1.tar.bz2 426831 RMD160 c6b235d43ea73a8aed89a0a646e4c5d0340bdfd8 SHA1 408645581e589135aa03d2e9b84f4eede68596b2 SHA256 39cbed29da06960074014b74abc2ba57db49dc81ab8995fb2160579c51669956
 EBUILD libxfce4ui-4.8.0-r1.ebuild 1380 RMD160 0da17e74f63fc30adb1ae6e04fb3bdeb8b520657 SHA1 601587e0101c50591fe3447f8412c1aeb8b62834 SHA256 3dc4f6489d3feb073367a2c4b5dd4e84021a7fee8c41dcdce254af890d54fdbe
 EBUILD libxfce4ui-4.8.0.ebuild 1279 RMD160 50b2a27dc0d65ea7f8dace0238cce7d9f18b6fa1 SHA1 a274f96c223e23be8f5054ffa5c8d7977fb70aa3 SHA256 7cb7fcc5a5faca97d1f8cc80fc6a93e8f6797ccea49be1580d96d5abaa4d7402
-MISC ChangeLog 3573 RMD160 aaaa6b805d49cc3949c93a935fe107d95d78f53e SHA1 7db380152882ccce42cd41aa1bbd712328b3e803 SHA256 6a2b620611b7db26b1f8d4e8570d2ed0614e8ddfbd294deaeafe355218b5d8f7
+EBUILD libxfce4ui-4.8.1.ebuild 1377 RMD160 c54a4286bcf641fb156b6856e407f264c6fd37be SHA1 817dd0b5969ee87e0a766b76cfb800d2f1febcd5 SHA256 7df5e1e133ae7551932fb27f120b38517d0ff55df57e928cfcb6751132d810d9
+MISC ChangeLog 3819 RMD160 5feab7ea544f24d517aacadf46e80e236b7549c9 SHA1 9ab5faf863a04dc4c846ea4f3f797562a166e61b SHA256 c660780307f42ad6324dd9cb091fb20ffdbd0885357e61a4d96145acb43146b7
 MISC metadata.xml 347 RMD160 35d10ae9eb7101ede48732ea05625d0017cea655 SHA1 95a61f64efd22364f593996eb6f4f142fbea1a6f SHA256 6c130594d794cfd1cc332d87bc30253651002805479b8563ff108c6ec15cb044
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO5Fj8AAoJEEdUh39IaPFNUJkH/3USBlKYjHxCPBVjnVU0vHFI
-DASRvxumKmXjGqq80pXNA9oB/jQNv1l8qkGL1hxD5xIWyzccVPLC0zg8/NkNRl05
-JDvoYqYqaBx4dtwEKQ8C20uCUjtONj9V+fwcYniZAk7VfyniLpgleJzI9lmpKOoM
-4K2o7SFi4inDv82v4SUVJENsN5chjIf34SnfjAuKxWEf/q2IwlInDWrYILBHm4lP
-ctR/F8ZEjD5+5QD+wbz32rbgbIyRF76zpBfclEz8LPOuZ1kjnadtgCyjZR/B1gBY
-RnzaTbrL0i9Mj6L9auVdOEesuX/o0DIghC7M9VWAUPO3zXGUYNCp8X8+LLYxcYk=
-=5RSX
+iQEcBAEBAgAGBQJO+biNAAoJEEdUh39IaPFNg+kH/3CGvY13cOsaT6Cyyd88SYQQ
+/pzGHW/Qm3DaLFInYAln8DEYTX4Rh/jfWFKxIyzU4zfd8mn+4lo8HearWL2VPRSj
+GnUKhnODq7/udidligR9Y2EevScK/Ohd4jUPB1CObofMFtHBtCrial9HSyukD1Gp
+Sno0bC97QycElrEIro28yGR3occOB8wn6wIPRAqWSK3kUMA5dV2Z+QO56s6o6twE
+uTfzRywMWzwAEwSjuv9sL9zmwkEp+Jwzh68LF4vMBYIsXUy7G4d83qNKlWgr4/Ym
+c5HnovrQdOSTHgKTqTOEsJdASmEXPDx8ukHcLFPnUe5a1n2OGKJtur5EJjd1MXM=
+=4779
 -----END PGP SIGNATURE-----
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 )
+}