Fix installing KDE service menu script. Closes bug #159076, reported by Jeroen Roover...

Package-Manager: portage-2.1.2_rc4-r1

diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog
index 838ade9fe2eb7b7e93ccf2df22322c20f50613e3..6f47bc1a58a1f884d0e6abb42e692490b70456fc 100644 (file)
--- a/mail-client/claws-mail/ChangeLog
+++ b/mail-client/claws-mail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/claws-mail
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.3 2006/12/22 18:48:28 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.4 2006/12/26 20:00:09 ticho Exp $
+
+  26 Dec 2006; Andrej Kacian <ticho@gentoo.org> claws-mail-2.6.1.ebuild:
+  Fix installing KDE service menu script. Closes bug #159076, reported by
+  Jeroen Roovers <jer at gentoo.org>.
 
   19 Dec 2006; Andrej Kacian <ticho@gentoo.org> files/plugins-rebuild.sh:
   Remove old plugins before merging new to prevent collision-protect issues.

diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 7bcbc684227e8df96d7be528e629dbd3b78bc73a..78716cde33a10ca5c1f78051cd56978992f5bca7 100644 (file)
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -6,14 +6,14 @@ MD5 8a856a024132287c298aff0bf9aac806 files/plugins-rebuild.sh 1359
 RMD160 71fb3f6d087e4b82b1821d7ee8e2cb6aa4332269 files/plugins-rebuild.sh 1359
 SHA256 9f6e8f639a6261f442a0209f619c1d212a4867d2829b82fbc2c442898780677d files/plugins-rebuild.sh 1359
 DIST claws-mail-2.6.1.tar.bz2 5080311 RMD160 26eded6e9292fc43ab74692eec3cea1412779280 SHA1 09bddec7466390d7925701e5296f40865ccf45cd SHA256 7edb2d58dbd0a5842dde7cbb2be10f5f70888f3e6f3b4fcb052e909c7eebda88
-EBUILD claws-mail-2.6.1.ebuild 5269 RMD160 e79d8a72c7d073ddd16f50ddbbdf2c9b9a194648 SHA1 5a60375c8d6d1132a4fe76e935bc03305b6a2b94 SHA256 8805acd8b0e521b966eb33e9f236dd776bdaeca331f905a809ed8c099240d99e
-MD5 c166ba6885da68ca33859bb75844e30b claws-mail-2.6.1.ebuild 5269
-RMD160 e79d8a72c7d073ddd16f50ddbbdf2c9b9a194648 claws-mail-2.6.1.ebuild 5269
-SHA256 8805acd8b0e521b966eb33e9f236dd776bdaeca331f905a809ed8c099240d99e claws-mail-2.6.1.ebuild 5269
-MISC ChangeLog 759 RMD160 1a47d4fe175fa53845ee63e08b7e07ec6faf9b7a SHA1 aa6ad724ded43c8dda781fd086c03d668e5e500b SHA256 01a9b878fb0f4dc5dd7f47e0f590ac3e69656fa7b1224a2cb727fe7c283984ea
-MD5 101334e01a7c0f99064bc2744cd6f599 ChangeLog 759
-RMD160 1a47d4fe175fa53845ee63e08b7e07ec6faf9b7a ChangeLog 759
-SHA256 01a9b878fb0f4dc5dd7f47e0f590ac3e69656fa7b1224a2cb727fe7c283984ea ChangeLog 759
+EBUILD claws-mail-2.6.1.ebuild 5399 RMD160 cf7eddc70e25fc990db6bc87eb9af918a0f46a02 SHA1 749f18355fafe4d966d7e45669de3f8801e87200 SHA256 51ff9e3d1072842cd2d7f1498dd0e3d4cb337ad26b4137bde57a3aae34642c11
+MD5 05ab000c457e34cab8ad7ee8dab97121 claws-mail-2.6.1.ebuild 5399
+RMD160 cf7eddc70e25fc990db6bc87eb9af918a0f46a02 claws-mail-2.6.1.ebuild 5399
+SHA256 51ff9e3d1072842cd2d7f1498dd0e3d4cb337ad26b4137bde57a3aae34642c11 claws-mail-2.6.1.ebuild 5399
+MISC ChangeLog 942 RMD160 da86a31ecd49f90847533e245442a9b6b270eb95 SHA1 a12fa5d3eeef4e50b7e880546181d16c0c5546db SHA256 f067450ed769119d28bb88a7d69ba7d0fa4687ffa328bcffc924ee878dced754
+MD5 60169a799ecc09aff0ccc0e3354874e9 ChangeLog 942
+RMD160 da86a31ecd49f90847533e245442a9b6b270eb95 ChangeLog 942
+SHA256 f067450ed769119d28bb88a7d69ba7d0fa4687ffa328bcffc924ee878dced754 ChangeLog 942
 MISC metadata.xml 375 RMD160 aef134f2148c1c49355908facfa629a8e7af157c SHA1 517cdd70d1f329b174b7eb68bfd55c954981bdd5 SHA256 24017fb3bfa040e177963d586916169cac027bb8703ac7cef4f79ffd8fff0424
 MD5 b9517b3a2f57bb06971ac9770ee8da4b metadata.xml 375
 RMD160 aef134f2148c1c49355908facfa629a8e7af157c metadata.xml 375
