Better doc installation, removed older 1.4.1 version

Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 24 insertions, 58 deletions

diff --git a/sci-mathematics/ginac/ChangeLog b/sci-mathematics/ginac/ChangeLog
index 549d167e8113..42ac95b277b3 100644
--- a/sci-mathematics/ginac/ChangeLog
+++ b/sci-mathematics/ginac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/ginac
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ChangeLog,v 1.20 2008/07/21 09:35:14 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ChangeLog,v 1.21 2008/09/29 14:10:06 bicatali Exp $
+
+  29 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org> -ginac-1.4.1.ebuild,
+  ginac-1.4.3.ebuild:
+  Better doc installation, removed older 1.4.1 version
 
   21 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org> ginac-1.4.3.ebuild:
   Added dev-texlive/fontsrecommended as a dependency when doc flag is
diff --git a/sci-mathematics/ginac/Manifest b/sci-mathematics/ginac/Manifest
index 95c4fbe39e12..aa6df76dd795 100644
--- a/sci-mathematics/ginac/Manifest
+++ b/sci-mathematics/ginac/Manifest
@@ -3,17 +3,15 @@ Hash: SHA1
 
 AUX ginac-1.4.1-gcc4.3.patch 902 RMD160 de2c683802e77277679b1ea2ee5dfae5278d247d SHA1 6bddc2865eb1353bb304718a7392c252ff4aa256 SHA256 7c507525ba2b16a042783df797f8d3a356bfd442b2b97ba4b8fa588f3e949c9c
 DIST ginac-1.3.7.tar.bz2 793441 RMD160 04ce8fce6e7aba29835a5a8d925b2a6ea630d9cc SHA1 5c6d4ebe3d80de835a456cb8e0853ece0847df26 SHA256 a550af7f970ce93651b63951b0a1d013f264204cd82774d0984c7b5f89c8815a
-DIST ginac-1.4.1.tar.bz2 918853 RMD160 d8176a01d8fead372b8427c1bc7f67aca143a17a SHA1 5120bc8fcf43c42e3b49b66d0bebef26e5c697bb SHA256 f1e673b8c411afa3f35062b0f266eb4aeeabebe5126175d311794f9bd8a2c7c8
 DIST ginac-1.4.3.tar.bz2 847869 RMD160 a24e91ab55533f0eef22a54fb1f2abef6a70869f SHA1 0e560bb9420c16bf182829d35f9841f8b7f76d2e SHA256 dcd6991abae6df2fa247b57d754b8cbd9cc8119268c15d3470b3286132f7708f
 EBUILD ginac-1.3.7.ebuild 580 RMD160 52471984e197c41b55c308d337c2d32a132454e2 SHA1 f658a36200acc824e71345447a14e994152fd43c SHA256 83e220e3dfcae96d3aa716c07f93d4e1a0f1c140e97cb09ca9f519451cec6dd4
