From fda27de536f28c13daa23c5d033bb374ad05d759 Mon Sep 17 00:00:00 2001 From: Keri Harris Date: Fri, 16 Jun 2006 23:40:11 +0000 Subject: [PATCH] Add thread-safe libgrade support. Package-Manager: portage-2.1 --- dev-lang/mercury/ChangeLog | 7 +- dev-lang/mercury/Manifest | 15 ++-- .../mercury/files/digest-mercury-0.12.2-r2 | 6 ++ dev-lang/mercury/mercury-0.12.2-r2.ebuild | 72 +++++++++++++++++++ 4 files changed, 95 insertions(+), 5 deletions(-) create mode 100644 dev-lang/mercury/files/digest-mercury-0.12.2-r2 create mode 100644 dev-lang/mercury/mercury-0.12.2-r2.ebuild diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog index 5de471bb7e73..58d6d788d8ce 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.28 2006/06/14 09:57:55 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.29 2006/06/16 23:40:11 keri Exp $ + +*mercury-0.12.2-r2 (16 Jun 2006) + + 16 Jun 2006; Keri Harris +mercury-0.12.2-r2.ebuild: + Add thread-safe libgrade support. 14 Jun 2006; Keri Harris +files/mercury-0.12.2-portage-r1.patch, +files/mercury-0.12.2-tests.patch, diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest index 7702e3920714..b04ee50c70e2 100644 --- a/dev-lang/mercury/Manifest +++ b/dev-lang/mercury/Manifest @@ -45,6 +45,10 @@ EBUILD mercury-0.12.2-r1.ebuild 2004 RMD160 df7e09f85f3748560f9282b667c76b87b059 MD5 8ac12895463559881728628ff9ce81cf mercury-0.12.2-r1.ebuild 2004 RMD160 df7e09f85f3748560f9282b667c76b87b05948d1 mercury-0.12.2-r1.ebuild 2004 SHA256 9aae052739461b696b10863110da7eab47406c6a629ce36d8792f258af0d2eeb mercury-0.12.2-r1.ebuild 2004 +EBUILD mercury-0.12.2-r2.ebuild 2049 RMD160 ac46ab78426366847d261e15186f948a5e2e73eb SHA1 34eff4da8869f548afb8fff2f04d8e9738a3b897 SHA256 c720c26188169afd6fe913340805a210792d5d435cd84bea3501b1f2b7ff5b33 +MD5 9a7a9f1f139e7d7c931ef3dbc54dffa4 mercury-0.12.2-r2.ebuild 2049 +RMD160 ac46ab78426366847d261e15186f948a5e2e73eb mercury-0.12.2-r2.ebuild 2049 +SHA256 c720c26188169afd6fe913340805a210792d5d435cd84bea3501b1f2b7ff5b33 mercury-0.12.2-r2.ebuild 2049 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 @@ -53,10 +57,10 @@ EBUILD mercury-0.13.0_beta20060609.ebuild 1845 RMD160 354f5bb90e5dda319de58063c5 MD5 5c1e60c4336b3b9feae61b32cfe6c65d mercury-0.13.0_beta20060609.ebuild 1845 RMD160 354f5bb90e5dda319de58063c5a3c5bec4b71d61 mercury-0.13.0_beta20060609.ebuild 1845 SHA256 58d18b4dbc89ab02c776b9f81b164e0d77c30c0fb695e8cfec0fd7c470a6238f mercury-0.13.0_beta20060609.ebuild 1845 -MISC ChangeLog 4941 RMD160 5d0194944ec160d4c2b562bc9bb48473a9c22cc5 SHA1 2d1caaa8385bb72cf48b923a1a3613535ba43d40 SHA256 fd81aabf79604a6722ac1bd6d13f70269a6eb6b9af641efc9f46cf804f933349 -MD5 1329f5a44128425226fbd1af242e402f ChangeLog 4941 -RMD160 5d0194944ec160d4c2b562bc9bb48473a9c22cc5 ChangeLog 4941 -SHA256 fd81aabf79604a6722ac1bd6d13f70269a6eb6b9af641efc9f46cf804f933349 ChangeLog 4941 +MISC ChangeLog 5084 RMD160 56214b885c2c0499c783f459065c56bb1210c90f SHA1 408bfa8d394aee5b4563cd26f70e86e6c449155f SHA256 2d9da8e90f5767c7e8330699438b279c7407f58b5e15581c10892667cc41baa8 +MD5 580706f2bbbb890555ffe35a8cd5291f ChangeLog 5084 +RMD160 56214b885c2c0499c783f459065c56bb1210c90f ChangeLog 5084 +SHA256 2d9da8e90f5767c7e8330699438b279c7407f58b5e15581c10892667cc41baa8 ChangeLog 5084 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247 @@ -67,6 +71,9 @@ SHA256 b9767d0d39801d79c2c6fad1bb77b2f7327bc0f5e70c8e9adcc4126352c8ddf9 files/di MD5 0d30492cc04519cf02a3453c452710c5 files/digest-mercury-0.12.2-r1 539 RMD160 6be0bed956edd23408af2bcf449cd393419f64c0 files/digest-mercury-0.12.2-r1 539 SHA256 76206eb085f179635a04f8ad1b2b53b1e4a2b4e1dccab1d25bac557e609f7df2 files/digest-mercury-0.12.2-r1 539 +MD5 0d30492cc04519cf02a3453c452710c5 files/digest-mercury-0.12.2-r2 539 +RMD160 6be0bed956edd23408af2bcf449cd393419f64c0 files/digest-mercury-0.12.2-r2 539 +SHA256 76206eb085f179635a04f8ad1b2b53b1e4a2b4e1dccab1d25bac557e609f7df2 files/digest-mercury-0.12.2-r2 539 MD5 457220c8f04fd9572c27674a4815623d files/digest-mercury-0.13.0_beta20060609 352 RMD160 5eb045511b07f5b0592d3da95fa44a1c88e793a0 files/digest-mercury-0.13.0_beta20060609 352 SHA256 de54e3fa9defbe8da86bc8ed33ef0d3cccae339ad7c7c66d324ebec7611296da files/digest-mercury-0.13.0_beta20060609 352 diff --git a/dev-lang/mercury/files/digest-mercury-0.12.2-r2 b/dev-lang/mercury/files/digest-mercury-0.12.2-r2 new file mode 100644 index 000000000000..44b741b8da2b --- /dev/null +++ b/dev-lang/mercury/files/digest-mercury-0.12.2-r2 @@ -0,0 +1,6 @@ +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 +MD5 46099512bf8b9f1a336759845f2737f7 mercury-tests-0.12.2.tar.gz 897454 +RMD160 e7cf515b0d56aff5432c5ec3e535faa907ce2955 mercury-tests-0.12.2.tar.gz 897454 +SHA256 6d3fd92d11ce2a9ce99cfa35990027557d1c70f00a3417639523b6e27f746280 mercury-tests-0.12.2.tar.gz 897454 diff --git a/dev-lang/mercury/mercury-0.12.2-r2.ebuild b/dev-lang/mercury/mercury-0.12.2-r2.ebuild new file mode 100644 index 000000000000..1111d595b9d4 --- /dev/null +++ b/dev-lang/mercury/mercury-0.12.2-r2.ebuild @@ -0,0 +1,72 @@ +# 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-r2.ebuild,v 1.1 2006/06/16 23:40:11 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 + ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/mercury-tests-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~ppc ~x86" + +IUSE="debug minimal readline threads" + +DEPEND="readline? ( sys-libs/readline )" + +S="${WORKDIR}"/${MY_P} +TESTDIR="${WORKDIR}"/${PN}-tests-${PV} + +src_unpack() { + unpack ${A} + + cd "${S}" + epatch "${FILESDIR}"/${P}-portage-r1.patch + epatch "${FILESDIR}"/${P}-CFLAGS.patch + epatch "${FILESDIR}"/${P}-LIBDIR.patch + epatch "${FILESDIR}"/${P}-docs.patch + + cd "${TESTDIR}" + epatch "${FILESDIR}"/${P}-tests.patch + sed -i -e "s:MDB_DOC:${S}/doc/mdb_doc:" mdbrc +} + +src_compile() { + econf \ + --disable-dotnet-grades \ + $(use_enable debug debug-grades) \ + $(use_enable threads par_grades) \ + $(use_enable !minimal most-grades) \ + $(use_with readline) \ + PACKAGE_VERSION=${PV} \ + || die "econf failed" + emake || die "emake failed" +} + +src_test() { + cd "${TESTDIR}" + + PATH="${S}"/scripts:"${S}"/util:"${PATH}" \ + WORKSPACE="${S}" \ + MERCURY_COMPILER="${S}"/compiler/${PN}_compile \ + MMAKE_DIR="${S}"/scripts \ + MERCURY_DEBUGGER_INIT="${TESTDIR}"/mdbrc \ + mmake || die "mmake test 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 +} -- 2.26.2