Fixing bug #200659 and stable for HPPA (bug #199740).

Package-Manager: portage-2.1.4_rc3

4 files changed, 33 insertions, 11 deletions

diff --git a/app-accessibility/dasher/ChangeLog b/app-accessibility/dasher/ChangeLog
index 4858843a8b8b..2c1d30ed9b66 100644
--- a/app-accessibility/dasher/ChangeLog
+++ b/app-accessibility/dasher/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/dasher
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.120 2007/11/26 13:43:35 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.121 2007/11/29 05:01:46 jer Exp $
+
+  29 Nov 2007; Jeroen Roovers <jer@gentoo.org>
+  +files/dasher-4.6.1-lldiv.patch, dasher-4.6.1.ebuild:
+  Fixing bug #200659 and stable for HPPA (bug #199740).
 
   26 Nov 2007; Markus Rothe <corsair@gentoo.org> dasher-4.6.1.ebuild:
   Stable on ppc64; bug #199740
diff --git a/app-accessibility/dasher/Manifest b/app-accessibility/dasher/Manifest
index 49c37340ac3b..319ddeb7b0db 100644
--- a/app-accessibility/dasher/Manifest
+++ b/app-accessibility/dasher/Manifest
@@ -30,6 +30,10 @@ AUX dasher-4.6.1-gnome.patch 1685 RMD160 8767be5fa679862e0a793062eff491d32704afe
 MD5 bb864e66505f8abd00bd9bf6673f178c files/dasher-4.6.1-gnome.patch 1685
 RMD160 8767be5fa679862e0a793062eff491d32704afe9 files/dasher-4.6.1-gnome.patch 1685
 SHA256 6462d01b3ce27e89a2d44ba9e1461d21da6490485bddfce87a82e9a549165d84 files/dasher-4.6.1-gnome.patch 1685
+AUX dasher-4.6.1-lldiv.patch 367 RMD160 2ea3a9f822e27c8fbc68b7ffcd63cd0153501876 SHA1 cfc2193d0b98f9ede818241d5b1d53205a7dec7f SHA256 9d4d814d6e13190f3677f3cf08dbf8a729bbab80d48f0451c6de91572dde879c
+MD5 a10ca9957051144123885ec05e5980fd files/dasher-4.6.1-lldiv.patch 367
+RMD160 2ea3a9f822e27c8fbc68b7ffcd63cd0153501876 files/dasher-4.6.1-lldiv.patch 367
+SHA256 9d4d814d6e13190f3677f3cf08dbf8a729bbab80d48f0451c6de91572dde879c files/dasher-4.6.1-lldiv.patch 367
 DIST dasher-4.2.2.tar.bz2 5625199 RMD160 33fccd70dbe9d977a1c6efd7037e939d28acbdcf SHA1 b2258080cc6480c2173148e09013e7efd0307914 SHA256 a51a3bf9a3a1b28a5e9dacc82bad14903a93389a0df92b289e8c2f4180e8bdcf
 DIST dasher-4.4.2.tar.bz2 6880246 RMD160 17d33eb2db6f2e7dc9e7e227509f8254ae732baf SHA1 9b82e11ef0104e7acf9add78e48d59a67516c531 SHA256 0ee0d5e7f867bd21f0ab13dcd72dd2dd7eb6bb0d7918c18971ece81d3c2a76ed
 DIST dasher-4.6.1.tar.bz2 6473483 RMD160 77a765ddc623895a2a121732848f00c5a82652d0 SHA1 6efeb3fdd160e203b60e5d2b9faca0d243a68ed3 SHA256 3f0ee0a37465f5262937e8d2746bf7710cc6505e704e80c318dc3e01806aebc8
@@ -41,14 +45,14 @@ EBUILD dasher-4.4.2.ebuild 1947 RMD160 a8b601fd680774639287c64c42e90e78e0774f73
 MD5 8bc1bafdd4d23c05935d348e3d4b0278 dasher-4.4.2.ebuild 1947
 RMD160 a8b601fd680774639287c64c42e90e78e0774f73 dasher-4.4.2.ebuild 1947
 SHA256 055b2260ad19618cb92edd07f2fbeef2e7510e1836d5aaf20942a667d7a7d9ee dasher-4.4.2.ebuild 1947
