Add a patch by Tom Payne <twp@gentoo.org> that should fix bug #123465.

Package-Manager: portage-2.1_pre4-r1

diff --git a/dev-lang/hugs98/ChangeLog b/dev-lang/hugs98/ChangeLog
index 74ebaa895103d40fa2636e53b61a3d7739b31231..9832b628837eec6975ed67b933cc9081781bb9d5 100644 (file)
--- a/dev-lang/hugs98/ChangeLog
+++ b/dev-lang/hugs98/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/hugs98
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/ChangeLog,v 1.27 2006/02/16 11:52:55 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/ChangeLog,v 1.28 2006/02/28 18:37:39 dcoutts Exp $
+
+  28 Feb 2006; Duncan Coutts <dcoutts@gentoo.org>
+  +files/hugs98-2005.3-find.patch, hugs98-2005.3-r2.ebuild:
+  Add a patch by Tom Payne <twp@gentoo.org> that should fix bug #123465.
 
   16 Feb 2006; <duncan@gentoo.org> +files/hugs98-2005.3-openal.patch,
   metadata.xml, hugs98-2005.3-r2.ebuild:

diff --git a/dev-lang/hugs98/Manifest b/dev-lang/hugs98/Manifest
index 998b9a2adec5abf8d4fea57615e80a52666d6460..42f3d9be238a97b5712af8a08fc34dc480af6a0b 100644 (file)
--- a/dev-lang/hugs98/Manifest
+++ b/dev-lang/hugs98/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 025f52e4058a1ec0c3b62cd6a54dbec4 ChangeLog 5393
-RMD160 bd2b1f83dd776db65a3e8ff2aff33af75b6191dd ChangeLog 5393
-SHA256 944227c3b2194ef9774f6c27c2af6d7917156476f818a7a2edf5699dff5c2d98 ChangeLog 5393
+MD5 c83fe3496bf400531549c9df6dcebc09 ChangeLog 5577
+RMD160 c7f276a4bde0861e9258c069d2f93af9436cef03 ChangeLog 5577
+SHA256 36609eb2be9806170ac02c62ee0dcaeac1c39ec0dd7f25e672baf845dae3ab20 ChangeLog 5577
 MD5 eb7ae57bb23e867135381cbd99c5c1c0 files/digest-hugs98-2003.11 67
 RMD160 22a7c4f341235c48d815661dbcd6bd09ea7e349c files/digest-hugs98-2003.11 67
 SHA256 bba01220731cd99e559c50dd5ad243da635a47a797d83145e07c16722a4690dd files/digest-hugs98-2003.11 67
@@ -16,6 +16,9 @@ SHA256 2e788c888d2a255a600a26d9c75e61419b889531be148584f623c355c6092154 files/di
 MD5 4c6e27fe15252dea9f141e0f6b06ed36 files/hugs98-2003.11-gcc34.patch 303
 RMD160 db9c39870607d55182f1d09e7d52d6d03d7a9935 files/hugs98-2003.11-gcc34.patch 303
 SHA256 d59a4b1d9fe4632d0a551aaeb2bc53e5804c88948e0a797220f427f0b452879d files/hugs98-2003.11-gcc34.patch 303
+MD5 b94ac78ab52ca4e344f395f9745c9e12 files/hugs98-2005.3-find.patch 576
+RMD160 2af0bec8c03662ce1e1ad6206c73d8dac652c7cf files/hugs98-2005.3-find.patch 576
+SHA256 c330530b14e7f37a0656a83516eb0cd8d8ca634f686aae2884ffb06a50e5f233 files/hugs98-2005.3-find.patch 576
 MD5 c923a2f2a44b3e7dd35751a877c6e163 files/hugs98-2005.3-openal.patch 1323
 RMD160 eaf01eadf4bf71ed690fcccc2fdb57e3e3868e33 files/hugs98-2005.3-openal.patch 1323
 SHA256 7e60d448b4c75f0321ff6aec0cff845c9c6053b5ba5229af4451f814211f13ef files/hugs98-2005.3-openal.patch 1323
@@ -25,16 +28,16 @@ SHA256 57bcbdc2d3b77b9cde0deb36921da2e28798fe85eecdf1f02c0a5ec1a8d5054f hugs98-2
 MD5 acd9560964734571829a7a9fa4f09be2 hugs98-2005.3-r1.ebuild 2243
 RMD160 a91956532064253e4524d09533f77212f9ad35e4 hugs98-2005.3-r1.ebuild 2243
 SHA256 6e64b4670dd1edb87d366b501401d96ad8f0c9b6967bf8b4d5f9651e6e125e16 hugs98-2005.3-r1.ebuild 2243
