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
commitd2f69a165ebade1c8c2f2ed376914e30103b66d7 (patch)
tree1d39236af114d22cbf6e5827c0d6d5ca881b410c /app-arch
parentOld. (diff)
downloadhistorical-d2f69a165ebade1c8c2f2ed376914e30103b66d7.tar.gz
historical-d2f69a165ebade1c8c2f2ed376914e30103b66d7.tar.bz2
historical-d2f69a165ebade1c8c2f2ed376914e30103b66d7.zip
Do only install one .desktop file for compression, #366465
Package-Manager: portage-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/Manifest16
-rw-r--r--app-arch/p7zip/metadata.xml14
-rw-r--r--app-arch/p7zip/p7zip-9.20.1.ebuild3
4 files changed, 21 insertions, 18 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/Manifest b/app-arch/p7zip/Manifest
index 0f8399faf22a..93dc1d1c1563 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
AUX 9.04-kde4.patch 5185 RMD160 57433a9b1dbfb44b7d8b362e1cee5a5a9b5e641c SHA1 e2bbbc7ac6563ac5f097e66263b5801ecdebbc80 SHA256 facc613f8c684ca2c0baff4c89e99f0abe29b12b96ef2281e17a0041e07631c3
AUX 9.04-makefile.patch 470 RMD160 3b114968d83174ef78acc0e9fce81fcfc7fe862e SHA1 3a3333d4703955664fdd4023c624ab4828af0ab1 SHA256 c8ef2898ed994929600c04ed0ecfd2dc2b94982d274ee217cbc05234c37750f6
@@ -8,15 +8,13 @@ DIST p7zip_9.13_src_all.tar.bz2 3753579 RMD160 beb9181330f4dfa75aa4f473c68a462c7
DIST p7zip_9.20.1_src_all.tar.bz2 3835235 RMD160 c3ff2dd12459282b46d9a68ab4af7800ff46039f SHA1 1cd567e043ee054bf08244ce15f32cb3258306b7 SHA256 49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782
EBUILD p7zip-9.13-r3.ebuild 4286 RMD160 5b83e47910ac32954aeacf0ef7ae59334df9d29f SHA1 8dbbe22a74eaeb60e01a85bb9cc97bbf8ae7b817 SHA256 febdc3f7e02e6baa97309ba5dd7b81b18ae3f4a5db1fd79400af1af3d47cd9dd
EBUILD p7zip-9.13.ebuild 3848 RMD160 753ffbc07e3eccc8db7d31d7d06ad92d23c4fd9d SHA1 1420dfa76ba1226a17c204d7230450907e15ff3e SHA256 cec2dc8b759c6f952c7d57b346711df1bf84697df477a7525b8ecd5ee8d67a76
-EBUILD p7zip-9.20.1.ebuild 4269 RMD160 9608669e4ca3d9137f5d0b481667b8b286c9cbac SHA1 a87297e943fbec679c7f5f1e19c83f49e904babf SHA256 ffadb813deb5efdce4e56496fbef2da78695b0f4924c099b47ebc0b7aa7f11c0
-MISC ChangeLog 18318 RMD160 4dcf40dfc1bdf6855ce6387372e1dd3476d666d4 SHA1 3bf72d9a1164f55f907fc585ee8bd103511a74d2 SHA256 ab80d4289b69d21ee901c19aa6118be393488043a3ab9bdac9a6cf36c82d1d9a
-MISC metadata.xml 317 RMD160 7c83b07b76aa8176bd0fb63c57180973c9f77658 SHA1 2cef3dd8f98ad9e4d4f6bd7a1929f47475ba609a SHA256 c4b8853a670cd8c68829be66127200dedee2e4e8bc2a3bfa595f099460c0946d
+EBUILD p7zip-9.20.1.ebuild 4303 RMD160 1597ea7f6b8e8c013fe56e19e8df8cabbe908c0a SHA1 2808ca790f02d69236fcea50b1d7ecf2265f4bf9 SHA256 cc85ab8d55e5de0d59a3441ee05106fbcab44677e7ad84b676146dc09e05f9a9
+MISC ChangeLog 18460 RMD160 77891e068622a6251fd32ddead035ed3ca5e75b8 SHA1 c50dd69a5cb0b6f82dcad948fc18e6a0813b10cc SHA256 2a14eef8a35621e3b3152f2303885c12043d45c3ff172174a8963bedda996f05
+MISC metadata.xml 322 RMD160 787cc0c7ce3c7080a3b847c4a02435522f831981 SHA1 84bd3fdb3f094c1c74f0d5abb1f8a446aeb284ed SHA256 4850c2010e5785e0498e0fb0a73101f2b934c71ae6daf06782938b821a0f9142
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iJwEAQEIAAYFAk589y8ACgkQfXuS5UK5QB37lQP/cRbIP8SBX8kan6WraS8dC/G9
-iPLtZvS89NBKG+L0XxSyee3pSiy7a9ejQ2ozDVKjQhytynRnkXAZd6nvgyYphi0P
-lWrQrPv0oGa5peO1z6yQNjA55uvPomiZtbbheER8ZDbMJV6bqt6WLBTfkQ9jEsoR
-EXQRWD2h8L2vHe4nL+c=
-=eUoC
+iEYEAREKAAYFAk6PGmYACgkQgAnW8HDreRYXgQCbBJOWCMmxwm8cH6YSi5MfpOZ6
+COEAn1DU2YRiCkffx2xxo0Ht5pZ7IipK
+=Rda9
-----END PGP SIGNATURE-----
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