@@ -24,7 +24,7 @@ SHA256 6c69e248902c0cde16dae58751281e962627bf6ff1d2b2355d094ee9fed2782c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFjCiTI1lqEGTUzyQRAqgDAJ0US9dp0wWKtMih7rvGL6aowjPy6gCePm0O
-KhKF7aBDUcURsqAHGte3Qxk=
-=JOBr
+iD8DBQFFkX/cQlM6RnzZP+IRAvcLAJ9+/QIDEF7CmsImqg5E70hCAiDIswCgjYAR
+qFwPEX0Jehjsj9aN45EFGAI=
+=HvHd
 -----END PGP SIGNATURE-----

diff --git a/mail-client/claws-mail/claws-mail-2.6.1.ebuild b/mail-client/claws-mail/claws-mail-2.6.1.ebuild
index 1a916010fe0a94a8d1b4e7b539384d7690f72d56..cb7ba2c9c9924d4fff4634311f007ed9df2fd9a5 100644 (file)
--- a/mail-client/claws-mail/claws-mail-2.6.1.ebuild
+++ b/mail-client/claws-mail/claws-mail-2.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-2.6.1.ebuild,v 1.1 2006/12/08 11:07:55 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-2.6.1.ebuild,v 1.2 2006/12/26 20:00:09 ticho Exp $
 
 IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc startup-notification bogofilter"
 
@@ -108,12 +108,17 @@ src_install() {
        if use kde; then
                einfo "Installing kde service scripts"
                local kdeprefix="$(kde-config --prefix)"
-               local servicescript="claws-mail-kdeservicemenu.pl"
+               local servicescript="${PN}-kdeservicemenu.pl"
+               local desktopfile="${PN}-attach-files.desktop"
                cd ${S}/tools/kdeservicemenu
-               for f in claws-mail-attach-files.desktop; do
-                       sed -e "s:SCRIPT_PATH:${kdeprefix}/bin/${servicescript}:g" template_$f > $f
-                       install -m 0644 $f ${D}/${kdeprefix}/share/apps/konqueror/servicemenus/$f || die
-               done
+               sed -i -e "s:SCRIPT_PATH:${kdeprefix}/bin/${servicescript}:g" \
+                       template_${desktopfile}
+               dodir /usr/share/apps/konqueror/servicemenus
+               insopts -m 0644
+               insinto /usr/share/apps/konqueror/servicemenus
+               newins template_${desktopfile} ${desktopfile} || die
+               dodir ${kdeprefix}/bin
+               insopts -m 755
                insinto ${kdeprefix}/bin
                doexe ${servicescript} || die
        fi