addded p7zip-9.13 with correct desktop files

	modified:   ChangeLog
	modified:   Manifest
	new file:   files/4.65-kde4.patch
	new file:   files/9.04-kde4.patch
	modified:   p7zip-9.04.ebuild
	renamed:    p7zip-4.65-r1.ebuild -> p7zip-9.13.ebuild

6 files changed, 202 insertions, 31 deletions

diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index 6fa1a03f..f40be564 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.114 2010/02/16 08:19:27 jlec Exp $
 
+  07 Jul 2010; Roman v. Gemmeren <strowi@hasnoname.de> 
+  +p7zip-9.13.ebuild:
+  removed kde4-desktop-files
+  
   21 Feb 2010; Roman v. Gemmeren <strowi@hasnoname.de> p7zip-9.04.ebuild:
   p7zip-4.65-r1.ebuild:
   removed kde4-patch
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index d4309d87..a4fb2ac0 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,10 +1,12 @@
 AUX 4.65-hardlink.patch 413 RMD160 49bfa9195ee874f1e6718503919b620b0986a711 SHA1 ed6d221f34f029c2b1cc7d710b78e98e2d310e32 SHA256 187fc9f9ec0160c7b5f6a1bf7394e7d92db1fbebf219a1ea55725d40255256c8
+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 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.65_src_all.tar.bz2 2501418 RMD160 1749032c16e7c5afaa79bc123db33d61acc79eba SHA1 988f6ec63e93e6ec23492fd39e3b48a58fd695d1 SHA256 691cc9419a73a9348319f5b2c3ba2655471bee052c6c7fa57a226800c89ab07f
 DIST p7zip_9.04_src_all.tar.bz2 3759021 RMD160 2d9caf81dd3fc038441be7e1e592a972a1114df7 SHA1 6430fcd3a5e16d0a30f1eebf34a085e5372b813b SHA256 ddfbb6795a14bcab1f9622096fe9385c239b43c3f6a9a80d85021849f738f9ab
-EBUILD p7zip-4.65-r1.ebuild 4014 RMD160 16e10ce2f10237b8bb62a6415feb1f48c86f36dd SHA1 aca698df523021787601b36d40927abc92fd815a SHA256 b41b6327a8b33cd02df986aaa55cab19266654fe103bc8e4188aff5f83aee3f0
-EBUILD p7zip-9.04.ebuild 3894 RMD160 f1354f71e161af2a93e61ef735773b6b021c7c6a SHA1 5fac1350e644e312849f88213c2f907642af692e SHA256 5dc73d81746ebc21610fe59704206f09e1ec5d0bba06ba8b13fdfd4be02fdce9
-MISC ChangeLog 14929 RMD160 b66890521040fab355f41f1a1188ca9164ec6e91 SHA1 de7b57db38a4f34067d4d58c0fb819fd1b94e925 SHA256 b2f1b6a2f330e2d15e9104e45bd0d82ab036493d254a5be3f1ced7b19def0c46
+DIST p7zip_9.13_src_all.tar.bz2 3753579 RMD160 beb9181330f4dfa75aa4f473c68a462c76b7ab19 SHA1 81da0729561ce123c0a82656ec96a04ad5bfa522 SHA256 fc9c0fa2eabd367d6adbc3ea07bb305dbdc1f68717eea362c8c074b91c03d923
+EBUILD p7zip-9.04.ebuild 3853 RMD160 e3bbef3c3cf2964b8a59eb0c124470d4717bf285 SHA1 152cb137784ff2ba5af503874be03c6cb3079a09 SHA256 ff4216229edc3944fc5e2c6505dca1cf2d04f3c257c6f1b16777de14edada6e8
+EBUILD p7zip-9.13.ebuild 4097 RMD160 0a1637c076c56df79c724ee40e8a953b249d658e SHA1 6824887fed67156ea073f08eeb23070702c11152 SHA256 84e8d1c6d05da6fb19afb65832b47e205a03bafe89347e07ae6888efe456beb9
+MISC ChangeLog 15039 RMD160 34407ee3be05221e34dea7c182e03c0428f3443e SHA1 25af67efce66f493698cd9cfbcebab482c82ef8a SHA256 6ac473e3eff330e22ed6c2a3c51413b531f10631a4d9ad13ee6db3d00c4e621d
 MISC metadata.xml 403 RMD160 e0525b688d7e49c113379f1da3cb48f7dd283339 SHA1 b792f63297087a3671ac45773e8f4b111f624572 SHA256 7a27b824829214305e00f9a9732fb3ba6325da30425b5e04b775d2bf2d93cedb
