Backported ffmpeg fixup and use flag cleanup (see bug #250850).

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27.7 x86_64

4 files changed, 74 insertions, 73 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index aceffae9e190..abefcbd44ffd 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.65 2008/11/08 22:19:39 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.66 2008/12/19 05:57:29 nerdboy Exp $
+
+  19 Dec 2008; Steve Arnold <nerdboy@gentoo.org>
+  +files/grass-6.2.1-gcc43.patch, grass-6.2.1.ebuild:
+  Backported ffmpeg fixup and use flag cleanup (see bug #250850).  Also 
+  added ggc 4.3 include patch.  Still need postgres 8.3 pushed to stable
+  before Grass 6.3 can go stable.
 
   08 Nov 2008; Steve Arnold <nerdboy@gentoo.org> metadata.xml,
   grass-6.3.0.ebuild:
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index ac76540bf08e..6d27375d2add 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -2,6 +2,7 @@ AUX 99grass-6 100 RMD160 e62ea08a12a22039fbe8fb396e011fd9b769ff2f SHA1 8ef4acdbb
 AUX 99grass-6.2 68 RMD160 08c932be282925ca1316664ba7ef9654a0543488 SHA1 ba73dcd993687fc0bfa95d97ff1ce30fb05bfa45 SHA256 bf7b1df4b9d9f71ffdd36cf924cb374032fd49ba0277a5cc7a4f77658cdc76e4
 AUX grass-6.2.0-html-nonviz.patch 1721 RMD160 ad57109c03792e8376ccbe2ed8ff459b850cdf20 SHA1 20122b510bc7e52dfbaac04fd8587281d99a08e6 SHA256 492475975bb08f5b24f6c043a8bdfce32a1b22b5432127223dfe36e1ba66057c
 AUX grass-6.2.1-ffmpeg-fix.patch 816 RMD160 eaefa978b965e1b66d0efec6d3ba8a07d4515307 SHA1 322b5ed2089f5b94f74ba38924cde7fe2611918c SHA256 2cbdfe11078783cf5bc95a5f4baaa05769c0921025737d8afdcf638321b4b501
+AUX grass-6.2.1-gcc43.patch 488 RMD160 23dfe1e408063330281258ae04dee5b07427b5f9 SHA1 c09e881eb3dde567ed1414075f1cbb33426928b4 SHA256 59346dd5aa8d4411622843db8256f20f7cddd1cc506757dd0b7820fa8f7349a4
 AUX grass-6.2.1-html-nonviz.patch 1742 RMD160 39103490f48abcc53f1fb8f3d9df48910866fab6 SHA1 a98486fb4b21f5ef42084d37ec0e6addc655fdc2 SHA256 73b7661832230f5ea1dadf983d6ce723b2f87bd3bafc4e939f36f7620d764270
 AUX grass-6.2.1-html-nviz-fix.patch 592 RMD160 7935449babc7dd6a07cffad66513c404a266848f SHA1 653a049d80fba93968620f7dc4e0ec2bbfb8edba SHA256 df2bfefc4aa6ddb030eb4a809a3cc885ade69e526a0ec99cd31fe1b751e05c41
 AUX grass-6.3.0-html-nonviz.patch 763 RMD160 054b336fcc47d64e56a40d2dda955732047ceb08 SHA1 e8f10078f8cccc5a47d2f2c8bed1d9ace7ed2598 SHA256 e870d724170a9d629a5d0bb8897a2e2f5d1b25eed204a7450061f26d48192981
@@ -12,7 +13,7 @@ DIST grass-6.2.1.tar.gz 12599109 RMD160 ff885023b926ece6545591666fdaa1189facc8bc
 DIST grass-6.3.0.tar.gz 17688547 RMD160 66db4223fc0d5172371903f71d68f1dd024ad2d2 SHA1 c4b0b1407655f8ed1e16e911df191323fe00eb9e SHA256 a84658a7065a3ece09d3d18a3b601515484d1e5dbb3a92b8fbac3c37e368acf4
 EBUILD grass-5.4.0.ebuild 3097 RMD160 885b7eabdad5fa912b7120b8a571d5b59c9f3971 SHA1 72b35ffc88f218afb14055e94eb8573713d67bb9 SHA256 d93cbad8dea7f99c74979abfc5a86292dffa76e8e3477c5cbc8a7cdf7cf33d21
 EBUILD grass-6.0.1.ebuild 3185 RMD160 9861427db9a4a846941eacd6d8f35cb057460d1b SHA1 79ef31f94dcb9bf8d7a3a89563867b291509173b SHA256 8ce6c6abd8359c2d736d491998d2d93720c89834a7e5f935c954b26af31781be
-EBUILD grass-6.2.1.ebuild 6507 RMD160 4f383e98f43b50e6cc3ca594e33c1b80cafcfaed SHA1 fc78c4076f8d15f53ff568e5f031ac565f7705b4 SHA256 cbf66c333e16f85979aaaba47614fe8798aa6f30948083968ef30b83bd1a231a
+EBUILD grass-6.2.1.ebuild 5898 RMD160 55aa97b65c844a9e436f403ea2f8e49aa16620c7 SHA1 57a97027573fb96ebafca2d820b8693b56aedc62 SHA256 fb54121425315410f9cc174b67819ba3d7eb84cc3e9d68ee1d52a2b703879ca1
 EBUILD grass-6.3.0.ebuild 8234 RMD160 90bc30c53da6906a69b80c09065b6a75fae8bdfd SHA1 4eb2a2324bd39cb9015f25a8edd590813285b583 SHA256 28a8b8cd1a7a1947615a8f52d3462da429e96ab2e0267043573e2fe92680467a
-MISC ChangeLog 13513 RMD160 9b6196352c92a34a579e4e08cee76c6466aba400 SHA1 dff3f01f14939d4ff4036404499fc352c52f3ffa SHA256 6d0fce9775da95ff63563f105629dac353c7dc064bc643c441aa4d99ce9e03fb
+MISC ChangeLog 13797 RMD160 4496b4eab418e15b7be01eb30ef47dd5da46a592 SHA1 6ff503f4cdef9b108412f1bb603c41e4e4ab2834 SHA256 cf9d70426ee9aff8d33cc3020d20c7c2a7694f06c7afb2b332083079cbbebd96
 MISC metadata.xml 874 RMD160 d131172bff1e4b072dce2b0015df6afb31a51d2b SHA1 5c59aeba3ea221ab9c195d36cb8ce6dad3cb5bd1 SHA256 a036bd075d95c2326841a62e3146c7fe9f38654d611585962aa904bed0907aaa
diff --git a/sci-geosciences/grass/files/grass-6.2.1-gcc43.patch b/sci-geosciences/grass/files/grass-6.2.1-gcc43.patch
new file mode 100644
index 000000000000..556ac73168fe
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.2.1-gcc43.patch
@@ -0,0 +1,11 @@
+diff -aur grass-6.2.3.orig/raster/r.terraflow/IOStream/include/ami_stream.h grass-6.2.3/raster/r.terraflow/IOStream/include/ami_stream.h
+--- grass-6.2.3.orig/raster/r.terraflow/IOStream/include/ami_stream.h	2004-11-09 14:29:58.000000000 +0100
++++ grass-6.2.3/raster/r.terraflow/IOStream/include/ami_stream.h	2008-03-21 01:03:36.000000000 +0100
+@@ -51,6 +51,7 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <unistd.h>
++#include <cstring>
+ 
+ #include <iostream>
+ using namespace std;
diff --git a/sci-geosciences/grass/grass-6.2.1.ebuild b/sci-geosciences/grass/grass-6.2.1.ebuild
index 34901720b987..0099085239f5 100644
--- a/sci-geosciences/grass/grass-6.2.1.ebuild
+++ b/sci-geosciences/grass/grass-6.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.1.ebuild,v 1.14 2008/08/14 07:07:57 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.1.ebuild,v 1.15 2008/12/19 05:57:29 nerdboy Exp $
 
 inherit eutils libtool
 
@@ -13,8 +13,8 @@ SLOT="6"
 KEYWORDS="amd64 ppc sparc x86"
 # To-do: get ppc64 gdal deps fixed up
 
-IUSE="ffmpeg fftw glw gmath jpeg largefile motif mysql nls odbc opengl png
-postgres python readline sqlite tcl tk tiff truetype X"
+IUSE="ffmpeg fftw gmath jpeg largefile motif mysql nls odbc opengl png \
+postgres python readline sqlite tiff truetype X"
 
 RESTRICT="strip"
 
@@ -26,9 +26,7 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	    sys-apps/man-db )
 	sci-libs/gdal
 	>=sci-libs/proj-4.4.7
-	ffmpeg? ( <media-video/ffmpeg-0.4.9_p20070616-r20
-		!=media-video/ffmpeg-0.4.9_p20070616-r1
-		!=media-video/ffmpeg-0.4.9_p20070616-r2	)
+	ffmpeg? ( media-video/ffmpeg )
 	fftw? ( sci-libs/fftw )
 	gmath? ( virtual/blas
 	    virtual/lapack )
@@ -36,15 +34,12 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	motif? ( x11-libs/openmotif )
 	mysql? ( dev-db/mysql )
 	odbc? ( >=dev-db/unixODBC-2.0.6 )
-	opengl? ( ( virtual/opengl )
-	    glw? ( media-libs/mesa ) )
+	opengl? ( virtual/opengl )
 	png? ( >=media-libs/libpng-1.2.2 )
-	postgres? ( >=virtual/postgresql-server-7.3 )
+	postgres? ( >=virtual/postgresql-base-7.3 )
 	python? ( dev-lang/python )
 	readline? ( sys-libs/readline )
 	sqlite? ( dev-db/sqlite )
-	tcl? ( >=dev-lang/tcl-8.4 )
-	tk? ( >=dev-lang/tk-8.4 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
 	truetype? ( >=media-libs/freetype-2.0 )
 	X? (
@@ -57,19 +52,19 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 		x11-libs/libICE
 		x11-libs/libXpm
 		x11-libs/libXaw
+		>=dev-lang/tcl-8.4
+		>=dev-lang/tk-8.4
 	)"
 
 DEPEND="${RDEPEND}
-	>=sys-devel/make-3.80
 	>=sys-devel/flex-2.5.4a
 	>=sys-devel/bison-1.35
-	>=sys-devel/gcc-3.2.2
 	X? (
 		x11-proto/xproto
 		x11-proto/xextproto
 	)"
 
-src_unpack() {
+pkg_setup() {
 	local myblas
 	if use gmath; then
 		for d in $(eselect lapack show); do myblas=${d}; done
@@ -88,61 +83,45 @@ src_unpack() {
 		fi
 	fi
 
-	if use glw && ! use opengl; then
-		ewarn "You set USE='glw -opengl'. GLw support needs OpenGL."
-		ewarn "OpenGL support also requires Tcl and Tk support."
-		die "Set opengl, tcl, and tk useflags."
-	fi
-
-	if use glw && ! built_with_use media-libs/mesa motif; then
-		ewarn "GRASS OpenGL support needs mesa with motif headers."
-		ewarn "Please rebuild mesa with motif support."
-		die "Re-emerge mesa with motif."
-	fi
-
-	if use opengl && ! use {tcl,tk}; then
-		ewarn "GRASS OpenGL support needs both Tcl and Tk."
-		die "Please set tcl and tk useflags."
-	fi
-
-	if use tcl && ! use tk; then
-		ewarn "You set USE='tcl -tk'. GRASS needs both tcl and tk."
-		die "Set tk useflag."
-	fi
-
-	if use tk && ! use tcl; then
-		ewarn "You set USE='-tcl tk'. GRASS needs both tcl and tk."
-		die "Set tcl useflag."
+	if use opengl && ! use X; then
+		ewarn "GRASS OpenGL support needs X (will also pull in Tcl/Tk)."
+		die "Please set the X useflag."
 	fi
+}
 
-	if use tcl && built_with_use dev-lang/tcl threads; then
-		ewarn "GRASS nviz will not work with Tcl compiled with threads!"
-		ewarn "Please disable either opengl or tcl threads."
-		die "Emerge TCL without threads."
-	fi
-	if use tk && built_with_use dev-lang/tk threads; then
-		ewarn "GRASS nviz will not work with Tk compiled with threads!"
-		ewarn "Please disable either opengl or tk threads."
-		die "Emerge tk without threads."
-	fi
+src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
 	use ffmpeg && epatch "${FILESDIR}"/${P}-ffmpeg-fix.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 	epatch rpm/fedora/grass-readline.patch
+
 	elibtoolize
+
+	# patch missing math functions (yes, this is still needed)
+	sed -i -e "s:\$(EXTRA_LIBS):\$(EXTRA_LIBS) \$(MATHLIB):g" include/Make/Shlib.make
+	echo "MATHLIB=-lm" >> include/Make/Rules.make
 }
 
 src_compile() {
 	local myconf
 	myconf="--prefix=/usr --with-cxx --enable-shared \
 		--with-gdal=$(type -P gdal-config) --with-curses --with-proj \
-		--with-proj-includes=/usr/include --with-proj-libs=/usr/lib \
-		--with-proj-share=/usr/share/proj"
-
-	if use tcl || use tk; then
-		myconf="${myconf} --with-tcltk \
-		    --with-tcltk-includes=/usr/include \
-		    --with-tcltk-libs=/usr/$(get_libdir)/tcl8.4 --with-x"
+		--with-includes=/usr/include --with-libs=/usr/$(get_libdir) \
+		--with-proj-includes=/usr/include  \
+		--with-proj-libs=/usr/$(get_libdir) \
+		--with-proj-share=/usr/share/proj \
+		--without-glw --without-wxwidgets"
+	if use X; then
+	    if has_version ">=dev-lang/tcl-8.5"; then
+		TCL_LIBDIR="/usr/$(get_libdir)/tcl8.5"
+	    else
+		TCL_LIBDIR="/usr/$(get_libdir)/tcl8.4"
+	    fi
+	    myconf="${myconf} --with-tcltk --with-x \
+	        --with-tcltk-includes=/usr/include \
+		--with-tcltk-libs=${TCL_LIBDIR}"
 	else
 		myconf="${myconf} --without-tcltk --without-x"
 	fi
@@ -150,28 +129,36 @@ src_compile() {
 	if use opengl; then
 	    epatch "${FILESDIR}"/${P}-html-nviz-fix.patch
 	    myconf="${myconf} --with-opengl --with-opengl-libs=/usr/$(get_libdir)/opengl/xorg-x11/lib"
-	    if use glw; then
-		myconf="${myconf} --with-glw"
-	    fi
 	else
 	    epatch "${FILESDIR}"/${P}-html-nonviz.patch
 	    myconf="${myconf} --without-opengl --without-glw"
 	fi
 
+	# Should handle either older or latest without intervention;
+	# this won't work forever, but it should be okay for a while...
 	if use ffmpeg; then
-		myconf="${myconf} --with-ffmpeg --with-ffmpeg-includes=/usr/include/ffmpeg --with-ffmpeg-libs=/usr/lib"
+	    myconf="${myconf} --with-ffmpeg \
+	        --with-ffmpeg-libs=/usr/$(get_libdir)"
+	    if has_version ">=media-video/ffmpeg-0.4.9_p20080326" ; then
+		# must pass multiple include dirs now; if anyone has a better
+		# way to do this, please speak up and file a bug :)
+	        myconf="${myconf} --with-ffmpeg-includes=/usr/include/libav*"
+	    else
+		myconf="${myconf} --with-ffmpeg-includes=/usr/include/ffmpeg"
+	    fi
 	else
-		myconf="${myconf} --without-ffmpeg"
+	    myconf="${myconf} --without-ffmpeg"
 	fi
 
 	if use truetype; then
-		myconf="${myconf} --with-freetype --with-freetype-includes=/usr/include/freetype2"
+	    myconf="${myconf} --with-freetype --with-freetype-includes=/usr/include/freetype2"
 	fi
 
 	if use mysql; then
-		myconf="${myconf} --with-mysql --with-mysql-includes=/usr/include/mysql --with-mysql-libs=/usr/$(get_libdir)/mysql"
+	    myconf="${myconf} --with-mysql --with-mysql-includes=/usr/include/mysql \
+		--with-mysql-libs=/usr/$(get_libdir)/mysql"
 	else
-		myconf="${myconf} --without-mysql"
+	    myconf="${myconf} --without-mysql"
 	fi
 
 	if use sqlite; then
@@ -181,7 +168,7 @@ src_compile() {
 		myconf="${myconf} --without-sqlite"
 	fi
 
-	export LD_LIBRARY_PATH="/${WORKDIR}/image/usr/${P}/$(get_libdir):${LD_LIBRARY_PATH}"
+	#export LD_LIBRARY_PATH="/${WORKDIR}/image/usr/${P}/$(get_libdir):${LD_LIBRARY_PATH}"
 	econf ${myconf} --with-libs=/usr/$(get_libdir) \
 		$(use_enable amd64 64bit) \
 		$(use_with fftw) \
@@ -194,11 +181,7 @@ src_compile() {
 		$(use_with postgres) \
 		$(use_with python) \
 		$(use_with readline) \
-		$(use_with tiff) \
-		$(use_with tcl tcltk) || die "configure failed!"
-	# patch missing math functions
-	sed -i 's:EXTRA_LIBS=:EXTRA_LIBS=-lm :g' "${S}"/lib/gmath/Makefile
-	sed -i 's:EXTRA_LIBS = :EXTRA_LIBS = -lm :g' "${S}"/lib/gis/Makefile
+		$(use_with tiff) || die "configure failed!"
 
 	emake -j1 || die "emake failed!"
 }