sci-mathematics/cadabra: Drop old, move doxygen to build deps

Package-Manager: portage-2.2.0_alpha179

7 files changed, 14 insertions, 275 deletions

diff --git a/sci-mathematics/cadabra/ChangeLog b/sci-mathematics/cadabra/ChangeLog
index f398b4736..fc95a0fae 100644
--- a/sci-mathematics/cadabra/ChangeLog
+++ b/sci-mathematics/cadabra/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Jun 2013; Justin Lecher <jlec@gentoo.org> -cadabra-1.25.ebuild,
+  -cadabra-1.28.ebuild, -cadabra-1.29.ebuild, cadabra-1.31.ebuild,
+  metadata.xml:
+  Drop old, move doxygen to build deps
+
 *cadabra-1.31 (21 Mar 2013)
 
   21 Mar 2013; Jauhien Piatlicki (jauhien) <piatlicki@gmail.com>
diff --git a/sci-mathematics/cadabra/Manifest b/sci-mathematics/cadabra/Manifest
index 3d6d2a1d9..96690ef40 100644
--- a/sci-mathematics/cadabra/Manifest
+++ b/sci-mathematics/cadabra/Manifest
@@ -1,4 +1 @@
-DIST cadabra-1.25.tar.gz 847273 SHA256 8a284f5d9782b9f94acb8df1d3af8a14d319f49f43550f0f47d7e4b710bbb7da
-DIST cadabra-1.28.tar.gz 851618 SHA256 d34c76e5d98710e52fc2b9a62721747bafc354224d2ef9df7ecdca37c77eeb63
-DIST cadabra-1.29.tar.gz 852128 SHA256 b11f0c5fe8970184e89712a479f32042afa4d1f253f028425751b259f6258f13
 DIST cadabra-1.31.tar.gz 853016 SHA256 97be19dfce98a91d133dd60cebe58029ffbba3108dd1ae6b8e201f1d1791aad2 SHA512 a1e77b5e5c099b3eecd27ec06721acd1054815d987b405265a9e31348ca0b12ab5c6be437417e8783a34a6bf3ee55cebfaf92a12621bc72d8ede559af4e2ef40 WHIRLPOOL 22a99e61afc8b40b9bc314ad9481199dcf09cf5c6ec8dd43dfbc82177f4b3d1d9756c602713f0e5e099f026f3ef8dfbe0fecc4a94da57562f325ed064fc200d1
