Version bump

Package-Manager: portage-2.2.0_alpha37/cvs/Linux i686

4 files changed, 16 insertions, 154 deletions

diff --git a/sci-libs/mathgl/ChangeLog b/sci-libs/mathgl/ChangeLog
index d39ecbe47ddb..54323ccefc95 100644
--- a/sci-libs/mathgl/ChangeLog
+++ b/sci-libs/mathgl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/mathgl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.23 2011/03/29 15:42:35 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.24 2011/06/04 18:05:45 grozin Exp $
+
+*mathgl-1.11.2 (04 Jun 2011)
+
+  04 Jun 2011; Andrey Grozin <grozin@gentoo.org> -mathgl-1.10.2.1-r1.ebuild,
+  -mathgl-1.11.0.1.ebuild, +mathgl-1.11.2.ebuild:
+  Version bump
 
 *mathgl-1.11.1.1 (29 Mar 2011)
 
diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index 81c63998e4d9..a57501ffb3b0 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,11 +1,9 @@
 AUX mathgl-1.10.2-gcc43.patch 345 RMD160 81d76baed06d779853dd96ce169f5bef620629b2 SHA1 e50c8e600cb243c809d3a6648344bbe29146666d SHA256 2165125d4677b882548530dc21a0368bf7ed27cab516ee6f78604f98b3b60ac9
 AUX mathgl-octave-3.4.patch 396 RMD160 620581ff85c8025d25819ef23af6e4885e1d26e9 SHA1 02e61712be707e2f9e116304b41245da47b3b949 SHA256 a6262a8e67a280cc19b8a0ab501c17400d46a91e0eb8b46967c5354f120380b6
 DIST STIX_font.tgz 2450541 RMD160 7595c2b99c5982d72b1ef551ab8f9d65237e5466 SHA1 3cbc4f5090cd37d1b35d594150357550d2639f81 SHA256 6408290fd4a5267637a88507344a8f07b908ce72f46ef93d09e068fedb67e8fe
-DIST mathgl-1.10.2.1.tgz 2038416 RMD160 9a95b71997b156a186ec718f9e64fd2eec116903 SHA1 8b17bd167535d6e5e187d6cb8d06ef52e692afbe SHA256 21d8f37e889eca91ae252a512e551792e059e575368ace0de3836091701cba1a
-DIST mathgl-1.11.0.1.tgz 4583067 RMD160 25e72bad824bd9327418a6d1130ec2a53525195d SHA1 5de2d58a2deede8c30960657f4f85b963a3be6a9 SHA256 70bddab03b1a9c93b2183196ac01d80894113f034db3e08de26e0e437825d67c
 DIST mathgl-1.11.1.1.tar.gz 4590143 RMD160 058ee41aefa6821cd5fa45651406041cee6e0f0c SHA1 06eaad16de16c37b800b0bf538c2379af90cff39 SHA256 10f44bfdd7a03b9654088994b8bc7ebcb8b65d23d0c06327c30a8adc017389d2
-EBUILD mathgl-1.10.2.1-r1.ebuild 3437 RMD160 403d44a0f387320ebafe3d51cd636418270d8b53 SHA1 8e2f633b7e849a7bb6ad0ef513df62ee9edc518f SHA256 bc3997025bc28fe9e064e1674521e3992a73220eb2053e058bb9504a3111e6c8
-EBUILD mathgl-1.11.0.1.ebuild 3434 RMD160 8c53f09470c991bfb23a6986ae0eea8b9b9b33e2 SHA1 9280e555a7f707562675256a20e41f8c5df37352 SHA256 15661b108a3521ff47c6e81fcb8f65b483ab281091e4c0c6199017f84d3ff0cb
+DIST mathgl-1.11.2.tar.gz 4641427 RMD160 d7e59015304041b3a582e58bc3f60f51bd36e094 SHA1 16b9ab58e654c5b91374f8a35eafc33630d7f5c0 SHA256 1602244136f42bf4b47a4880cb1ff599f6cce9dfb455f8accdbca668ed680e96
 EBUILD mathgl-1.11.1.1.ebuild 3508 RMD160 845e181664780b697e5508c1515251ed9e87bc84 SHA1 6ef1e9cf2e4e6a58a911bcf72422de78697fd3cb SHA256 4636ae10e307d1077e3647efeb950a85573bd822670cbc66cd86f7381801250e
