Emacs and dependencies fixes, thanks to ulm, bug #249360. Removed -j1 since parallel building seems to work again.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.25-gentoo-r7 x86_64

5 files changed, 42 insertions, 78 deletions

diff --git a/sci-mathematics/agda/ChangeLog b/sci-mathematics/agda/ChangeLog
index 5cdc96c32bd7..5e8e3baa87ab 100644
--- a/sci-mathematics/agda/ChangeLog
+++ b/sci-mathematics/agda/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/agda
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/ChangeLog,v 1.8 2008/12/05 16:58:17 bicatali Exp $
+
+*agda-1.0.2-r2 (05 Dec 2008)
+
+  05 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
+  -agda-1.0.2.ebuild, -agda-1.0.2-r1.ebuild, +agda-1.0.2-r2.ebuild:
+  Emacs and dependencies fixes, thanks to ulm, bug #249360. Removed -j1
+  since parallel building seems to work again.
 
   26 Jul 2008; Markus Dittrich <markusle@gentoo.org>
   +files/agda-1.0.2-upstream-fixes.patch, agda-1.0.2.ebuild,
diff --git a/sci-mathematics/agda/Manifest b/sci-mathematics/agda/Manifest
index c780d0eedcce..40211a00374c 100644
--- a/sci-mathematics/agda/Manifest
+++ b/sci-mathematics/agda/Manifest
@@ -1,8 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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 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
+EBUILD agda-1.0.2-r2.ebuild 1383 RMD160 b7d33cc7863b70ce156152b7bd5d9af8044dd027 SHA1 c3f610978d16cb034be0c8873e9166cee7782174 SHA256 457f2a8e16fae83a8747071dd625398fec5775221cf30d3fde084eae83a55090
+MISC ChangeLog 1837 RMD160 7a7b2e9aee468dfa15874faf253f55f905387008 SHA1 665b8a58e8cd0d5429cace3092ca907318594fb9 SHA256 b1f15d01ae34b6310f828fa9b0b711077edada704217a998c2d11568455bb1ee
+MISC metadata.xml 534 RMD160 0441029b6e1a3409af8ae8dc66ce2b6bb13cea6c SHA1 018fada115cd6275c73c53cbb929be2857dd9024 SHA256 4b2301380c3d5573d7a34753fd9191a558783e2a5a1de759780dd96fc9d9c42c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkk5XbEACgkQ1ycZbhPLE2BQTgCfdINIWzYQKBM6P6nRT8cBPYY/
+n6EAoIeqmZc1QWRX3LhqqhFRnqcaL6Ek
+=Yg+W
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/agda/agda-1.0.2-r1.ebuild b/sci-mathematics/agda/agda-1.0.2-r2.ebuild
index 5e14612076b2..5f9d6b6b2dd3 100644
--- a/sci-mathematics/agda/agda-1.0.2-r1.ebuild
+++ b/sci-mathematics/agda/agda-1.0.2-r2.ebuild
@@ -1,25 +1,25 @@
 # 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.3 2008/07/26 11:37:35 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/agda-1.0.2-r2.ebuild,v 1.1 2008/12/05 16:58:17 bicatali Exp $
 
 inherit elisp-common eutils
 
 MY_PN="Agda"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-DESCRIPTION="Agda is a proof assistant in Haskell."
+DESCRIPTION="Proof assistant in Haskell"
 HOMEPAGE="http://unit.aist.go.jp/cvs/Agda/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="emacs"
 
-DEPEND="dev-lang/ghc
-		dev-haskell/mtl
-		emacs? ( virtual/emacs )"
-RDEPEND=""
+RDEPEND="emacs? ( virtual/emacs app-emacs/haskell-mode )"
+DEPEND="${RDEPEND}
+	dev-lang/ghc
+	dev-haskell/mtl"
 
 SITEFILE="50${PN}-gentoo.el"
 
@@ -34,22 +34,21 @@ src_unpack() {
 }
 
 src_compile() {
-	econf --enable-newsyntax || die "./configure failed"
-	emake -j1 || die "make failed"
+	econf --enable-newsyntax
+	emake || die "emake failed"
 	#if use doc ; then
 	#	emake html
 	#fi
 }
 
 src_install() {
-	emake ROOT="${D}" install || die "make install failed"
+	emake -C src ROOT="${D}" install || die "make install failed"
 	dosym /usr/lib/EmacsAgda/bin/emacsagda /usr/bin/emacsagda
-	dosym /usr/bin/emacsagda /usr/bin/agda
+	dosym emacsagda /usr/bin/agda
 
 	if use emacs; then
-		cd "${S}/elisp"
-		elisp-install ${PN} *.el
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+		elisp-install ${PN} elisp/agda-mode.el || die
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
 	fi
 }
 
diff --git a/sci-mathematics/agda/agda-1.0.2.ebuild b/sci-mathematics/agda/agda-1.0.2.ebuild
deleted file mode 100644
index 2dab0473253e..000000000000
--- a/sci-mathematics/agda/agda-1.0.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.4 2008/07/26 11:37:35 markusle Exp $
-
-inherit elisp-common eutils
-
-MY_PN="Agda"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DESCRIPTION="Agda is a proof assistant in Haskell."
-HOMEPAGE="http://unit.aist.go.jp/cvs/Agda/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc emacs"
-
-DEPEND="dev-lang/ghc
-		emacs? ( virtual/emacs )
-		doc? ( dev-haskell/haddock )"
-RDEPEND=""
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/agda-make_install.patch"
-}
-
-src_compile() {
-	econf --enable-newsyntax || die "./configure failed"
-	emake || die "make failed"
-	if use doc ; then
-		emake html
-	fi
-}
-
-src_install() {
-	if use emacs; then
-		cd "${S}"/elisp
-		elisp-install ${PN} *.el
-		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() {
-	if use emacs; then
-		elisp-site-regen
-	fi
-}
diff --git a/sci-mathematics/agda/metadata.xml b/sci-mathematics/agda/metadata.xml
index 0b35b2b14a93..d60792b2fbcc 100644
--- a/sci-mathematics/agda/metadata.xml
+++ b/sci-mathematics/agda/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<herd>haskell</herd>
+  <herd>sci-mathematics</herd>
+  <herd>haskell</herd>
+<longdescription lang="en">
+  Agda is an interactive proof editor, or proof assistant. Its input language,
+  called Agda language (or simply Agda), is based on a constructive type
+  theory á la Martin-Löf, extended with dependent record types,
+  inductive definitions, module structures and a class hierarchy mechanism.
+</longdescription>
 </pkgmetadata>