diff --git a/app-arch/p7zip/files/4.65-kde4.patch b/app-arch/p7zip/files/4.65-kde4.patch
new file mode 100644
index 00000000..dad8cfaf
--- /dev/null
+++ b/app-arch/p7zip/files/4.65-kde4.patch
@@ -0,0 +1,81 @@
+diff --git a/GUI/kde/p7zip_compress.desktop b/GUI/kde/p7zip_compress.desktop
+index 9010fbd..eec41dd 100644
+--- a/GUI/kde/p7zip_compress.desktop
++++ b/GUI/kde/p7zip_compress.desktop
+@@ -1,6 +1,8 @@
+ [Desktop Entry]
+-ServiceTypes=inode/directory
+-Actions=CompressDialog;Compress7z;CompressZip;extractHere;ExtractSubdir;ExtractTo;test;Benchmark
++Type=Service
++ServiceTypes=KonqPopupMenu/Plugin
++MimeType=all/all;
++Actions=CompressDialog;Compress7z;CompressZip;Benchmark
+ X-KDE-Priority=TopLevel
+ X-KDE-Submenu=7-Zip
+ X-KDE-Icon=p7zip
+@@ -20,26 +22,6 @@ Name=Add to Zip Archive
+ Icon=p7zip
+ Exec=p7zipForFilemanager a -tzip %U
+ 
+-[Desktop Action extractHere]
+-Name=Extract Here
+-Exec=p7zipForFilemanager x %U
+-Icon=p7zip
+-
+-[Desktop Action ExtractSubdir]
+-Name=Extract to subdirectory
+-Icon=p7zip
+-Exec=p7zipForFilemanager xs %U
+-
+-[Desktop Action ExtractTo]
+-Name=Extract to ...
+-Icon=p7zip
+-Exec=p7zipForFilemanager xd %U
+-
+-[Desktop Action test]
+-Name=Test Archive
+-Exec=p7zipForFilemanager t %U
+-Icon=p7zip
+-
+ [Desktop Action Benchmark]
+ Name=Benchmark
+ Icon=p7zip
+diff --git a/GUI/kde/p7zip_extract.desktop b/GUI/kde/p7zip_extract.desktop
+index 9038c76..217788c 100644
+--- a/GUI/kde/p7zip_extract.desktop
++++ b/GUI/kde/p7zip_extract.desktop
+@@ -1,10 +1,29 @@
+ [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=extractHere
++Type=Service
++ServiceTypes=KonqPopupMenu/Plugin
++MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;application/zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-java-archive;application/x-deb;application/x-ace;application/x-7z-compressed;application/x-arc;application/x-arj;application/x-compress;application/x-zip-compressed;application/x-cpio;application/x-pak;
++#MimeType=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;ExtractSubdir;ExtractTo;test;
++X-KDE-Priority=TopLevel
++X-KDE-Submenu=7-Zip
++X-KDE-Icon=p7zip
+ 
+ [Desktop Action extractHere]
+-Name=Extract Here with 7-zip
++Name=Extract Here
+ Exec=p7zipForFilemanager x %U
+ Icon=p7zip
++
++[Desktop Action ExtractSubdir]
++Name=Extract to subdirectory
++Icon=p7zip
++Exec=p7zipForFilemanager xs %U
++
++[Desktop Action ExtractTo]
++Name=Extract to ...
++Icon=p7zip
++Exec=p7zipForFilemanager xd %U
++
++[Desktop Action test]
++Name=Test Archive
++Exec=p7zipForFilemanager t %U
++Icon=p7zip
diff --git a/app-arch/p7zip/files/9.04-kde4.patch b/app-arch/p7zip/files/9.04-kde4.patch
new file mode 100644
index 00000000..c309d70d
--- /dev/null
+++ b/app-arch/p7zip/files/9.04-kde4.patch
@@ -0,0 +1,87 @@
+diff --git a/GUI/kde/p7zip_compress.desktop b/GUI/kde/p7zip_compress.desktop
+index 9010fbd..b965fa6 100644
+--- a/GUI/kde/p7zip_compress.desktop
++++ b/GUI/kde/p7zip_compress.desktop
+@@ -1,6 +1,8 @@
+ [Desktop Entry]
+-ServiceTypes=inode/directory
+-Actions=CompressDialog;Compress7z;CompressZip;extractHere;ExtractSubdir;ExtractTo;test;Benchmark
++Type=Service
++ServiceTypes=KonqPopupMenu/Plugin
++MimeType=all/all;
++Actions=CompressDialog;Compress7z;CompressZip;Benchmark
+ X-KDE-Priority=TopLevel
+ 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..a7dca4d 100644
+--- a/GUI/kde/p7zip_extract.desktop
++++ b/GUI/kde/p7zip_extract.desktop
+@@ -1,10 +1,30 @@
+ [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=extractHere
++Type=Service
++ServiceTypes=KonqPopupMenu/Plugin
++MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;application/zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-java-archive;application/x-deb;application/x-ace;application/x-7z-compressed;application/x-arc;application/x-arj;application/x-compress;application/x-zip-compressed;application/x-cpio;application/x-pak;
++#MimeType=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;ExtractSubdir;ExtractTo;test;
++X-KDE-Priority=TopLevel
++X-KDE-Submenu=7-Zip
++X-KDE-Icon=p7zip
+ 
+ [Desktop Action extractHere]
+-Name=Extract Here with 7-zip
++Name=Extract Here
+ Exec=p7zipForFilemanager x %U
+ Icon=p7zip
++
++[Desktop Action ExtractSubdir]
++Name=Extract to subdirectory
++Icon=p7zip
++Exec=p7zipForFilemanager xs %U
++
++[Desktop Action ExtractTo]
++Name=Extract to ...
++Icon=p7zip
++Exec=p7zipForFilemanager xd %U
++
++[Desktop Action test]
++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
+ 
diff --git a/app-arch/p7zip/p7zip-9.04.ebuild b/app-arch/p7zip/p7zip-9.04.ebuild
index a9dbc970..0edf1c78 100644
--- a/app-arch/p7zip/p7zip-9.04.ebuild
+++ b/app-arch/p7zip/p7zip-9.04.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/app-arch/p7zip/p7zip-9.04.ebuild,v 1.2 2010/02/16 08:19:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.04.ebuild,v 1.5 2010/06/07 06:43:56 jlec Exp $
 
 EAPI="2"
 WX_GTK_VER="2.8"
@@ -52,10 +52,14 @@ src_prepare() {
 		cp -f makefile.linux_amd64 makefile.machine
 	elif [[ ${CHOST} == *-darwin* ]] ; then
 		# Mac OS X needs this special makefile, because it has a non-GNU linker
-		cp -f makefile.macosx makefile.machine
-		# bundles have extension .bundle
+		[[ ${CHOST} == *64-* ]] \
+			&& cp -f makefile.macosx_64bits makefile.machine \
+			|| cp -f makefile.macosx_32bits makefile.machine
+		# bundles have extension .bundle but don't die because USE=-rar
+		# removes the Rar directory
 		sed -i -e '/^PROG=/s/\.so/.bundle/' \
-			CPP/7zip/Bundles/Format7zFree/makefile || die
+			CPP/7zip/Bundles/Format7zFree/makefile \
+			CPP/7zip/Compress/Rar/makefile
 	elif use x86-fbsd; then
 		# FreeBSD needs this special makefile, because it hasn't -ldl
 		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
@@ -65,8 +69,7 @@ src_prepare() {
 	# We can be more parallel
 	cp -f makefile.parallel_jobs makefile
 
-	# disable kde4-patch
-	#epatch "${FILESDIR}"/${PV}-kde4.patch
+	epatch "${FILESDIR}"/${PV}-kde4.patch
 
 	if use kde || use wxwidgets; then
 		einfo "Preparing dependency list"
@@ -83,9 +86,6 @@ src_compile() {
 
 src_test() {
 	emake test_7z test_7zr || die "test failed"
-	if use kde || use wxwidgets; then
-		emake test_7zG || die "GUI test failed"
-	fi
 }
 
 src_install() {
@@ -108,10 +108,8 @@ src_install() {
 			insinto /usr/share/icons/hicolor/16x16/apps/
 			newins GUI/p7zip_16_ok.png p7zip.png
 
-			# don' put desktop-files to kde4-directory
-			#insinto  /usr/share/kde4/services/ServiceMenus
-			insinto /usr/kde/3.5/share/apps/konqueror/servicemenus/
-			doins GUI/kde/p7zip_compress*.desktop
+			insinto  /usr/share/kde4/services/ServiceMenus
+			doins GUI/kde/*.desktop
 		fi
 	fi
 
diff --git a/app-arch/p7zip/p7zip-4.65-r1.ebuild b/app-arch/p7zip/p7zip-9.13.ebuild
index e8f6adfc..3b9c8ee1 100644
--- a/app-arch/p7zip/p7zip-4.65-r1.ebuild
+++ b/app-arch/p7zip/p7zip-9.13.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/app-arch/p7zip/p7zip-4.65-r1.ebuild,v 1.1 2010/02/15 21:10:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.13.ebuild,v 1.1 2010/06/07 06:52:52 jlec Exp $
 
 EAPI="2"
 WX_GTK_VER="2.8"
@@ -38,24 +38,28 @@ src_prepare() {
 	else
 		sed -e '/Rar/d' -i makefile*
 		rm -rf CPP/7zip/Compress/Rar
-		epatch "${FILESDIR}"/${PV}-makefile.patch
+		epatch "${FILESDIR}"/9.04-makefile.patch
 	fi
 
 	sed -i \
 		-e "/^CXX=/s:g++:$(tc-getCXX):" \
 		-e "/^CC=/s:gcc:$(tc-getCC):" \
 		-e "s:OPTFLAGS=-O:OPTFLAGS=${CXXFLAGS}:" \
-		-e 's:-s ::' \
+		-e '/ALLFLAGS/s:-s ::' \
 		makefile* || die "changing makefiles"
 
 	if use amd64; then
 		cp -f makefile.linux_amd64 makefile.machine
 	elif [[ ${CHOST} == *-darwin* ]] ; then
 		# Mac OS X needs this special makefile, because it has a non-GNU linker
-		cp -f makefile.macosx makefile.machine
-		# bundles have extension .bundle
+		[[ ${CHOST} == *64-* ]] \
+			&& cp -f makefile.macosx_64bits makefile.machine \
+			|| cp -f makefile.macosx_32bits makefile.machine
+		# bundles have extension .bundle but don't die because USE=-rar
+		# removes the Rar directory
 		sed -i -e '/^PROG=/s/\.so/.bundle/' \
-			CPP/7zip/Bundles/Format7zFree/makefile || die
+			CPP/7zip/Bundles/Format7zFree/makefile \
+			CPP/7zip/Compress/Rar/makefile
 	elif use x86-fbsd; then
 		# FreeBSD needs this special makefile, because it hasn't -ldl
 		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
@@ -65,10 +69,7 @@ src_prepare() {
 	# We can be more parallel
 	cp -f makefile.parallel_jobs makefile
 
-	epatch "${FILESDIR}"/${PV}-hardlink.patch
-
-	#disable kde4-patch
-	#epatch "${FILESDIR}"/${PV}-kde4.patch
+	epatch "${FILESDIR}"/9.04-kde4.patch
 
 	if use kde || use wxwidgets; then
 		einfo "Preparing dependency list"
@@ -85,9 +86,6 @@ src_compile() {
 
 src_test() {
 	emake test_7z test_7zr || die "test failed"
-	if use kde || use wxwidgets; then
-		emake test_7zG || die "GUI test failed"
-	fi
 }
 
 src_install() {
@@ -113,7 +111,8 @@ src_install() {
                         # don' put desktop-files to kde4-directory
                         #insinto  /usr/share/kde4/services/ServiceMenus
                         insinto /usr/kde/3.5/share/apps/konqueror/servicemenus/
-                        doins GUI/kde/p7zip_compress*.desktop
+                        #doins GUI/kde/p7zip_compress*.desktop
+			doins GUI/kde/p7zip_compress2.desktop
 		fi
 	fi