-MISC ChangeLog 4599 RMD160 1d733d7468d3ffd935dfbf7c43f8d79c9f2fc39c SHA1 0fce9069d4b4e6d747b8776d8888ad19dac22bda SHA256 e7c2f534bab596a50ee0eed7393e690d5c8dbc1d39e2ebaec016efbc5b3a57d9
+EBUILD mathgl-1.11.2.ebuild 3506 RMD160 c2543084fafd0d85ccb2b5e5cd1e61575c4048a7 SHA1 490314c19579816c539d91e0a6c4001bb5ed50ee SHA256 a8d95d517d54facf05f5118d71151a6b7d3eb536a3053a7a053e853564cda58e
+MISC ChangeLog 4772 RMD160 e611653c9a3ca89565f0b66c9f741115a427948b SHA1 b2ab9827680f5533e0e31cff1cd3a7b20d0828e1 SHA256 89ab540e48ddb3a37c686097d58d2322a524dec7e2c7caf17a75e0fb5bdfaee4
 MISC metadata.xml 403 RMD160 58842b16ab72ab3b23b8d29eaf00dd2c05da11c9 SHA1 de3dde83893663018de696e3e07010a276db0fff SHA256 2e033d0243bbbafcb9397978f74e7bf0edcb03cfb6f2d2d5ff9e22cdf5e77a42
