updated to handle either ffmpeg API, but not a permanent fix

Package-Manager: portage-2.1.5_rc6

3 files changed, 19 insertions, 17 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 1c83f74370d2..69b2cf7e389c 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,10 @@
 # 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.53 2008/05/04 01:14:07 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.54 2008/05/07 06:56:13 nerdboy Exp $
+
+  07 May 2008; Steve Arnold <nerdboy@gentoo.org> grass-6.2.3.ebuild:
+  Updated to handle either ffmpeg API, but not a permanent fix; this should
+  be reverted to the new interface once ffmpeg is unmasked and stable.
 
   04 May 2008; Steve Arnold <nerdboy@gentoo.org> grass-6.2.1.ebuild:
   forced stable version to use the older ffmpeg
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 235445a06b8d..74e83cfa4222 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -16,6 +16,6 @@ EBUILD grass-5.4.0.ebuild 3089 RMD160 0e18c66b2410d062a756df0c436535bad39f8e89 S
 EBUILD grass-6.0.1.ebuild 3177 RMD160 c1a168fd9008a3490a9ca040dd0c4fd752f7d635 SHA1 a9b6209a84d7a67011d903a8f86add1fa23ef1b9 SHA256 b613f5d646f83037ab2a08e151ec1d923a23eca634c0fc636e6bc57b87422434
 EBUILD grass-6.2.0-r1.ebuild 5413 RMD160 3db6698e2ae49bbc3c6dbf466edc9703c0ae1553 SHA1 67f3dca703f52ff948dcabfdc6037132c12521b0 SHA256 af65999cacb6d177b5acedd66b5e21f28cc593b6f2e24fce0a5ae36f310dca60
 EBUILD grass-6.2.1.ebuild 6414 RMD160 a51ee0df23e52f9128b23d277f84e9d0f331c084 SHA1 ef4237c5aed57a2e3273743812f897bacfa392e4 SHA256 c4f87b7ad2ced0209ccd00565558fbdd8a73ac752afa8b9a405cebee9005ee1a
-EBUILD grass-6.2.3.ebuild 7151 RMD160 485df675319346211ea60cdd831cbf2f878841a7 SHA1 e4c4c0aa021f491b44afa3e6d79e6105f2ee0ae1 SHA256 3bdfb9ab2a701149da7a2a58d384c8fa4f070ef7adaa599199eeb7ff04a877e6
-MISC ChangeLog 11024 RMD160 f479e72d5287133ef3c3c6343152250b6fd760cc SHA1 7d6b2539d3e71f4732cd413f8f0c44594809c206 SHA256 6cadcd0083b4bfbe75ab8b9c1bebc29360ce15122bf8a49bc74c4fd82de5f43d
+EBUILD grass-6.2.3.ebuild 7082 RMD160 de66d8f76004cd239065c6e8259fe714a1c8eddd SHA1 7cbff7f50831c650a93ae2cf137d49a4c0f2681a SHA256 f3bf9892ac9085ca759e1b71fff752defd3d240880a459822c974fba97cf931a
+MISC ChangeLog 11241 RMD160 0a9406652623645ce4c34944ef30b037f1d7e43e SHA1 8b01348dd1ae4763e89530dd36feaee375620397 SHA256 c207b49343e13bdd262fa7d707174e0173608f49fa5a1a28b35c6011974d07fa
 MISC metadata.xml 492 RMD160 03cf12a529c5443dffc366017b997d183a2bcf3b SHA1 bd8657499f8b6cb3b232684afd63c3b5d915ba5e SHA256 976d5771ed6fbabbeba026b0394186b7735135deb79c86aa9388fc5134467e8e
diff --git a/sci-geosciences/grass/grass-6.2.3.ebuild b/sci-geosciences/grass/grass-6.2.3.ebuild
index 31026c4bf4cb..1c2e58397c14 100644
--- a/sci-geosciences/grass/grass-6.2.3.ebuild
+++ b/sci-geosciences/grass/grass-6.2.3.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.3.ebuild,v 1.3 2008/05/04 01:07:37 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.3.ebuild,v 1.4 2008/05/07 06:56:13 nerdboy Exp $
 
 inherit eutils autotools fdo-mime versionator
 
@@ -33,7 +33,7 @@ RDEPEND=">=sys-devel/make-3.80
 	    sys-apps/man-db )
 	sci-libs/gdal
 	>=sci-libs/proj-4.4.7
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
+	ffmpeg? ( media-video/ffmpeg )
 	fftw? ( sci-libs/fftw )
 	gmath? ( virtual/blas
 	    virtual/lapack )
@@ -105,15 +105,6 @@ pkg_setup() {
 		ewarn "GRASS OpenGL support needs X (will also pull in Tcl/Tk)."
 		die "Please set the X useflag."
 	fi
-
-	if use ffmpeg; then
-		ewarn "This version requires the newest ffmpeg, which is a major"
-		ewarn "ABI change (and may break things).  You should definitely"
-		ewarn "rebuild everything that uses ffmpeg if you haven't already"
-		ewarn "done so, and be prepared for possible breakage..."
-		ewarn "Hit Ctrl-C now if you're not ready to do this."
-		epause 10
-	fi
 }
 
 src_unpack() {
@@ -159,10 +150,17 @@ src_compile() {
 	    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/libavcodec \
-		    --with-ffmpeg-libs=/usr/$(get_libdir)"
+	    myconf="${myconf} --with-ffmpeg \
+	        --with-ffmpeg-libs=/usr/$(get_libdir)"
+	    if has_version media-video/ffmpeg-0.4.9_p20080326 ; then
+	        myconf="${myconf} \
+	    	    --with-ffmpeg-includes=/usr/include/libavcodec"
+	    else
+		myconf="${myconf} --with-ffmpeg-includes=/usr/include/ffmpeg"
+	    fi
 	else
 		myconf="${myconf} --without-ffmpeg"
 	fi