Add debug support to libgrades.

(Portage version: 2.1_rc4-r3)

3 files changed, 66 insertions, 3 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 7f73590c7599..e1277722450b 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,11 @@
 # 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.25 2006/06/09 08:53:24 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.26 2006/06/09 09:25:01 keri Exp $
+
+  09 Jun 2006; Keri Harris <keri@gentoo.org>
+  +files/mercury-0.13.0_beta-LIBDIR.patch,
+  mercury-0.13.0_beta20060601.ebuild:
+  Add debug support to libgrades.
 
 *mercury-0.12.2-r1 (09 Jun 2006)
 
diff --git a/dev-lang/mercury/files/mercury-0.13.0_beta-LIBDIR.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-LIBDIR.patch
new file mode 100644
index 000000000000..05c06d9a5532
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.0_beta-LIBDIR.patch
@@ -0,0 +1,55 @@
+--- mercury-compiler-0.13.0-beta-2006-06-01.orig/configure	2006-06-01 22:35:57.000000000 +1200
++++ mercury-compiler-0.13.0-beta-2006-06-01/configure	2006-06-09 19:14:47.000000000 +1200
+@@ -1609,7 +1609,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.13.0-beta-2006-06-01.orig/scripts/Mmake.vars.in	2006-05-23 18:46:54.000000000 +1200
++++ mercury-compiler-0.13.0-beta-2006-06-01/scripts/Mmake.vars.in	2006-06-09 19:14:47.000000000 +1200
+@@ -717,18 +717,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.13.0-beta-2006-06-01.orig/scripts/mercury_config.in	2005-10-27 14:48:24.000000000 +1300
++++ mercury-compiler-0.13.0-beta-2006-06-01/scripts/mercury_config.in	2006-06-09 19:14:47.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/mercury-0.13.0_beta20060601.ebuild b/dev-lang/mercury/mercury-0.13.0_beta20060601.ebuild
index c95e2dd93416..c6712d9cf89e 100644
--- a/dev-lang/mercury/mercury-0.13.0_beta20060601.ebuild
+++ b/dev-lang/mercury/mercury-0.13.0_beta20060601.ebuild
@@ -1,6 +1,6 @@
 # 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.13.0_beta20060601.ebuild,v 1.1 2006/06/04 06:58:12 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.0_beta20060601.ebuild,v 1.2 2006/06/09 09:25:01 keri Exp $
 
 inherit eutils versionator
 
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
 
-IUSE="minimal readline"
+IUSE="debug minimal readline"
 
 DEPEND="readline? ( sys-libs/readline )"
 
@@ -31,14 +31,17 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-portage.patch
 	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-CFLAGS.patch
+	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-LIBDIR.patch
 	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-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"
 }