Merge pull request #323 from marbre/givaro

Fix and clean sci-libs/givaro ebuilds; Bump version

5 files changed, 42 insertions, 29 deletions

diff --git a/sci-libs/givaro/ChangeLog b/sci-libs/givaro/ChangeLog
index 1df7d4e4e..eb8991107 100644
--- a/sci-libs/givaro/ChangeLog
+++ b/sci-libs/givaro/ChangeLog
@@ -1,7 +1,16 @@
 # ChangeLog for sci-libs/givaro
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*givaro-3.8.0 (11 Jan 2015)
+
+  11 Jan 2015; Marius Brehler <marbre@linux.sungazer.de> +givaro-3.8.0.ebuild:
+  Version bump
+
+  11 Jan 2015; Marius Brehler <marbre@linux.sungazer.de>
+  givaro-3.3.0, givaro-3.2.13:
+  Move to EAPI=5; Cleanup ebuilds, Fix SRC_URI for 3.3.0
+
 *givaro-3.3.0 (09 Nov 2009)
 *givaro-3.2.13 (09 Nov 2009)
 
@@ -12,4 +21,3 @@
 
   18 Jul 2008; Francois Bissey <f.r.bissey@massey.ac.nz> ChangeLog:
   Initial import, see bug #227803
-
diff --git a/sci-libs/givaro/Manifest b/sci-libs/givaro/Manifest
index 1ea550033..4100d6544 100644
--- a/sci-libs/givaro/Manifest
+++ b/sci-libs/givaro/Manifest
@@ -1,2 +1,3 @@
-DIST givaro-3.2.13.tar.gz 601026 SHA256 cef5972a79038c7fdbbcc80c90917ed0b339614723e9cd12436b55358ef34eb0
-DIST givaro-3.3.tar.gz 643288 SHA256 90677ee9af4a33f827dfce48359c2c419302dfb46227fb8cc16de23f18ac757e
+DIST givaro-3.2.13.tar.gz 601026 SHA256 cef5972a79038c7fdbbcc80c90917ed0b339614723e9cd12436b55358ef34eb0 SHA512 ba792f00003940aedadbea388ff652bc7df3472a9451a950c0818d5424e2656d479ee32a4cf40c2e91f3437c13882a0067040585f9744f309b77067360a267d7 WHIRLPOOL 6840ee4a39f3b2b1f464dd864128825cbfc6adc6b71bf62a81bb8fccc55ec21cfafee971e59be1e5026d22749f813547f73a412190fb5b68e8bd44533f9a1375
+DIST givaro-3.3.0.tar.gz 643288 SHA256 90677ee9af4a33f827dfce48359c2c419302dfb46227fb8cc16de23f18ac757e SHA512 0121917855989b31ce888280229e022fafcdb4f1da4411328d79accac3ce1f057805d4efa23798e3c888b3ddcdcbde8d6e841d415c6509ed4a299287482f5032 WHIRLPOOL ced6bc6ce47e767087feb993922f53e1e160bfa328f9ea12a5b715937bf6aa06ee876abf891f9055da434566642aabb5cd2317dcf302651ec239f65e2f170d53
+DIST givaro-3.8.0.tar.gz 823507 SHA256 d89728d6ae527e80e9cd48fb40daf9b8a16907ed1b7cb621416a1483b69e42a0 SHA512 067a89093501bb4a9627b2141653b4f0636dd2e9323503e6b9c9e6d25e50240d30a6fc9971415ef5c0f227449493a585e4408ebbc4da6f5ee7363faee78f88fb WHIRLPOOL 67ca6f54aa59cab0bae78959ee01bc53486e5b18d6be0649b2447ec30ff588d9026d812757ad85f174d2076caeef64afb6a58c040324f08871e8e991fb61c88f
diff --git a/sci-libs/givaro/givaro-3.2.13.ebuild b/sci-libs/givaro/givaro-3.2.13.ebuild
index ad54cbee8..c6ffca68e 100644
--- a/sci-libs/givaro/givaro-3.2.13.ebuild
+++ b/sci-libs/givaro/givaro-3.2.13.ebuild
@@ -1,16 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=5
 
 DESCRIPTION="C++ library for arithmetic and algebraic computations"
 HOMEPAGE="http://ljk.imag.fr/CASYS/LOGICIELS/givaro/"
 SRC_URI="http://ljk.imag.fr/CASYS/LOGICIELS/givaro/Downloads/${P}.tar.gz"
 
-#### Remove the following line when moving this ebuild to the main tree!
-RESTRICT="mirror"
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~ppc64"
@@ -20,11 +17,7 @@ RDEPEND=">=dev-libs/gmp-4.1-r1"
 DEPEND="${RDEPEND}"
 
 src_configure(){
-	econf "--enable-shared" || die "Configure failed!"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
+	econf "--enable-shared"
 }
 
 pkg_postinst() {
diff --git a/sci-libs/givaro/givaro-3.3.0.ebuild b/sci-libs/givaro/givaro-3.3.0.ebuild
index fb965a0ec..02a9f2745 100644
--- a/sci-libs/givaro/givaro-3.3.0.ebuild
+++ b/sci-libs/givaro/givaro-3.3.0.ebuild
@@ -1,20 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
-
-inherit versionator
+EAPI=5
 
 DESCRIPTION="C++ library for arithmetic and algebraic computations"
 HOMEPAGE="http://ljk.imag.fr/CASYS/LOGICIELS/givaro/"
-MY_P=${PN}-$(get_version_component_range 1-2)
-SRC_URI="http://ljk.imag.fr/CASYS/LOGICIELS/givaro/Downloads/${MY_P}.tar.gz"
-
-#### Remove the following line when moving this ebuild to the main tree!
-RESTRICT="mirror"
+SRC_URI="http://ljk.imag.fr/CASYS/LOGICIELS/givaro/Downloads/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~ppc64"
 IUSE=""
@@ -23,11 +17,7 @@ RDEPEND=">=dev-libs/gmp-4.1-r1"
 DEPEND="${RDEPEND}"
 
 src_configure(){
-	econf "--enable-shared" || die "Configure failed!"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
+	econf "--enable-shared"
 }
 
 pkg_postinst() {
diff --git a/sci-libs/givaro/givaro-3.8.0.ebuild b/sci-libs/givaro/givaro-3.8.0.ebuild
new file mode 100644
index 000000000..79f1db0b5
--- /dev/null
+++ b/sci-libs/givaro/givaro-3.8.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="C++ library for arithmetic and algebraic computations"
+HOMEPAGE="http://ljk.imag.fr/CASYS/LOGICIELS/givaro/"
+SRC_URI="https://forge.imag.fr/frs/download.php/592/${P}.tar.gz"
+
+LICENSE="CeCILL-B"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc64"
+IUSE=""
+
+RDEPEND=">=dev-libs/gmp-4.1-r1"
+DEPEND="${RDEPEND}"
+
+src_configure(){
+	econf "--enable-shared"
+}