Add debug support to libgrades. Append ${P} to install_libdir so that mercury-extras can be upgraded.

Package-Manager: portage-2.1_rc4-r3

6 files changed, 151 insertions, 9 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 3779f78558d7..7f73590c7599 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.24 2006/06/04 07:07:40 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.25 2006/06/09 08:53:24 keri Exp $
+
+*mercury-0.12.2-r1 (09 Jun 2006)
+
+  09 Jun 2006; Keri Harris <keri@gentoo.org>
+  +files/mercury-0.12.2-LIBDIR.patch, files/mercury-0.12.2-portage.patch,
+  +mercury-0.12.2-r1.ebuild:
+  Add debug support to libgrades. Append ${P} to install_libdir so that
+  mercury-extras can be upgraded.
 
   04 Jun 2006; Keri Harris <keri@gentoo.org>
   -mercury-0.13.0_beta20060517.ebuild, -mercury-0.13.0_beta20060525.ebuild:
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 64f43351ff30..558fca6f9da3 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -2,14 +2,18 @@ AUX mercury-0.12.2-CFLAGS.patch 1267 RMD160 70cbaa9b85c8ac23cd17c41c3d834c69af5b
 MD5 f9d8db42316ea25a27a1bbc6806f60d7 files/mercury-0.12.2-CFLAGS.patch 1267
 RMD160 70cbaa9b85c8ac23cd17c41c3d834c69af5bff1a files/mercury-0.12.2-CFLAGS.patch 1267
 SHA256 b27660a29a71b56071daa5e7fc6c62c697c53c55bf8b9068c1bc42002cdb00f1 files/mercury-0.12.2-CFLAGS.patch 1267
+AUX mercury-0.12.2-LIBDIR.patch 2436 RMD160 05a57fe17f770a1dbfb862aea6669db1f7a2463f SHA1 b52da4e3e8b4e70e2a1633694fefc2f5e4af1c78 SHA256 e470e2a3a693a6d0294f6940a64fda3aa423322bf7620745474a76aeb1c83793
+MD5 cace61ef145e50a3d4ddeb284cc0bcd3 files/mercury-0.12.2-LIBDIR.patch 2436
+RMD160 05a57fe17f770a1dbfb862aea6669db1f7a2463f files/mercury-0.12.2-LIBDIR.patch 2436
+SHA256 e470e2a3a693a6d0294f6940a64fda3aa423322bf7620745474a76aeb1c83793 files/mercury-0.12.2-LIBDIR.patch 2436
 AUX mercury-0.12.2-docs.patch 796 RMD160 27543c5201dfcc3112878026c06f193e126288be SHA1 f7c2e543781f9f8b69777e7ef985279a6e9b284d SHA256 78be9f8ef2960ce9ea99b33734d9143a998d87056efa84bafb618cab74fcd514
 MD5 5e8e5942a015e9832289c90913fa2bca files/mercury-0.12.2-docs.patch 796
 RMD160 27543c5201dfcc3112878026c06f193e126288be files/mercury-0.12.2-docs.patch 796
 SHA256 78be9f8ef2960ce9ea99b33734d9143a998d87056efa84bafb618cab74fcd514 files/mercury-0.12.2-docs.patch 796
-AUX mercury-0.12.2-portage.patch 1606 RMD160 485229c1485e0acade8df39dca0da1ae2ade9a7f SHA1 7f849b136b98dd9687173eda9ca2c0dfeb94d92c SHA256 5b56cdfc254d7e20b0fba5c3bb8187fd9883e7ea2063930de5f6c4fb8da25be1
-MD5 8ba4f9e032e6b3d148dcb3dc80cc9938 files/mercury-0.12.2-portage.patch 1606
-RMD160 485229c1485e0acade8df39dca0da1ae2ade9a7f files/mercury-0.12.2-portage.patch 1606
-SHA256 5b56cdfc254d7e20b0fba5c3bb8187fd9883e7ea2063930de5f6c4fb8da25be1 files/mercury-0.12.2-portage.patch 1606
+AUX mercury-0.12.2-portage.patch 2052 RMD160 3fdcd9a309c27da3cf539829413ca8b15d5b50ab SHA1 3b9cc1c7ff9b0885feeeab35857ae862a7366169 SHA256 80189cf0515f212f2756f5c944b9eab5db3acdece1404ab11a4e5eedcd1b42e0
+MD5 bfc5cb304791178b3283d7cd48e750a7 files/mercury-0.12.2-portage.patch 2052
+RMD160 3fdcd9a309c27da3cf539829413ca8b15d5b50ab files/mercury-0.12.2-portage.patch 2052
+SHA256 80189cf0515f212f2756f5c944b9eab5db3acdece1404ab11a4e5eedcd1b42e0 files/mercury-0.12.2-portage.patch 2052
 AUX mercury-0.13.0_beta-CFLAGS.patch 1387 RMD160 50beda679059cfa2f1c4c0868c34d7fcad147336 SHA1 ccde9305e9ee1b1705ffc96de36fbb766dc1f12e SHA256 aa3e882f2590d2962b2421495f92d1ae24030799e829f72caf5a55b17fcdea58
 MD5 978c7b688fa22fbf08bbd85f052cc603 files/mercury-0.13.0_beta-CFLAGS.patch 1387
 RMD160 50beda679059cfa2f1c4c0868c34d7fcad147336 files/mercury-0.13.0_beta-CFLAGS.patch 1387
