Version bump

Package-Manager: portage-2.2.01.21688-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 160 insertions, 180 deletions

diff --git a/sci-libs/mathgl/ChangeLog b/sci-libs/mathgl/ChangeLog
index 7997b1f65db2..f3b71faee4c5 100644
--- a/sci-libs/mathgl/ChangeLog
+++ b/sci-libs/mathgl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/mathgl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.33 2013/03/02 23:23:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.34 2013/03/21 15:40:47 bicatali Exp $
+
+*mathgl-2.1.2 (21 Mar 2013)
+
+  21 Mar 2013; Sébastien Fabbro <bicatali@gentoo.org> +mathgl-2.1.2.ebuild,
+  -mathgl-1.11.2.ebuild:
+  Version bump
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> mathgl-1.11.2.ebuild,
   mathgl-2.0.3.ebuild:
diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index f5ab62ff8e8b..b008fafc484a 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -7,28 +7,16 @@ AUX mathgl-1.11.2-zlib.patch 687 SHA256 417da2322b380ce538a1fc3abaa14f68130761e7
 AUX mathgl-2.0.3-fix-hardcoded-paths.patch 2015 SHA256 3ec5d0d18aa353a4196baf6a0e1351bd602eb03042e2ff28e4d135c535517a78 SHA512 89d3817c9aebb907cd924c59d02ec0f8efd4c9562d0cc675f34ae669255e67fa8c5daabcf0050a331aba448ca151c0ac8d3d1790ee8c419a658fe4808beae148 WHIRLPOOL e27ace69e38dadc17ef2fe3bde17cf2bb62cc96c17419b41f52237b08a9a2c4f599cb16b0ae700a64c4132b5324c5ca19ead7753adf98c5fcb70a215be7cba78
 AUX mathgl-octave-3.4.patch 396 SHA256 a6262a8e67a280cc19b8a0ab501c17400d46a91e0eb8b46967c5354f120380b6 SHA512 ece155d84d73ed3a067fbbdc81260dff63ff2d43304393b4e57fa4c22b23347073aefa55aa5efb28e5f55212f2527c39e7de196bd030906590de121736ad9808 WHIRLPOOL 9bbf023e85ebdfef6b198f7c4d714e2bd82bae818c8784db9aa0285809266d0b5586b11aea9af0f8140ca998462ea3bc3b132a65e8777496f33689f2921a3651
 DIST STIX_font.tgz 2450541 SHA256 6408290fd4a5267637a88507344a8f07b908ce72f46ef93d09e068fedb67e8fe SHA512 c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5 WHIRLPOOL 912a280ad550040c961a84fe48cfa2bd9bbcbad6c539b6126b4cbb5f9673ddd4ad5cc9e0d053fcb20cc6c12e1203aeaa3a05cf07360b16e2e7cbb13c0c42cc1e
-DIST mathgl-1.11.2.tar.gz 4641427 SHA256 1602244136f42bf4b47a4880cb1ff599f6cce9dfb455f8accdbca668ed680e96
 DIST mathgl-2.0.3.tar.gz 4024665 SHA256 f2b7d6a0106d854e78bf6933596a04f09bc011eae50466cafcd0b979981ccb7a SHA512 6c47e985d0fefb635b5453b9d21ed2a77675edffbfe70738cf475d5c99c0f96c8c8515263ed20ba323a1ee24c30ae02317a66313e78c78d30414c597354528f7 WHIRLPOOL 26bf5e3301dc66974dfc14021cc41b4117b20b6c7e00f181af4bfc46bc85b46a4c347fef55975489151fb2817469707547965cecdfa8fc8885fdf8dd0cededc2
