public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sci-mathematics/e: e-1.8.ebuild ChangeLog
@ 2013-08-23 12:17 Mark Wright (gienah)
  0 siblings, 0 replies; 2+ messages in thread
From: Mark Wright (gienah) @ 2013-08-23 12:17 UTC (permalink / raw
  To: gentoo-commits

gienah      13/08/23 12:17:53

  Modified:             ChangeLog
  Added:                e-1.8.ebuild
  Log:
  Bump E to 1.8 Jun Gopaldhara.
  
  (Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

Revision  Changes    Path
1.6                  sci-mathematics/e/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/e/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/e/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/e/ChangeLog?r1=1.5&r2=1.6

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/e/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog	23 Aug 2013 12:11:05 -0000	1.5
+++ ChangeLog	23 Aug 2013 12:17:53 -0000	1.6
@@ -1,8 +1,10 @@
 # ChangeLog for sci-mathematics/e
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/e/ChangeLog,v 1.5 2013/08/23 12:11:05 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/e/ChangeLog,v 1.6 2013/08/23 12:17:53 gienah Exp $
 
-  23 Aug 2013; Mark Wright <gienah@gentoo.org> e-1.6.ebuild:
+*e-1.8 (23 Aug 2013)
+
+  23 Aug 2013; Mark Wright <gienah@gentoo.org> +e-1.8.ebuild:
   Bump E to 1.8 Jun Gopaldhara.
 
   24 May 2013; Mark Wright <gienah@gentoo.org> metadata.xml:



1.1                  sci-mathematics/e/e-1.8.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/e/e-1.8.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/e/e-1.8.ebuild?rev=1.1&content-type=text/plain

Index: e-1.8.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/e/e-1.8.ebuild,v 1.1 2013/08/23 12:17:53 gienah Exp $

EAPI="5"

MY_PN="E"
MY_P="${MY_PN}-${PV}"

DESCRIPTION="E is a theorem prover for full first-order logic with equality"
HOMEPAGE="http://www4.informatik.tu-muenchen.de/~schulz/E/E.html"
SRC_URI="http://www4.in.tum.de/~schulz/WORK/E_DOWNLOAD/V_${PV}/${MY_PN}.tgz -> ${MY_P}.tgz"

LICENSE="GPL-2"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE="doc examples isabelle"

RDEPEND="isabelle? (
			>=sci-mathematics/isabelle-2011.1-r1:=
		)"
DEPEND="${RDEPEND}"

S="${WORKDIR}"/${MY_PN}

src_configure() {
	./configure --prefix="${ROOT}usr" \
		--man-prefix="${ROOT}share/man" \
		|| die "E configure failed"

	sed -e "s@CFLAGS     = @CFLAGS     = ${CFLAGS} @" \
		-e "s@LD         = \$(CC) @LD         = \$(CC) ${LDFLAGS} @" \
		-i "${S}/Makefile.vars" \
		|| die "Could not add our flags to Makefile.vars"
}

src_install() {
	for i in "${S}/PROVER/eprover" \
		"${S}/PROVER/epclextract" \
		"${S}/PROVER/eproof" \
		"${S}/PROVER/eproof_ram" \
		"${S}/PROVER/eground" \
		"${S}/PROVER/e_ltb_runner" \
		"${S}/PROVER/e_axfilter" \
		"${S}/PROVER/checkproof" \
		"${S}/PROVER/ekb_create" \
		"${S}/PROVER/ekb_delete" \
		"${S}/PROVER/ekb_ginsert" \
		"${S}/PROVER/ekb_insert"
	do
		dobin "${i}"
	done

	for i in "${S}/DOC/man/eprover.1" \
		"${S}/DOC/man/epclextract.1" \
		"${S}/DOC/man/eproof.1" \
		"${S}/DOC/man/eproof_ram.1" \
		"${S}/DOC/man/eground.1" \
		"${S}/DOC/man/e_ltb_runner.1" \
		"${S}/DOC/man/e_axfilter.1" \
		"${S}/DOC/man/checkproof.1" \
		"${S}/DOC/man/ekb_create.1" \
		"${S}/DOC/man/ekb_delete.1" \
		"${S}/DOC/man/ekb_ginsert.1" \
		"${S}/DOC/man/ekb_insert.1"
	do
		doman "${i}"
	done

	if use doc; then
		pushd "${S}"/DOC || die "Could not cd to DOC"
		dodoc ANNOUNCE CREDITS DONE E-REMARKS E-REMARKS.english E-USERS \
			HISTORY NEWS PORTING ReadMe THINKME TODO TPTP_SUBMISSION \
			WISHLIST eprover.pdf
		dohtml *.html
		insinto /usr/share/doc/${PF}/html
		doins estyle.sty
		popd
	fi

	if use examples; then
		dodir /usr/share/${MY_PN}/examples
		insinto /usr/share/${MY_PN}/examples
		doins -r EXAMPLE_PROBLEMS
		doins -r SIMPLE_APPS
	fi

	if use isabelle; then
		ISABELLE_HOME="$(isabelle getenv ISABELLE_HOME | cut -d'=' -f 2)" \
			|| die "isabelle getenv ISABELLE_HOME failed"
		[[ -n "${ISABELLE_HOME}" ]] || die "ISABELLE_HOME empty"
		dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
		cat <<- EOF >> "${S}/settings"
			E_HOME="${ROOT}usr/bin"
			E_VERSION="${PV}"
		EOF
		insinto "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
		doins "${S}/settings"
	fi
}

pkg_postinst() {
	if use isabelle; then
		if [ -f "${ROOT}etc/isabelle/components" ]; then
			if egrep "contrib/${PN}-[0-9.]*" "${ROOT}etc/isabelle/components"; then
				sed -e "/contrib\/${PN}-[0-9.]*/d" \
					-i "${ROOT}etc/isabelle/components"
			fi
			cat <<- EOF >> "${ROOT}etc/isabelle/components"
				contrib/${PN}-${PV}
			EOF
		fi
	fi
}

pkg_postrm() {
	if use isabelle; then
		if [ ! -f "${ROOT}usr/bin/eproof" ]; then
			if [ -f "${ROOT}etc/isabelle/components" ]; then
				# Note: this sed should only match the version of this ebuild
				# Which is what we want as we do not want to remove the line
				# of a new E being installed during an upgrade.
				sed -e "/contrib\/${PN}-${PV}/d" \
					-i "${ROOT}etc/isabelle/components"
			fi
		fi
	fi
}





^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sci-mathematics/e: e-1.8.ebuild ChangeLog
@ 2013-08-23 12:38 Mark Wright (gienah)
  0 siblings, 0 replies; 2+ messages in thread
From: Mark Wright (gienah) @ 2013-08-23 12:38 UTC (permalink / raw
  To: gentoo-commits

gienah      13/08/23 12:38:30

  Modified:             e-1.8.ebuild ChangeLog
  Log:
  Thanks to jlec for suggestions on simplifying the e-1.8.ebuild (dodir unecessary, dobin and doman take multiple arguments, dohtml estyle.sty).
  
  (Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

Revision  Changes    Path
1.2                  sci-mathematics/e/e-1.8.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/e/e-1.8.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/e/e-1.8.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/e/e-1.8.ebuild?r1=1.1&r2=1.2

Index: e-1.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/e/e-1.8.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- e-1.8.ebuild	23 Aug 2013 12:17:53 -0000	1.1
+++ e-1.8.ebuild	23 Aug 2013 12:38:30 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/e/e-1.8.ebuild,v 1.1 2013/08/23 12:17:53 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/e/e-1.8.ebuild,v 1.2 2013/08/23 12:38:30 gienah Exp $
 
 EAPI="5"
 
@@ -35,7 +35,7 @@
 }
 
 src_install() {
-	for i in "${S}/PROVER/eprover" \
+	dobin "${S}/PROVER/eprover" \
 		"${S}/PROVER/epclextract" \
 		"${S}/PROVER/eproof" \
 		"${S}/PROVER/eproof_ram" \
@@ -47,11 +47,8 @@
 		"${S}/PROVER/ekb_delete" \
 		"${S}/PROVER/ekb_ginsert" \
 		"${S}/PROVER/ekb_insert"
-	do
-		dobin "${i}"
-	done
 
-	for i in "${S}/DOC/man/eprover.1" \
+	doman "${S}/DOC/man/eprover.1" \
 		"${S}/DOC/man/epclextract.1" \
 		"${S}/DOC/man/eproof.1" \
 		"${S}/DOC/man/eproof_ram.1" \
@@ -63,9 +60,6 @@
 		"${S}/DOC/man/ekb_delete.1" \
 		"${S}/DOC/man/ekb_ginsert.1" \
 		"${S}/DOC/man/ekb_insert.1"
-	do
-		doman "${i}"
-	done
 
 	if use doc; then
 		pushd "${S}"/DOC || die "Could not cd to DOC"
@@ -73,13 +67,11 @@
 			HISTORY NEWS PORTING ReadMe THINKME TODO TPTP_SUBMISSION \
 			WISHLIST eprover.pdf
 		dohtml *.html
-		insinto /usr/share/doc/${PF}/html
-		doins estyle.sty
+		dohtml estyle.sty
 		popd
 	fi
 
 	if use examples; then
-		dodir /usr/share/${MY_PN}/examples
 		insinto /usr/share/${MY_PN}/examples
 		doins -r EXAMPLE_PROBLEMS
 		doins -r SIMPLE_APPS
@@ -89,7 +81,6 @@
 		ISABELLE_HOME="$(isabelle getenv ISABELLE_HOME | cut -d'=' -f 2)" \
 			|| die "isabelle getenv ISABELLE_HOME failed"
 		[[ -n "${ISABELLE_HOME}" ]] || die "ISABELLE_HOME empty"
-		dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
 		cat <<- EOF >> "${S}/settings"
 			E_HOME="${ROOT}usr/bin"
 			E_VERSION="${PV}"



1.7                  sci-mathematics/e/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/e/ChangeLog?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/e/ChangeLog?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/e/ChangeLog?r1=1.6&r2=1.7

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/e/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog	23 Aug 2013 12:17:53 -0000	1.6
+++ ChangeLog	23 Aug 2013 12:38:30 -0000	1.7
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/e
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/e/ChangeLog,v 1.6 2013/08/23 12:17:53 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/e/ChangeLog,v 1.7 2013/08/23 12:38:30 gienah Exp $
+
+  23 Aug 2013; Mark Wright <gienah@gentoo.org> e-1.8.ebuild:
+  Thanks to jlec for suggestions on simplifying the e-1.8.ebuild (dodir
+  unecessary, dobin and doman take multiple arguments, dohtml estyle.sty).
 
 *e-1.8 (23 Aug 2013)
 





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-08-23 12:38 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-23 12:17 [gentoo-commits] gentoo-x86 commit in sci-mathematics/e: e-1.8.ebuild ChangeLog Mark Wright (gienah)
  -- strict thread matches above, loose matches on Subject: below --
2013-08-23 12:38 Mark Wright (gienah)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox