From dea730655abdb8d566319379504884bf7d1dae5d Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Wed, 30 Jun 2010 22:14:20 +0000 Subject: [PATCH] Version Bump, fixes for PYTHON multi ABI, #323605, no pointless la files, #313167 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sci-libs/mathgl/ChangeLog | 12 +- sci-libs/mathgl/Manifest | 18 ++- ...-1.10.1.ebuild => mathgl-1.10.1-r1.ebuild} | 42 +++++- ...-1.10.2.ebuild => mathgl-1.10.2-r1.ebuild} | 40 ++++- sci-libs/mathgl/mathgl-1.10.2.1-r1.ebuild | 141 ++++++++++++++++++ 5 files changed, 233 insertions(+), 20 deletions(-) rename sci-libs/mathgl/{mathgl-1.10.1.ebuild => mathgl-1.10.1-r1.ebuild} (68%) rename sci-libs/mathgl/{mathgl-1.10.2.ebuild => mathgl-1.10.2-r1.ebuild} (68%) create mode 100644 sci-libs/mathgl/mathgl-1.10.2.1-r1.ebuild diff --git a/sci-libs/mathgl/ChangeLog b/sci-libs/mathgl/ChangeLog index 0ac39c465f2e..9b7d89c11bf0 100644 --- a/sci-libs/mathgl/ChangeLog +++ b/sci-libs/mathgl/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for sci-libs/mathgl # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.14 2010/03/29 21:10:08 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.15 2010/06/30 22:14:20 jlec Exp $ + +*mathgl-1.10.2.1-r1 (30 Jun 2010) +*mathgl-1.10.2-r1 (30 Jun 2010) +*mathgl-1.10.1-r1 (30 Jun 2010) + + 30 Jun 2010; Justin Lecher -mathgl-1.10.1.ebuild, + +mathgl-1.10.1-r1.ebuild, -mathgl-1.10.2.ebuild, +mathgl-1.10.2-r1.ebuild, + +mathgl-1.10.2.1-r1.ebuild: + Version Bump, fixes for PYTHON multi ABI, #323605, no pointless la files, + #313167 *mathgl-1.10.2 (30 Mar 2010) diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest index 2278a5fb01f6..db1031d83cc0 100644 --- a/sci-libs/mathgl/Manifest +++ b/sci-libs/mathgl/Manifest @@ -1,9 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX mathgl-1.10.1-gcc43.patch 345 RMD160 81d76baed06d779853dd96ce169f5bef620629b2 SHA1 e50c8e600cb243c809d3a6648344bbe29146666d SHA256 2165125d4677b882548530dc21a0368bf7ed27cab516ee6f78604f98b3b60ac9 AUX mathgl-1.10.2-gcc43.patch 345 RMD160 81d76baed06d779853dd96ce169f5bef620629b2 SHA1 e50c8e600cb243c809d3a6648344bbe29146666d SHA256 2165125d4677b882548530dc21a0368bf7ed27cab516ee6f78604f98b3b60ac9 DIST STIX_font.tgz 2450541 RMD160 7595c2b99c5982d72b1ef551ab8f9d65237e5466 SHA1 3cbc4f5090cd37d1b35d594150357550d2639f81 SHA256 6408290fd4a5267637a88507344a8f07b908ce72f46ef93d09e068fedb67e8fe DIST mathgl-1.10.1.tgz 2037231 RMD160 ef373d2286cad705d9fc8d461d4a3e30bd4364f8 SHA1 2a016ae7abf74c2409c8888bdb0fd75d99a0586f SHA256 39fd65bfa12cbf230229f7a9b7b7712982f7ae8fa813a20300b82af8afcbe15e +DIST mathgl-1.10.2.1.tgz 2038416 RMD160 9a95b71997b156a186ec718f9e64fd2eec116903 SHA1 8b17bd167535d6e5e187d6cb8d06ef52e692afbe SHA256 21d8f37e889eca91ae252a512e551792e059e575368ace0de3836091701cba1a DIST mathgl-1.10.2.tgz 2036363 RMD160 aab89f4206cc5af529e64ae03e04ea8877cdd9e5 SHA1 8447577478d7b50a3d81b8153e22b3adcc953e13 SHA256 43dd91de2c0921a3570c1aaab4b1bf791cab1d4c3b30429a6d53e0a0a8dab393 -EBUILD mathgl-1.10.1.ebuild 2555 RMD160 6089dde3aae661dd1ef336bb1cba16764138e444 SHA1 3ecbac6c4256ea5c41e11e2d693ff95a742ceb73 SHA256 447e21d26b0a69a7119899578b768e9e020bbb5cb6702f30ec41ddfc6cb1f7e8 -EBUILD mathgl-1.10.2.ebuild 2555 RMD160 63145b0c5ba89421d132f25cdd2993848c30e686 SHA1 e0cb15fac96194828dffe6a9a5065bb18c0601cb SHA256 54858cb371695037d08cf2015befe08eeb567bf9d38a4e0eab84ae383009e43b -MISC ChangeLog 2962 RMD160 6b5b49e525b9110793458b753407f57dba560aef SHA1 b8a8977480e1a92bf51d51334d781b67e2812238 SHA256 fef927ca267b0e28e69b2cd99061a989374c3300fd553ec4607398e9c704e945 +EBUILD mathgl-1.10.1-r1.ebuild 3352 RMD160 b19e3db2358c7bbece80e1887cf2a3e6bf394c0f SHA1 a8f329caf88ba2e34f383c06124e97215b9c688c SHA256 bd131b974600e8bbe44d7a9e219ae62dd76fe3eeab8a3004201085f8d2293741 +EBUILD mathgl-1.10.2-r1.ebuild 3350 RMD160 f8464e10ed5afc35b23c8029285e2fcba5da0f61 SHA1 6ff3eedcbcade57b46e442e6b10c267b5f6f0d1c SHA256 874dd50608e944af852dc0ca2f4de143383fcb4f1784b25c61618475b2236c6a +EBUILD mathgl-1.10.2.1-r1.ebuild 3365 RMD160 f9023503880bdd3f71a2053bdd5109654c4742bd SHA1 934e1a5c1388e67aba09e4c2055587273b75aa4f SHA256 3f8cea59e8e112a01f0b0ce180bb009a17d2f2915fa395c13f89e15886ad8990 +MISC ChangeLog 3323 RMD160 34cef8cfe84ba641deee5d5a419efccc2764b186 SHA1 923ac15b8943f3c109cdca89be8828398eae4354 SHA256 ff345768e7df1adce7048169945a21ba5cf7b895336aa1c69f5c43858ef06bfa MISC metadata.xml 403 RMD160 58842b16ab72ab3b23b8d29eaf00dd2c05da11c9 SHA1 de3dde83893663018de696e3e07010a276db0fff SHA256 2e033d0243bbbafcb9397978f74e7bf0edcb03cfb6f2d2d5ff9e22cdf5e77a42 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEARECAAYFAkwrwcIACgkQgAnW8HDreRaQvwCcCd5q+1CbKkQf/Is34oVLbpVX +ImUAn2Vu8Ne39fwWMCI2/faQGtzY9CvN +=V5EG +-----END PGP SIGNATURE----- diff --git a/sci-libs/mathgl/mathgl-1.10.1.ebuild b/sci-libs/mathgl/mathgl-1.10.1-r1.ebuild similarity index 68% rename from sci-libs/mathgl/mathgl-1.10.1.ebuild rename to sci-libs/mathgl/mathgl-1.10.1-r1.ebuild index db749295ddd7..ec393c95b897 100644 --- a/sci-libs/mathgl/mathgl-1.10.1.ebuild +++ b/sci-libs/mathgl/mathgl-1.10.1-r1.ebuild @@ -1,9 +1,14 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.10.1.ebuild,v 1.1 2010/03/08 18:13:35 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.10.1-r1.ebuild,v 1.1 2010/06/30 22:14:20 jlec Exp $ + +EAPI=3 -EAPI=2 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" @@ -57,13 +62,12 @@ src_prepare() { # correct location of numpy/arrayobject.h if use python; then - local numpy_h - numpy_h=$(python_get_sitedir)/numpy/core/include/numpy/arrayobject.h - einfo "fixing numpy.i" - sed -e "s||\"${numpy_h}\"|" \ - -i lang/numpy.i \ - || die "sed failed" + sed \ + -e '/SUBDIRS/s:lang::g' \ + -i Makefile.am || die + python_src_prepare fi + echo "#!${EPREFIX}/bin/sh" > config/py-compile eautoreconf } @@ -88,10 +92,30 @@ src_compile() { 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_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" } @@ -101,6 +125,7 @@ pkg_postinst() { pkg install /usr/share/${PN}/octave/${PN}.tar.gz EOF fi + use python && python_mod_optimize ${PN}.py } pkg_prerm() { @@ -109,4 +134,5 @@ pkg_prerm() { pkg uninstall ${PN} EOF fi + use python && python_mod_cleanup ${PN}.py } diff --git a/sci-libs/mathgl/mathgl-1.10.2.ebuild b/sci-libs/mathgl/mathgl-1.10.2-r1.ebuild similarity index 68% rename from sci-libs/mathgl/mathgl-1.10.2.ebuild rename to sci-libs/mathgl/mathgl-1.10.2-r1.ebuild index 84e1931a7404..e18f21bd6bf8 100644 --- a/sci-libs/mathgl/mathgl-1.10.2.ebuild +++ b/sci-libs/mathgl/mathgl-1.10.2-r1.ebuild @@ -1,9 +1,12 @@ # Copyright 1999-2010 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.ebuild,v 1.1 2010/03/29 21:10:08 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.10.2-r1.ebuild,v 1.1 2010/06/30 22:14:20 jlec Exp $ -EAPI=2 +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" @@ -57,13 +60,12 @@ src_prepare() { # correct location of numpy/arrayobject.h if use python; then - local numpy_h - numpy_h=$(python_get_sitedir)/numpy/core/include/numpy/arrayobject.h - einfo "fixing numpy.i" - sed -e "s||\"${numpy_h}\"|" \ - -i lang/numpy.i \ - || die "sed failed" + sed \ + -e '/SUBDIRS/s:lang::g' \ + -i Makefile.am || die + python_src_prepare fi + echo "#!${EPREFIX}/bin/sh" > config/py-compile eautoreconf } @@ -88,10 +90,30 @@ src_compile() { 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_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" } @@ -101,6 +123,7 @@ pkg_postinst() { pkg install /usr/share/${PN}/octave/${PN}.tar.gz EOF fi + use python && python_mod_optimize ${PN}.py } pkg_prerm() { @@ -109,4 +132,5 @@ pkg_prerm() { pkg uninstall ${PN} EOF fi + 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.10.2.1-r1.ebuild new file mode 100644 index 000000000000..83732201b007 --- /dev/null +++ b/sci-libs/mathgl/mathgl-1.10.2.1-r1.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2010 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.1 2010/06/30 22:14:20 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/glu + python? ( dev-python/numpy ) + glut? ( virtual/glut ) + fltk? ( x11-libs/fltk:1.1 ) + gif? ( media-libs/giflib ) + jpeg? ( media-libs/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 +} + +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 + python_src_prepare + 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_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 + use python && python_mod_cleanup ${PN}.py +} -- 2.26.2