diff --git a/sci-libs/mathgl/mathgl-1.11.0.1.ebuild b/sci-libs/mathgl/mathgl-1.11.0.1.ebuild
deleted file mode 100644
index 278e66701002..000000000000
--- a/sci-libs/mathgl/mathgl-1.11.0.1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.11.0.1.ebuild,v 1.2 2011/03/20 19:59:40 jlec Exp $
-
-EAPI=3
-
-WX_GTK_VER=2.8
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit autotools wxwidgets python versionator toolchain-funcs
-
-DESCRIPTION="Math Graphics Library"
-HOMEPAGE="http://mathgl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz mirror://sourceforge/${PN}/STIX_font.tgz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fltk gif glut gsl hdf5 jpeg octave python qt4 wxwidgets"
-
-RDEPEND="media-libs/libpng
-	virtual/opengl
-	python? ( dev-python/numpy )
-	glut? ( media-libs/freeglut )
-	fltk? ( x11-libs/fltk:1 )
-	gif? ( media-libs/giflib )
-	jpeg? ( virtual/jpeg )
-	hdf5? ( >=sci-libs/hdf5-1.8 )
-	gsl? ( sci-libs/gsl )
-	octave? ( sci-mathematics/octave )
-	qt4? ( x11-libs/qt-gui:4 )
-	wxwidgets? ( x11-libs/wxGTK:2.8 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2.4
-	doc? ( app-text/texi2html virtual/texi2dvi )
-	python? ( dev-lang/swig )
-	octave? ( dev-lang/swig )"
-
-pkg_setup() {
-	if ! version_is_at_least "4.3.0" "$(gcc-version)"; then
-		eerror "You need >=gcc-4.3.0 to compile this package"
-		die "Wrong gcc version"
-	fi
-	if use hdf5 && has_version sci-libs/hdf5[mpi]; then
-		export CC=mpicc
-		export CXX=mpicxx
-	fi
-	use python && python_pkg_setup
-	use wxwidgets && wxwidgets_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	mkdir "${S}"/fonts
-	cd "${S}"/fonts
-	unpack STIX_font.tgz
-}
-
-src_prepare() {
-	# bug #267061
-	epatch "${FILESDIR}"/${PN}-1.10.2-gcc43.patch
-
-	# correct location of numpy/arrayobject.h
-	if use python; then
-		sed \
-			-e '/SUBDIRS/s:lang::g' \
-			-i Makefile.am || die
-	fi
-
-	echo "#!${EPREFIX}/bin/sh" > config/py-compile
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --docdir="${ROOT}"usr/share/doc/${PF} \
-		$(use_enable glut) \
-		$(use_enable qt4 qt) \
-		$(use_enable wxwidgets wx) \
-		$(use_enable fltk) \
-		$(use_enable gif) \
-		$(use_enable jpeg) \
-		$(use_enable hdf5 hdf5_18) \
-		$(use_enable python) \
-		$(use_enable octave) \
-		$(use_enable gsl) \
-		$(use_enable doc docs)
-}
-
-src_compile() {
-	# see bug #249627
-	local JOBS
-	use doc && JOBS=-j1
-	emake ${JOBS} || die "emake failed"
-
-	if use python; then
-		python_copy_sources lang
-		compilation() {
-			local numpy_h
-			numpy_h=$(python_get_sitedir)/numpy/core/include/numpy/arrayobject.h
-			einfo "fixing numpy.i for Python-${PYTHON_ABI}"
-			sed -e "s|<numpy/arrayobject.h>|\"${numpy_h}\"|" \
-				-i numpy.i \
-				|| die "sed failed"
-			emake PYTHON_HEADERS="-I$(python_get_includedir)" pyexecdir="$(python_get_sitedir)"
-		}
-		python_execute_function -s --source-dir lang compilation
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use python; then
-		installation() {
-			emake DESTDIR="${D}" PYTHON="$(PYTHON)" pyexecdir="$(python_get_sitedir)" pythondir="$(python_get_sitedir)" install
-		}
-		python_execute_function -s --source-dir lang installation
-		python_clean_installation_image
-	fi
-	dodoc README AUTHORS || die "dodoc failed"
-}
-
-pkg_postinst() {
-	if use octave; then
-		octave <<-EOF
-		pkg install /usr/share/${PN}/octave/${PN}.tar.gz
-		EOF
-	fi
-	use python && python_mod_optimize ${PN}.py
-}
-
-pkg_prerm() {
-	if use octave; then
-		octave <<-EOF
-		pkg uninstall ${PN}
-		EOF
-	fi
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup ${PN}.py
-}
diff --git a/sci-libs/mathgl/mathgl-1.10.2.1-r1.ebuild b/sci-libs/mathgl/mathgl-1.11.2.ebuild
index 32dc963afd20..850ddb281907 100644
--- a/sci-libs/mathgl/mathgl-1.10.2.1-r1.ebuild
+++ b/sci-libs/mathgl/mathgl-1.11.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.10.2.1-r1.ebuild,v 1.7 2011/03/20 19:59:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.11.2.ebuild,v 1.1 2011/06/04 18:05:45 grozin Exp $
 
 EAPI=3
 
@@ -13,7 +13,7 @@ inherit autotools wxwidgets python versionator toolchain-funcs
 
 DESCRIPTION="Math Graphics Library"
 HOMEPAGE="http://mathgl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz mirror://sourceforge/${PN}/STIX_font.tgz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz mirror://sourceforge/${PN}/STIX_font.tgz"
 
 LICENSE="LGPL-3"
 SLOT="0"
@@ -29,7 +29,7 @@ RDEPEND="media-libs/libpng
 	jpeg? ( virtual/jpeg )
 	hdf5? ( >=sci-libs/hdf5-1.8 )
 	gsl? ( sci-libs/gsl )
-	octave? ( sci-mathematics/octave )
+	octave? ( >=sci-mathematics/octave-3.4.0 )
 	qt4? ( x11-libs/qt-gui:4 )
 	wxwidgets? ( x11-libs/wxGTK:2.8 )"
 DEPEND="${RDEPEND}
@@ -62,6 +62,9 @@ src_prepare() {
 	# bug #267061
 	epatch "${FILESDIR}"/${PN}-1.10.2-gcc43.patch
 
+	# bug #358245
+	epatch "${FILESDIR}"/${PN}-octave-3.4.patch
+
 	# correct location of numpy/arrayobject.h
 	if use python; then
 		sed \