Fixing bug #249627; new USE flag octave.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.26-tuxonice i686

6 files changed, 119 insertions, 4 deletions

diff --git a/sci-libs/mathgl/ChangeLog b/sci-libs/mathgl/ChangeLog
index fe34ff2e90db..30a85dd5e1d2 100644
--- a/sci-libs/mathgl/ChangeLog
+++ b/sci-libs/mathgl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/mathgl
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.1 2008/12/02 16:23:04 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.2 2008/12/06 16:26:11 grozin Exp $
+
+*mathgl-1.8-r1 (06 Dec 2008)
+
+  06 Dec 2008; Andrey Grozin <grozin@gentoo.org>
+  +files/mathgl-1.8-fltk.patch, +files/mathgl-1.8-octave.patch,
+  metadata.xml, +mathgl-1.8-r1.ebuild:
+  Fixing bug #249627; new USE flag octave.
 
 *mathgl-1.8 (02 Dec 2008)
 
diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index 5c93d4316f8c..85341ad2b3bf 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,4 +1,7 @@
+AUX mathgl-1.8-fltk.patch 774 RMD160 1e865f3659cca8d3c70e4f2c51263d342ee027ce SHA1 966e5f691e0feae4dace3345e469eec9bc861eaf SHA256 c8e038aeeff64b08482e6d8abf5edf63a1c2b68338f00f18f483f16c85f8b280
+AUX mathgl-1.8-octave.patch 979 RMD160 ed2674304185914a99d2eee25737c127273393f8 SHA1 e4d697919e3228e8c20f46e1f973229d17307223 SHA256 a4462814e62ace1ddec8587aaa51b931c89be26e266f22dd7df29edeacf51dde
 DIST mathgl-1.8.tar.gz 4697872 RMD160 696f2e9beb56e9a5e6de48b4282af99692356dce SHA1 03f86cfec2f28349cb53b9f0ff5849465b1d32a8 SHA256 c06d695c66c4fad3e4e6aec56675efc2261173226853085422891e30be5033a8
+EBUILD mathgl-1.8-r1.ebuild 1521 RMD160 a189889e947a382de964a8a54169290ab2372043 SHA1 80d92310b9c3b191958f6d0d75f16cdd5a0958d5 SHA256 bbedb6de5f822713ff937528be464b27147e817544c7f5ca43253fda0ea56890
 EBUILD mathgl-1.8.ebuild 1361 RMD160 076c18c47dbaaa89e2d0c29841c10ba0607dd411 SHA1 fb7c6ea6743efe8dedf2e40e78522c156ac88853 SHA256 161316cd772dccf5ad17b14e725d2bd0045a9e8bdd10f027e5fe9796c754e5f1
