Bundle patches into distfiles tarball.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 13 insertions, 15 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 1de7ac2359a4..e0eb7ce1f039 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.125 2010/11/03 07:10:08 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.126 2010/11/03 07:32:54 keri Exp $
+
+  03 Nov 2010; <keri@gentoo.org> mercury-10.04-r1.ebuild:
+  Bundle patches into distfiles tarball.
 
   03 Nov 2010; <keri@gentoo.org> mercury-10.04.ebuild,
   mercury-10.04.1.ebuild, -files/mercury-10.04.1-boehm_gc.patch,
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 98d8b0dc0205..6909bad57ee8 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -21,10 +21,10 @@ DIST mercury-tests-10.04.1.tar.gz 1332741 RMD160 e7880a095d071f4fcdce69f9e656e67
 DIST mercury-tests-10.04.2.tar.gz 1332984 RMD160 5c56b4c92627be5903b9a7fcaa7af9dddc160ed3 SHA1 9a8dcaabcbe6aa6a398ab97f63700c2d2f53de5d SHA256 7aca501f4bb8604f09ca4d5d0c102fd327fbec4cdd789c27c7b0f08f7e9e9491
 DIST mercury-tests-10.04.tar.gz 1329423 RMD160 c85e489eea4e36fef6d12fb9bf4e7cd01bb2e7fd SHA1 32ca9267d58d2cbb7d144c1501803f0a7b92f145 SHA256 d56a76b4a2c8c2cc878b7a7cd04fd34b4069cef1316155a942f4372425d45085
 EBUILD mercury-0.13.1-r2.ebuild 3350 RMD160 8a1635d8c301751b2da7260785baaa788b81b620 SHA1 2aae241faf85518b6bb6d162939b2f293eb67649 SHA256 af0a034331b9a7acb0d0a7dea42fc84aafcf9e66de2b6fceddc623f975689c44
-EBUILD mercury-10.04-r1.ebuild 4397 RMD160 ac0c5f73a0468ad0b975c7b4e45fd962cd3d1b42 SHA1 b7d1d4b635f916f1be1a4fc496c2d80f9949ab30 SHA256 55dfdb3ae95f0dfc74014d2f87085d568316c84d78d74805e30c8674f8ece543
+EBUILD mercury-10.04-r1.ebuild 4058 RMD160 045040097513847a6959ef40121d8e6b81e6ae85 SHA1 f8746e3d5b738c5ed0079be878cb11393dfd96ca SHA256 ceb6d53b6f96c42b38e4bfbfee8f8dc71c098bb48aa13b4046d9264b9653641b
 EBUILD mercury-10.04.1.ebuild 4529 RMD160 91e2a1ddf874123394ae90431608525ae0a26f6c SHA1 273b09516ff839983613fbd526f6a7d12b2536c9 SHA256 8ae2505b6e5bcd624692c29cdba4963a8931b5e1b87ef4e5ac0b21a0a19e52eb
 EBUILD mercury-10.04.2-r1.ebuild 5008 RMD160 9468feb07ac943c954af4faf13f69737c7ff15ac SHA1 b933bd55c2b9a121e17362324cbb74c55d66929e SHA256 4c3e45638ba4e95b4678bb895f9f47ae58d22949240b93d710d5c2182db8f601
 EBUILD mercury-10.04.2.ebuild 4529 RMD160 43477f989449a2fe794afb35df94855175bb7a0a SHA1 1e14fef6fbabaf466ca0237286978b281f0a2aee SHA256 e5ca10919d13cf82701d98a5a3acdf4c495238842d4b65eed87064a5ef86983a
 EBUILD mercury-10.04.ebuild 3857 RMD160 d9bb8e9e002d2f50b384c24733d64c6a02f7e4f6 SHA1 70aae9ae137fb35dacdcaf3541ec78b5f4c1ddaa SHA256 0133dfea517707ff1d1d2e9275a6051be07911d9b374cc91016ee166a94b5f20
-MISC ChangeLog 27663 RMD160 b033be8e22e4572d9bf6c5a8244e0015c9584e40 SHA1 f135e5a368a3e68460122eb6f5447fc5276583f0 SHA256 83e0dbe9f46c48f398b175a95b5d1b6650ba5d2ce8637897cf51fc86d0eb18e3
+MISC ChangeLog 27763 RMD160 dcdf975a44d2b369c6fad00b45dbc13c7cba26d4 SHA1 3e03317c7177bb453bddf88027d0c1aeee51cd14 SHA256 b0e8094556d28c6c0bf44bcfcfb8b25d38bc9d4a8f2c55825d1ffa4865ebb7b3
 MISC metadata.xml 318 RMD160 b9e62c5b9d04f43a6570cfcadd6a6c9a2b9e3f6f SHA1 67893d667419e727696eb2c386565794fd137418 SHA256 5e64767eb2ff6b10d88b169c87648d62b534356fb94c5407a253aeafc2d16935
diff --git a/dev-lang/mercury/mercury-10.04-r1.ebuild b/dev-lang/mercury/mercury-10.04-r1.ebuild
index 1526f3471538..759d09eacfdd 100644
--- a/dev-lang/mercury/mercury-10.04-r1.ebuild
+++ b/dev-lang/mercury/mercury-10.04-r1.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04-r1.ebuild,v 1.1 2010/08/22 06:09:57 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04-r1.ebuild,v 1.2 2010/11/03 07:32:54 keri Exp $
 
 inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
 
+PATCHSET_VER="0"
 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="http://www.mercury.cs.mu.oz.au/download/files/${MY_P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
 	test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )"
 
 LICENSE="GPL-2"
@@ -34,23 +36,16 @@ SITEFILE=50${PN}-gentoo.el
 src_unpack() {
 	unpack ${A}
 
-	epatch "${FILESDIR}"/${P}-multilib.patch
-	epatch "${FILESDIR}"/${P}-linker-flags.patch
-	epatch "${FILESDIR}"/${P}-default-grade.patch
-	epatch "${FILESDIR}"/${P}-boehm_gc.patch
-	epatch "${FILESDIR}"/${P}-sparc-llds-base-grade.patch
-	epatch "${FILESDIR}"/${P}-docs.patch
-	epatch "${FILESDIR}"/${P}-no-reconf.patch
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
 
 	sed -i -e "s/@libdir@/$(get_libdir)/" \
 		"${S}"/compiler/make.program_target.c \
 		"${S}"/scripts/Mmake.vars.in
 
 	if use test; then
-		epatch "${FILESDIR}"/${P}-tests-workspace.patch
-		epatch "${FILESDIR}"/${P}-tests-sandbox.patch
-		epatch "${FILESDIR}"/${P}-tests-mercury-float.patch
-		epatch "${FILESDIR}"/${P}-tests-static-link.patch
+		epatch "${WORKDIR}"/${PV}-tests
 	fi
 }