Added example useflag and install static libs (#257252).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 169 insertions, 6 deletions

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 7293a531ebc2..0cf1fc4a652a 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/scilab
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.46 2008/11/15 18:41:11 dertobi123 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.47 2009/08/10 13:41:15 markusle Exp $
+
+*scilab-4.1.2-r2 (10 Aug 2009)
+
+  10 Aug 2009; Markus Dittrich <markusle@gentoo.org>
+  +scilab-4.1.2-r2.ebuild:
+  Added example useflag and install static libs (#257252).
 
   15 Nov 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   scilab-4.1.2-r1.ebuild:
diff --git a/sci-mathematics/scilab/Manifest b/sci-mathematics/scilab/Manifest
index bae12b2da6c5..9941f73da331 100644
--- a/sci-mathematics/scilab/Manifest
+++ b/sci-mathematics/scilab/Manifest
@@ -12,6 +12,7 @@ AUX scilab-ppc-gcc4.patch 1045 RMD160 db4219fc04b5555e702d823425735125f3000c00 S
 DIST scilab-4.0-src.tar.gz 12523941 RMD160 13e8637b0793650b0dd2ae07ccaa6bbbff62375c SHA1 841dfe0837cd44a0608e70fe2c49023312481fd0 SHA256 e0f0e784909020c34c4512cf34f946373950cb5f8ee5499a16af73880189d41d
 DIST scilab-4.1.2-src.tar.gz 15892277 RMD160 f708b966143ccbf989f7a0dbed95e4dab324e66f SHA1 d3f3190bd11fe23eebec03fe9feaced0406ddfe3 SHA256 4c0318a316c62a1206e53b936bbb1262d940e390c1d14da77c231e49b134b3a9
 EBUILD scilab-4.0.ebuild 3941 RMD160 9f705662d5d3bf92e2447a94cffb906030312653 SHA1 0f9f7d8ecb51cce7013645746c7600da72cd31a6 SHA256 2074dd1e6259a4a0d1b3f8e232cd43ae6dd5d03b8284a3ec3098ed82d51c8005
-EBUILD scilab-4.1.2-r1.ebuild 4351 RMD160 128eb74b31385ba4dbbefacee16b452bc39b6658 SHA1 e72dc9d3af8a17edddc83b7c3351a236c3f988ac SHA256 7bc0afc8dc9039143de29db0fde19280546ec3316aa1eeba3ac74a03094e39b5
-MISC ChangeLog 11238 RMD160 496db8ddf6e0da902583a4013742a7887133458d SHA1 836c7e01830eec0331c7bf6dbcdd9e713deb57a0 SHA256 eb8777070a87b9489774a0118d678d88871ac9e4b1d68845f2cfa2e2514fcba2
+EBUILD scilab-4.1.2-r1.ebuild 4349 RMD160 079ab5e749528dd1dee8b90be89d8a3c6bbaf9f3 SHA1 7247024c59212174adba9ad843a4ef8945a03cc2 SHA256 00016e4e4937ca216a118dae53445a22cc47dd138840b06c24f92d6b6dfedc39
+EBUILD scilab-4.1.2-r2.ebuild 4580 RMD160 7a2530edb494c4ede31243b02940ef774e5cf0e4 SHA1 84afda9eeba75f63b731266e0d89de97b9a809e5 SHA256 b34455a7b3ba9a66750f9c7bdfb4e72a496d71119831a22bf2ef7abf82d5e367
+MISC ChangeLog 11408 RMD160 d4692bc9b54fd4799fa95ce881349607703b4dba SHA1 166a4cf66b92eba6b9252e847df4a9e6e20b4f68 SHA256 3dc86ca521ac21044e69cb41f02460163950ac5638193ff7d230920079f2308c
 MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
diff --git a/sci-mathematics/scilab/scilab-4.1.2-r1.ebuild b/sci-mathematics/scilab/scilab-4.1.2-r1.ebuild
index a2621a6a0f78..82c0a87d0535 100644
--- a/sci-mathematics/scilab/scilab-4.1.2-r1.ebuild
+++ b/sci-mathematics/scilab/scilab-4.1.2-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/scilab/scilab-4.1.2-r1.ebuild,v 1.3 2008/11/15 18:41:11 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.1.2-r1.ebuild,v 1.4 2009/08/10 13:41:15 markusle Exp $
 
 inherit eutils fortran toolchain-funcs multilib autotools java-pkg-opt-2
 
diff --git a/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild b/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild
new file mode 100644
index 000000000000..1ea6f2019656
--- /dev/null
+++ b/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2009 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.1 2009/08/10 13:41:15 markusle Exp $
+
+inherit eutils fortran toolchain-funcs multilib autotools java-pkg-opt-2
+
+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="ocaml gtk Xaw3d java examples"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="virtual/blas
+	virtual/lapack
+	virtual/cblas
+	sys-libs/ncurses
+	gtk? (
+		media-libs/jpeg
+		media-libs/libpng
+		sys-libs/zlib
+		>=x11-libs/gtk+-2
+		x11-libs/vte
+		=gnome-extra/gtkhtml-2*
+	)
+	>=dev-lang/tk-8.4
+	>=dev-lang/tcl-8.4
+	Xaw3d? ( x11-libs/Xaw3d )
+	ocaml? ( dev-lang/ocaml )
+	java? ( >=virtual/jdk-1.4 )"
+
+DEPEND="${RDEPEND}
+	app-text/sablotron"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	need_fortran gfortran g77
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-4.0-makefile.patch
+	epatch "${FILESDIR}"/${PN}-4.1-java-pic.patch
+	epatch "${FILESDIR}"/${P}-header-fix.patch
+	epatch "${FILESDIR}"/${PN}-4.1-examples.patch
+	epatch "${FILESDIR}"/${P}-java-config.patch
+	epatch "${FILESDIR}"/${P}-tmp-fix.patch
+	eautoconf
+
+	sed -e '/^ATLAS_LAPACKBLAS\>/s,=.*,= $(ATLASDIR)/liblapack.so $(ATLASDIR)/libblas.so $(ATLASDIR)/libcblas.so,' \
+		-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_compile() {
+	local myopts
+	myopts="${myopts} --with-atlas-library=/usr/$(get_libdir)"
+
+	# the tk interface is the default
+	myopts="${myopts} --with-tk"
+
+	if [[ ${FORTRANC} == gfortran ]]; then
+		myopts="${myopts} --with-gfortran"
+	fi
+
+	econf $(use_with Xaw3d xaw3d) \
+		$(use_with gtk gtk2 ) \
+		$(use_with ocaml) \
+		$(use_with java ) \
+		${myopts} || die "econf failed"
+	env HOME="${S}" emake -j1 all || die "emake failed"
+}
+
+src_install() {
+	DESTDIR="${D}" make install || die "installation failed"
+
+	# some postinstall fixes
+	echo "SCIDIR=/usr/$(get_libdir)/${P}" > \
+		"${D}/usr/$(get_libdir)/${P}/Path.incl"
+
+	# install docs
+	dodoc ACKNOWLEDGEMENTS CHANGES README_Unix RELEASE_NOTES \
+		Readme_Visual.txt || die "failed to install docs"
+
+	# install examples
+	if use examples; then
+		insinto /usr/share/${PN}/
+		doins -r examples/ || die "failed to install 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 || die "failed to install static libs"
+
+	insinto /usr/$(get_libdir)/${P}
+	doins Makefile.incl || die "failed to install Makefile.incl"
+
+	exeinto /usr/$(get_libdir)/${P}
+	doexe libtool || die "failed to install libtool"
+
+	insinto /usr/$(get_libdir)/${P}/config
+	doins config/Makeso.incl || die "failed to install 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\""
+}