-MISC ChangeLog 374 RMD160 26f308d49758a6f7bb78582be491e51bf3a53010 SHA1 8729e44ce261de28e2cb7e157ee0c0c95777fbf4 SHA256 5776fe8c47b6f9e315658f350ac7795e19dbe190820679d14fe9f306e620c732
-MISC metadata.xml 308 RMD160 7e52afebc99b40a4ed056002307eccfc243c8e33 SHA1 d75607661597f90d142073e16cc715b94b63e123 SHA256 0fdf6bfe52b4d44ece7bbc62097f2e671f7ebb35ad52785140e21ab958e379b5
+MISC ChangeLog 600 RMD160 b948e2b7294256726b4eeca495f8469044c12342 SHA1 54e0f80a6a72981df42cb61fe7e80ef9c76e0ed6 SHA256 2097cf3de051e91286942a061ebc802b4db4330d7fda4822b8fc59a4d26f149f
+MISC metadata.xml 407 RMD160 1eb68494bbd3286099a8de2415899c9ed624d8d2 SHA1 9fc068a7a7560578471edfa85aa8c7dc54aba624 SHA256 d9bf76394d79267818a3024ed86f50fbbb1bc14f65171070718d71e766f129f6
diff --git a/sci-libs/mathgl/files/mathgl-1.8-fltk.patch b/sci-libs/mathgl/files/mathgl-1.8-fltk.patch
new file mode 100644
index 000000000000..102e13583136
--- /dev/null
+++ b/sci-libs/mathgl/files/mathgl-1.8-fltk.patch
@@ -0,0 +1,20 @@
+Index: mathgl-1.8/examples/Makefile.am
+===================================================================
+--- mathgl-1.8.orig/examples/Makefile.am
++++ mathgl-1.8/examples/Makefile.am
+@@ -9,11 +9,13 @@ mgl_example_LDADD = $(top_builddir)/mgl/
+ if USE_FLTK
+ bin_PROGRAMS += mgl_fltk_example
+ mgl_fltk_example_SOURCES = fltk_example.cpp
+-mgl_fltk_example_LDADD = $(top_builddir)/widgets/libmgl-fltk.la
++mgl_fltk_example_LDADD = $(FLTK_LIBS) $(top_builddir)/widgets/libmgl-fltk.la
++mgl_fltk_example_CXXFLAGS = $(FLTK_FLAGS) $(AM_CXXFLAGS)
+ 
+ check_PROGRAMS += test
+ test_SOURCES = main.cpp
+-test_LDADD = $(top_builddir)/widgets/libmgl-fltk.la
++test_LDADD = $(FLTK_LIBS) $(top_builddir)/widgets/libmgl-fltk.la
++test_CXXFLAGS = $(FLTK_FLAGS) $(AM_CXXFLAGS)
+ endif
+ 
+ if USE_GLUT
diff --git a/sci-libs/mathgl/files/mathgl-1.8-octave.patch b/sci-libs/mathgl/files/mathgl-1.8-octave.patch
new file mode 100644
index 000000000000..0ee821b99682
--- /dev/null
+++ b/sci-libs/mathgl/files/mathgl-1.8-octave.patch
@@ -0,0 +1,21 @@
+Index: mathgl-1.8/configure.ac
+===================================================================
+--- mathgl-1.8.orig/configure.ac
++++ mathgl-1.8/configure.ac
+@@ -231,12 +231,14 @@ AC_ARG_ENABLE(octave,
+   *) AC_MSG_ERROR(bad value ${enableval} for --enable-octave) ;;
+ esac],[octave=false])
+ if (test x$langall = xtrue || test x$octave = xtrue) ;then
++    AC_CHECK_PROG([OCTAVE],[octave-config],[octave-config])
+ # find Octave arch
+-    OCTAVE=octave
+     AC_MSG_CHECKING([for Octave arch])
+-    OCTAVE_ARCH=`$OCTAVE -q --eval 'strcat(octave_config_info("canonical_host_type"), "-", octave_config_info("api_version"))'|sed -e 's/ans = //'`
++    OCTAVE_ARCH=`$OCTAVE -p CANONICAL_HOST_TYPE`-`$OCTAVE -p API_VERSION`
++    OCTAVE_INCFLAGS="-I`$OCTAVE -p OCTINCLUDEDIR`"
+     AC_MSG_RESULT([$OCTAVE_ARCH])
+     AC_SUBST(OCTAVE_ARCH,[$OCTAVE_ARCH])
++    AC_SUBST(OCTAVE_INCFLAGS,[$OCTAVE_INCFLAGS])
+     test_octave=true
+ fi
+ AM_CONDITIONAL(USE_OCTAVE, test x$test_octave = xtrue )
diff --git a/sci-libs/mathgl/mathgl-1.8-r1.ebuild b/sci-libs/mathgl/mathgl-1.8-r1.ebuild
new file mode 100644
index 000000000000..ee579e799a34
--- /dev/null
+++ b/sci-libs/mathgl/mathgl-1.8-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.8-r1.ebuild,v 1.1 2008/12/06 16:26:11 grozin Exp $
+EAPI=2
+WX_GTK_VER=2.8
+inherit autotools wxwidgets
+DESCRIPTION="Math Graphics Library"
+IUSE="doc fltk glut hdf5 jpeg octave python qt4 wxwindows"
+HOMEPAGE="http://mathgl.sourceforge.net/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+RDEPEND="sci-libs/gsl
+	media-libs/libpng
+	virtual/glu
+	glut? ( virtual/glut )
+	fltk? ( x11-libs/fltk )
+	jpeg? ( media-libs/jpeg )
+	hdf5? ( sci-libs/hdf5 )
+	octave? ( sci-mathematics/octave )
+	qt4? ( x11-libs/qt-gui:4 )
+	wxwindows? ( x11-libs/wxGTK:2.8 )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/texi2html virtual/texi2dvi )
+	python? ( dev-lang/swig[python] )
+	octave? ( dev-lang/swig[octave] )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-octave.patch
+	epatch "${FILESDIR}"/${P}-fltk.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf --docdir="${ROOT}"usr/share/doc/${PF} \
+		$(use_enable glut) \
+		$(use_enable qt4 qt) \
+		$(use_enable wxwindows wx) \
+		$(use_enable fltk) \
+		$(use_enable jpeg) \
+		$(use_enable hdf5) \
+		$(use_enable python) \
+		$(use_enable octave) \
+		$(use_enable doc docs)
+}
+
+src_compile() {
+	# see bug #249627
+	local JOBS
+	use doc && JOBS=-j1
+	emake ${JOBS} || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README AUTHORS || die "dodoc failed"
+}
diff --git a/sci-libs/mathgl/metadata.xml b/sci-libs/mathgl/metadata.xml
index 858ebd719418..cd4c771e73ac 100644
--- a/sci-libs/mathgl/metadata.xml
+++ b/sci-libs/mathgl/metadata.xml
@@ -3,8 +3,11 @@
 <pkgmetadata>
 	<herd>sci</herd>
 	<maintainer>
-		<email>grozin@gentoo.org</email>
+		<email>A.G.Grozin@inp.nsk.su</email>
 		<name>Andrey Grozin</name>
 	</maintainer>
 	<longdescription>Math Graphics Library</longdescription>
+	<use>
+		<flag name='octave'>Add bindings for <pkg>sci-mathematics/octave</pkg></flag>
+	</use>
 </pkgmetadata>