@@ -24,6 +28,10 @@ RMD160 30c59012a80aebac452d6ec7d24e7af193e8ab7d files/mercury-0.13.0_beta-portag
 SHA256 00fee4b44e779fd4cc79be60b95309a98999ae2fedfe602195fa1855e62d2da9 files/mercury-0.13.0_beta-portage.patch 1608
 DIST mercury-compiler-0.12.2.tar.gz 15074997 RMD160 227a3e1796d96ad77324d9f1d39efd6be7fce80e SHA1 96b7a878370bb256da28c8ffa1c4b0a4bc3711d6 SHA256 7fa1df8030cdc3d4dc848d102ba64bf23c12004461c985290622b81753b89572
 DIST mercury-compiler-0.13.0-beta-2006-06-01-unstable.tar.gz 15847299 RMD160 51304292fc0181e2ba1d14048fcf2c38219489cd SHA1 bef3058e573f21be9b6b6880f07c53607b8858ff SHA256 bf87e5d9a2bef4494b073e0030a212d1171d7c795b50a24a74d272808c31ff55
+EBUILD mercury-0.12.2-r1.ebuild 1533 RMD160 9fa48ee0a1639e971bf994064c94cc600b402357 SHA1 9984c71e82de63231cd7e67ecac99946674e5275 SHA256 459aeb074c15284a421832fb87154e97d48324ab89319c92113a505ed7f08d29
+MD5 b61155455083e4dc38e72db7c2c4cb4d mercury-0.12.2-r1.ebuild 1533
+RMD160 9fa48ee0a1639e971bf994064c94cc600b402357 mercury-0.12.2-r1.ebuild 1533
+SHA256 459aeb074c15284a421832fb87154e97d48324ab89319c92113a505ed7f08d29 mercury-0.12.2-r1.ebuild 1533
 EBUILD mercury-0.12.2.ebuild 1423 RMD160 9e5613b7a510ad5ba00c7ff079dffc3b788fb755 SHA1 8e8a9063248f02f94c4417a6c3f57626c04bd30b SHA256 89e50f4a3ca1267ba3b9715b42015c3be397a85068d7588c121473d3de2b78c8
 MD5 6f79d42347ca00bfe02253c965d88574 mercury-0.12.2.ebuild 1423
 RMD160 9e5613b7a510ad5ba00c7ff079dffc3b788fb755 mercury-0.12.2.ebuild 1423
@@ -32,10 +40,10 @@ EBUILD mercury-0.13.0_beta20060601.ebuild 1721 RMD160 6a275bb80793fba9ae9089ae92
 MD5 e54128dd71eed93964d945c0c3204731 mercury-0.13.0_beta20060601.ebuild 1721
 RMD160 6a275bb80793fba9ae9089ae92f16a0f0256eab1 mercury-0.13.0_beta20060601.ebuild 1721
 SHA256 faec96f6c648b5cddf2d9e05dfc2173e1c49a8736c8845d8978e568e52e86cbd mercury-0.13.0_beta20060601.ebuild 1721
-MISC ChangeLog 4101 RMD160 6df470a40191f353db6638ce4e574e3b50d49a26 SHA1 4749203c72d43ee898bff1f7fcdaa0a229acdc57 SHA256 7e0c25dd61f37e06cb3b1b307c62ab8c91cf270592dc74b69e171ff2a8832105
-MD5 f0d730e8d400a9a43e7efcaa719312f1 ChangeLog 4101
-RMD160 6df470a40191f353db6638ce4e574e3b50d49a26 ChangeLog 4101
-SHA256 7e0c25dd61f37e06cb3b1b307c62ab8c91cf270592dc74b69e171ff2a8832105 ChangeLog 4101
+MISC ChangeLog 4390 RMD160 189ca069babe36a324fb47df5c4fdbd753607c91 SHA1 0a01ab20f93215a90233ada57be9536b4bb0b07f SHA256 a6648f558bfac21944cab8f70c3d0d6d2a334ca6d5224ca7809384600eed0409
+MD5 c2d9abd8ca6479da2b538849c03c4fcf ChangeLog 4390
+RMD160 189ca069babe36a324fb47df5c4fdbd753607c91 ChangeLog 4390
+SHA256 a6648f558bfac21944cab8f70c3d0d6d2a334ca6d5224ca7809384600eed0409 ChangeLog 4390
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
@@ -43,6 +51,9 @@ SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa metadata
 MD5 1de216638d19d62bd270bcc2ec55d75d files/digest-mercury-0.12.2 277
 RMD160 56137f9a814f0f6f0d1d4b7200dfda77320ecc48 files/digest-mercury-0.12.2 277
 SHA256 b9767d0d39801d79c2c6fad1bb77b2f7327bc0f5e70c8e9adcc4126352c8ddf9 files/digest-mercury-0.12.2 277
