sci-mathematics/genius: Version Bump; drop old

(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

4 files changed, 30 insertions, 84 deletions

diff --git a/sci-mathematics/genius/ChangeLog b/sci-mathematics/genius/ChangeLog
index e2a784c094c8..f28a55e1390f 100644
--- a/sci-mathematics/genius/ChangeLog
+++ b/sci-mathematics/genius/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/genius
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/genius/ChangeLog,v 1.7 2013/01/02 08:35:45 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/genius/ChangeLog,v 1.8 2013/06/28 15:49:20 jlec Exp $
+
+*genius-1.0.17 (28 Jun 2013)
+
+  28 Jun 2013; Justin Lecher <jlec@gentoo.org> -genius-1.0.11.ebuild,
+  -genius-1.0.16.ebuild, +genius-1.0.17.ebuild, metadata.xml:
+  Version Bump; drop old
 
   02 Jan 2013; Andrey Grozin <grozin@gentoo.org> genius-1.0.16.ebuild:
   Add dependency on app-text/gnome-doc-utils, bug #448636
diff --git a/sci-mathematics/genius/genius-1.0.11.ebuild b/sci-mathematics/genius/genius-1.0.11.ebuild
deleted file mode 100644
index b6f454f2a434..000000000000
--- a/sci-mathematics/genius/genius-1.0.11.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/genius/genius-1.0.11.ebuild,v 1.3 2011/03/07 10:41:50 jlec Exp $
-
-EAPI=2
-inherit eutils gnome2
-
-DESCRIPTION="Genius Mathematics Tool and the GEL Language"
-HOMEPAGE="http://www.jirka.org/genius.html"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gnome nls"
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/${PN}/1.0/${P}.tar.bz2
-	doc? ( http://www.jirka.org/${PN}-reference.pdf )"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gmp
-	dev-libs/mpfr
-	dev-libs/popt
-	sys-libs/ncurses
-	sys-libs/readline
-	gnome? (
-		x11-libs/gtk+:2
-		gnome-base/libgnome
-		gnome-base/libgnomeui
-		gnome-base/libglade:2.0
-		x11-libs/gtksourceview:2.0
-		x11-libs/vte:0 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	|| ( sys-devel/bison
-		dev-util/yacc )
-	sys-devel/flex
-	app-text/scrollkeeper
-	nls? ( sys-devel/gettext )"
-
-G2CONF="${G2CONF} $(use_enable gnome) $(use_enable nls) \
-		--disable-update-mimedb --disable-scrollkeeper \
-		--disable-extra-gcc-optimization"
-# gnome2.eclass adds --disable-gtk-doc or --enable-gtk-doc to G2CONF
-# if there is the USE flag doc, thus leading to QA warnings
-GCONF_DEBUG="no"
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-USE_DESTDIR="1"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# bug #333871
-	epatch "${FILESDIR}"/${PN}-make.patch
-}
-
-src_install() {
-	gnome2_src_install
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/${PN}-reference.pdf
-	fi
-}
diff --git a/sci-mathematics/genius/genius-1.0.16.ebuild b/sci-mathematics/genius/genius-1.0.17.ebuild
index b14cb3dc03f7..376a7eee6f45 100644
--- a/sci-mathematics/genius/genius-1.0.16.ebuild
+++ b/sci-mathematics/genius/genius-1.0.17.ebuild
@@ -1,18 +1,21 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/genius/genius-1.0.16.ebuild,v 1.2 2013/01/02 08:35:45 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/genius/genius-1.0.17.ebuild,v 1.1 2013/06/28 15:49:20 jlec Exp $
+
+EAPI=5
 
-EAPI=4
 inherit eutils gnome2
 
 DESCRIPTION="Genius Mathematics Tool and the GEL Language"
 HOMEPAGE="http://www.jirka.org/genius.html"
+SRC_URI="
+	http://ftp.gnome.org/pub/GNOME/sources/${PN}/1.0/${P}.tar.xz
+	doc? ( http://www.jirka.org/${PN}-reference.pdf )"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc gnome nls"
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/${PN}/1.0/${P}.tar.xz
-	doc? ( http://www.jirka.org/${PN}-reference.pdf )"
 
 RDEPEND="
 	dev-libs/glib:2
@@ -30,26 +33,24 @@ RDEPEND="
 		x11-libs/vte:0 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
-	|| ( sys-devel/bison
-		dev-util/yacc )
+	|| ( sys-devel/bison dev-util/yacc )
 	sys-devel/flex
 	app-text/scrollkeeper
 	app-text/gnome-doc-utils
 	nls? ( sys-devel/gettext )"
 
-G2CONF="${G2CONF} $(use_enable gnome) $(use_enable nls) \
+src_prepare() {
+	G2CONF="${G2CONF} $(use_enable gnome) $(use_enable nls) \
 		--disable-update-mimedb --disable-scrollkeeper \
 		--disable-extra-gcc-optimization"
-# gnome2.eclass adds --disable-gtk-doc or --enable-gtk-doc to G2CONF
-# if there is the USE flag doc, thus leading to QA warnings
-GCONF_DEBUG="no"
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-USE_DESTDIR="1"
+	# gnome2.eclass adds --disable-gtk-doc or --enable-gtk-doc to G2CONF
+	# if there is the USE flag doc, thus leading to QA warnings
+	GCONF_DEBUG="no"
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	USE_DESTDIR="1"
+}
 
 src_install() {
+	use doc && DOCS+=" ${DISTDIR}/${PN}-reference.pdf"
 	gnome2_src_install
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/${PN}-reference.pdf
-	fi
 }
diff --git a/sci-mathematics/genius/metadata.xml b/sci-mathematics/genius/metadata.xml
index cbdd7f0a35a2..6260aca8ea54 100644
--- a/sci-mathematics/genius/metadata.xml
+++ b/sci-mathematics/genius/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<maintainer>
-		<email>grozin@gentoo.org</email>
-		<name>Andrey Grozin</name>
-	</maintainer>
-	<longdescription>Genius is a calculator program which can work
+  <herd>sci</herd>
+  <maintainer>
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <longdescription>Genius is a calculator program which can work
 	  with arbitrary precision integers, multiple precision floats,
 	  rational numbers, complex numbers, linear algebra, number theory,
 	  numerical calculus, statistics, numerical equation solving,