* [gentoo-commits] gentoo-x86 commit in dev-lang/mercury-extras: ChangeLog mercury-extras-10.04.2-r1.ebuild
@ 2011-01-12 7:51 Keri Harris (keri)
0 siblings, 0 replies; 6+ messages in thread
From: Keri Harris (keri) @ 2011-01-12 7:51 UTC (permalink / raw
To: gentoo-commits
keri 11/01/12 07:51:57
Modified: ChangeLog mercury-extras-10.04.2-r1.ebuild
Log:
Add explicit RDEPEND
(Portage version: 2.1.9.25/cvs/Linux x86_64)
Revision Changes Path
1.87 dev-lang/mercury-extras/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/ChangeLog?rev=1.87&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/ChangeLog?rev=1.87&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/ChangeLog?r1=1.86&r2=1.87
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- ChangeLog 12 Jan 2011 07:49:16 -0000 1.86
+++ ChangeLog 12 Jan 2011 07:51:57 -0000 1.87
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/mercury-extras
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.86 2011/01/12 07:49:16 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.87 2011/01/12 07:51:57 keri Exp $
+
+ 12 Jan 2011; <keri@gentoo.org> mercury-extras-10.04.2-r1.ebuild:
+ Add explicit RDEPEND
*mercury-extras-11.01_beta1 (12 Jan 2011)
1.7 dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild?r1=1.6&r2=1.7
Index: mercury-extras-10.04.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mercury-extras-10.04.2-r1.ebuild 7 Jan 2011 22:56:10 -0000 1.6
+++ mercury-extras-10.04.2-r1.ebuild 12 Jan 2011 07:51:57 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v 1.6 2011/01/07 22:56:10 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v 1.7 2011/01/12 07:51:57 keri Exp $
inherit eutils
@@ -17,7 +17,7 @@
IUSE="X examples glut iodbc ncurses odbc opengl ssl tcl tk xml"
-DEPEND="~dev-lang/mercury-${PV}
+RDEPEND="~dev-lang/mercury-${PV}
glut? ( media-libs/freeglut )
odbc? ( dev-db/unixODBC )
iodbc? ( !odbc? ( dev-db/libiodbc ) )
@@ -29,6 +29,8 @@
x11-libs/libX11
x11-libs/libXmu ) )"
+DEPEND="${RDEPEND}"
+
src_unpack() {
unpack ${A}
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in dev-lang/mercury-extras: ChangeLog mercury-extras-10.04.2-r1.ebuild
@ 2011-01-07 22:56 Christian Faulhammer (fauli)
0 siblings, 0 replies; 6+ messages in thread
From: Christian Faulhammer (fauli) @ 2011-01-07 22:56 UTC (permalink / raw
To: gentoo-commits
fauli 11/01/07 22:56:10
Modified: ChangeLog mercury-extras-10.04.2-r1.ebuild
Log:
stable x86, bug 346451
(Portage version: 2.1.9.25/cvs/Linux i686)
Revision Changes Path
1.85 dev-lang/mercury-extras/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/ChangeLog?rev=1.85&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/ChangeLog?rev=1.85&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/ChangeLog?r1=1.84&r2=1.85
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- ChangeLog 22 Dec 2010 11:50:27 -0000 1.84
+++ ChangeLog 7 Jan 2011 22:56:10 -0000 1.85
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/mercury-extras
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.84 2010/12/22 11:50:27 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.85 2011/01/07 22:56:10 fauli Exp $
+
+ 07 Jan 2011; Christian Faulhammer <fauli@gentoo.org>
+ mercury-extras-10.04.2-r1.ebuild:
+ stable x86, bug 346451
22 Dec 2010; Markos Chandras <hwoarang@gentoo.org>
mercury-extras-10.04.2-r1.ebuild:
1.6 dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild?r1=1.5&r2=1.6
Index: mercury-extras-10.04.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mercury-extras-10.04.2-r1.ebuild 22 Dec 2010 11:50:27 -0000 1.5
+++ mercury-extras-10.04.2-r1.ebuild 7 Jan 2011 22:56:10 -0000 1.6
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v 1.5 2010/12/22 11:50:27 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v 1.6 2011/01/07 22:56:10 fauli Exp $
inherit eutils
@@ -13,7 +13,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
IUSE="X examples glut iodbc ncurses odbc opengl ssl tcl tk xml"
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/mercury-extras: ChangeLog mercury-extras-10.04.2-r1.ebuild
@ 2010-12-22 11:50 Markos Chandras (hwoarang)
0 siblings, 0 replies; 6+ messages in thread
From: Markos Chandras (hwoarang) @ 2010-12-22 11:50 UTC (permalink / raw
To: gentoo-commits
hwoarang 10/12/22 11:50:27
Modified: ChangeLog mercury-extras-10.04.2-r1.ebuild
Log:
Stable on amd64 wrt bug #346451
(Portage version: 2.1.9.25/cvs/Linux x86_64)
Revision Changes Path
1.84 dev-lang/mercury-extras/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/ChangeLog?rev=1.84&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/ChangeLog?rev=1.84&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/ChangeLog?r1=1.83&r2=1.84
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- ChangeLog 16 Nov 2010 06:01:11 -0000 1.83
+++ ChangeLog 22 Dec 2010 11:50:27 -0000 1.84
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/mercury-extras
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.83 2010/11/16 06:01:11 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.84 2010/12/22 11:50:27 hwoarang Exp $
+
+ 22 Dec 2010; Markos Chandras <hwoarang@gentoo.org>
+ mercury-extras-10.04.2-r1.ebuild:
+ Stable on amd64 wrt bug #346451
16 Nov 2010; <keri@gentoo.org> mercury-extras-10.04.2-r1.ebuild:
Ensure lex patch can be applied from Mercury top-level
1.5 dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild?r1=1.4&r2=1.5
Index: mercury-extras-10.04.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mercury-extras-10.04.2-r1.ebuild 16 Nov 2010 06:01:11 -0000 1.4
+++ mercury-extras-10.04.2-r1.ebuild 22 Dec 2010 11:50:27 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v 1.4 2010/11/16 06:01:11 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v 1.5 2010/12/22 11:50:27 hwoarang Exp $
inherit eutils
@@ -13,7 +13,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
IUSE="X examples glut iodbc ncurses odbc opengl ssl tcl tk xml"
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/mercury-extras: ChangeLog mercury-extras-10.04.2-r1.ebuild
@ 2010-11-16 6:01 Keri Harris (keri)
0 siblings, 0 replies; 6+ messages in thread
From: Keri Harris (keri) @ 2010-11-16 6:01 UTC (permalink / raw
To: gentoo-commits
keri 10/11/16 06:01:11
Modified: ChangeLog mercury-extras-10.04.2-r1.ebuild
Log:
Ensure lex patch can be applied from Mercury top-level
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.83 dev-lang/mercury-extras/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/ChangeLog?rev=1.83&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/ChangeLog?rev=1.83&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/ChangeLog?r1=1.82&r2=1.83
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- ChangeLog 3 Nov 2010 07:51:27 -0000 1.82
+++ ChangeLog 16 Nov 2010 06:01:11 -0000 1.83
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/mercury-extras
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.82 2010/11/03 07:51:27 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.83 2010/11/16 06:01:11 keri Exp $
+
+ 16 Nov 2010; <keri@gentoo.org> mercury-extras-10.04.2-r1.ebuild:
+ Ensure lex patch can be applied from Mercury top-level
03 Nov 2010; <keri@gentoo.org> mercury-extras-10.04.ebuild,
mercury-extras-10.04-r1.ebuild, mercury-extras-10.04.1.ebuild,
1.4 dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild?r1=1.3&r2=1.4
Index: mercury-extras-10.04.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mercury-extras-10.04.2-r1.ebuild 3 Nov 2010 07:51:27 -0000 1.3
+++ mercury-extras-10.04.2-r1.ebuild 16 Nov 2010 06:01:11 -0000 1.4
@@ -1,10 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v 1.3 2010/11/03 07:51:27 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v 1.4 2010/11/16 06:01:11 keri Exp $
inherit eutils
-PATCHSET_VER="0"
+PATCHSET_VER="1"
DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/mercury-extras: ChangeLog mercury-extras-10.04.2-r1.ebuild
@ 2010-10-30 4:40 Keri Harris (keri)
0 siblings, 0 replies; 6+ messages in thread
From: Keri Harris (keri) @ 2010-10-30 4:40 UTC (permalink / raw
To: gentoo-commits
keri 10/10/30 04:40:34
Modified: ChangeLog mercury-extras-10.04.2-r1.ebuild
Log:
QA - add die to do... function calls, add die to sed calls
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.80 dev-lang/mercury-extras/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/ChangeLog?rev=1.80&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/ChangeLog?rev=1.80&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/ChangeLog?r1=1.79&r2=1.80
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- ChangeLog 23 Oct 2010 03:48:49 -0000 1.79
+++ ChangeLog 30 Oct 2010 04:40:34 -0000 1.80
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/mercury-extras
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.79 2010/10/23 03:48:49 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.80 2010/10/30 04:40:34 keri Exp $
+
+ 30 Oct 2010; <keri@gentoo.org> mercury-extras-10.04.2-r1.ebuild:
+ QA - add die to do... function calls, add die to sed calls
23 Oct 2010; <keri@gentoo.org>
files/mercury-extras-10.04.2-no-java-grade-no-erlang-grade.patch:
1.2 dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild?r1=1.1&r2=1.2
Index: mercury-extras-10.04.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mercury-extras-10.04.2-r1.ebuild 22 Oct 2010 23:54:39 -0000 1.1
+++ mercury-extras-10.04.2-r1.ebuild 30 Oct 2010 04:40:34 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v 1.1 2010/10/22 23:54:39 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v 1.2 2010/10/30 04:40:34 keri Exp $
inherit eutils
@@ -46,25 +46,46 @@
sed -i -e "s:posix:posix quickcheck:" \
-e "s:references:solver_types/library:" \
- -e "s:windows_installer_generator ::" Mmakefile
+ -e "s:windows_installer_generator ::" \
+ Mmakefile || die "sed default packages failed"
- use glut && sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile
- use tcl && use tk && sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile
- use opengl && sed -i -e "s: lex : graphics/mercury_opengl lex :" Mmakefile
+ if use glut; then
+ sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile \
+ || die "sed glut failed"
+ fi
+
+ if use tcl && use tk; then
+ sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile \
+ || die "sed tcltk failed"
+ fi
+
+ if use opengl; then
+ sed -i -e "s: lex : graphics/mercury_opengl lex :" Mmakefile \
+ || die "sed opengl failed"
+ fi
if use odbc || use iodbc; then
- sed -i -e "s:moose:moose odbc:" Mmakefile
+ sed -i -e "s:moose:moose odbc:" Mmakefile \
+ || die "sed odbc failed"
+ fi
+
+ if ! use ncurses; then
+ sed -i -e "s:curs curses::" Mmakefile \
+ || die "sed ncurses failed"
fi
- ! use ncurses && sed -i -e "s:curs curses::" Mmakefile
- ! use xml && sed -i -e "s:xml::" Mmakefile
+ if ! use xml; then
+ sed -i -e "s:xml::" Mmakefile \
+ || die "sed xml failed"
+ fi
sed -i -e "s:@libdir@:$(get_libdir):" \
- dynamic_linking/Mmakefile posix/Mmakefile
+ dynamic_linking/Mmakefile posix/Mmakefile \
+ || die "sed libdir failed"
# disable broken packages
- sed -i -e "s:lazy_evaluation ::" \
- -e "s:quickcheck::" Mmakefile
+ sed -i -e "s:lazy_evaluation ::" -e "s:quickcheck::" Mmakefile \
+ || die "sed broken packages failed"
}
src_compile() {
@@ -92,71 +113,71 @@
cd "${S}"
if use examples; then
insinto /usr/share/doc/${PF}/samples/base64
- doins base64/*.m
+ doins base64/*.m || die
insinto /usr/share/doc/${PF}/samples/complex_numbers
- doins complex_numbers/samples/*
+ doins complex_numbers/samples/* || die
insinto /usr/share/doc/${PF}/samples/concurrency
- doins concurrency/*
+ doins concurrency/* || die
insinto /usr/share/doc/${PF}/samples/dynamic_linking
- doins dynamic_linking/hello.m
+ doins dynamic_linking/hello.m || die
insinto /usr/share/doc/${PF}/samples/error
- doins error/*
+ doins error/* || die
insinto /usr/share/doc/${PF}/samples/fixed
- doins fixed/*.m
+ doins fixed/*.m || die
insinto /usr/share/doc/${PF}/samples/gator
- doins -r gator/*
+ doins -r gator/* || die
insinto /usr/share/doc/${PF}/samples/lex
- doins lex/samples/*
+ doins lex/samples/* || die
insinto /usr/share/doc/${PF}/samples/log4m
- doins log4m/*.m
+ doins log4m/*.m || die
insinto /usr/share/doc/${PF}/samples/moose
- doins moose/samples/*
+ doins moose/samples/* || die
insinto /usr/share/doc/${PF}/samples/net
- doins net/*.m
+ doins net/*.m || die
if use ncurses; then
insinto /usr/share/doc/${PF}/samples/curs
- doins curs/samples/*
+ doins curs/samples/* || die
insinto /usr/share/doc/${PF}/samples/curses
- doins curses/sample/*
+ doins curses/sample/* || die
fi
if use X; then
insinto /usr/share/doc/${PF}/samples/graphics
- doins graphics/easyx/samples/*.m
+ doins graphics/easyx/samples/*.m || die
fi
if use glut && use opengl; then
insinto /usr/share/doc/${PF}/samples/graphics
- doins graphics/samples/calc/*
- doins graphics/samples/gears/*
- doins graphics/samples/maze/*
- doins graphics/samples/pent/*
+ doins graphics/samples/calc/* || die
+ doins graphics/samples/gears/* || die
+ doins graphics/samples/maze/* || die
+ doins graphics/samples/pent/* || die
fi
if use opengl && use tcl && use tk; then
insinto /usr/share/doc/${PF}/samples/graphics
- doins graphics/samples/pent/*.m
+ doins graphics/samples/pent/*.m || die
fi
if use ssl; then
insinto /usr/share/doc/${PF}/samples/mopenssl
- doins mopenssl/*.m
+ doins mopenssl/*.m || die
fi
fi
rm -rf $(find "${D}"/usr/share/doc/${PF}/samples -name CVS)
- dodoc README
+ dodoc README || die
}
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in dev-lang/mercury-extras: ChangeLog mercury-extras-10.04.2-r1.ebuild
@ 2010-10-22 23:54 Keri Harris (keri)
0 siblings, 0 replies; 6+ messages in thread
From: Keri Harris (keri) @ 2010-10-22 23:54 UTC (permalink / raw
To: gentoo-commits
keri 10/10/22 23:54:39
Modified: ChangeLog
Added: mercury-extras-10.04.2-r1.ebuild
Log:
Install non-compilable packages
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.78 dev-lang/mercury-extras/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/ChangeLog?rev=1.78&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/ChangeLog?rev=1.78&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/ChangeLog?r1=1.77&r2=1.78
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- ChangeLog 10 Oct 2010 05:32:54 -0000 1.77
+++ ChangeLog 22 Oct 2010 23:54:39 -0000 1.78
@@ -1,6 +1,11 @@
# ChangeLog for dev-lang/mercury-extras
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.77 2010/10/10 05:32:54 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.78 2010/10/22 23:54:39 keri Exp $
+
+*mercury-extras-10.04.2-r1 (22 Oct 2010)
+
+ 22 Oct 2010; <keri@gentoo.org> +mercury-extras-10.04.2-r1.ebuild:
+ Install non-compilable packages
*mercury-extras-10.04.2 (10 Oct 2010)
1.1 dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild?rev=1.1&content-type=text/plain
Index: mercury-extras-10.04.2-r1.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v 1.1 2010/10/22 23:54:39 keri Exp $
inherit eutils
DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="X examples glut iodbc ncurses odbc opengl ssl tcl tk xml"
DEPEND="~dev-lang/mercury-${PV}
glut? ( media-libs/freeglut )
odbc? ( dev-db/unixODBC )
iodbc? ( !odbc? ( dev-db/libiodbc ) )
ncurses? ( sys-libs/ncurses )
opengl? ( virtual/opengl )
tcl? ( tk? (
dev-lang/tcl
dev-lang/tk
x11-libs/libX11
x11-libs/libXmu ) )"
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${P}-curs.patch
epatch "${FILESDIR}"/${P}-dynamic-linking.patch
epatch "${FILESDIR}"/${P}-lex.patch
epatch "${FILESDIR}"/${P}-mercury-glut.patch
epatch "${FILESDIR}"/${P}-mercury-tcltk.patch
epatch "${FILESDIR}"/${P}-mercury-opengl.patch
epatch "${FILESDIR}"/${P}-posix.patch
epatch "${FILESDIR}"/${P}-no-java-grade-no-erlang-grade.patch
if use odbc; then
epatch "${FILESDIR}"/${P}-odbc.patch
elif use iodbc; then
epatch "${FILESDIR}"/${P}-iodbc.patch
fi
sed -i -e "s:posix:posix quickcheck:" \
-e "s:references:solver_types/library:" \
-e "s:windows_installer_generator ::" Mmakefile
use glut && sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile
use tcl && use tk && sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile
use opengl && sed -i -e "s: lex : graphics/mercury_opengl lex :" Mmakefile
if use odbc || use iodbc; then
sed -i -e "s:moose:moose odbc:" Mmakefile
fi
! use ncurses && sed -i -e "s:curs curses::" Mmakefile
! use xml && sed -i -e "s:xml::" Mmakefile
sed -i -e "s:@libdir@:$(get_libdir):" \
dynamic_linking/Mmakefile posix/Mmakefile
# disable broken packages
sed -i -e "s:lazy_evaluation ::" \
-e "s:quickcheck::" Mmakefile
}
src_compile() {
# Mercury dependency generation must be run single-threaded
mmake \
-j1 depend || die "mmake depend failed"
mmake \
MMAKEFLAGS="${MAKEOPTS}" \
EXTRA_MLFLAGS=--no-strip \
EXTRA_LDFLAGS="${LDFLAGS}" \
EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
|| die "mmake failed"
}
src_install() {
mmake \
MMAKEFLAGS="${MAKEOPTS}" \
EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
INSTALL_PREFIX="${D}"/usr \
install || die "mmake install failed"
find "${D}"/usr/$(get_libdir)/mercury -type l | xargs rm
cd "${S}"
if use examples; then
insinto /usr/share/doc/${PF}/samples/base64
doins base64/*.m
insinto /usr/share/doc/${PF}/samples/complex_numbers
doins complex_numbers/samples/*
insinto /usr/share/doc/${PF}/samples/concurrency
doins concurrency/*
insinto /usr/share/doc/${PF}/samples/dynamic_linking
doins dynamic_linking/hello.m
insinto /usr/share/doc/${PF}/samples/error
doins error/*
insinto /usr/share/doc/${PF}/samples/fixed
doins fixed/*.m
insinto /usr/share/doc/${PF}/samples/gator
doins -r gator/*
insinto /usr/share/doc/${PF}/samples/lex
doins lex/samples/*
insinto /usr/share/doc/${PF}/samples/log4m
doins log4m/*.m
insinto /usr/share/doc/${PF}/samples/moose
doins moose/samples/*
insinto /usr/share/doc/${PF}/samples/net
doins net/*.m
if use ncurses; then
insinto /usr/share/doc/${PF}/samples/curs
doins curs/samples/*
insinto /usr/share/doc/${PF}/samples/curses
doins curses/sample/*
fi
if use X; then
insinto /usr/share/doc/${PF}/samples/graphics
doins graphics/easyx/samples/*.m
fi
if use glut && use opengl; then
insinto /usr/share/doc/${PF}/samples/graphics
doins graphics/samples/calc/*
doins graphics/samples/gears/*
doins graphics/samples/maze/*
doins graphics/samples/pent/*
fi
if use opengl && use tcl && use tk; then
insinto /usr/share/doc/${PF}/samples/graphics
doins graphics/samples/pent/*.m
fi
if use ssl; then
insinto /usr/share/doc/${PF}/samples/mopenssl
doins mopenssl/*.m
fi
fi
rm -rf $(find "${D}"/usr/share/doc/${PF}/samples -name CVS)
dodoc README
}
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-01-12 7:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-12 7:51 [gentoo-commits] gentoo-x86 commit in dev-lang/mercury-extras: ChangeLog mercury-extras-10.04.2-r1.ebuild Keri Harris (keri)
-- strict thread matches above, loose matches on Subject: below --
2011-01-07 22:56 Christian Faulhammer (fauli)
2010-12-22 11:50 Markos Chandras (hwoarang)
2010-11-16 6:01 Keri Harris (keri)
2010-10-30 4:40 Keri Harris (keri)
2010-10-22 23:54 Keri Harris (keri)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox