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 | 92cd5d9c6aa0de67b4e8c8393c0c32435c82b652 (patch) | |
| tree | 4780504acadc0781c3e452f043f4751563fc46b3 /xfce-base | |
| parent | fix mech-and-cow with patch from Kostya Sha (bug #333881); EAPI=2 (diff) | |
| download | historical-92cd5d9c6aa0de67b4e8c8393c0c32435c82b652.tar.gz historical-92cd5d9c6aa0de67b4e8c8393c0c32435c82b652.tar.bz2 historical-92cd5d9c6aa0de67b4e8c8393c0c32435c82b652.zip | |
Don't try to replace xfce4-keyboard-shortcuts.xml from libxfce4ui.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'xfce-base')
| -rw-r--r-- | xfce-base/libxfcegui4/ChangeLog | 6 | ||||
| -rw-r--r-- | xfce-base/libxfcegui4/Manifest | 14 | ||||
| -rw-r--r-- | xfce-base/libxfcegui4/libxfcegui4-4.6.4.ebuild | 9 |
3 files changed, 15 insertions, 14 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/Manifest b/xfce-base/libxfcegui4/Manifest index 17dedfd30330..4831fad0a191 100644 --- a/xfce-base/libxfcegui4/Manifest +++ b/xfce-base/libxfcegui4/Manifest @@ -1,16 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST libxfcegui4-4.6.1.tar.bz2 650666 RMD160 295263f3e8a6bbcea05ce5ae8ab0f3a9cf1e4568 SHA1 82bcfe74dd3b9188b9f41d8fa7dc4a8481461696 SHA256 3468a9cb348bf54f8a0afa386366683eff1987b722d2e81326f9e7ec7dfbe093 DIST libxfcegui4-4.6.4.tar.bz2 669219 RMD160 4d790c3990372aa82581450e1b2a2dfd36df293b SHA1 a12c79f8fa14c5d1fc0fca5615a451b7d23f8695 SHA256 c37e407dc00fb87dc16758d53e69edeac7b32aa76c5fcad2b784cf22f58af421 EBUILD libxfcegui4-4.6.1-r1.ebuild 995 RMD160 28bfef466a4b01960e01e25ca397753c4acfaf63 SHA1 287b8b2e610ccaa3713c73cf7b4b8c07483efe89 SHA256 d198db9f47535fc5bd5b16a927b514bc5487954ef927995fd23e03926b31abd0 -EBUILD libxfcegui4-4.6.4.ebuild 1175 RMD160 b35362e4355b5c947d8d65d4345fc8d6cabfc30d SHA1 ffba4a292937a88b530ef55793faacd20100c7c8 SHA256 5165649369448120c3c4f3948299fc6c4d0846942eb28cb0d9f8b1536e08557d -MISC ChangeLog 18384 RMD160 b0368020d7251af8c54de77fcc63f442504c096f SHA1 76e46032b5f6a52b947cdcc5d076ebd133e628cc SHA256 f0b3f6ca4b65cba497a69edb70a31cef2e6a8095ee3c445bfc1ebd79aee548a2 +EBUILD libxfcegui4-4.6.4.ebuild 1342 RMD160 f2aa39eb7c72301acf509c1b80111443cf0cf6ff SHA1 f7cc68cff177163583b204feaaf0e1d302ffa8aa SHA256 b6df650e455886edc33fa799f948f43cdb156f09e125d5d4b317dc08785d235b +MISC ChangeLog 18539 RMD160 44788702a4c648411b695e56842c8296edd6127d SHA1 c0e875759fb47cf2971615426019754b59cc791d SHA256 839a42ba0ca26186a627e0c3749dff43d33fc24fbbbf107cb837394d178f46dc MISC metadata.xml 227 RMD160 2023b4e67c56314acd3e483bedff0de00e864131 SHA1 4372778b73dbf21ec8030f1574123dd938c83563 SHA256 82c293b5d834b607586f75cfa8b1420259298d748a19edfea3eaaabfe211b8d1 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkxjC/wACgkQcsIHjyDViGSODgCgxDb0T1istwWkaioyCDenYSF2 -YuwAoOVP5SQHwfsOdVKH0KGLhPxU6Jf0 -=o53Y ------END PGP SIGNATURE----- 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 +} |