Fixed several compile and QA issues (fixes bug #232349). Disabled doc useflag for now since installation of html docs is broken.

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.25-SENTINEL-5 i686

5 files changed, 95 insertions, 32 deletions

diff --git a/sci-mathematics/agda/ChangeLog b/sci-mathematics/agda/ChangeLog
index 2e50555d3b51..5cdc96c32bd7 100644
--- a/sci-mathematics/agda/ChangeLog
+++ b/sci-mathematics/agda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/agda
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/ChangeLog,v 1.6 2007/10/31 13:28:20 dcoutts Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/ChangeLog,v 1.7 2008/07/26 11:37:35 markusle Exp $
+
+  26 Jul 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/agda-1.0.2-upstream-fixes.patch, agda-1.0.2.ebuild,
+  agda-1.0.2-r1.ebuild:
+  Fixed several compile and QA issues (fixes bug #232349). Disabled doc
+  useflag for now since installation of html docs is broken.
 
   31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> agda-1.0.2.ebuild,
   agda-1.0.2-r1.ebuild:
diff --git a/sci-mathematics/agda/Manifest b/sci-mathematics/agda/Manifest
index 6edd87d25f47..c780d0eedcce 100644
--- a/sci-mathematics/agda/Manifest
+++ b/sci-mathematics/agda/Manifest
@@ -1,7 +1,8 @@
 AUX 50agda-gentoo.el 318 RMD160 8562741e1705eb87f9409a4b25d19d5c11ed42a2 SHA1 68d46099ad58b0d6617b3479aeece4e618040f5c SHA256 64f767d1fb3bef2e0b31f13f8ed5764dd3c5ede563c543694946a26ef16e22ee
+AUX agda-1.0.2-upstream-fixes.patch 2011 RMD160 2a8800c74748746e78b8e27e9f869ec258535186 SHA1 ea6d31923b5da554145020f4618179a6bb555b42 SHA256 634253f00a400f4e4e2c2714287ff6a7ebd1b5623d60770a6963e42d3a9f8cac
 AUX agda-make_install.patch 549 RMD160 323539535e17244e979f0fd14684f4375e0de4ef SHA1 f7e9a2b633b7c03f305db1210f954f34e5dc4037 SHA256 f23e6fa062ca5ef3c6b1e6b7e9133a19bcf3846e12fdd1659d23d44d252946fc
 DIST Agda-1.0.2.tar.gz 505642 RMD160 6686a0bd5920a83a3e08ef2894b8ddf1620f21c2 SHA1 fffcb8ca8d565e40756cd57035d869a90d2538cc SHA256 2ab56783a26e84f64422316daf0ce160f983667357361e2986baa13fb17e7ea1
-EBUILD agda-1.0.2-r1.ebuild 1285 RMD160 282b7f62244a136273ef7edbf8a6b05d4b63b2c2 SHA1 a72b9421dd3756a06af6eed93820a241a9eb4ce4 SHA256 a6036be01e8148834ccc86963c3390732d9a68ff9bd180e8f9e38cac58756c58
-EBUILD agda-1.0.2.ebuild 1245 RMD160 e65efea922b05c1ddf0281a8077bc0be96ee0c71 SHA1 62b40aac8116625bdcf8c482d5d5e1bf93a246bc SHA256 d70fbd56c5c93165803da219e6b09553ee3fdd5bb2798302ee94a3a9a537e2e8
-MISC ChangeLog 1277 RMD160 6999fe3cff33bc83a740ffaaa2509c89f6c0a7ba SHA1 7f4ac3f183bde11fb0b4ed0611ef14ac9774e12f SHA256 a671c0f5447f5608c671f1f1c72b287e20c9e3d8b49e657a19720b6c201f82f2
+EBUILD agda-1.0.2-r1.ebuild 1386 RMD160 dc8691c1d087690398010898ba85cc133aee4ac6 SHA1 7828f9d0abfa8c93ebf7fea8adf4ce7d3e41b1ca SHA256 60a5489b502b9563046b51b7dfe5b0167852ecd88280aefefd66d1a8718db8de
+EBUILD agda-1.0.2.ebuild 1234 RMD160 1d81319cf58b026618a1ba54cc72770ceba97bfa SHA1 a4479a37603625d92baf3178299104d420f9f297 SHA256 f2ebcc54ba36d34c034a20f6da7579d0dcd90df80fd31e9f2cea91a33755141e
+MISC ChangeLog 1550 RMD160 ba27f505a109f52370e5e9ea61dd5710f6225f39 SHA1 54cd477cf56badb4a014553cd85a9878eef74751 SHA256 f79dbba3a059caca1800355a8aec7a1855a78032a8a42cdde585c8ce3941c1d5
 MISC metadata.xml 179 RMD160 df489a6cad85f0b92f9766fa51d3ba4400889b4c SHA1 a70f1537d568405a6cae08cc53c80176bf307c84 SHA256 314c17b2733c7282a7ce0f60bbb5d36aaebd67fa7f76fe45535c4d7073178dd0
diff --git a/sci-mathematics/agda/agda-1.0.2-r1.ebuild b/sci-mathematics/agda/agda-1.0.2-r1.ebuild
index 74043aae9bd4..5e14612076b2 100644
--- a/sci-mathematics/agda/agda-1.0.2-r1.ebuild
+++ b/sci-mathematics/agda/agda-1.0.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/agda-1.0.2-r1.ebuild,v 1.2 2007/10/31 13:28:20 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/agda-1.0.2-r1.ebuild,v 1.3 2008/07/26 11:37:35 markusle Exp $
 
-inherit autotools elisp-common
+inherit elisp-common eutils
 
 MY_PN="Agda"
 S="${WORKDIR}/${MY_PN}-${PV}"
@@ -13,12 +13,12 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc emacs"
+KEYWORDS="~x86 ~amd64"
+IUSE="emacs"
 
 DEPEND="dev-lang/ghc
-		emacs? ( virtual/emacs )
-		doc? ( dev-haskell/haddock )"
+		dev-haskell/mtl
+		emacs? ( virtual/emacs )"
 RDEPEND=""
 
 SITEFILE="50${PN}-gentoo.el"
@@ -26,29 +26,31 @@ SITEFILE="50${PN}-gentoo.el"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/agda-make_install.patch"
+	epatch "${FILESDIR}"/${PN}-make_install.patch
+	epatch "${FILESDIR}"/${P}-upstream-fixes.patch
+
+	sed -e "s:-package lang::" -i src/Makefile.in \
+		|| die "Failed to fix Makfile.in"
 }
 
 src_compile() {
-	cd "${S}"
 	econf --enable-newsyntax || die "./configure failed"
-	emake || die "make failed"
-	if use doc ; then
-		emake html
-	fi
+	emake -j1 || die "make failed"
+	#if use doc ; then
+	#	emake html
+	#fi
 }
 
 src_install() {
+	emake ROOT="${D}" install || die "make install failed"
+	dosym /usr/lib/EmacsAgda/bin/emacsagda /usr/bin/emacsagda
+	dosym /usr/bin/emacsagda /usr/bin/agda
+
 	if use emacs; then
 		cd "${S}/elisp"
 		elisp-install ${PN} *.el
-		elisp-site-file-install ${FILESDIR}/${SITEFILE}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
-	cd "${S}/src"
-	make prefix="${D}/usr" install || die "make install failed"
-	dosym /usr/lib/EmacsAgda/bin/emacsagda /usr/bin/emacsagda
-	dosym /usr/bin/emacsagda /usr/bin/agda
-
 }
 
 pkg_postinst() {
diff --git a/sci-mathematics/agda/agda-1.0.2.ebuild b/sci-mathematics/agda/agda-1.0.2.ebuild
index f031c3aa13c5..2dab0473253e 100644
--- a/sci-mathematics/agda/agda-1.0.2.ebuild
+++ b/sci-mathematics/agda/agda-1.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/agda-1.0.2.ebuild,v 1.3 2007/10/31 13:28:20 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/agda-1.0.2.ebuild,v 1.4 2008/07/26 11:37:35 markusle Exp $
 
-inherit autotools elisp-common
+inherit elisp-common eutils
 
 MY_PN="Agda"
 S="${WORKDIR}/${MY_PN}-${PV}"
@@ -30,7 +30,6 @@ src_unpack() {
 }
 
 src_compile() {
-	cd "${S}"
 	econf --enable-newsyntax || die "./configure failed"
 	emake || die "make failed"
 	if use doc ; then
@@ -40,12 +39,12 @@ src_compile() {
 
 src_install() {
 	if use emacs; then
-		cd "${S}/elisp"
+		cd "${S}"/elisp
 		elisp-install ${PN} *.el
-		elisp-site-file-install ${FILESDIR}/${SITEFILE}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
-	cd "${S}/src"
-	make prefix="${D}/usr" install || die "make install failed"
+	cd "${S}"/src
+	make prefix="${D}"/usr install || die "make install failed"
 	dosym /usr/lib/EmacsAgda/bin/emacsagda /usr/bin/emacsagda
 	dosym /usr/bin/emacsagda /usr/bin/agda
 
diff --git a/sci-mathematics/agda/files/agda-1.0.2-upstream-fixes.patch b/sci-mathematics/agda/files/agda-1.0.2-upstream-fixes.patch
new file mode 100644
index 000000000000..40eea5bec836
--- /dev/null
+++ b/sci-mathematics/agda/files/agda-1.0.2-upstream-fixes.patch
@@ -0,0 +1,55 @@
+diff -Naur Agda-1.0.2/src/BasicEngineOps.hs-boot Agda-1.0.2.new/src/BasicEngineOps.hs-boot
+--- Agda-1.0.2/src/BasicEngineOps.hs-boot	2006-12-25 18:47:26.000000000 -0500
++++ Agda-1.0.2.new/src/BasicEngineOps.hs-boot	2008-07-26 06:29:02.000000000 -0400
+@@ -1,4 +1,4 @@
+-module BasicEngineOps where
++module BasicEngineOps (checkAndUpdate, solveCs) where
+ import MetaVars(MetaVar)
+ import ISynType(Exp)
+ import ProofMonad(PCM)
+diff -Naur Agda-1.0.2/src/Id.hs Agda-1.0.2.new/src/Id.hs
+--- Agda-1.0.2/src/Id.hs	2006-12-25 18:47:26.000000000 -0500
++++ Agda-1.0.2.new/src/Id.hs	2008-07-26 06:28:22.000000000 -0400
+@@ -157,7 +157,7 @@
+     "$"   -> FInfixr 0
+     ">>"  -> FInfixl 1
+     ">>=" -> FInfixl 1
+-    "×"   -> FInfixr 1
++    "\xD7"-> FInfixr 1 -- times
+     "||"  -> FInfixr 2
+     "&&"  -> FInfixr 3
+     "=="  -> FInfix  4
+@@ -172,8 +172,8 @@
+     "-"   -> FInfixl 6
+     "*"   -> FInfixl 7
+     "/"   -> FInfixl 7
+-    "·"   -> FInfixr 8
+-    "°"   -> FInfixr 8
++    "\xB7"-> FInfixr 8 -- cdot
++    "\xB0"-> FInfixr 8 -- circ
+     _     -> FInfixl 9
+ 
+ 
+diff -Naur Agda-1.0.2/src/Lex.hs Agda-1.0.2.new/src/Lex.hs
+--- Agda-1.0.2/src/Lex.hs	2006-12-25 18:47:26.000000000 -0500
++++ Agda-1.0.2.new/src/Lex.hs	2008-07-26 06:35:10.000000000 -0400
+@@ -307,7 +307,7 @@
+ isSym '>' = True; isSym '\\' = True; isSym '^' = True
+ isSym '|' = True; isSym ':'  = True; isSym '-' = True; isSym '~' = True
+ isSym ',' = True
+-isSym c | c >= '\x80' = c `elem` "¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿×÷"
++isSym c | c >= '\x80' = ord c `elem` ([161..191] ++ [215,247])
+ --isSym c | c >= '\x80' = isSymbol c
+ isSym _   = False
+ 
+diff -Naur Agda-1.0.2/src/PreStrings.hs Agda-1.0.2.new/src/PreStrings.hs
+--- Agda-1.0.2/src/PreStrings.hs	2006-12-25 18:47:26.000000000 -0500
++++ Agda-1.0.2.new/src/PreStrings.hs	2008-07-26 06:28:36.000000000 -0400
+@@ -46,6 +46,6 @@
+   "Setoid","Elem","Equal","ref","sym",
+   "tran","El","Eq", "_V", "A", 
+   "B", "x", "xs", "m","JMeq", 
+-  "same", "a", "b", "×"
++  "same", "a", "b", "\xD7" -- times
+  ]
+