[gentoo-commits] proj/sci:master commit in: sci-mathematics/cadabra/

[Justin Lecher]

commit:     6c551d91e87ae3785005be586a3421c8e9aa8be7
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 22 07:40:08 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 07:40:08 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=6c551d91

sci-mathematics/cadabra: Fix unknown deps

drop old

Package-Manager: portage-2.2.21
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-mathematics/cadabra/cadabra-1.33.ebuild | 88 -----------------------------
 sci-mathematics/cadabra/cadabra-1.39.ebuild | 11 ++--
 2 files changed, 6 insertions(+), 93 deletions(-)

diff --git a/sci-mathematics/cadabra/cadabra-1.33.ebuild b/sci-mathematics/cadabra/cadabra-1.33.ebuild
deleted file mode 100644
index 5886476..0000000
--- a/sci-mathematics/cadabra/cadabra-1.33.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils texlive-common
-
-DESCRIPTION="Field-theory motivated computer algebra system"
-HOMEPAGE="http://cadabra.phi-sci.com"
-SRC_URI="http://cadabra.phi-sci.com/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples X test"
-
-CDEPEND="
-	sci-libs/modglue
-	sci-mathematics/lie
-	dev-libs/gmp[cxx]
-	dev-libs/libpcre
-	X? (
-		x11-libs/gtk+:2
-		dev-cpp/gtkmm:2.4
-		dev-cpp/pangomm:1.4
-		app-text/dvipng )"
-DEPEND="${CDEPEND}
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-latexextra
-		|| ( app-text/texlive-core dev-tex/pdftex ) )
-	test? ( sys-process/time )"
-RDEPEND="${CDEPEND}
-	virtual/latex-base
-	dev-texlive/texlive-latexrecommended"
-
-src_prepare(){
-	# fixing the flag mess
-	epatch "${FILESDIR}/${PN}-1.33-FLAGS.patch"
-}
-
-src_configure(){
-	econf $(use_enable X gui) \
-		--disable-runtime-dependency-check
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd "${S}/doc"
-		emake
-		cd doxygen/latex
-		emake pdf
-	fi
-}
-
-src_install() {
-	# cadabra strip binaries unless you are on OS X.
-	# So faking it to avoid outright stripping.
-	emake DESTDIR="${D}" DEVDESTDIR="${D}" MACTEST=1 install
-
-	dodoc AUTHORS ChangeLog INSTALL
-
-	if use doc;	then
-		cd "${S}/doc/doxygen"
-		dohtml html/*
-		dodoc latex/*.pdf
-	fi
-
-	if use examples; then
-		dodoc -r "${S}/examples/"
-	fi
-
-	rm -rf "${D}/usr/share/TeXmacs" || die
-}
-
-pkg_postinst() {
-	etexmf-update
-	elog "This version of the cadabra ebuild is still under development."
-	elog "Help us improve the ebuild in:"
-	elog "http://bugs.gentoo.org/show_bug.cgi?id= 194393"
-}
-
-pkg_postrm() {
-	etexmf-update
-}

diff --git a/sci-mathematics/cadabra/cadabra-1.39.ebuild b/sci-mathematics/cadabra/cadabra-1.39.ebuild
index cdb3661..ce3603b 100644
--- a/sci-mathematics/cadabra/cadabra-1.39.ebuild
+++ b/sci-mathematics/cadabra/cadabra-1.39.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -29,7 +29,8 @@ DEPEND="${CDEPEND}
 	doc? (
 		app-doc/doxygen
 		dev-texlive/texlive-latexextra
-		|| ( app-text/texlive-core dev-tex/pdftex ) )
+		app-text/texlive-core
+		)
 	test? ( sys-process/time )"
 RDEPEND="${CDEPEND}
 	virtual/latex-base
@@ -49,9 +50,9 @@ src_compile() {
 	default
 
 	if use doc; then
-		cd "${S}/doc"
+		cd "${S}/doc" || die
 		emake
-		cd doxygen/latex
+		cd doxygen/latex || die
 		emake pdf
 	fi
 }
@@ -64,7 +65,7 @@ src_install() {
 	dodoc AUTHORS ChangeLog INSTALL
 
 	if use doc;	then
-		cd "${S}/doc/doxygen"
+		cd "${S}/doc/doxygen" || die
 		dohtml html/*
 		dodoc latex/*.pdf
 	fi