3 files changed, 12 insertions, 25 deletions
diff --git a/sci-libs/givaro/ChangeLog b/sci-libs/givaro/ChangeLog
index 1df7d4e4e..5d4576dd9 100644
--- a/sci-libs/givaro/ChangeLog
+++ b/sci-libs/givaro/ChangeLog
@@ -1,7 +1,11 @@
 # 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: $
 
+  11 Jan 2015; Marius Brehler <marbre@linux.sungazer.de>
+  givaro-3.3.0, ivaro-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)
 
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..c6ffca68e 100644
--- a/sci-libs/givaro/givaro-3.3.0.ebuild
+++ b/sci-libs/givaro/givaro-3.3.0.ebuild
@@ -1,18 +1,12 @@
-# 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"
 SLOT="0"
@@ -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() {