| 1 |
ssuominen 10/08/23 23:23:48 |
| 2 |
|
| 3 |
Modified: libxfcegui4-4.6.4.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Don't try to replace xfce4-keyboard-shortcuts.xml from libxfce4ui. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.9 xfce-base/libxfcegui4/libxfcegui4-4.6.4.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.6.4.ebuild?rev=1.9&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.6.4.ebuild?rev=1.9&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.6.4.ebuild?r1=1.8&r2=1.9 |
| 14 |
|
| 15 |
Index: libxfcegui4-4.6.4.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.6.4.ebuild,v |
| 18 |
retrieving revision 1.8 |
| 19 |
retrieving revision 1.9 |
| 20 |
diff -u -r1.8 -r1.9 |
| 21 |
--- libxfcegui4-4.6.4.ebuild 11 Aug 2010 20:47:04 -0000 1.8 |
| 22 |
+++ libxfcegui4-4.6.4.ebuild 23 Aug 2010 23:23:48 -0000 1.9 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2010 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.6.4.ebuild,v 1.8 2010/08/11 20:47:04 josejx Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.6.4.ebuild,v 1.9 2010/08/23 23:23:48 ssuominen Exp $ |
| 28 |
|
| 29 |
EAPI=3 |
| 30 |
inherit xfconf |
| 31 |
@@ -36,3 +36,10 @@ |
| 32 |
--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html" |
| 33 |
DOCS="AUTHORS ChangeLog NEWS" |
| 34 |
} |
| 35 |
+ |
| 36 |
+src_install() { |
| 37 |
+ xfconf_src_install |
| 38 |
+ |
| 39 |
+ has_version xfce-base/libxfce4ui && rm -f \ |
| 40 |
+ "${D}"/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml |
| 41 |
+} |
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.153 xfce-base/libxfcegui4/ChangeLog |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/libxfcegui4/ChangeLog?rev=1.153&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/libxfcegui4/ChangeLog?rev=1.153&content-type=text/plain |
| 49 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/libxfcegui4/ChangeLog?r1=1.152&r2=1.153 |
| 50 |
|
| 51 |
Index: ChangeLog |
| 52 |
=================================================================== |
| 53 |
RCS file: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v |
| 54 |
retrieving revision 1.152 |
| 55 |
retrieving revision 1.153 |
| 56 |
diff -u -r1.152 -r1.153 |
| 57 |
--- ChangeLog 11 Aug 2010 20:47:04 -0000 1.152 |
| 58 |
+++ ChangeLog 23 Aug 2010 23:23:48 -0000 1.153 |
| 59 |
@@ -1,6 +1,10 @@ |
| 60 |
# ChangeLog for xfce-base/libxfcegui4 |
| 61 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 62 |
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.152 2010/08/11 20:47:04 josejx Exp $ |
| 63 |
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.153 2010/08/23 23:23:48 ssuominen Exp $ |
| 64 |
+ |
| 65 |
+ 23 Aug 2010; Samuli Suominen <ssuominen@g.o> |
| 66 |
+ libxfcegui4-4.6.4.ebuild: |
| 67 |
+ Don't try to replace xfce4-keyboard-shortcuts.xml from libxfce4ui. |
| 68 |
|
| 69 |
11 Aug 2010; Joseph Jezak <josejx@g.o> libxfcegui4-4.6.4.ebuild: |
| 70 |
Marked ppc stable for bug #323729. |
Archives