Add debug support to libgrades.

Package-Manager: portage-2.1_rc4-r3

4 files changed, 78 insertions, 11 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/Manifest b/dev-lang/mercury/Manifest
index 558fca6f9da3..64ec4cabfca1 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -18,6 +18,10 @@ AUX mercury-0.13.0_beta-CFLAGS.patch 1387 RMD160 50beda679059cfa2f1c4c0868c34d7f
 MD5 978c7b688fa22fbf08bbd85f052cc603 files/mercury-0.13.0_beta-CFLAGS.patch 1387
 RMD160 50beda679059cfa2f1c4c0868c34d7fcad147336 files/mercury-0.13.0_beta-CFLAGS.patch 1387
 SHA256 aa3e882f2590d2962b2421495f92d1ae24030799e829f72caf5a55b17fcdea58 files/mercury-0.13.0_beta-CFLAGS.patch 1387
+AUX mercury-0.13.0_beta-LIBDIR.patch 2532 RMD160 81f976dc646a1cc8f2917388ca788f6aa6965df5 SHA1 194eb109e0ace3fde4e294cebdf1ac0530215902 SHA256 2ee03ae0663265ffefc765431939a0debafc32f9ea5aa1e0ab3a83f5b896ae6f
+MD5 163d4559496e9293a1db517ad609a285 files/mercury-0.13.0_beta-LIBDIR.patch 2532
+RMD160 81f976dc646a1cc8f2917388ca788f6aa6965df5 files/mercury-0.13.0_beta-LIBDIR.patch 2532
+SHA256 2ee03ae0663265ffefc765431939a0debafc32f9ea5aa1e0ab3a83f5b896ae6f files/mercury-0.13.0_beta-LIBDIR.patch 2532
 AUX mercury-0.13.0_beta-docs.patch 828 RMD160 451ce70dc6f2121f6585d3633693c289b584db47 SHA1 29556a9a7aa2d568c37f0a9df33f16c10bfee906 SHA256 0dd010fa6acdef885b2bca5d79c4bb7b2b3aba2b2569e17035de1fbd0d32cbf7
 MD5 825e199f587b2ceb1521e68ac78ec58a files/mercury-0.13.0_beta-docs.patch 828
 RMD160 451ce70dc6f2121f6585d3633693c289b584db47 files/mercury-0.13.0_beta-docs.patch 828
@@ -36,14 +40,14 @@ EBUILD mercury-0.12.2.ebuild 1423 RMD160 9e5613b7a510ad5ba00c7ff079dffc3b788fb75
 MD5 6f79d42347ca00bfe02253c965d88574 mercury-0.12.2.ebuild 1423
 RMD160 9e5613b7a510ad5ba00c7ff079dffc3b788fb755 mercury-0.12.2.ebuild 1423
 SHA256 89e50f4a3ca1267ba3b9715b42015c3be397a85068d7588c121473d3de2b78c8 mercury-0.12.2.ebuild 1423
-EBUILD mercury-0.13.0_beta20060601.ebuild 1721 RMD160 6a275bb80793fba9ae9089ae92f16a0f0256eab1 SHA1 3bce408e25aa33ced7a6a17bc0c593caaa5498aa SHA256 faec96f6c648b5cddf2d9e05dfc2173e1c49a8736c8845d8978e568e52e86cbd
-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 4390 RMD160 189ca069babe36a324fb47df5c4fdbd753607c91 SHA1 0a01ab20f93215a90233ada57be9536b4bb0b07f SHA256 a6648f558bfac21944cab8f70c3d0d6d2a334ca6d5224ca7809384600eed0409
-MD5 c2d9abd8ca6479da2b538849c03c4fcf ChangeLog 4390
-RMD160 189ca069babe36a324fb47df5c4fdbd753607c91 ChangeLog 4390
-SHA256 a6648f558bfac21944cab8f70c3d0d6d2a334ca6d5224ca7809384600eed0409 ChangeLog 4390
+EBUILD mercury-0.13.0_beta20060601.ebuild 1845 RMD160 950ee9880cd3aa2ca4a76e295468fbe7795e0f2b SHA1 1d741b4bee667e5288b5d6fb6ec243c7a7d749f7 SHA256 bafba67343ad3e078ec29cf5261b3fce7029844d8e5e8c82c5eaa4e8e6a0bf22
+MD5 6d1147e6b267c5e4fe43f8ed9a527f7b mercury-0.13.0_beta20060601.ebuild 1845
+RMD160 950ee9880cd3aa2ca4a76e295468fbe7795e0f2b mercury-0.13.0_beta20060601.ebuild 1845
+SHA256 bafba67343ad3e078ec29cf5261b3fce7029844d8e5e8c82c5eaa4e8e6a0bf22 mercury-0.13.0_beta20060601.ebuild 1845
+MISC ChangeLog 4551 RMD160 9f33337e8dbc05caa1381292a6813bb24e49f168 SHA1 4b6b8d683d109160978366f737315070681f3a11 SHA256 43615929dcfa068499eb32a6e097298e12b359e96aecf6ed3b8a6b3eed7ae889
+MD5 0325cae4a8295c6f2a680c2b6121dbd2 ChangeLog 4551
+RMD160 9f33337e8dbc05caa1381292a6813bb24e49f168 ChangeLog 4551
+SHA256 43615929dcfa068499eb32a6e097298e12b359e96aecf6ed3b8a6b3eed7ae889 ChangeLog 4551
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
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"
 }