-EBUILD mathgl-1.11.2.ebuild 3662 SHA256 5b08fb9cfeb1b642e6041694f700db44c32170a28145690695553d7ec4e1d3e1 SHA512 2c35918139ed21f08ff007010bc5752e383130e3d1fffd1c98d7abd0d4f0a522f645f246d9d935e08d7ec90fb84516260952f6db5af3efce6cb0c051031fae5e WHIRLPOOL cde4d61a78de38edbec6adb5104f472ab9980ce97ded1ff4bad6ea67d80e274bbe0ef0823e2342f18f6c68a9fe15c3eae2eb9e53bd2864dc9025daee0e64396d
+DIST mathgl-2.1.2.tar.gz 5173804 SHA256 161c013ea2767b28fc887ee7a0aa875029666f8d88bea60f761b87083b0d18ec SHA512 d0f7605af31a7e0330b25f64619b724c87a429c60d1fb34129a749570c2a77b15214d9c74b652484f6b36a25e94b779c8e5a630d8bcdbd49075faca4ba04dd3b WHIRLPOOL 12fec240a1e11a33126c40967679f8f8908162591d1bff10c4577a12c46cf26c76125f34f4bcc84d1666db7bd741793f2c7f1b011cf96ecb608bf18a37af37c3
 EBUILD mathgl-2.0.3.ebuild 3863 SHA256 55286f4ad3e30d38fbe26420b2fee4ff03e74088f1ced5220603df82283a0b40 SHA512 0f54083956545af8672ec26bbd478110e9ca2ac049145dc284e53f21ad4c6e8dca9cc3bdae317805312e37807ed00e999317a097b634cd6d30bd227b41c94c6f WHIRLPOOL 695cfc4aba78b1d385a299c061ee7fecc0c5cea970c1732d528923d39aaebc7838495d71b15120ec1a430e7bab124a816a65f63ce2667ba197d03b5a5cdadae8
