Version bump

(Portage version: 2.2_rc30/cvs/Linux i686)

3 files changed, 22 insertions, 99 deletions

diff --git a/sci-mathematics/wxmaxima/ChangeLog b/sci-mathematics/wxmaxima/ChangeLog
index 7456d5b27071..e73f537eca9e 100644
--- a/sci-mathematics/wxmaxima/ChangeLog
+++ b/sci-mathematics/wxmaxima/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/wxmaxima
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/wxmaxima/ChangeLog,v 1.22 2008/12/20 10:20:02 grozin Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/wxmaxima/ChangeLog,v 1.23 2009/04/19 22:09:22 grozin Exp $
+
+*wxmaxima-0.8.2 (20 Apr 2009)
+
+  20 Apr 2009; Andrey Grozin <grozin@gentoo.org> -wxmaxima-0.7.3a.ebuild,
+  -wxmaxima-0.7.5.ebuild, +wxmaxima-0.8.2.ebuild:
+  Version bump
 
 *wxmaxima-0.8.1 (20 Dec 2008)
 
diff --git a/sci-mathematics/wxmaxima/wxmaxima-0.7.3a.ebuild b/sci-mathematics/wxmaxima/wxmaxima-0.7.3a.ebuild
deleted file mode 100644
index a2becac60368..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-0.7.3a.ebuild
+++ /dev/null
@@ -1,70 +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/wxmaxima/wxmaxima-0.7.3a.ebuild,v 1.7 2008/02/26 17:34:25 bicatali Exp $
-
-WX_GTK_VER="2.6"
-inherit eutils autotools wxwidgets fdo-mime
-
-MYP=wxMaxima-${PV}
-
-DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit."
-HOMEPAGE="http://wxmaxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="unicode"
-
-DEPEND=">=dev-libs/libxml2-2.5.0
-	=x11-libs/wxGTK-2.6*"
-RDEPEND="${DEPEND}
-	>=sci-mathematics/maxima-5.13.0"
-
-S="${WORKDIR}/${MYP}"
-
-pkg_setup() {
-	if use unicode; then
-		need-wxwidgets unicode
-	else
-		need-wxwidgets ansi
-	fi
-}
-
-src_compile () {
-
-	# consistent package names
-	sed -i \
-		-e "s:${datadir}/wxMaxima:${datadir}/${PN}:g" \
-		Makefile.in data/Makefile.in || die "sed failed"
-
-	sed -i \
-		-e 's:share/wxMaxima:share/wxmaxima:g' \
-		src/wxMaxima.cpp || die "sed failed"
-
-	econf \
-		--enable-dnd \
-		--enable-printing \
-		--with-wx-config=${WX_CONFIG} \
-		$(use_unicode unicode-glyphs) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newicon maxima-new.png wxmaxima.png
-	make_desktop_entry wxmaxima wxMaxima wxmaxima
-	dodir /usr/share/doc/${PF}
-	dosym /usr/share/${PN}/README /usr/share/doc/${PF}/README
-	dodoc AUTHORS
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-mathematics/wxmaxima/wxmaxima-0.7.5.ebuild b/sci-mathematics/wxmaxima/wxmaxima-0.8.2.ebuild
index b94fe458bcf1..eb21d2616139 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-0.7.5.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-0.8.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/wxmaxima/wxmaxima-0.7.5.ebuild,v 1.4 2008/11/26 21:13:57 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/wxmaxima/wxmaxima-0.8.2.ebuild,v 1.1 2009/04/19 22:09:22 grozin Exp $
 
 WX_GTK_VER="2.8"
-EAPI="1"
-inherit eutils autotools wxwidgets fdo-mime
+EAPI="2"
+inherit wxwidgets fdo-mime
 
 MYP=wxMaxima-${PV}
 
@@ -20,44 +20,31 @@ IUSE="unicode"
 DEPEND=">=dev-libs/libxml2-2.5.0
 	x11-libs/wxGTK:2.8"
 RDEPEND="${DEPEND}
-	sci-visualization/gnuplot
+	sci-visualization/gnuplot[wxwindows]
 	>=sci-mathematics/maxima-5.15.0"
 
 S="${WORKDIR}/${MYP}"
 
-pkg_setup() {
-	if ! built_with_use sci-visualization/gnuplot wxwindows; then
-		elog "To benefit full plotting capability of wxmaxima,"
-		elog "enable the wxwindows USE flag for sci-visualization/gnuplot"
-		epause 5
-	fi
-	wxwidgets_pkg_setup
-}
-
-src_compile () {
-
+src_prepare() {
 	# consistent package names
-	sed -i \
-		-e "s:${datadir}/wxMaxima:${datadir}/${PN}:g" \
-		Makefile.in data/Makefile.in || die "sed failed"
+	sed -e "s:${datadir}/wxMaxima:${datadir}/${PN}:g" \
+		-i Makefile.in data/Makefile.in || die "sed failed"
 
-	sed -i \
-		-e 's:share/wxMaxima:share/wxmaxima:g' \
-		src/wxMaxima.cpp || die "sed failed"
+	sed -e 's:share/wxMaxima:share/wxmaxima:g' \
+		-i src/wxMaxima.cpp src/wxMaximaFrame.cpp || die "sed failed"
+}
 
+src_configure() {
 	econf \
 		--enable-dnd \
 		--enable-printing \
 		--with-wx-config=${WX_CONFIG} \
-		$(use_enable unicode unicode-glyphs) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
+		$(use_enable unicode unicode-glyphs)
 }
 
 src_install () {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	doicon wxmaxima.png
+	doicon data/wxmaxima.png
 	make_desktop_entry wxmaxima wxMaxima wxmaxima
 	dodir /usr/share/doc/${PF}
 	dosym /usr/share/${PN}/README /usr/share/doc/${PF}/README