summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-10-07 15:27:28 +0000
committerJustin Lecher <jlec@gentoo.org>2011-10-07 15:27:28 +0000
commite5d0c60bc0071f173c7f7e87d17ceae85968046b (patch)
tree45b25b227869efcefb482484d8938abcd29f783e /app-arch
parentOld. (diff)
downloadgentoo-2-e5d0c60bc0071f173c7f7e87d17ceae85968046b.tar.gz
gentoo-2-e5d0c60bc0071f173c7f7e87d17ceae85968046b.tar.bz2
gentoo-2-e5d0c60bc0071f173c7f7e87d17ceae85968046b.zip
Do only install one .desktop file for compression, #366465
(Portage version: 2.2.0_alpha62/cvs/Linux x86_64)
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/p7zip/ChangeLog6
-rw-r--r--app-arch/p7zip/metadata.xml14
-rw-r--r--app-arch/p7zip/p7zip-9.20.1.ebuild3
3 files changed, 14 insertions, 9 deletions
diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index 607d640f20d6..88af271ad49b 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-arch/p7zip
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.142 2011/08/19 17:27:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.143 2011/10/07 15:27:28 jlec Exp $
+
+ 07 Oct 2011; Justin Lecher <jlec@gentoo.org> p7zip-9.20.1.ebuild,
+ metadata.xml:
+ Do only install one .desktop file for compression, #366465
19 Aug 2011; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
Fix metadata.xml
diff --git a/app-arch/p7zip/metadata.xml b/app-arch/p7zip/metadata.xml
index 485625e2535a..e71e75219555 100644
--- a/app-arch/p7zip/metadata.xml
+++ b/app-arch/p7zip/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
- <email>jlec@gentoo.org</email>
- <description>maintainer</description>
-</maintainer>
-<use>
- <flag name="rar">Enable support for non-free rar decoder</flag>
-</use>
+ <maintainer>
+ <email>jlec@gentoo.org</email>
+ <description>maintainer</description>
+ </maintainer>
+ <use>
+ <flag name="rar">Enable support for non-free rar decoder</flag>
+ </use>
</pkgmetadata>
diff --git a/app-arch/p7zip/p7zip-9.20.1.ebuild b/app-arch/p7zip/p7zip-9.20.1.ebuild
index db2fbaff5343..1d675927e2ac 100644
--- a/app-arch/p7zip/p7zip-9.20.1.ebuild
+++ b/app-arch/p7zip/p7zip-9.20.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1.ebuild,v 1.3 2011/08/17 16:41:23 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1.ebuild,v 1.4 2011/10/07 15:27:28 jlec Exp $
EAPI="2"
WX_GTK_VER="2.8"
@@ -121,6 +121,7 @@ src_install() {
insinto /usr/share/icons/hicolor/16x16/apps/
newins GUI/p7zip_16_ok.png p7zip.png
+ rm GUI/kde4/p7zip_compress.desktop
insinto /usr/share/kde4/services/ServiceMenus
doins GUI/kde4/*.desktop
fi