old

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

diff --git a/xfce-base/libxfce4ui/ChangeLog b/xfce-base/libxfce4ui/ChangeLog
index 0d0826c9bedad7c3362f22c0f3aa5feb33a15a05..24490386672a76a99c4f527be987cdd347eb3864 100644 (file)
--- 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/Manifest b/xfce-base/libxfce4ui/Manifest
index b626d3e949a515ee9d7e86f0e66a400ef70ac8fc..2e8f795ecf5fe6e95590d45c0f7e2cb304ea62a6 100644 (file)
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,23 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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
 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
+MISC ChangeLog 3963 RMD160 eadedd830e35d561c43f0846cecc80ad25806349 SHA1 b3f28490f2a91f945628fd6ffa91ceebdb21f05e SHA256 321907923a2377663363837f671d4e8d414879ad4e3f55f988cf3cf080c61f3f
+MISC metadata.xml 260 RMD160 1cc6fe6e5ed5173c0193c1a0016042254ad78c77 SHA1 904dda364a94c6e7f015f30f4e925001c8e34b11 SHA256 69d1d192d350fb54e69b6d70ccd79754fe198cb5419923972a54bdd671524a4d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO+biNAAoJEEdUh39IaPFNg+kH/3CGvY13cOsaT6Cyyd88SYQQ
-/pzGHW/Qm3DaLFInYAln8DEYTX4Rh/jfWFKxIyzU4zfd8mn+4lo8HearWL2VPRSj
-GnUKhnODq7/udidligR9Y2EevScK/Ohd4jUPB1CObofMFtHBtCrial9HSyukD1Gp
-Sno0bC97QycElrEIro28yGR3occOB8wn6wIPRAqWSK3kUMA5dV2Z+QO56s6o6twE
-uTfzRywMWzwAEwSjuv9sL9zmwkEp+Jwzh68LF4vMBYIsXUy7G4d83qNKlWgr4/Ym
-c5HnovrQdOSTHgKTqTOEsJdASmEXPDx8ukHcLFPnUe5a1n2OGKJtur5EJjd1MXM=
-=4779
+iQEcBAEBAgAGBQJPBtbgAAoJEEdUh39IaPFNpL0H/3+zbfx4EZoBNQvPeGmM+Gpm
+Y5MXHHMtI4K7voPg1+PNdCEtWK9rEzpGpuoCpOck1J9uuxiG9VdF0YdtaUaHHt5H
+VoOJHQbIhG9JcRxPA9tl4PP9RWKZAauXKFZ4AbVi4dQ2rErxFqJSp/Su5cVYnD0w
+Ytl4oWlgA3GqJJJTFqL5Qi8tHw91MQtIt4115zPt7CJj2gUeGTlfZysH/lrXz14m
+f/j2RYSN37N2fKySBw+oYoHQZ9A/14Zne6FWx53n5+iq8nWTLeSiSaVf7JrVU+Kr
+0GgAevGsPaAajq//oInLJwmoFC0+vtnM0ymAOp9heXKERpm1jQ4pSFS8gYv3qio=
+=lDD0
 -----END PGP SIGNATURE-----

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 (file)
index b0fb442..0000000
--- 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 (file)
index cddc802..0000000
--- 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 c9349c23134c934fe729edd4a73cb635542089d1..5d833ecdc4315904e0f09f74a3b336bae9e11c26 100644 (file)
--- 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>