-MD5 9463ffaaca1b4b49c813fd61f67c48db hugs98-2005.3-r2.ebuild 2948
-RMD160 6e87dfd92e59fe1a75d51d236bff29a7edd37bb0 hugs98-2005.3-r2.ebuild 2948
-SHA256 c543295b9f17c5577c983b0baa20a17647211ce878b89b31968196fa4ee7cf98 hugs98-2005.3-r2.ebuild 2948
+MD5 ace819f92a99f624b549ea3c31a981fd hugs98-2005.3-r2.ebuild 3003
+RMD160 68ff87336c62e087c79ca52e564fbe45e7bf2330 hugs98-2005.3-r2.ebuild 3003
+SHA256 672c978b043fdc932d052f985a70f1d98e40744ecb97857575ec33eef735a9da hugs98-2005.3-r2.ebuild 3003
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 metadata.xml 223
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD9Gel/B0cxt+cq+wRAsS6AKCDSvsZ3QMga+vqqfzrLDsDMCkpMgCgrVfz
-juN7Z+zjRKt9xxrPcG4hApA=
-=ZCif
+iD8DBQFEBJit/B0cxt+cq+wRAv0WAJ4nsVLks8ytZgwqBYWMq4LvGpi+OwCgslA5
+uF7B4NdQASALhej2ZfTnj9o=
+=Aow3
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/hugs98/files/hugs98-2005.3-find.patch b/dev-lang/hugs98/files/hugs98-2005.3-find.patch
new file mode 100644 (file)
index 0000000..6211f37
--- /dev/null
+++ b/dev-lang/hugs98/files/hugs98-2005.3-find.patch
@@ -0,0 +1,14 @@
+diff -Naur hugs98-Mar2005/libraries/tools/make_bootlib hugs98-Mar2005.new/libraries/tools/make_bootlib
+--- hugs98-Mar2005/libraries/tools/make_bootlib        2005-03-10 01:03:39.000000000 +0100
++++ hugs98-Mar2005.new/libraries/tools/make_bootlib    2006-02-28 18:07:37.000000000 +0100
+@@ -78,8 +78,9 @@
+ 
+       (
+               cd $package_dir
+-              $FIND . \( -name '[a-z]*' -o -name '[GN]HC' \) -prune -o \
++              $FIND [A-Z]* -name '[GN]HC' -prune -o \
+                       \( -name \*.hs -o -name \*.lhs -o -name \*.hsc \) -print |
++                      grep -ve '^[GN]HC$' |
+                       sed '   s:^\./::
+                               s/\..*//' |
+                       grep -v '^Text/Regex' |

diff --git a/dev-lang/hugs98/hugs98-2005.3-r2.ebuild b/dev-lang/hugs98/hugs98-2005.3-r2.ebuild
index 532cf90da9082142eeed6886efafe724fac3d12c..a2caba8f11ffa579c8bd22846055b3f2821db93a 100644 (file)
--- a/dev-lang/hugs98/hugs98-2005.3-r2.ebuild
+++ b/dev-lang/hugs98/hugs98-2005.3-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/hugs98-2005.3-r2.ebuild,v 1.2 2006/02/16 11:52:55 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/hugs98-2005.3-r2.ebuild,v 1.3 2006/02/28 18:37:39 dcoutts Exp $
 
-inherit base flag-o-matic eutils versionator
+inherit base flag-o-matic eutils versionator multilib
 
 IUSE="X opengl openal"
 
@@ -54,6 +54,7 @@ src_unpack() {
        cd ${S}
        epatch ${WORKDIR}/${MY_P}-patch
        epatch ${FILESDIR}/${P}-openal.patch
+       epatch ${FILESDIR}/${P}-find.patch
 
        if ! use X; then
                sed -i -e 's/X11//' -e 's/HGL//' "${S}/Makefile" \
@@ -107,7 +108,7 @@ src_install () {
        #somewhat clean-up installation of few docs
        cd "${S}"
        dodoc Credits License Readme
-       cd "${D}/usr/lib/hugs"
+       cd "${D}/usr/$(get_libdir)/hugs"
        rm Credits License Readme
        mv demos/ docs/ "${D}/usr/share/doc/${PF}"
 }