+MD5 1de216638d19d62bd270bcc2ec55d75d files/digest-mercury-0.12.2-r1 277
+RMD160 56137f9a814f0f6f0d1d4b7200dfda77320ecc48 files/digest-mercury-0.12.2-r1 277
+SHA256 b9767d0d39801d79c2c6fad1bb77b2f7327bc0f5e70c8e9adcc4126352c8ddf9 files/digest-mercury-0.12.2-r1 277
 MD5 bd2a79f905a036f28eacc5252b64cf30 files/digest-mercury-0.13.0_beta20060601 352
 RMD160 c2e46b5e4f8aaa4dc82984bbefca09f39acd1f36 files/digest-mercury-0.13.0_beta20060601 352
 SHA256 3f2eaebc28ad552568e15a5eb03679bb632590e1971fa149c711cf0c97c40cdf files/digest-mercury-0.13.0_beta20060601 352
diff --git a/dev-lang/mercury/files/digest-mercury-0.12.2-r1 b/dev-lang/mercury/files/digest-mercury-0.12.2-r1
new file mode 100644
index 000000000000..8447aec3d358
--- /dev/null
+++ b/dev-lang/mercury/files/digest-mercury-0.12.2-r1
@@ -0,0 +1,3 @@
+MD5 49796cb9f475a0959d13ec7694777a94 mercury-compiler-0.12.2.tar.gz 15074997
+RMD160 227a3e1796d96ad77324d9f1d39efd6be7fce80e mercury-compiler-0.12.2.tar.gz 15074997
+SHA256 7fa1df8030cdc3d4dc848d102ba64bf23c12004461c985290622b81753b89572 mercury-compiler-0.12.2.tar.gz 15074997
diff --git a/dev-lang/mercury/files/mercury-0.12.2-LIBDIR.patch b/dev-lang/mercury/files/mercury-0.12.2-LIBDIR.patch
new file mode 100644
index 000000000000..f81852240da8
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.12.2-LIBDIR.patch
@@ -0,0 +1,55 @@
+--- mercury-compiler-0.12.2.orig/configure	2006-01-25 17:24:01.000000000 +1300
++++ mercury-compiler-0.12.2/configure	2006-06-06 20:57:45.000000000 +1200
+@@ -1599,7 +1599,7 @@
+ 
+ 
+ PREFIX="`$CYGPATH $PREFIX`"
+-LIBDIR="`$CYGPATH $PREFIX/lib/mercury`"
++LIBDIR="`$CYGPATH $PREFIX/lib/mercury-$PACKAGE_VERSION`"
+ NONSHARED_LIB_DIR=${MERCURY_NONSHARED_LIB_DIR=$PREFIX/lib/nonshared}
+ 
+ 
+--- mercury-compiler-0.12.2.orig/scripts/Mmake.vars.in	2005-08-17 03:57:40.000000000 +1200
++++ mercury-compiler-0.12.2/scripts/Mmake.vars.in	2006-06-06 20:04:46.000000000 +1200
+@@ -716,18 +716,18 @@
+ INSTALL_PREFIX		= @prefix@
+ FINAL_INSTALL_PREFIX	= @prefix@
+ INSTALL_BINDIR		= $(INSTALL_PREFIX)/bin
+-INSTALL_LIBDIR		= $(INSTALL_PREFIX)/lib/mercury
+-FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/lib/mercury
+-INSTALL_JAVA_LIBRARY_DIR= $(INSTALL_PREFIX)/lib/mercury/lib/java
++INSTALL_LIBDIR		= $(INSTALL_PREFIX)/lib/mercury-@PACKAGE_VERSION@
++FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/lib/mercury-@PACKAGE_VERSION@
++INSTALL_JAVA_LIBRARY_DIR= $(INSTALL_LIBDIR)/lib/java
+ INSTALL_INFO_DIR	= $(INSTALL_PREFIX)/info
+-INSTALL_DVI_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
+-INSTALL_TEXT_DIR	= $(INSTALL_PREFIX)/lib/mercury/doc
+-INSTALL_PS_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
+-INSTALL_PDF_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
++INSTALL_DVI_DIR		= $(INSTALL_LIBDIR)/doc
++INSTALL_TEXT_DIR	= $(INSTALL_LIBDIR)/doc
++INSTALL_PS_DIR		= $(INSTALL_LIBDIR)/doc
++INSTALL_PDF_DIR		= $(INSTALL_LIBDIR)/doc
+ INSTALL_MAN_DIR		= $(INSTALL_PREFIX)/man
+-INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/lib/mercury/html
+-INSTALL_MDB_DOC_DIR	= $(INSTALL_PREFIX)/lib/mercury/mdb
+-INSTALL_ELISP_DIR	= $(INSTALL_PREFIX)/lib/mercury/elisp
++INSTALL_HTML_DIR	= $(INSTALL_LIBDIR)/html
++INSTALL_MDB_DOC_DIR	= $(INSTALL_LIBDIR)/mdb
++INSTALL_ELISP_DIR	= $(INSTALL_LIBDIR)/elisp
+ INSTALL_CGI_DIR		= @CGIDIR@
+ 
+ # You should not need to override anything below here
+--- mercury-compiler-0.12.2.orig/scripts/mercury_config.in	2005-09-11 01:47:49.000000000 +1200
++++ mercury-compiler-0.12.2/scripts/mercury_config.in	2006-06-07 18:55:12.000000000 +1200
+@@ -90,8 +90,8 @@
+ 	shift
+ done
+ 
+-input_libdir="$input_prefix/lib/mercury"
+-output_libdir="$output_prefix/lib/mercury"
++input_libdir="$input_prefix/lib/mercury-@PACKAGE_VERSION@"
++output_libdir="$output_prefix/lib/mercury-@PACKAGE_VERSION@"
+ 
+ # mercury_config regenerates itself, so we can't just execute it in place.
+ case $recursive in
diff --git a/dev-lang/mercury/files/mercury-0.12.2-portage.patch b/dev-lang/mercury/files/mercury-0.12.2-portage.patch
index 75244325ca67..6379e4215a00 100644
--- a/dev-lang/mercury/files/mercury-0.12.2-portage.patch
+++ b/dev-lang/mercury/files/mercury-0.12.2-portage.patch
@@ -42,3 +42,14 @@
  
  .PHONY: install_main
  install_main: all \
