| 1 |
keri 10/11/03 07:10:08 |
| 2 |
|
| 3 |
Modified: mercury-10.04.1.ebuild ChangeLog |
| 4 |
mercury-10.04.ebuild mercury-10.04.2-r1.ebuild |
| 5 |
mercury-10.04.2.ebuild |
| 6 |
Log: |
| 7 |
Bundle patches into distfiles tarball. Closes #343731 |
| 8 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.4 dev-lang/mercury/mercury-10.04.1.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.1.ebuild?rev=1.4&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.1.ebuild?rev=1.4&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.1.ebuild?r1=1.3&r2=1.4 |
| 16 |
|
| 17 |
Index: mercury-10.04.1.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.1.ebuild,v |
| 20 |
retrieving revision 1.3 |
| 21 |
retrieving revision 1.4 |
| 22 |
diff -u -r1.3 -r1.4 |
| 23 |
--- mercury-10.04.1.ebuild 10 Oct 2010 00:09:47 -0000 1.3 |
| 24 |
+++ mercury-10.04.1.ebuild 3 Nov 2010 07:10:08 -0000 1.4 |
| 25 |
@@ -1,14 +1,16 @@ |
| 26 |
# Copyright 1999-2010 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.1.ebuild,v 1.3 2010/10/10 00:09:47 keri Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.1.ebuild,v 1.4 2010/11/03 07:10:08 keri Exp $ |
| 30 |
|
| 31 |
inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib |
| 32 |
|
| 33 |
+PATCHSET_VER="0" |
| 34 |
MY_P=${PN}-compiler-${PV} |
| 35 |
|
| 36 |
DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" |
| 37 |
HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html" |
| 38 |
SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${MY_P}.tar.gz |
| 39 |
+ mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz |
| 40 |
test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )" |
| 41 |
|
| 42 |
LICENSE="GPL-2" |
| 43 |
@@ -34,15 +36,9 @@ |
| 44 |
src_unpack() { |
| 45 |
unpack ${A} |
| 46 |
|
| 47 |
- epatch "${FILESDIR}"/${P}-multilib.patch |
| 48 |
- epatch "${FILESDIR}"/${P}-linker-flags.patch |
| 49 |
- epatch "${FILESDIR}"/${P}-bootstrap-depend.patch |
| 50 |
- epatch "${FILESDIR}"/${P}-default-grade.patch |
| 51 |
- epatch "${FILESDIR}"/${P}-boehm_gc.patch |
| 52 |
- epatch "${FILESDIR}"/${P}-sparc-llds-base-grade.patch |
| 53 |
- epatch "${FILESDIR}"/${P}-char-det-from-int.patch |
| 54 |
- epatch "${FILESDIR}"/${P}-docs.patch |
| 55 |
- epatch "${FILESDIR}"/${P}-no-reconf.patch |
| 56 |
+ EPATCH_FORCE=yes |
| 57 |
+ EPATCH_SUFFIX=patch |
| 58 |
+ epatch "${WORKDIR}"/${PV} |
| 59 |
|
| 60 |
sed -i -e "s/@libdir@/$(get_libdir)/" \ |
| 61 |
"${S}"/compiler/file_util.m \ |
| 62 |
@@ -62,9 +58,7 @@ |
| 63 |
touch "${S}"/compiler/*.c |
| 64 |
|
| 65 |
if use test; then |
| 66 |
- epatch "${FILESDIR}"/${P}-tests-workspace.patch |
| 67 |
- epatch "${FILESDIR}"/${P}-tests-sandbox.patch |
| 68 |
- epatch "${FILESDIR}"/${P}-tests-static-link.patch |
| 69 |
+ epatch "${WORKDIR}"/${PV}-tests |
| 70 |
fi |
| 71 |
|
| 72 |
cd "${S}" |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
1.125 dev-lang/mercury/ChangeLog |
| 77 |
|
| 78 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.125&view=markup |
| 79 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.125&content-type=text/plain |
| 80 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?r1=1.124&r2=1.125 |
| 81 |
|
| 82 |
Index: ChangeLog |
| 83 |
=================================================================== |
| 84 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v |
| 85 |
retrieving revision 1.124 |
| 86 |
retrieving revision 1.125 |
| 87 |
diff -u -r1.124 -r1.125 |
| 88 |
--- ChangeLog 3 Nov 2010 06:54:29 -0000 1.124 |
| 89 |
+++ ChangeLog 3 Nov 2010 07:10:08 -0000 1.125 |
| 90 |
@@ -1,6 +1,43 @@ |
| 91 |
# ChangeLog for dev-lang/mercury |
| 92 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 93 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.124 2010/11/03 06:54:29 keri Exp $ |
| 94 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.125 2010/11/03 07:10:08 keri Exp $ |
| 95 |
+ |
| 96 |
+ 03 Nov 2010; <keri@g.o> mercury-10.04.ebuild, |
| 97 |
+ mercury-10.04.1.ebuild, -files/mercury-10.04.1-boehm_gc.patch, |
| 98 |
+ -files/mercury-10.04.1-bootstrap-depend.patch, |
| 99 |
+ -files/mercury-10.04.1-char-det-from-int.patch, |
| 100 |
+ -files/mercury-10.04.1-default-grade.patch, |
| 101 |
+ -files/mercury-10.04.1-docs.patch, |
| 102 |
+ -files/mercury-10.04.1-linker-flags.patch, |
| 103 |
+ -files/mercury-10.04.1-multilib.patch, |
| 104 |
+ -files/mercury-10.04.1-no-reconf.patch, |
| 105 |
+ -files/mercury-10.04.1-sparc-llds-base-grade.patch, |
| 106 |
+ -files/mercury-10.04.1-tests-sandbox.patch, |
| 107 |
+ -files/mercury-10.04.1-tests-static-link.patch, |
| 108 |
+ -files/mercury-10.04.1-tests-workspace.patch, mercury-10.04.2.ebuild, |
| 109 |
+ mercury-10.04.2-r1.ebuild, -files/mercury-10.04.2-boehm_gc.patch, |
| 110 |
+ -files/mercury-10.04.2-bootstrap-depend.patch, |
| 111 |
+ -files/mercury-10.04.2-char-det-from-int.patch, |
| 112 |
+ -files/mercury-10.04.2-default-grade.patch, |
| 113 |
+ -files/mercury-10.04.2-docs.patch, |
| 114 |
+ -files/mercury-10.04.2-linker-flags.patch, |
| 115 |
+ -files/mercury-10.04.2-multilib.patch, |
| 116 |
+ -files/mercury-10.04.2-no-reconf.patch, |
| 117 |
+ -files/mercury-10.04.2-prepare-install-dir.patch, |
| 118 |
+ -files/mercury-10.04.2-sparc-llds-base-grade.patch, |
| 119 |
+ -files/mercury-10.04.2-tests-sandbox.patch, |
| 120 |
+ -files/mercury-10.04.2-tests-static-link.patch, |
| 121 |
+ -files/mercury-10.04.2-tests-workspace.patch, |
| 122 |
+ -files/mercury-10.04-boehm_gc.patch, |
| 123 |
+ -files/mercury-10.04-default-grade.patch, -files/mercury-10.04-docs.patch, |
| 124 |
+ -files/mercury-10.04-linker-flags.patch, |
| 125 |
+ -files/mercury-10.04-multilib.patch, -files/mercury-10.04-no-reconf.patch, |
| 126 |
+ -files/mercury-10.04-sparc-llds-base-grade.patch, |
| 127 |
+ -files/mercury-10.04-tests-mercury-float.patch, |
| 128 |
+ -files/mercury-10.04-tests-sandbox.patch, |
| 129 |
+ -files/mercury-10.04-tests-static-link.patch, |
| 130 |
+ -files/mercury-10.04-tests-workspace.patch: |
| 131 |
+ Bundle patches into distfiles tarball. Closes #343731 |
| 132 |
|
| 133 |
03 Nov 2010; <keri@g.o> -mercury-10.04_beta1.ebuild, |
| 134 |
-files/mercury-10.04_beta1-atomic-ops.patch, |
| 135 |
|
| 136 |
|
| 137 |
|
| 138 |
1.7 dev-lang/mercury/mercury-10.04.ebuild |
| 139 |
|
| 140 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild?rev=1.7&view=markup |
| 141 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild?rev=1.7&content-type=text/plain |
| 142 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild?r1=1.6&r2=1.7 |
| 143 |
|
| 144 |
Index: mercury-10.04.ebuild |
| 145 |
=================================================================== |
| 146 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v |
| 147 |
retrieving revision 1.6 |
| 148 |
retrieving revision 1.7 |
| 149 |
diff -u -r1.6 -r1.7 |
| 150 |
--- mercury-10.04.ebuild 28 Jul 2010 08:24:55 -0000 1.6 |
| 151 |
+++ mercury-10.04.ebuild 3 Nov 2010 07:10:08 -0000 1.7 |
| 152 |
@@ -1,14 +1,16 @@ |
| 153 |
# Copyright 1999-2010 Gentoo Foundation |
| 154 |
# Distributed under the terms of the GNU General Public License v2 |
| 155 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v 1.6 2010/07/28 08:24:55 keri Exp $ |
| 156 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v 1.7 2010/11/03 07:10:08 keri Exp $ |
| 157 |
|
| 158 |
inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib |
| 159 |
|
| 160 |
+PATCHSET_VER="0" |
| 161 |
MY_P=${PN}-compiler-${PV} |
| 162 |
|
| 163 |
DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" |
| 164 |
HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html" |
| 165 |
SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${MY_P}.tar.gz |
| 166 |
+ mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz |
| 167 |
test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )" |
| 168 |
|
| 169 |
LICENSE="GPL-2" |
| 170 |
@@ -34,22 +36,16 @@ |
| 171 |
src_unpack() { |
| 172 |
unpack ${A} |
| 173 |
|
| 174 |
- epatch "${FILESDIR}"/${P}-multilib.patch |
| 175 |
- epatch "${FILESDIR}"/${P}-default-grade.patch |
| 176 |
- epatch "${FILESDIR}"/${P}-sparc-llds-base-grade.patch |
| 177 |
- epatch "${FILESDIR}"/${P}-boehm_gc.patch |
| 178 |
- epatch "${FILESDIR}"/${P}-docs.patch |
| 179 |
- epatch "${FILESDIR}"/${P}-no-reconf.patch |
| 180 |
+ EPATCH_FORCE=yes |
| 181 |
+ EPATCH_SUFFIX=patch |
| 182 |
+ epatch "${WORKDIR}"/${PV} |
| 183 |
|
| 184 |
sed -i -e "s/@libdir@/$(get_libdir)/" \ |
| 185 |
"${S}"/compiler/make.program_target.c \ |
| 186 |
"${S}"/scripts/Mmake.vars.in |
| 187 |
|
| 188 |
if use test; then |
| 189 |
- epatch "${FILESDIR}"/${P}-tests-workspace.patch |
| 190 |
- epatch "${FILESDIR}"/${P}-tests-sandbox.patch |
| 191 |
- epatch "${FILESDIR}"/${P}-tests-mercury-float.patch |
| 192 |
- epatch "${FILESDIR}"/${P}-tests-static-link.patch |
| 193 |
+ epatch "${WORKDIR}"/${PV}-tests |
| 194 |
fi |
| 195 |
} |
| 196 |
|
| 197 |
|
| 198 |
|
| 199 |
|
| 200 |
1.4 dev-lang/mercury/mercury-10.04.2-r1.ebuild |
| 201 |
|
| 202 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild?rev=1.4&view=markup |
| 203 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild?rev=1.4&content-type=text/plain |
| 204 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild?r1=1.3&r2=1.4 |
| 205 |
|
| 206 |
Index: mercury-10.04.2-r1.ebuild |
| 207 |
=================================================================== |
| 208 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild,v |
| 209 |
retrieving revision 1.3 |
| 210 |
retrieving revision 1.4 |
| 211 |
diff -u -r1.3 -r1.4 |
| 212 |
--- mercury-10.04.2-r1.ebuild 31 Oct 2010 00:02:59 -0000 1.3 |
| 213 |
+++ mercury-10.04.2-r1.ebuild 3 Nov 2010 07:10:08 -0000 1.4 |
| 214 |
@@ -1,14 +1,16 @@ |
| 215 |
# Copyright 1999-2010 Gentoo Foundation |
| 216 |
# Distributed under the terms of the GNU General Public License v2 |
| 217 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild,v 1.3 2010/10/31 00:02:59 keri Exp $ |
| 218 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild,v 1.4 2010/11/03 07:10:08 keri Exp $ |
| 219 |
|
| 220 |
inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib |
| 221 |
|
| 222 |
+PATCHSET_VER="0" |
| 223 |
MY_P=${PN}-compiler-${PV} |
| 224 |
|
| 225 |
DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" |
| 226 |
HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html" |
| 227 |
SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${MY_P}.tar.gz |
| 228 |
+ mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz |
| 229 |
test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )" |
| 230 |
|
| 231 |
LICENSE="GPL-2" |
| 232 |
@@ -34,16 +36,9 @@ |
| 233 |
src_unpack() { |
| 234 |
unpack ${A} |
| 235 |
|
| 236 |
- epatch "${FILESDIR}"/${P}-multilib.patch |
| 237 |
- epatch "${FILESDIR}"/${P}-linker-flags.patch |
| 238 |
- epatch "${FILESDIR}"/${P}-bootstrap-depend.patch |
| 239 |
- epatch "${FILESDIR}"/${P}-default-grade.patch |
| 240 |
- epatch "${FILESDIR}"/${P}-prepare-install-dir.patch |
| 241 |
- epatch "${FILESDIR}"/${P}-boehm_gc.patch |
| 242 |
- epatch "${FILESDIR}"/${P}-sparc-llds-base-grade.patch |
| 243 |
- epatch "${FILESDIR}"/${P}-char-det-from-int.patch |
| 244 |
- epatch "${FILESDIR}"/${P}-docs.patch |
| 245 |
- epatch "${FILESDIR}"/${P}-no-reconf.patch |
| 246 |
+ EPATCH_FORCE=yes |
| 247 |
+ EPATCH_SUFFIX=patch |
| 248 |
+ epatch "${WORKDIR}"/${PV} |
| 249 |
|
| 250 |
sed -i -e "s/@libdir@/$(get_libdir)/" \ |
| 251 |
"${S}"/compiler/file_util.m \ |
| 252 |
@@ -64,9 +59,7 @@ |
| 253 |
touch "${S}"/compiler/*.c |
| 254 |
|
| 255 |
if use test; then |
| 256 |
- epatch "${FILESDIR}"/${P}-tests-workspace.patch |
| 257 |
- epatch "${FILESDIR}"/${P}-tests-sandbox.patch |
| 258 |
- epatch "${FILESDIR}"/${P}-tests-static-link.patch |
| 259 |
+ epatch "${WORKDIR}"/${PV}-tests |
| 260 |
fi |
| 261 |
|
| 262 |
cd "${S}" |
| 263 |
|
| 264 |
|
| 265 |
|
| 266 |
1.2 dev-lang/mercury/mercury-10.04.2.ebuild |
| 267 |
|
| 268 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.2.ebuild?rev=1.2&view=markup |
| 269 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.2.ebuild?rev=1.2&content-type=text/plain |
| 270 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.2.ebuild?r1=1.1&r2=1.2 |
| 271 |
|
| 272 |
Index: mercury-10.04.2.ebuild |
| 273 |
=================================================================== |
| 274 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2.ebuild,v |
| 275 |
retrieving revision 1.1 |
| 276 |
retrieving revision 1.2 |
| 277 |
diff -u -r1.1 -r1.2 |
| 278 |
--- mercury-10.04.2.ebuild 10 Oct 2010 05:01:38 -0000 1.1 |
| 279 |
+++ mercury-10.04.2.ebuild 3 Nov 2010 07:10:08 -0000 1.2 |
| 280 |
@@ -1,14 +1,16 @@ |
| 281 |
# Copyright 1999-2010 Gentoo Foundation |
| 282 |
# Distributed under the terms of the GNU General Public License v2 |
| 283 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2.ebuild,v 1.1 2010/10/10 05:01:38 keri Exp $ |
| 284 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2.ebuild,v 1.2 2010/11/03 07:10:08 keri Exp $ |
| 285 |
|
| 286 |
inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib |
| 287 |
|
| 288 |
+PATCHSET_VER="0" |
| 289 |
MY_P=${PN}-compiler-${PV} |
| 290 |
|
| 291 |
DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" |
| 292 |
HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html" |
| 293 |
SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${MY_P}.tar.gz |
| 294 |
+ mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz |
| 295 |
test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )" |
| 296 |
|
| 297 |
LICENSE="GPL-2" |
| 298 |
@@ -34,15 +36,9 @@ |
| 299 |
src_unpack() { |
| 300 |
unpack ${A} |
| 301 |
|
| 302 |
- epatch "${FILESDIR}"/${P}-multilib.patch |
| 303 |
- epatch "${FILESDIR}"/${P}-linker-flags.patch |
| 304 |
- epatch "${FILESDIR}"/${P}-bootstrap-depend.patch |
| 305 |
- epatch "${FILESDIR}"/${P}-default-grade.patch |
| 306 |
- epatch "${FILESDIR}"/${P}-boehm_gc.patch |
| 307 |
- epatch "${FILESDIR}"/${P}-sparc-llds-base-grade.patch |
| 308 |
- epatch "${FILESDIR}"/${P}-char-det-from-int.patch |
| 309 |
- epatch "${FILESDIR}"/${P}-docs.patch |
| 310 |
- epatch "${FILESDIR}"/${P}-no-reconf.patch |
| 311 |
+ EPATCH_FORCE=yes |
| 312 |
+ EPATCH_SUFFIX=patch |
| 313 |
+ epatch "${WORKDIR}"/${PV} |
| 314 |
|
| 315 |
sed -i -e "s/@libdir@/$(get_libdir)/" \ |
| 316 |
"${S}"/compiler/file_util.m \ |
| 317 |
@@ -62,9 +58,7 @@ |
| 318 |
touch "${S}"/compiler/*.c |
| 319 |
|
| 320 |
if use test; then |
| 321 |
- epatch "${FILESDIR}"/${P}-tests-workspace.patch |
| 322 |
- epatch "${FILESDIR}"/${P}-tests-sandbox.patch |
| 323 |
- epatch "${FILESDIR}"/${P}-tests-static-link.patch |
| 324 |
+ epatch "${WORKDIR}"/${PV}-tests |
| 325 |
fi |
| 326 |
|
| 327 |
cd "${S}" |
Archives