Fix for the kde4 patches, thanks ssuominen for spying on my commits

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

3 files changed, 49 insertions, 19 deletions

diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 445e2768450e..4f118b50fd0f 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -2,9 +2,9 @@
 Hash: SHA1
 
 AUX 4.65-hardlink.patch 413 RMD160 49bfa9195ee874f1e6718503919b620b0986a711 SHA1 ed6d221f34f029c2b1cc7d710b78e98e2d310e32 SHA256 187fc9f9ec0160c7b5f6a1bf7394e7d92db1fbebf219a1ea55725d40255256c8
-AUX 4.65-kde4.patch 3453 RMD160 11e1f44bb848ad9a1538056ce6399fd8ede16c8b SHA1 9a48bde358b6081723f551c9ca589c9de46e7213 SHA256 43c7acd4fafd45d64c059bacf0cae038845f5c29fb9b6dd4ce67ebf0764eeb50
+AUX 4.65-kde4.patch 3409 RMD160 568a0804bac5a46a471c974d3a9ae8919d0e73cd SHA1 b6535d4b79ece3c36b91355434ff1de7bdfd8ce8 SHA256 85215ca3c0e98340bca6469d4f21ebdd64b92958886f0d6500379d6ad0ea52ed
 AUX 4.65-makefile.patch 450 RMD160 9f3de770dd3d74d3546c871364ee527bb9c9d3b6 SHA1 7fdcbf714b65c25e5749ee78b34256bba84adee0 SHA256 d36e71be74fdcc3c2afaf2217cb4712f00e3e75f3d23efd6c288f058092c4120
-AUX 9.04-kde4.patch 2891 RMD160 02410e4e10a100df0865c5226543b4d0e7f784f0 SHA1 c6c870d3938e0066db6d49cdf99a73b5ad01321b SHA256 dc73dada05ef443b3a73507577b6ec8f67aa9c097816b4a3b9d470bdb080ff8d
+AUX 9.04-kde4.patch 5185 RMD160 57433a9b1dbfb44b7d8b362e1cee5a5a9b5e641c SHA1 e2bbbc7ac6563ac5f097e66263b5801ecdebbc80 SHA256 facc613f8c684ca2c0baff4c89e99f0abe29b12b96ef2281e17a0041e07631c3
 AUX 9.04-makefile.patch 470 RMD160 3b114968d83174ef78acc0e9fce81fcfc7fe862e SHA1 3a3333d4703955664fdd4023c624ab4828af0ab1 SHA256 c8ef2898ed994929600c04ed0ecfd2dc2b94982d274ee217cbc05234c37750f6
 AUX p7zip 1210 RMD160 0f331392eb77077ea6c100011326202661e9b6ab SHA1 b4e1e02081e28ece33d2a8303ee69c5f0e9ad239 SHA256 28d181cd1c43628da0adb485e20f270461b6cf8d743d2187a3380f7799fbc2d5
 DIST p7zip_4.57_src_all.tar.bz2 1473608 RMD160 af40563b4ead84d138e9fff03a2677540c50d29d SHA1 eda5de3d35567e2633373dbe60313527a6a4db27 SHA256 00e923386dd53d532a86331d1694eaeee626783afa503f91edf7370357e05b53
@@ -22,7 +22,7 @@ MISC metadata.xml 403 RMD160 e0525b688d7e49c113379f1da3cb48f7dd283339 SHA1 b792f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkt5v8gACgkQgAnW8HDreRYkVwCgxq25su0IdqAfThvAb6TB9a/y
-ULoAoImDo64n78YjnWdByWUExk9kz6+l
-=G4Dm
+iEYEARECAAYFAkt5wdsACgkQgAnW8HDreRZCPgCgsIioZvZFYnWKRPLdwnjYU2o6
+sBwAoMLyVhLyxNGJvbx6875+vH0VEQNf
+=sUb6
 -----END PGP SIGNATURE-----
diff --git a/app-arch/p7zip/files/4.65-kde4.patch b/app-arch/p7zip/files/4.65-kde4.patch
index fae64e446b7b..dad8cfaf1ef4 100644
--- a/app-arch/p7zip/files/4.65-kde4.patch
+++ b/app-arch/p7zip/files/4.65-kde4.patch
@@ -1,12 +1,11 @@
 diff --git a/GUI/kde/p7zip_compress.desktop b/GUI/kde/p7zip_compress.desktop
-index 9010fbd..53f25ec 100644
+index 9010fbd..eec41dd 100644
 --- a/GUI/kde/p7zip_compress.desktop
 +++ b/GUI/kde/p7zip_compress.desktop
-@@ -1,6 +1,9 @@
+@@ -1,6 +1,8 @@
  [Desktop Entry]
 -ServiceTypes=inode/directory
 -Actions=CompressDialog;Compress7z;CompressZip;extractHere;ExtractSubdir;ExtractTo;test;Benchmark
-+Encoding=UTF-8
 +Type=Service
 +ServiceTypes=KonqPopupMenu/Plugin
 +MimeType=all/all;
