diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-08-23 23:23:48 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-08-23 23:23:48 +0000 |
| commit | 3c81a08ea8d041b58f7763fe8596051134e5edc0 (patch) | |
| tree | ad215c2f940fd6dea6197267ee255ab9865477aa /xfce-base/libxfcegui4 | |
| parent | fix mech-and-cow with patch from Kostya Sha (bug #333881); EAPI=2 (diff) | |
| download | gentoo-2-3c81a08ea8d041b58f7763fe8596051134e5edc0.tar.gz gentoo-2-3c81a08ea8d041b58f7763fe8596051134e5edc0.tar.bz2 gentoo-2-3c81a08ea8d041b58f7763fe8596051134e5edc0.zip | |
Don't try to replace xfce4-keyboard-shortcuts.xml from libxfce4ui.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'xfce-base/libxfcegui4')
| -rw-r--r-- | xfce-base/libxfcegui4/ChangeLog | 6 | ||||
| -rw-r--r-- | xfce-base/libxfcegui4/libxfcegui4-4.6.4.ebuild | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/xfce-base/libxfcegui4/ChangeLog b/xfce-base/libxfcegui4/ChangeLog index 36b2df11f2a3..4a48dcf40f05 100644 --- a/xfce-base/libxfcegui4/ChangeLog +++ b/xfce-base/libxfcegui4/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for xfce-base/libxfcegui4 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.152 2010/08/11 20:47:04 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.153 2010/08/23 23:23:48 ssuominen Exp $ + + 23 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> + libxfcegui4-4.6.4.ebuild: + Don't try to replace xfce4-keyboard-shortcuts.xml from libxfce4ui. 11 Aug 2010; Joseph Jezak <josejx@gentoo.org> libxfcegui4-4.6.4.ebuild: Marked ppc stable for bug #323729. diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.6.4.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.6.4.ebuild index 51d1206ec035..724f95bd0f5f 100644 --- a/xfce-base/libxfcegui4/libxfcegui4-4.6.4.ebuild +++ b/xfce-base/libxfcegui4/libxfcegui4-4.6.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.6.4.ebuild,v 1.8 2010/08/11 20:47:04 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.6.4.ebuild,v 1.9 2010/08/23 23:23:48 ssuominen Exp $ EAPI=3 inherit xfconf @@ -36,3 +36,10 @@ pkg_setup() { --with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html" DOCS="AUTHORS ChangeLog NEWS" } + +src_install() { + xfconf_src_install + + has_version xfce-base/libxfce4ui && rm -f \ + "${D}"/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml +} |