Yet more brokenness in the install (bug #179285)

Package-Manager: portage-2.1.2.7

3 files changed, 27 insertions, 16 deletions

diff --git a/app-text/hunspell/ChangeLog b/app-text/hunspell/ChangeLog
index 8cc828f92e30..fa6772b5915e 100644
--- a/app-text/hunspell/ChangeLog
+++ b/app-text/hunspell/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/hunspell
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.24 2007/05/21 17:49:27 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.25 2007/05/21 21:20:57 kevquinn Exp $
+
+  21 May 2007; Kevin F. Quinn <kevquinn@gentoo.org> hunspell-1.1.5.ebuild:
+  Yet more brokenness in the install (bug #179285)
 
   21 May 2007; Kevin F. Quinn <kevquinn@gentoo.org> hunspell-1.1.5.ebuild:
   Fixup wobbly header installation (bug #179285).
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index f8b60f088d0e..f5ab2882ee03 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -40,14 +40,14 @@ EBUILD hunspell-1.1.4.ebuild 1887 RMD160 335609149954c6b73d95bddb0b2c20156011b3c
 MD5 14cd49da898e168d7df22dee2b38910f hunspell-1.1.4.ebuild 1887
 RMD160 335609149954c6b73d95bddb0b2c20156011b3c6 hunspell-1.1.4.ebuild 1887
 SHA256 78dad84fdece24da538d36c8df3076ea952e6f9e2ec81719e5bd0d8f7c7dc990 hunspell-1.1.4.ebuild 1887
-EBUILD hunspell-1.1.5.ebuild 2271 RMD160 111c852c9662fdfd723e1d09a3d9ce29689248c6 SHA1 6eb01a93bff3b11fe5536e3b37e1d61aca1479db SHA256 39bcc3f1f5253922de26d125f46148fd64f54c6d3031fc64e8e0c2289347bd54
-MD5 4ecfaac9ff4304a697870eaa2a647ede hunspell-1.1.5.ebuild 2271
-RMD160 111c852c9662fdfd723e1d09a3d9ce29689248c6 hunspell-1.1.5.ebuild 2271
-SHA256 39bcc3f1f5253922de26d125f46148fd64f54c6d3031fc64e8e0c2289347bd54 hunspell-1.1.5.ebuild 2271
-MISC ChangeLog 3700 RMD160 e2f2f0a12bd7f7cdb21656bd308ec01cecafa7aa SHA1 45bd0b5f5e88d683ac5958110fb954cf7f3dd0f3 SHA256 987b5a6727b3c5c6e4d402e71158e46f5d5e075967a7216e1d1e08237740d117
-MD5 1b671639bdcc9005a6a1bdf1d1a43a80 ChangeLog 3700
-RMD160 e2f2f0a12bd7f7cdb21656bd308ec01cecafa7aa ChangeLog 3700
-SHA256 987b5a6727b3c5c6e4d402e71158e46f5d5e075967a7216e1d1e08237740d117 ChangeLog 3700
+EBUILD hunspell-1.1.5.ebuild 2597 RMD160 ddcf13615863ea2af9b256cfd478287677ba37f0 SHA1 25558f3d82fbb36e4670d05986ed79e94b17af15 SHA256 653dc679342e9453f0553b2345c93b2b2debc6400a0b68be2599c806ef95c0f1
+MD5 9d00f9e587143f5fb73355661891c356 hunspell-1.1.5.ebuild 2597
+RMD160 ddcf13615863ea2af9b256cfd478287677ba37f0 hunspell-1.1.5.ebuild 2597
+SHA256 653dc679342e9453f0553b2345c93b2b2debc6400a0b68be2599c806ef95c0f1 hunspell-1.1.5.ebuild 2597
+MISC ChangeLog 3827 RMD160 5d1be721448e32cf9fd68c0ad4d56aedeecd2fab SHA1 a95031ae6da4d10dc316cccc131de751b33816b7 SHA256 c9e5755ff46f33f8c9b940d478261bbffcfcbb9a86555a12db69949dcf1e7f8c
+MD5 ab3745d2033b6b55e5c6a1f437033652 ChangeLog 3827
+RMD160 5d1be721448e32cf9fd68c0ad4d56aedeecd2fab ChangeLog 3827
+SHA256 c9e5755ff46f33f8c9b940d478261bbffcfcbb9a86555a12db69949dcf1e7f8c ChangeLog 3827
 MISC metadata.xml 222 RMD160 a74fc306077c440fea351793a03168651fb28f13 SHA1 45da96e6af3a3e7898ca55691d0e07583b6c75bf SHA256 5e7b34981ea08b001bd6eac085d6876fbeef6a4fdd91575e4e9f988cadf4f03f
 MD5 b86e3c93f969dbb4f433611cb0f6b0b0 metadata.xml 222
 RMD160 a74fc306077c440fea351793a03168651fb28f13 metadata.xml 222
@@ -70,7 +70,7 @@ SHA256 79091037dcde11220f8794a25be35956cc48a29996ebc5a44f6a3b1a1e6340d5 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGUdxUZfNLSOUrp0sRAqU3AJ9b8h+2tJRT92DkWmJtuhf/0Z2guQCfTmWX
-0Rbx/QHRJ3pX07GNRZTpH6w=
-=F5Xe
+iD8DBQFGUg3kZfNLSOUrp0sRAhmaAJ9jeh2pvWmm31Fbz9BHaKBQ97eLkACgonqU
+D6ZAnZ65dHCUB3KC1SpU7Uo=
+=cc0e
 -----END PGP SIGNATURE-----
diff --git a/app-text/hunspell/hunspell-1.1.5.ebuild b/app-text/hunspell/hunspell-1.1.5.ebuild
index 4b1cd16dad38..2d4c9006108b 100644
--- a/app-text/hunspell/hunspell-1.1.5.ebuild
+++ b/app-text/hunspell/hunspell-1.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.1.5.ebuild,v 1.2 2007/05/21 17:49:27 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.1.5.ebuild,v 1.3 2007/05/21 21:20:57 kevquinn Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -50,18 +50,26 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR=${D} install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell
 	# hunspell is derived from myspell
 	dodoc AUTHORS.myspell README.myspell license.myspell
 
-	# Fixup broken install results.
+	# Upstream install has a few problems - rather than try to figure out
+	# what's broken in the build system, just fix things up manually.
+
 	# These are included by hunspell.hxx, but aren't installed by the install
-	# script
+	# script.
 	insinto /usr/include/hunspell/
 	doins license.myspell license.hunspell config.h
+
 	# These are in the wrong place.
 	mv ${D}/usr/include/munch.h ${D}/usr/include/hunspell/munch.h
 	mv ${D}/usr/include/unmunch.h ${D}/usr/include/hunspell/unmunch.h
+
+	# Libraries include the version in their name, so make a sensible
+	# default symlink.  They should probably be libhunspell.so.1.1 etc.
+	cd ${D}/usr/lib
+	ln -s libhunspell-1.1.so.0.0.0 libhunspell.so
 }
 
 pkg_postinst() {