Fix traydock in amsn.. see bug 56188

diff --git a/net-im/amsn/ChangeLog b/net-im/amsn/ChangeLog
index 1bfe3e3a4fe5d1bb6b873d40479cdf8f10681d75..8ef62e2447cd4bb058d665b234c24ff66a70ad90 100644 (file)
--- a/net-im/amsn/ChangeLog
+++ b/net-im/amsn/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/amsn
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/ChangeLog,v 1.40 2004/11/06 15:51:16 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/ChangeLog,v 1.41 2004/11/17 00:39:01 tester Exp $
+
+  16 Nov 2004; Olivier Crete <tester@gentoo.org> amsn-0.94.ebuild:
+  Fix traydock installation, bug 56188
 
 *amsn-0.94 (06 Nov 2004)
 

diff --git a/net-im/amsn/Manifest b/net-im/amsn/Manifest
index dd10da74d7ad298b30a27f23d158d65ebe1bb4da..0917bd1332b0fe148660671a6c4b97f59c7ebda3 100644 (file)
--- a/net-im/amsn/Manifest
+++ b/net-im/amsn/Manifest
@@ -2,8 +2,8 @@
 Hash: SHA1
 
 MD5 f70e1154208a1c41e842d65e9bc37dc3 amsn-0.93.ebuild 2403
-MD5 63127f4f2a79302ffbfa183dd347c03a amsn-0.94.ebuild 2411
-MD5 03e0c7413dac11ce21db1b54211447a8 ChangeLog 4695
+MD5 036119e8f4c9478ce5612f4000129d9d amsn-0.94.ebuild 2455
+MD5 681469057debf9661ff4406e4874fe37 ChangeLog 4802
 MD5 2b3b0837d29c67ec7714a3a901a619c0 metadata.xml 233
 MD5 70919744c42f27e436339d14c678f731 files/amsn.desktop 273
 MD5 34cdd985d3d7a0cf5f84a79cca1c728f files/digest-amsn-0.94 62
@@ -11,7 +11,7 @@ MD5 092065dac17f94efcb8225a9cb52f46f files/digest-amsn-0.93 62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBjPMVwDHaUUJ0mYMRAu/nAJ9e+tVA4QaTGRH2xouOpoIo0i4a1ACdGXTD
-CMPlTKtM3P4ViouyWNj60bQ=
-=EVPt
+iD8DBQFBmp2wwDHaUUJ0mYMRAgTTAKCdS6TPNx6VM3OK/kQmJ4cI0MR6uwCfQ5yT
+UzXADXAfNGo+NKFh4PPzI+8=
+=WbIj
 -----END PGP SIGNATURE-----

diff --git a/net-im/amsn/amsn-0.94.ebuild b/net-im/amsn/amsn-0.94.ebuild
index 9150ecd6889b6f5451e6d64993c1f1dc793800d7..f3d24e99d8a92c20e075fe7d4e6212112d19bd37 100644 (file)
--- a/net-im/amsn/amsn-0.94.ebuild
+++ b/net-im/amsn/amsn-0.94.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/amsn-0.94.ebuild,v 1.1 2004/11/06 15:51:16 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/amsn-0.94.ebuild,v 1.2 2004/11/17 00:39:01 tester Exp $
 
 S="${WORKDIR}/${P/./_}"
 DESCRIPTION="Alvaro's Messenger client for MSN"
@@ -65,8 +65,9 @@ src_install() {
        then
                einfo "Installing the freedesktop notification plugin"
                dodir /usr/lib/amsn/plugins/traydock
-               mv ${D}/usr/share/amsn/plugins/traydock/libtray.so ${D}/usr/lib/amsn/plugins/traydock
-               ln -s /usr/lib/amsn/plugins/traydock ${D}/usr/share/amsn/plugins/traydock
+               mv ${D}/usr/share/amsn/plugins/traydock/libtray.so ${D}/usr/lib/amsn/plugins/traydock/
+               rm -rf  ${D}/usr/share/amsn/plugins/traydock/
+               ln -s ../../../lib/amsn/plugins/traydock/ ${D}/usr/share/amsn/plugins/
        else
                rm -rf ${D}/usr/share/amsn/plugins/traydock
        fi
@@ -79,7 +80,7 @@ src_install() {
        rm -rf ${D}/usr/share/amsn/utils/
 
        dodir /usr/bin/
-       ln -s /usr/share/amsn/amsn ${D}/usr/bin/amsn
+       ln -s ../share/amsn/amsn ${D}/usr/bin/amsn
 
        cd ${D}/usr/share/amsn
        dodoc TODO README FAQ CREDITS HELP