-EBUILD dasher-4.6.1.ebuild 2150 RMD160 6eb915424966bfcb96486e5540f0631339f7a3f9 SHA1 4a987989aaeeb4c5a75151adc5dca1b0ecad7044 SHA256 ba3cacc3cac14d9b0c2e7453da2fc8936b02655573a71ffa324a3f90544987f6
-MD5 173814fccc761cd4ceac2e947923e809 dasher-4.6.1.ebuild 2150
-RMD160 6eb915424966bfcb96486e5540f0631339f7a3f9 dasher-4.6.1.ebuild 2150
-SHA256 ba3cacc3cac14d9b0c2e7453da2fc8936b02655573a71ffa324a3f90544987f6 dasher-4.6.1.ebuild 2150
-MISC ChangeLog 15081 RMD160 e03c32957a3d01d8972fcbe3a9352f1995b400a3 SHA1 781890a4aea38e720a4b2ad45feef58bd82f6f70 SHA256 7a4e3bb34dbbd0d884a47b6d23168f59bad81962716cd9429b14e825e1cdad1a
-MD5 ea862055cd423f24834c50b8ece73e65 ChangeLog 15081
-RMD160 e03c32957a3d01d8972fcbe3a9352f1995b400a3 ChangeLog 15081
-SHA256 7a4e3bb34dbbd0d884a47b6d23168f59bad81962716cd9429b14e825e1cdad1a ChangeLog 15081
+EBUILD dasher-4.6.1.ebuild 2219 RMD160 edf37e017b0ab0a13ff11c91f7fe09e511110896 SHA1 42b2a000b42cc190c07cb5fee025d88871324f82 SHA256 cbcee2b328c3adce8eeedc0ae0cb6972480b818dd1379c787295b737bb89d13e
+MD5 d9a2ab18d9afff39f11b9d9e759c5bb9 dasher-4.6.1.ebuild 2219
+RMD160 edf37e017b0ab0a13ff11c91f7fe09e511110896 dasher-4.6.1.ebuild 2219
+SHA256 cbcee2b328c3adce8eeedc0ae0cb6972480b818dd1379c787295b737bb89d13e dasher-4.6.1.ebuild 2219
+MISC ChangeLog 15237 RMD160 201c777ab127ce331c8d7552215a585b53430785 SHA1 0aa621bdac9732ec26c5831afff06e2ac9743818 SHA256 43e9b2569de2c73a4d37adb0b07cb7ece5cea3b0158a3d34a56b67c02ee7f61c
+MD5 1d8857686c6e25535a85d90fcade8d5f ChangeLog 15237
+RMD160 201c777ab127ce331c8d7552215a585b53430785 ChangeLog 15237
+SHA256 43e9b2569de2c73a4d37adb0b07cb7ece5cea3b0158a3d34a56b67c02ee7f61c ChangeLog 15237
 MISC metadata.xml 718 RMD160 80e52afb8285d78a52704f4f7c4b79275cddff35 SHA1 450e5ccc819b3c4497dc2685432d75939ac629c3 SHA256 265dfe7a088764ff6a165384ade6c9fe04a5dd068c1e7f31736fe4a2c1c10eca
 MD5 76d666e6399f7768a17fe572e9a3096e metadata.xml 718
 RMD160 80e52afb8285d78a52704f4f7c4b79275cddff35 metadata.xml 718
diff --git a/app-accessibility/dasher/dasher-4.6.1.ebuild b/app-accessibility/dasher/dasher-4.6.1.ebuild
index fb18bf216b82..73f51a219765 100644
--- a/app-accessibility/dasher/dasher-4.6.1.ebuild
+++ b/app-accessibility/dasher/dasher-4.6.1.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-accessibility/dasher/dasher-4.6.1.ebuild,v 1.8 2007/11/26 13:43:35 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.6.1.ebuild,v 1.9 2007/11/29 05:01:46 jer Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.8"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.inference.phy.cam.ac.uk/dasher/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 
 IUSE="accessibility cairo gnome"
 
@@ -77,6 +77,9 @@ src_unpack() {
 	# Fix compilation with gcc-4
 	epatch "${FILESDIR}/${PN}-4.5.2-gcc4-speech-fix.patch"
 
+	# Fix compilation with glibc-2.5
+	epatch "${FILESDIR}/${P}-lldiv.patch"
+
 	cp aclocal.m4 old-macros.m4
 	AT_M4DIR="." eautoreconf
 }
diff --git a/app-accessibility/dasher/files/dasher-4.6.1-lldiv.patch b/app-accessibility/dasher/files/dasher-4.6.1-lldiv.patch
new file mode 100644
index 000000000000..04f70a576d90
--- /dev/null
+++ b/app-accessibility/dasher/files/dasher-4.6.1-lldiv.patch
@@ -0,0 +1,11 @@
+--- Src/DasherCore/DasherViewSquare.cpp. 2007-10-15 15:55:00.000000000 +0200
++++ Src/DasherCore/DasherViewSquare.cpp  2007-11-28 17:18:08.000000000 +0100
+@@ -802,7 +802,7 @@
+   else
+     return quot;
+ #else
+-  lldiv_t res = __gnu_cxx::lldiv(iNumerator, iDenominator);
++  lldiv_t res = lldiv(iNumerator, iDenominator);
+   
+   if(res.rem < 0)
+     return res.quot - 1;