From: Justin Lecher Date: Mon, 19 Sep 2011 15:39:11 +0000 (+0000) Subject: Corrected missing revbump, as noticed by darkside X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=bc7f5d232aad6a3a19fd1d4b6d05cf81075b1ca0;p=gentoo.git Corrected missing revbump, as noticed by darkside Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64 --- diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog index 1b0bc8eabe2b..9581da0e2c5e 100644 --- a/sci-mathematics/scilab/ChangeLog +++ b/sci-mathematics/scilab/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-mathematics/scilab # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.60 2011/09/19 15:30:17 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.61 2011/09/19 15:39:11 jlec Exp $ + +*scilab-4.1.2-r3 (19 Sep 2011) + + 19 Sep 2011; Justin Lecher scilab-4.1.2-r2.ebuild, + +scilab-4.1.2-r3.ebuild: + Corrected missing revbump, as noticed by darkside 19 Sep 2011; Justin Lecher scilab-4.1.2-r2.ebuild, +files/scilab-4.1.2-gcc45-2.patch: diff --git a/sci-mathematics/scilab/Manifest b/sci-mathematics/scilab/Manifest index 0f31d773ff7e..f00904049b0c 100644 --- a/sci-mathematics/scilab/Manifest +++ b/sci-mathematics/scilab/Manifest @@ -16,13 +16,14 @@ AUX scilab-4.1.2-tmp-fix.patch 6067 RMD160 63f217f41edb721d1717724931410c228ad92 AUX scilab-ppc-gcc4.patch 1045 RMD160 db4219fc04b5555e702d823425735125f3000c00 SHA1 ba001966a62202f66188ba4be1abe483f56f8fbe SHA256 0844c4edad45ba23219b8d3405104a8bbb2b45e2b7b742f7aaeb10ce5e92388a DIST scilab-4.1.2-src.tar.gz 15892277 RMD160 f708b966143ccbf989f7a0dbed95e4dab324e66f SHA1 d3f3190bd11fe23eebec03fe9feaced0406ddfe3 SHA256 4c0318a316c62a1206e53b936bbb1262d940e390c1d14da77c231e49b134b3a9 EBUILD scilab-4.1.2-r1.ebuild 4334 RMD160 6b12bcbe55b076ffcfd4442c84cb4906cd6338ec SHA1 814e06e38e3451beb5567b8aea192b0c8adeb26b SHA256 35e7d3edbe51dfa1fb30797004b1aaec9153b0acd4973d1b81b5150a9e17cbdd -EBUILD scilab-4.1.2-r2.ebuild 4281 RMD160 1052c47c3c2d1612643af7b64bfa6d509e1b806e SHA1 897a2e46a3386354dfaebdf3b92ac15fe70e6bb1 SHA256 ff2ff90b952697640bfa17070a52e696f1b96a32076d1fe61e3f7a50a420869e -MISC ChangeLog 13269 RMD160 bb80eb8b9f87f4862e1d0dc813f367ab8ab6a592 SHA1 0d92271ddd0055cdc9985369cb10804773e60f19 SHA256 0cd1bb83bd6443071fc450e372d1387669180542f97cca47600dc7a0b20c89fa +EBUILD scilab-4.1.2-r2.ebuild 4244 RMD160 849c634f28fba7dc13cf4289d72270ea6750dac3 SHA1 fcb28791bcfc25a87c9a5e9d6387659641f401fa SHA256 3ca55d6b260c62fef9cea25062c04bb52f51301caa003067c8d4eac4fe25b84f +EBUILD scilab-4.1.2-r3.ebuild 4280 RMD160 16cfceaef391fc66369a7c50b7bf6f6df8adac8d SHA1 48527988c5041653dbee3aee7878e406ebcea509 SHA256 a7950b7fc5ba3280b598ad178022a0e91c609bf5dede788c2a97b8cb9b23b11d +MISC ChangeLog 13452 RMD160 01f3d5dcde13f93ab1dc6b8277dcb47a41e021f1 SHA1 a65c67b9483a15e6d22efbcbd389a9231ed23847 SHA256 3d535b06a9eb01f3e75adb8c083aa64b0667f31c494f8f1017c218f7439cf079 MISC metadata.xml 169 RMD160 a8b2671842bbec7d36e587fbf53c4eb111498347 SHA1 604114857745acb6253b121cda619e3c35771cc7 SHA256 7a9f25879c1299572cfaf2a3efb47313412564a1ef12c828224194f4e96edcd0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEAREKAAYFAk53YA8ACgkQgAnW8HDreRbgTwCgqfexOvLc4BU83NGjLLckvvrX -KMkAoMgixJjPbat9dlqWZ/v8q1He0XEy -=LvlL +iEYEAREKAAYFAk53YiQACgkQgAnW8HDreRbrOgCeImIxNvsR0q3/guiaTQWSVgnb ++KkAoJlC0wJXg8ToQp2AnEWSiLLAWAIO +=9wnl -----END PGP SIGNATURE----- diff --git a/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild b/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild index 17117670e37b..0db3037d2d99 100644 --- a/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild +++ b/sci-mathematics/scilab/scilab-4.1.2-r2.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-mathematics/scilab/scilab-4.1.2-r2.ebuild,v 1.13 2011/09/19 15:30:17 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild,v 1.14 2011/09/19 15:39:11 jlec Exp $ EAPI=4 @@ -51,8 +51,7 @@ src_prepare() { "${FILESDIR}"/${PN}-4.1-examples.patch \ "${FILESDIR}"/${P}-java-config.patch \ "${FILESDIR}"/${P}-tmp-fix.patch \ - "${FILESDIR}"/${P}-gcc45.patch \ - "${FILESDIR}"/${P}-gcc45-2.patch + "${FILESDIR}"/${P}-gcc45.patch eautoconf sed \ diff --git a/sci-mathematics/scilab/scilab-4.1.2-r3.ebuild b/sci-mathematics/scilab/scilab-4.1.2-r3.ebuild new file mode 100644 index 000000000000..1a067cc3f7a4 --- /dev/null +++ b/sci-mathematics/scilab/scilab-4.1.2-r3.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.1.2-r3.ebuild,v 1.1 2011/09/19 15:39:11 jlec Exp $ + +EAPI=4 + +inherit autotools eutils fortran-2 java-pkg-opt-2 multilib toolchain-funcs + +DESCRIPTION="Scientific software package for numerical computations (Matlab lookalike)" +LICENSE="scilab" +SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz" +HOMEPAGE="http://www.scilab.org/" + +SLOT="0" +IUSE="examples gtk java ocaml Xaw3d" +KEYWORDS="~amd64 ~ppc ~x86" + +RDEPEND=" + virtual/fortran + virtual/blas + virtual/lapack + virtual/cblas + sys-libs/ncurses + gtk? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + x11-libs/gtk+:2 + x11-libs/vte:0 + gnome-extra/gtkhtml:2 + ) + >=dev-lang/tk-8.4 + >=dev-lang/tcl-8.4 + Xaw3d? ( x11-libs/libXaw3d ) + ocaml? ( dev-lang/ocaml ) + java? ( >=virtual/jdk-1.4 )" + +DEPEND="${RDEPEND} + app-text/sablotron" + +pkg_setup() { + fortran-2_pkg_setup + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-4.0-makefile.patch \ + "${FILESDIR}"/${PN}-4.1-java-pic.patch \ + "${FILESDIR}"/${P}-header-fix.patch \ + "${FILESDIR}"/${PN}-4.1-examples.patch \ + "${FILESDIR}"/${P}-java-config.patch \ + "${FILESDIR}"/${P}-tmp-fix.patch \ + "${FILESDIR}"/${P}-gcc45.patch \ + "${FILESDIR}"/${P}-gcc45-2.patch + eautoconf + + sed \ + -e "/^ATLAS_LAPACKBLAS\>/s,=.*,= $(pkg-config --libs blas cblas lapack)," \ + -e 's,$(SCIDIR)/libs/lapack.a,,' \ + -i Makefile.OBJ.in || die "Failed to fix Makefile.OBJ.in" + + sed \ + -e "s:\$(PREFIX):\${D}\$(PREFIX):g" \ + -e "s:\$(PREFIX)/lib:\$(PREFIX)/$(get_libdir):g" \ + -i Makefile.in || die "Failed to fix Makefile.in" + + sed \ + -e "s|@CC_OPTIONS@|${CFLAGS}|" \ + -e "s|@FC_OPTIONS@|${FFLAGS}|" \ + -e "s|@LD_LDFLAGS@|${LDFLAGS} -lpthread|" \ + -i Makefile.incl.in || die "Failed to fix Makefile.incl.in" + + # fix bad C practices by failure of scilab build system to + # include proper headers + sed -e "s:-DNOTMPNAM:-DNOTMPNAM -DSYSVSTR -DHASSTDLIB:" \ + -i pvm3/conf/LINUX.def -i pvm3/conf/LINUX64.def || \ + die "Failed to fix pvm3 conf scripts." + + # fix examples + local MAKE_TO_FIX="callsci inter* link* m* interface-multi-so/lib interface-general/lib" + cd examples/ + for name in ${MAKE_TO_FIX}; do + sed -e "s:gentoo-scidir:/usr/$(get_libdir)/${P}:" \ + -i ${name}/Makefile || die "Failed to fix examples" + done +} + +src_configure() { + local myopts + myopts="${myopts} --with-atlas-library=/usr/$(get_libdir)" + + # the tk interface is the default + myopts="${myopts} --with-tk" + + if [[ $(tc-getFC) =~ gfortran ]]; then + myopts="${myopts} --with-gfortran" + fi + + econf \ + $(use_with Xaw3d xaw3d) \ + $(use_with gtk gtk2 ) \ + $(use_with ocaml) \ + $(use_with java ) \ + ${myopts} +} + +src_compile() { + env HOME="${S}" emake -j1 all +} + +src_install() { + default + + # some postinstall fixes + echo "SCIDIR=/usr/$(get_libdir)/${P}" > \ + "${D}/usr/$(get_libdir)/${P}/Path.incl" + + # install docs + dodoc ACKNOWLEDGEMENTS Readme_Visual.txt + + # install examples + if use examples; then + insinto /usr/share/${PN}/ + doins -r examples/ + fi + + # install static libs since they are needed to link some third + # party apps (see bug #257252) + insinto /usr/$(get_libdir)/${P}/libs + doins libs/*.a + + insinto /usr/$(get_libdir)/${P} + doins Makefile.incl + + exeinto /usr/$(get_libdir)/${P} + doexe libtool + + insinto /usr/$(get_libdir)/${P}/config + doins config/Makeso.incl + + # The compile and install process causes the work folder + # to be registered as the runtime folder in many files. + # This is corrected here. + BAD_REF="${WORKDIR}/${P}" + FIXED_REF="/usr/$(get_libdir)/${P}" + local BIN_TO_FIX="Blpr BEpsf Blatexpr2 Blatexprs Blatexpr scilab" + for i in ${BIN_TO_FIX}; do + sed -e "s%${BAD_REF}%${FIXED_REF}%" -i \ + "${D}"/usr/$(get_libdir)/${P}/bin/${i} || \ + die "Failed to fix wrapper scripts" + done + local MISC_TO_FIX="util/Blatdoc util/Blatdocs" + for i in ${MISC_TO_FIX}; do + sed -e "s%${BAD_REF}%${FIXED_REF}%" -i \ + "${D}"/usr/$(get_libdir)/${P}/${i} || \ + die "Failed to fix Blatdocs" + done +} + +pkg_postinst() { + einfo "To tell Scilab about your printers, set the environment" + einfo "variable PRINTERS in the form:" + einfo + einfo "PRINTERS=\"firstPrinter:secondPrinter:anotherPrinter\"" +}