summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-02-20 21:14:40 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-02-20 21:14:40 +0000
commit963d343be0f80d1650da77e7dea0bf8dc26b3f16 (patch)
tree23afc31f1be00da775aa464c8775c9af8af416e2 /xfce-base/xfce-utils
parentversion bump and propagate ~arch keywords to live-template-ebuild (diff)
downloadhistorical-963d343be0f80d1650da77e7dea0bf8dc26b3f16.tar.gz
historical-963d343be0f80d1650da77e7dea0bf8dc26b3f16.tar.bz2
historical-963d343be0f80d1650da77e7dea0bf8dc26b3f16.zip
Remove more file collisions
Package-Manager: portage-2.2.0_alpha88/cvs/Linux x86_64
Diffstat (limited to 'xfce-base/xfce-utils')
-rw-r--r--xfce-base/xfce-utils/Manifest16
-rw-r--r--xfce-base/xfce-utils/xfce-utils-4.8.3.ebuild5
2 files changed, 11 insertions, 10 deletions
diff --git a/xfce-base/xfce-utils/Manifest b/xfce-base/xfce-utils/Manifest
index 68f124902f06..5154e4542fe7 100644
--- a/xfce-base/xfce-utils/Manifest
+++ b/xfce-base/xfce-utils/Manifest
@@ -2,17 +2,17 @@
Hash: SHA1
DIST xfce-utils-4.8.3.tar.bz2 880263 RMD160 03a3e690c803dd49f63cc700b59d5ccc716fbbed SHA1 159d445b689ebbf73462a4b4baf5cce4e04afaab SHA256 035070d7e608b29dbaeeb6ec541d8c2edbd28152d3ef111316c33871ab02b926
-EBUILD xfce-utils-4.8.3.ebuild 1780 RMD160 79d554c784deeaecb97808d4cdfc2bd022da75d1 SHA1 75b7b4800cbf51060266eb16549049ce07e8d18f SHA256 30589d9578aaf8745bb0b32953b72866d0e69c2279eea8a4e8728744f078cf87
+EBUILD xfce-utils-4.8.3.ebuild 1829 RMD160 ec40fefea527d20026379a3f967250b898cc9400 SHA1 08bdab8a836d3a99cb66f8087d56c083bd0381ac SHA256 de4c26800a2c029e98d8ce79399a2d3f1f945dc948cb6cc9b5a53f668e2f34c5
MISC ChangeLog 23512 RMD160 8aaaa26a9c957d337afbaa431792b96c2df7235a SHA1 b64cac6abfce1766ee5cbcd3cfd1f1dd96bd5f1e SHA256 9fb88ef9931cea5d43d629ecb79b2e30019e24dbecc18fd33e8ab8ed81735528
MISC metadata.xml 218 RMD160 e064747a2c888959d939ed09a70c242d905c89ea SHA1 8ff18a8acc37d299a3cc7b30663ca3eb0f91032e SHA256 c47df69ae42900828c5afb0aa77ee6f9ddca55a79b3326f69a0bbf8119f3d5df
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBAgAGBQJPQrNEAAoJEEdUh39IaPFNMjAIAJfMomaKiMNQe589XCARtyoi
-Drp7y7UqTLOhAjthjPi/uKf3HLOOl6BNrYOfLW3HVa/lmuus+QYaQgzD1rY7Uid0
-EN09bZSfNK2cYn8MTp2f3A+DEMQ76UfCJXTB0KLfkj+8bXR/ISYdnWLjmxzBnrp8
-n0Y/mdNX1yGkGYytbJPgb9UzHLMsZTxEBysm8iUzyolpl1L/+akDWXnr5mKgMPwl
-2S5Em/UfqbuZYoztGw5ktGCQdbXpY1LwPkofajdu7eUHmLB/kOJnEEFDrvsYr2R5
-jo11g4SfR3YjH8SWm2LHPAc0nAIaAqBhTUSE9PslHtA07CmjpV03SKqpCTq08rs=
-=aM+L
+iQEcBAEBAgAGBQJPQrbvAAoJEEdUh39IaPFNuNIH/1AGI0s2Y8kkqr7O07nls52B
+x0MYCYeoEni1vQ7bbgpcSeeDNeTNtz4ME31y4ew5U3UQiXSAdyKBYPmcQegzHkKP
+cwb69LIjTe7pburL/DYjOYVLSylMn/a4oHoHFNnYxBX6Yatml2nGsWuV8AHs0ka8
+L3L77/xDFfGahFifpD/WD8Hfq33rXuli+Xc0V4WK6cyvrip2ey44795fr+eCAdB8
+VyauQ8Hs2+pQV/RWwjVv4qPByuqpfbQhTyl3LFz4n1f4Asq5E6GXJGwvzxBi6tUo
+Ir9p7sJFVfDm2PpNT4xTfUltBE3dqQ/Hn0Z32lv0JHwBBNMyz+K2Qyyi2M8nwAk=
+=XmPy
-----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce-utils/xfce-utils-4.8.3.ebuild b/xfce-base/xfce-utils/xfce-utils-4.8.3.ebuild
index 57665bfb32ac..6bc50e506840 100644
--- a/xfce-base/xfce-utils/xfce-utils-4.8.3.ebuild
+++ b/xfce-base/xfce-utils/xfce-utils-4.8.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.8.3.ebuild,v 1.8 2012/02/20 20:59:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.8.3.ebuild,v 1.9 2012/02/20 21:14:40 ssuominen Exp $
EAPI=4
inherit xfconf
@@ -56,7 +56,8 @@ src_install() {
# NOTE: ONLY FOR DEVELOPMENT REASONS
has_version '>=xfce-extra/xfce4-appfinder-4.9' && rm -f \
- "${ED}"usr/bin/xfrun4
+ "${ED}"usr/bin/xfrun4 \
+ "${ED}"usr/share/applications/xfrun4.desktop
has_version '>=xfce-base/libxfce4ui-4.9' && rm -f \
"${ED}"usr/bin/xfce4-about \
"${ED}"usr/share/applications/xfce4-about.desktop \