@@ -14,7 +13,7 @@ index 9010fbd..53f25ec 100644
  X-KDE-Priority=TopLevel
  X-KDE-Submenu=7-Zip
  X-KDE-Icon=p7zip
-@@ -20,26 +23,6 @@ Name=Add to Zip Archive
+@@ -20,26 +22,6 @@ Name=Add to Zip Archive
  Icon=p7zip
  Exec=p7zipForFilemanager a -tzip %U
  
@@ -42,13 +41,13 @@ index 9010fbd..53f25ec 100644
  Name=Benchmark
  Icon=p7zip
 diff --git a/GUI/kde/p7zip_extract.desktop b/GUI/kde/p7zip_extract.desktop
-index 9038c76..4eda887 100644
+index 9038c76..217788c 100644
 --- a/GUI/kde/p7zip_extract.desktop
 +++ b/GUI/kde/p7zip_extract.desktop
-@@ -1,10 +1,30 @@
+@@ -1,10 +1,29 @@
  [Desktop Entry]
 -X-SuSE-translate=true
- Encoding=UTF-8
+-Encoding=UTF-8
 -ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak
 -Actions=extractHere
 +Type=Service
@@ -80,4 +79,3 @@ index 9038c76..4eda887 100644
 +Name=Test Archive
 +Exec=p7zipForFilemanager t %U
 +Icon=p7zip
-\ No newline at end of file
diff --git a/app-arch/p7zip/files/9.04-kde4.patch b/app-arch/p7zip/files/9.04-kde4.patch
index 2e074c287b14..c309d70d8bbe 100644
--- a/app-arch/p7zip/files/9.04-kde4.patch
+++ b/app-arch/p7zip/files/9.04-kde4.patch
@@ -1,12 +1,11 @@
 diff --git a/GUI/kde/p7zip_compress.desktop b/GUI/kde/p7zip_compress.desktop
-index 9010fbd..99e76b9 100644
+index 9010fbd..b965fa6 100644
 --- a/GUI/kde/p7zip_compress.desktop
 +++ b/GUI/kde/p7zip_compress.desktop
-@@ -1,6 +1,9 @@
+@@ -1,6 +1,8 @@
  [Desktop Entry]
 -ServiceTypes=inode/directory
 -Actions=CompressDialog;Compress7z;CompressZip;extractHere;ExtractSubdir;ExtractTo;test;Benchmark
-+Encoding=UTF-8
 +Type=Service
 +ServiceTypes=KonqPopupMenu/Plugin
 +MimeType=all/all;
@@ -15,13 +14,13 @@ index 9010fbd..99e76b9 100644
  X-KDE-Submenu=7-Zip
  X-KDE-Icon=p7zip
 diff --git a/GUI/kde/p7zip_extract.desktop b/GUI/kde/p7zip_extract.desktop
-index 9038c76..499d83a 100644
+index 9038c76..a7dca4d 100644
 --- a/GUI/kde/p7zip_extract.desktop
 +++ b/GUI/kde/p7zip_extract.desktop
-@@ -1,10 +1,31 @@
+@@ -1,10 +1,30 @@
  [Desktop Entry]
  X-SuSE-translate=true
- Encoding=UTF-8
+-Encoding=UTF-8
 -ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak
 -Actions=extractHere
 +Type=Service
@@ -53,3 +52,36 @@ index 9038c76..499d83a 100644
 +Name=Test Archive
 +Exec=p7zipForFilemanager t %U
 +Icon=p7zip
+diff --git a/GUI/kde/p7zip_extract_subdir.desktop b/GUI/kde/p7zip_extract_subdir.desktop
+index 1800fa0..a711f3c 100644
+--- a/GUI/kde/p7zip_extract_subdir.desktop
++++ b/GUI/kde/p7zip_extract_subdir.desktop
+@@ -1,6 +1,5 @@
+ [Desktop Entry]
+ X-SuSE-translate=true
+-Encoding=UTF-8
+ ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak
+ Actions=ExtractSubdir
+ 
+diff --git a/GUI/kde/p7zip_extract_to.desktop b/GUI/kde/p7zip_extract_to.desktop
+index bf13ec0..18d2b74 100644
+--- a/GUI/kde/p7zip_extract_to.desktop
++++ b/GUI/kde/p7zip_extract_to.desktop
+@@ -1,6 +1,5 @@
+ [Desktop Entry]
+ X-SuSE-translate=true
+-Encoding=UTF-8
+ ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak
+ Actions=ExtractTo
+ 
+diff --git a/GUI/kde/p7zip_test.desktop b/GUI/kde/p7zip_test.desktop
+index 2c17acb..5212bb2 100644
+--- a/GUI/kde/p7zip_test.desktop
++++ b/GUI/kde/p7zip_test.desktop
+@@ -1,6 +1,5 @@
+ [Desktop Entry]
+ X-SuSE-translate=true
+-Encoding=UTF-8
+ ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak
+ Actions=test
+