diff --git a/sci-mathematics/cadabra/cadabra-1.25.ebuild b/sci-mathematics/cadabra/cadabra-1.25.ebuild
deleted file mode 100644
index 75e2f1658..000000000
--- a/sci-mathematics/cadabra/cadabra-1.25.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="Field-theory motivated computer algebra system"
-HOMEPAGE="http://cadabra.phi-sci.com"
-SRC_URI="http://cadabra.phi-sci.com/${P}.tar.gz"
-#### Remove the following line when moving this ebuild to the main tree!
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc examples X"
-
-DEPEND="
-	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 )
-	doc? ( || ( app-text/texlive-core dev-tex/pdftex ) )"
-RDEPEND="${DEPEND}
-	virtual/latex-base
-	dev-tex/mh"
-
-src_prepare(){
-	# deal with pre-stripping - note that upstream do not provide any makefile.am
-	epatch "${FILESDIR}/${PN}-1.21-no-stripping.patch"
-	# xcadabra doesn't respect LDFLAGS (cadabra does!)
-	epatch "${FILESDIR}/${P}-xcadabra-flags.patch"
-}
-
-src_configure(){
-	econf $(use_enable X gui)
-}
-
-src_compile() {
-	emake || die
-
-	if use doc; then
-		cd "${S}/doc"
-		emake || die
-		cd doxygen/latex
-		emake pdf || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" DEVDESTDIR="${D}" install || die "install died"
-
-	dodoc AUTHORS ChangeLog INSTALL || die
-
-	if ( use doc )
-		then
-		cd "${S}/doc/doxygen"
-		dohtml html/*
-		dodoc latex/*.pdf
-	fi
-
-	if ( use examples )
-	then
-		docinto examples
-		dodoc "${S}/examples/*"
-	fi
-
-	rm -rf "${D}/usr/share/TeXmacs"
-}
-
-pkg_postinst() {
-	/usr/sbin/texmf-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()
-{
-	/usr/sbin/texmf-update
-}
diff --git a/sci-mathematics/cadabra/cadabra-1.28.ebuild b/sci-mathematics/cadabra/cadabra-1.28.ebuild
deleted file mode 100644
index 8764c7151..000000000
--- a/sci-mathematics/cadabra/cadabra-1.28.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="Field-theory motivated computer algebra system"
-HOMEPAGE="http://cadabra.phi-sci.com"
-SRC_URI="http://cadabra.phi-sci.com/${P}.tar.gz"
-#### Remove the following line when moving this ebuild to the main tree!
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc examples X"
-
-DEPEND="
-	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 )
-	doc? ( || ( app-text/texlive-core dev-tex/pdftex ) )"
-RDEPEND="${DEPEND}
-	virtual/latex-base
-	dev-tex/mh"
-
-src_prepare(){
-	# xcadabra doesn't respect LDFLAGS (cadabra does!)
-	epatch "${FILESDIR}/${PN}-1.25-xcadabra-flags.patch"
-}
-
-src_configure(){
-	econf $(use_enable X gui)
-}
-
-src_compile() {
-	emake || die
-
-	if use doc; then
-		cd "${S}/doc"
-		emake || die
-		cd doxygen/latex
-		emake pdf || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" DEVDESTDIR="${D}" install || die "install died"
-
-	dodoc AUTHORS ChangeLog INSTALL || die
-
-	if ( use doc )
-		then
-		cd "${S}/doc/doxygen"
-		dohtml html/*
-		dodoc latex/*.pdf
-	fi
-
-	if ( use examples )
-	then
-		docinto examples
-		dodoc "${S}/examples/*"
-	fi
-
-	rm -rf "${D}/usr/share/TeXmacs"
-}
-
-pkg_postinst() {
-	/usr/sbin/texmf-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()
-{
-	/usr/sbin/texmf-update
-}
diff --git a/sci-mathematics/cadabra/cadabra-1.29.ebuild b/sci-mathematics/cadabra/cadabra-1.29.ebuild
deleted file mode 100644
index 8764c7151..000000000
--- a/sci-mathematics/cadabra/cadabra-1.29.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="Field-theory motivated computer algebra system"
-HOMEPAGE="http://cadabra.phi-sci.com"
-SRC_URI="http://cadabra.phi-sci.com/${P}.tar.gz"
-#### Remove the following line when moving this ebuild to the main tree!
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc examples X"
-
-DEPEND="
-	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 )
-	doc? ( || ( app-text/texlive-core dev-tex/pdftex ) )"
-RDEPEND="${DEPEND}
-	virtual/latex-base
-	dev-tex/mh"
-
-src_prepare(){
-	# xcadabra doesn't respect LDFLAGS (cadabra does!)
-	epatch "${FILESDIR}/${PN}-1.25-xcadabra-flags.patch"
-}
-
-src_configure(){
-	econf $(use_enable X gui)
-}
-
-src_compile() {
-	emake || die
-
-	if use doc; then
-		cd "${S}/doc"
-		emake || die
-		cd doxygen/latex
-		emake pdf || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" DEVDESTDIR="${D}" install || die "install died"
-
-	dodoc AUTHORS ChangeLog INSTALL || die
-
-	if ( use doc )
-		then
-		cd "${S}/doc/doxygen"
-		dohtml html/*
-		dodoc latex/*.pdf
-	fi
-
-	if ( use examples )
-	then
-		docinto examples
-		dodoc "${S}/examples/*"
-	fi
-
-	rm -rf "${D}/usr/share/TeXmacs"
-}
-
-pkg_postinst() {
-	/usr/sbin/texmf-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()
-{
-	/usr/sbin/texmf-update
-}
diff --git a/sci-mathematics/cadabra/cadabra-1.31.ebuild b/sci-mathematics/cadabra/cadabra-1.31.ebuild
index d9c1fc4d6..f56d98121 100644
--- a/sci-mathematics/cadabra/cadabra-1.31.ebuild
+++ b/sci-mathematics/cadabra/cadabra-1.31.ebuild
@@ -9,15 +9,13 @@ 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"
-#### Remove the following line when moving this ebuild to the main tree!
-RESTRICT="mirror"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples X"
 
-DEPEND="
+CDEPEND="
 	sci-libs/modglue
 	sci-mathematics/lie
 	dev-libs/gmp[cxx]
@@ -26,10 +24,12 @@ DEPEND="
 		x11-libs/gtk+:2
 		dev-cpp/gtkmm:2.4
 		dev-cpp/pangomm:1.4
-		app-text/dvipng )
-	doc? ( app-doc/doxygen
+		app-text/dvipng )"
+DEPEND="${CDEPEND}
+	doc? (
+		app-doc/doxygen
 		|| ( app-text/texlive-core dev-tex/pdftex ) )"
-RDEPEND="${DEPEND}
+RDEPEND="${CDEPEND}
 	virtual/latex-base
 	dev-tex/mh"
 
@@ -43,7 +43,7 @@ src_configure(){
 }
 
 src_compile() {
-	emake
+	default
 
 	if use doc; then
 		cd "${S}/doc"
diff --git a/sci-mathematics/cadabra/metadata.xml b/sci-mathematics/cadabra/metadata.xml
index d3abbc670..b04aad6e2 100644
--- a/sci-mathematics/cadabra/metadata.xml
+++ b/sci-mathematics/cadabra/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-mathematics</herd>
-	<longdescription>Cadabra is a computer algebra system (CAS) designed specifically for the solution of problems encountered in field theory. It has extensive functionality for tensor computer algebra, tensor polynomial simplification including multi-term symmetries, fermions and anti-commuting variables, Clifford algebras and Fierz transformations, implicit coordinate dependence, multiple index types and many more.</longdescription>
+  <herd>sci-mathematics</herd>
+  <longdescription>Cadabra is a computer algebra system (CAS) designed specifically for the solution of problems encountered in field theory. It has extensive functionality for tensor computer algebra, tensor polynomial simplification including multi-term symmetries, fermions and anti-commuting variables, Clifford algebras and Fierz transformations, implicit coordinate dependence, multiple index types and many more.</longdescription>
 </pkgmetadata>