-MISC ChangeLog 6449 SHA256 3cf6a844dae988f3c5aa1e4b56ee4b6a4212f833dbd0d2c7545ffcd4718a0c1c SHA512 cb9240d0f33aee49eed39d773c84e0547b67767a11bc61032aeeb0ffc834340d30b32b287a815710165d9ebc124ad7ea8d6a512849001d19d76d6f0bf74e5362 WHIRLPOOL b4bd2e01e47a9d6849f09d810bfca3ef4bb7c55dc29446a2d175af87d19f13c98e8486783b4e31a12bba6ce938742da0e4e93d4e8914ead26925cf77777049e7
+EBUILD mathgl-2.1.2.ebuild 3808 SHA256 aead17c13e10ef1e9e59c00fca165bb13f02e38c6118293864c4b5c0d59fa3f8 SHA512 5fc652f05195d5ec0e97ac11afdf32529a21606cb71472d4f109472dd04efc96dd8a9b1fe1d8ed28275b54be8eb3c8e1a23e7d1812e19ffdf98205c94af17aac WHIRLPOOL 84427079b1006c1db497d3b1148e3cf66b8a671fe19408174df1ab695e78361ff105b0d36e9d155b65e524bf9ebe94f439f33a9441c31ad2b876701282619b5c
+MISC ChangeLog 6596 SHA256 638b9cc7970b57131337ab458dfcc81fef3e56cb37459650094c97b86351bbc2 SHA512 73682b8f6f6b710cfc761dfc75ac137249d3e7ce38ecb67590ad8426ea558561fd76a496d1142bcb7ded9c5d1fe07c71b42643101d286145fbf518c3c574fe9e WHIRLPOOL b82b35bb6106c54651dc8c34fc98a64d5981bdad16ebd3e54c510ada5506f06201be0a6a6768551bb8c186212d367171df586ac17f61677ddcbb145958612002
 MISC metadata.xml 773 SHA256 7fc0d1c5f8b19e5ad28866f385039d95be8685c41d1628b7c9c450b6d5f5f4f3 SHA512 7fb6759ad0746073efcaea969e47049160ecd9fbd4c9d8f9d6c0e1d933d6335dd8d840edbe02cabec607091f725f8e0e1a7d01ec80969b43aab66282d65c8f64 WHIRLPOOL e788345f073dcbee2f43f496a5d69b6868d288473fe56f37b3f0666c94b5decef14738a8139c8a00532dc350ca974ef3c3f2c9e572e86a4674e26f82e20f3240
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMonmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88geQP/3IGgLaj3JRoB2P/s7CbiUks
-SPrmAZHef2F0ioNd295i1vL4NHBUGpAzD37S/Dw47uwt6VCjJyaXy7jqU8usSwd9
-e1NPXJKe9AxMQaM55jknYrJ97cXX7L+ix2ggrRe3JwfJgjW0lS7QGDjrS1+lbiri
-c5deb5HV2EOwViVNGKVq4h+wQOp8+7Rdzm8bCwY25Jtaweh8PJvdfQxhRGAUcHwl
-bfQwmLoUqrGNuX18uhOED+az+fBCePKvJSHzMHeiXFaO3dVWChqBbmFTp+RESxQh
-6Wem6152JopVAZx04e/2g00kkjc0Cp7+EAEIUhX3AOdKsm+Vo7fEIJait/l41T4j
-xmph9z43r9xr7eX7qYqi880VDxmBjUZ3Hnke/SrC69bYECy21m4Ql2brEwaR/asP
-vHkh4BjHouW9uobe18TWWapzKVJpVLBEeyKy0QBXUGBZzUF8mz5sSR8sEmLMJLGY
-iJ+/lx3BYijIMSOKvA74yFQQ3exmHZIreglOdh21PNbmCkIqYCadBD0aNkNhjaLl
-HcGTW0DURs9qPFFeLBLGfLhL0ucYEpJEGizJqzV6oQMw1cwLqrQkivqH3vym4B++
-ekDTVHo+vo9i9g2zptMSxGtbajayuX3BKHteZYHGTfpiypjrnw6rSyo2UXik4kPu
-7Er7vGS/7hkWwsSl3Sn+
-=elaS
+iEYEAREIAAYFAlFLKgMACgkQ1ycZbhPLE2AZyACghGVAlhQbmLKLYOAuLMpNs7g0
+RSEAoJ6WdhDIq6e9WzPmZ8qYRk0ZVBcK
+=Stlo
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/mathgl/mathgl-1.11.2.ebuild b/sci-libs/mathgl/mathgl-1.11.2.ebuild
deleted file mode 100644
index 8d96b07233ba..000000000000
--- a/sci-libs/mathgl/mathgl-1.11.2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.11.2.ebuild,v 1.5 2013/03/02 23:23:19 hwoarang Exp $
-
-EAPI=4
-
-WX_GTK_VER=2.8
-
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-* *-jython"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils eutils python toolchain-funcs versionator wxwidgets
-
-DESCRIPTION="Math Graphics Library"
-HOMEPAGE="http://mathgl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz mirror://sourceforge/${PN}/STIX_font.tgz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fltk gif glut gsl hdf5 jpeg mpi octave python qt4 wxwidgets static-libs"
-
-RDEPEND="
-	media-libs/libpng
-	sys-libs/zlib
-	virtual/opengl
-	fltk? ( x11-libs/fltk:1 )
-	gif? ( media-libs/giflib )
-	glut? ( media-libs/freeglut )
-	gsl? ( sci-libs/gsl )
-	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
-	jpeg? ( virtual/jpeg )
-	octave? ( >=sci-mathematics/octave-3.4.0 )
-	python? ( dev-python/numpy )
-	qt4? ( dev-qt/qtgui:4 )
-	wxwidgets? ( x11-libs/wxGTK:2.8 )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool:2
-	doc? ( app-text/texi2html virtual/texi2dvi )
-	octave? ( dev-lang/swig )
-	python? ( dev-lang/swig )"
-
-REQUIRED_USE="mpi? ( hdf5 ) "
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10.2-gcc43.patch
-	"${FILESDIR}"/${PN}-octave-3.4.patch
-	"${FILESDIR}"/${P}-zlib.patch
-	"${FILESDIR}"/${P}-cast.patch
-	)
-
-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 mpi; then
-		export CC=mpicc
-		export CXX=mpicxx
-	fi
-	use python && python_pkg_setup
-	use wxwidgets && wxwidgets_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	[[ -d "${S}"/fonts ]] || mkdir "${S}"/fonts
-	cd "${S}"/fonts
-	unpack STIX_font.tgz
-}
-
-src_prepare() {
-	# 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
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--docdir="${EPREFIX}/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)
-		)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	# see bug #249627
-	local JOBS
-	use doc && MAKEOPTS+=" -j1"
-
-	autotools-utils_src_compile
-
-	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() {
-	autotools-utils_src_install
-
-	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
-}
-
-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-2.1.2.ebuild b/sci-libs/mathgl/mathgl-2.1.2.ebuild
new file mode 100644
index 000000000000..4ffccd68b545
--- /dev/null
+++ b/sci-libs/mathgl/mathgl-2.1.2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-2.1.2.ebuild,v 1.1 2013/03/21 15:40:47 bicatali Exp $
+
+EAPI=5
+
+WX_GTK_VER=2.8
+
+inherit cmake-utils eutils python wxwidgets multilib flag-o-matic
+
+DESCRIPTION="Math Graphics Library"
+HOMEPAGE="http://mathgl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz mirror://sourceforge/${PN}/STIX_font.tgz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fltk gif glut gsl hdf hdf5 jpeg mpi octave opengl pdf
+	png python qt4 static-libs threads wxwidgets zlib"
+
+LANGS="ru"
+for l in ${LANGS}; do
+	IUSE+=" linguas_${l}"
+done
+
+RDEPEND="
+	!sci-visualization/udav
+	virtual/opengl
+	fltk? ( x11-libs/fltk:1 )
+	gif? ( media-libs/giflib )
+	glut? ( media-libs/freeglut )
+	gsl? ( sci-libs/gsl )
+	hdf? ( sci-libs/hdf )
+	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
+	jpeg? ( virtual/jpeg )
+	octave? ( >=sci-mathematics/octave-3.4.0 )
+	pdf? ( media-libs/libharu )
+	png? ( media-libs/libpng )
+	python? ( dev-python/numpy )
+	qt4? ( dev-qt/qtgui:4 )
+	wxwidgets? ( x11-libs/wxGTK:2.8 )
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/texi2html virtual/texi2dvi )
+	octave? ( dev-lang/swig )
+	python? ( dev-lang/swig )"
+
+REQUIRED_USE="mpi? ( hdf5 ) png? ( zlib ) pdf? ( png )"
+
+pkg_setup() {
+	use mpi && export CC=mpicc CXX=mpicxx
+	use python && python_pkg_setup
+	use wxwidgets && wxwidgets_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	[[ -d "${S}"/fonts ]] || mkdir "${S}"/fonts
+	cd "${S}"/fonts
+	unpack STIX_font.tgz
+}
+
+src_prepare() {
+	# fix for location of hdf headers
+	sed -i -e 's:hdf/::g' src/data_io.cpp || die
+	# bored of reporting bad libdir upstream
+	sed -i \
+		-e '/DESTINATION/s:lib$:lib${LIB_SUFFIX}:g' \
+		{src,widgets}/CMakeLists.txt || die
+	echo "" > lang/install.m || die
+	# fix desktop file
+	sed -i -e 's/.png//' udav/udav.desktop || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DHDF4_INCLUDE_DIR="${EPREFIX}/usr/include"
+		$(cmake-utils_use doc enable-doc)
+		$(cmake-utils_use fltk enable-fltk)
+		$(cmake-utils_use gif enable-gif)
+		$(cmake-utils_use glut enable-glut)
+		$(cmake-utils_use gsl enable-gsl)
+		$(cmake-utils_use hdf enable-hdf4)
+		$(cmake-utils_use hdf5 enable-hdf5_18)
+		$(cmake-utils_use jpeg enable-jpeg)
+		$(cmake-utils_use mpi enable-mpi)
+		$(cmake-utils_use octave enable-octave)
+		$(cmake-utils_use opengl enable-opengl)
+		$(cmake-utils_use pdf enable-pdf)
+		$(cmake-utils_use png enable-png)
+		$(cmake-utils_use qt4 enable-qt)
+		$(cmake-utils_use threads enable-pthread)
+		$(cmake-utils_use python enable-python)
+		$(cmake-utils_use wxwidgets enable-wx)
+		$(cmake-utils_use zlib enable-zlib)
+	)
+	cmake-utils_src_configure
+	# to whoever cares: TODO: do for multiple python ABI
+	if use python; then
+		sed -i \
+			-e "s:--prefix=\(.*\) :--prefix=\$ENV{DESTDIR}\1 :" \
+			"${CMAKE_BUILD_DIR}"/lang/cmake_install.cmake || die
+		# fix location of numpy
+		use python && append-cppflags \
+			-I$(echo "import numpy; print(numpy.get_include())" | "$(PYTHON)" - 2>/dev/null)
+	fi
+
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README* *.txt AUTHORS
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a
+	if use qt4 ; then
+		local lang
+		insinto /usr/share/udav
+		for lang in ${LANGS} ; do
+			use linguas_${lang} && doins udav/udav_${lang}.qm
+		done
+	fi
+	if use octave ; then
+		insinto /usr/share/${PN}/octave
+		doins "${CMAKE_BUILD_DIR}"/lang/${PN}.tar.gz
+	fi
+}
+
+pkg_postinst() {
+	if use octave; then
+		octave <<-EOF
+		pkg install ${EROOT}/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
+}