Version bump

Package-Manager: portage-2.2_rc30/cvs/Linux i686

4 files changed, 25 insertions, 104 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/Manifest b/sci-mathematics/wxmaxima/Manifest
index 8240f6a49ef8..cac1982044e1 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,12 +1,10 @@
-DIST wxMaxima-0.7.3a.tar.gz 802526 RMD160 ed4ae9d852046d21c46cc8d2fccd301063cbc156 SHA1 456ee53fc8dd273d64badec2a9867d7dc8c1470b SHA256 a87e1a3f118f1bd7b17936248ee38671525cdba02770fc121c632dbb5b6365f2
 DIST wxMaxima-0.7.4.tar.gz 809228 RMD160 fcd8d5ae66eecfb4b3bd5ba87157c33f03faa6f3 SHA1 6df58896ba8d01b766eb29e2b08d34955ab68e85 SHA256 caf2115507da686636789b69b4de1392ce014569172ca579a8b4df67c00ebd2e
-DIST wxMaxima-0.7.5.tar.gz 826665 RMD160 a5bb7826ed47f6f2f2ea00ef1c35fc92103f9fa1 SHA1 a43e9fcf7eb87775c964d0645c2c9af7ec6cb998 SHA256 8273fb3715271a0338a5d115153546f95308187bf1c946e4e812b4e2d9517052
 DIST wxMaxima-0.7.6.tar.gz 918594 RMD160 f7dce79b3c6f3bbe5da2244caf11e6e0abd23d92 SHA1 f9052e7a553bf75ca22be739ee5d56f99be03bd7 SHA256 0863714641d8615986a594c420e24d62736d9ae0e15bf366581f5e4003b1be52
 DIST wxMaxima-0.8.1.tar.gz 830875 RMD160 b716ab5c31c1f83a5ebc80756602aca08573a517 SHA1 8a332da2d5dc0013a20ce479c0ca0648060677b2 SHA256 f81f9431ef70281d3f9b5c6f4265c92ecf097a786790e0db2cda6e3a8d5ef9a4
-EBUILD wxmaxima-0.7.3a.ebuild 1574 RMD160 0b81f07f5b1311412a0fe9ccd101e0fa14c58b4d SHA1 c44d8e091987442c9c7b63a2527a9cc18bc7f38f SHA256 2f863890b084309843f8070d29b71c3af943a5f458dbf64da2f62d367b8cdf2c
+DIST wxMaxima-0.8.2.tar.gz 930011 RMD160 43ea46e845f79576d273f4d0ad21a2c0d47664f9 SHA1 bc1d221855f5b7e57401801f43b60924987c5079 SHA256 36c47638c323b5ec3f77ba96694481aca978fb76c48baef9c782fee3b6f1c186
 EBUILD wxmaxima-0.7.4.ebuild 1469 RMD160 f742457334870b8a8a8ce8e3c9ee8fab67240eec SHA1 f80fdc94620515c2755749e133dcf3600964fd3c SHA256 1fb31586122761a28612c31665a8cfaf2c3e1672b91fb384a74e4dc645c53285
-EBUILD wxmaxima-0.7.5.ebuild 1748 RMD160 4a1f1cfd66deffde98dfd1e7f31b3ac28132e86b SHA1 8489cf28f0f3c1646cc841a43f8cecd63a2be19f SHA256 1a9d220a8db2ac5108efe415422e09a654d1fc42315c8309f02d1001e5599be6
 EBUILD wxmaxima-0.7.6.ebuild 1467 RMD160 c45da216badf4f3beee9b02a4124a6b4b7c7856e SHA1 01f9e0ba314af2e0c075f36e164e33b1e4f5abc5 SHA256 445310f6a12c47ba15bfe42e66fd84ff86bb16d71692a5207ebfd5736cf73776
 EBUILD wxmaxima-0.8.1.ebuild 1477 RMD160 69bc476b0d93130b4a7bab7ee075b7ab1e945885 SHA1 0ae6aa3e767e3b94389b58c3dabef17b7e031cc1 SHA256 29cae486e26420aafd8a58628cb4b96e5d84a2c2ba13ced2bf6beec847f41007
-MISC ChangeLog 3526 RMD160 62c69aca85ed30c46f63ecb34e9fa8752eaeb449 SHA1 1c729735759ddac852b96af866115feaebacbd79 SHA256 7ac16227572dfd29395e27ec0e9ceb48352e2d110514c88ac5bcc776b6b51cd6
+EBUILD wxmaxima-0.8.2.ebuild 1477 RMD160 5a0f786e591e86b68eefdaa40523e7faf433ccab SHA1 bad6e3cb485e58a04ee4e47f58b565a4a50709dd SHA256 e98dd15adbb7b75d97913306b86cfeb7b1118b637586f62d0231281994fe3203
+MISC ChangeLog 3697 RMD160 091e1ef99ea9d10dbd98a86b7ec123d90283d76e SHA1 1f77187a53d16cbfdccd692d7878175ad52cbf72 SHA256 ae3e1204f5dde2ff0c40e524cc97c2ca758fa33f4123e96689d2ff4058e18b77
 MISC metadata.xml 517 RMD160 baf1e245fd04a68066d9df651bfabafdad5bf93b SHA1 5f2e8be04f1cbfb3f71c45e535044d029632e49f SHA256 84060fc148aeee241cd08b55666c2c0783203d5085b8b3ebe2d95a6b6e198b71
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