-EBUILD ginac-1.4.1.ebuild 1176 RMD160 f87fe7ed2510c56a176b91d869d76574a8633940 SHA1 729b011ac6864d325c63dc07f3d9743f90800d13 SHA256 d41cd003b492495c19f6828ef2c5b6d58c31c4dae4d2388f33f5fc948c533924
-EBUILD ginac-1.4.3.ebuild 1222 RMD160 321c72ed02e8d4daef82cb4dfbb152ab30315c07 SHA1 f067c997087518213acc79217ab8f46805724130 SHA256 d8e4b2012c7e8b3354d0292ad14e9d5df30e37385a80a95199bc32a3c4ffedf6
-MISC ChangeLog 4144 RMD160 12c9772bd4a1ced85ce37281dcc95656104dd36f SHA1 eb8fbda0f0284e66fe8e9c81cff9300ff364541f SHA256 f0843728bb512dd854e059fd1cb3da769e596b4c54984b674390aebbf0987cf2
+EBUILD ginac-1.4.3.ebuild 1427 RMD160 0fb909dee420d20b3ffa695111a6e5aa68223b09 SHA1 64f3a82991505f5366ede485d0d47fa18c582597 SHA256 8e12012f537c650a6f0878c34ec4fe31ae5ce7cc573b1edf871c1e2b46db490b
+MISC ChangeLog 4298 RMD160 480be7d0387c1cd6c373eb4d61ef9c16387ba9cc SHA1 f0b09abd918d5c91d76862e64a0c8fdfb49b13d0 SHA256 a241c9196fdd6f4424a3e7a9a6706656d420f429e173ff3f0a103b91feef516d
 MISC metadata.xml 582 RMD160 0f0b60e373c8fee0efbebb7b7fd2420e2052082e SHA1 7e2a04c2da42292f37e33d06fc2e15305687bcdf SHA256 a68adc59dd6641c75f663a7be278804746fc15f64707b2570ed88918c6f9ff33
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiEWGIACgkQ1ycZbhPLE2BDmwCeJCLVNhQhHwx2lM4N3JrHs+Fq
-a1kAoKh0ED0FYssOF9LEVR5Qa0IRL8br
-=BLSf
+iEYEARECAAYFAkjg4cYACgkQ1ycZbhPLE2CGIwCgqSe7mKhxAwp6EIl1gx26Lr61
+EqwAnR4GAa1vEP1ebltptQqhaO8zv7tu
+=Vpdq
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/ginac/ginac-1.4.1.ebuild b/sci-mathematics/ginac/ginac-1.4.1.ebuild
deleted file mode 100644
index 4b3d2044c33b..000000000000
--- a/sci-mathematics/ginac/ginac-1.4.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ginac-1.4.1.ebuild,v 1.2 2008/04/01 14:45:11 markusle Exp $
-
-inherit eutils
-
-DESCRIPTION="C++ library and tools for symbolic calculations"
-SRC_URI="ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/${P}.tar.bz2"
-HOMEPAGE="http://www.ginac.de/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND="sci-libs/cln"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen media-gfx/transfig virtual/latex-base )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc4.3.patch
-}
-
-src_compile() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		|| die "econf failed"
-	emake || die "emake failed"
-	if use doc; then
-		emake html || die "emake html failed"
-		# need to run twice to get the references right (you know, latex)
-		# do not add die function at the first one
-		make pdf
-		emake pdf || die "emake pdf failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README NEWS AUTHORS || die
-}
diff --git a/sci-mathematics/ginac/ginac-1.4.3.ebuild b/sci-mathematics/ginac/ginac-1.4.3.ebuild
index 96793889aa77..bc6fcf8c6170 100644
--- a/sci-mathematics/ginac/ginac-1.4.3.ebuild
+++ b/sci-mathematics/ginac/ginac-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ginac-1.4.3.ebuild,v 1.3 2008/07/21 09:35:14 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ginac-1.4.3.ebuild,v 1.4 2008/09/29 14:10:06 bicatali Exp $
 
 inherit eutils
 
@@ -17,8 +17,10 @@ RDEPEND="sci-libs/cln"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( app-doc/doxygen
-		media-gfx/transfig
-		|| ( dev-texlive/texlive-fontsrecommended app-text/tetex app-text/ptex ) )"
+		   media-gfx/transfig
+		   || ( dev-texlive/texlive-fontsrecommended
+				app-text/tetex
+				app-text/ptex ) )"
 
 src_compile() {
 	econf || die "econf failed"
@@ -38,8 +40,15 @@ src_install() {
 	dodoc README NEWS AUTHORS || die
 
 	if use doc; then
+		cd doc
 		insinto /usr/share/doc/${PF}
-		doins doc/reference/reference.pdf
-		dohtml -r doc/reference/html_files/*
+		doins \
+			examples/ginac-examples.pdf \
+			reference/reference.pdf \
+			tutorial/ginac.pdf \
+			|| die "pdf doc install failed"
+		dohtml -r reference/html_files/*
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.cpp examples/ginac-examples.txt
 	fi
 }