old

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

4 files changed, 7 insertions, 77 deletions

diff --git a/xfce-base/libxfce4ui/ChangeLog b/xfce-base/libxfce4ui/ChangeLog
index 0d0826c9beda..24490386672a 100644
--- a/xfce-base/libxfce4ui/ChangeLog
+++ b/xfce-base/libxfce4ui/ChangeLog
@@ -1,6 +1,11 @@
 # 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.26 2011/12/27 12:23:53 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4ui/ChangeLog,v 1.27 2012/01/06 11:13:35 ssuominen Exp $
+
+  06 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -libxfce4ui-4.8.0-r1.ebuild,
+  -files/libxfce4ui-4.8.0-keyboard-shortcuts.patch:
+  old
 
 *libxfce4ui-4.8.1 (27 Dec 2011)
 
diff --git a/xfce-base/libxfce4ui/files/libxfce4ui-4.8.0-keyboard-shortcuts.patch b/xfce-base/libxfce4ui/files/libxfce4ui-4.8.0-keyboard-shortcuts.patch
deleted file mode 100644
index b0fb442196f2..000000000000
--- a/xfce-base/libxfce4ui/files/libxfce4ui-4.8.0-keyboard-shortcuts.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-http://bugzilla.xfce.org/show_bug.cgi?id=8194
-http://bugs.gentoo.org/show_bug.cgi?id=392001
-
-This is http://pkgs.fedoraproject.org/gitweb/?p=libxfce4ui.git;a=blob_plain;f=libxfce4ui-4.7.6-keyboard-shortcuts.patch;hb=HEAD
-BUT without the xfhelp4 keyboard shortcut.
-
---- libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
-+++ libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
-@@ -5,9 +5,19 @@
-     <property name="default" type="empty">
-       <property name="&lt;Alt&gt;F2" type="string" value="xfrun4"/>
-       <property name="&lt;Control&gt;&lt;Alt&gt;Delete" type="string" value="xflock4"/>
-+      <property name="&lt;Control&gt;&lt;Alt&gt;Escape" type="string" value="xkill"/>
-+      <property name="&lt;Control&gt;Escape" type="string" value="xfce4-popup-menu"/>
-+      <property name="&lt;Control&gt;&lt;Alt&gt;L" type="string" value="xfce4-session-logout"/>
-+      <property name="XF86WWW" type="string" value="xfbrowser4"/>
-+      <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/>
-       <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="XF86AudioRaiseVolume" type="string" value="amixer set Master 10%+ -q"/>
-+      <property name="XF86AudioLowerVolume" type="string" value="amixer set Master 10%- -q"/>
-+      <property name="XF86AudioMute" type="string" value="amixer set Master toggle -q"/>
-+      <property name="Print" type="string" value="xfce4-screenshooter -f"/>
-+      <property name="&lt;Alt&gt;Print" type="string" value="xfce4-screenshooter -w"/>
-     </property>
-   </property>
-   <property name="xfwm4" type="empty">
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.8.0-r1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.8.0-r1.ebuild
deleted file mode 100644
index cddc802364ee..000000000000
--- a/xfce-base/libxfce4ui/libxfce4ui-4.8.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.0-r1.ebuild,v 1.1 2011/12/11 07:15:59 ssuominen Exp $
-
-EAPI=4
-inherit xfconf
-
-DESCRIPTION="Xfce's unified widgets library"
-HOMEPAGE="http://www.xfce.org/projects/libraries/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/4.8/${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 vanilla"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libSM
-	>=dev-libs/glib-2.16:2
-	>=x11-libs/gtk+-2.14:2
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/xfconf-4.8
-	glade? ( dev-util/glade:3 )
-	startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}
-	!<xfce-base/libxfcegui4-4.8
-	dev-util/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext
-	dev-lang/perl"
-
-pkg_setup() {
-	use vanilla || 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 )
-}
diff --git a/xfce-base/libxfce4ui/metadata.xml b/xfce-base/libxfce4ui/metadata.xml
index c9349c23134c..5d833ecdc431 100644
--- a/xfce-base/libxfce4ui/metadata.xml
+++ b/xfce-base/libxfce4ui/metadata.xml
@@ -4,6 +4,5 @@
   <herd>xfce</herd>
   <use>
     <flag name='glade'>Build support for Glade 3's GtkBuilder implementation</flag>
-    <flag name='vanilla'>Don't apply extra keyboard shortcuts patch from Fedora</flag>
   </use>
 </pkgmetadata>