+--- mercury-compiler-0.12.2.orig/configure	2006-01-25 17:24:01.000000000 +1300
++++ mercury-compiler-0.12.2/configure	2006-06-08 19:31:53.000000000 +1200
+@@ -8861,7 +8861,7 @@
+ # Check whether --enable-debug-grades or --disable-debug-grades was given.
+ if test "${enable_debug_grades+set}" = set; then
+   enableval="$enable_debug_grades"
+-  enable_debug_grades="enableval"
++  enable_debug_grades="$enableval"
+ else
+   enable_debug_grades=yes
+ fi;
diff --git a/dev-lang/mercury/mercury-0.12.2-r1.ebuild b/dev-lang/mercury/mercury-0.12.2-r1.ebuild
new file mode 100644
index 000000000000..8cca106bf864
--- /dev/null
+++ b/dev-lang/mercury/mercury-0.12.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.12.2-r1.ebuild,v 1.1 2006/06/09 08:53:24 keri Exp $
+
+inherit eutils
+
+MY_P=${PN}-compiler-${PV}
+
+DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
+HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
+SRC_URI="ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+
+IUSE="debug minimal readline"
+
+DEPEND="readline? ( sys-libs/readline )"
+
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-portage.patch
+	epatch "${FILESDIR}"/${P}-CFLAGS.patch
+	epatch "${FILESDIR}"/${P}-LIBDIR.patch
+	epatch "${FILESDIR}"/${P}-docs.patch
+}
+
+src_compile() {
+	econf \
+		--disable-dotnet-grades \
+		$(use_enable debug debug-grades) \
+		$(use_enable !minimal most-grades) \
+		$(use_with readline) \
+		PACKAGE_VERSION=${PV} \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make \
+		MERCURY_COMPILER="${D}"/usr/lib/${P}/bin/${CHOST}/${PN}_compile \
+		INSTALL_PREFIX="${D}"/usr \
+		INSTALL_MAN_DIR="${D}"/usr/share/man \
+		INSTALL_INFO_DIR="${D}"/usr/share/info \
+		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
+		install || die "make install failed"
+
+	dodoc BUGS HISTORY LIMITATIONS NEWS README README.Java README.Linux README.Linux-Alpha README.Linux-m68k README.Linux-PPC RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS
+}