* [gentoo-commits] gentoo-x86 commit in dev-lang/mercury-extras: ChangeLog mercury-extras-10.04.2-r1.ebuild
@ 2010-10-30 4:40 99% Keri Harris (keri)
0 siblings, 0 replies; 1+ results
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 [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2010-10-30 4:40 99% [gentoo-commits] gentoo-x86 commit in dev-lang/mercury-extras: ChangeLog mercury-extras-10.04.2-r1.ebuild 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