Depend on virtual/ffmpeg instead of media-video/ffmpeg. Cleanup the deprecated if has_version for old ffmpeg.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

4 files changed, 14 insertions, 25 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 713ab159df74..64cf71b0bffa 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.96 2011/03/24 20:54:40 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.97 2011/03/26 15:27:44 scarabeus Exp $
+
+  26 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> grass-6.3.0.ebuild,
+  grass-6.4.0.ebuild:
+  Depend on virtual/ffmpeg instead of media-video/ffmpeg. Cleanup the
+  deprecated if has_version for old ffmpeg.
 
   24 Mar 2011; Ryan Hill <dirtyepic@gentoo.org> grass-6.4.0.ebuild:
   eselect wxwidgets affects build behaviour, not runtime, and only outside of
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 2e4f7b13c990..564996bf67d5 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX grass-6.3.0-gcc44.patch 387 RMD160 d104b2cbea3ee14d8f266da122d9e4aef63dc6b0 SHA1 1ce70dbb99f64419361816a75e6948d8960d4f4f SHA256 210e7f7f34ec04caf41bd312f5c90c7be206656766e98725f27185e0c8759f80
 AUX grass-6.3.0-html-nonviz.patch 763 RMD160 054b336fcc47d64e56a40d2dda955732047ceb08 SHA1 e8f10078f8cccc5a47d2f2c8bed1d9ace7ed2598 SHA256 e870d724170a9d629a5d0bb8897a2e2f5d1b25eed204a7450061f26d48192981
 AUX grass-6.3.0-o_creat.patch 1469 RMD160 dd2cec8103c07eabd906f3792544bf2225cb1287 SHA1 3bb27a3069abb47b3ac6a9480c508a036d1f3aba SHA256 b9bb9ea09414fbcb00b52520cd4e98147d3de199401efe9996eb6f911fd7ef05
@@ -9,14 +6,7 @@ AUX grass-pkgconf.patch 1322 RMD160 7b48d8e05a07090d8d36d2fb96b385f2d655e066 SHA
 AUX grass_icon.png 4470 RMD160 b4a6deeb6ce859a57c6aba3c4095e2dd718f36e9 SHA1 6839c28ec1d01c486d45a245a159fced3c0d0810 SHA256 c6c873f24bb59b8ff98000b500ca3a047ca86af216b4b7b1593baef5f2fbe6a9
 DIST grass-6.3.0.tar.gz 17688547 RMD160 66db4223fc0d5172371903f71d68f1dd024ad2d2 SHA1 c4b0b1407655f8ed1e16e911df191323fe00eb9e SHA256 a84658a7065a3ece09d3d18a3b601515484d1e5dbb3a92b8fbac3c37e368acf4
 DIST grass-6.4.0.tar.gz 22569021 RMD160 b0bd2d2ce048a5f10f345786bc81fa4bd22df019 SHA1 c91e8501c7a756a94d2be47729f640d33b2a7468 SHA256 1db0422de4bb6146322721760b3c2b310850069ee320e03b6a625e4472f477a7
-EBUILD grass-6.3.0.ebuild 8432 RMD160 94af7d9ae466f8997f342ac839d0324bf3ba9301 SHA1 79372cb66b73a3c643b3a8b222cbddde93b2ab12 SHA256 296dd2e6fa966f1c0fe93832a0bb10faf89e2889e34274aed88291cac618655b
-EBUILD grass-6.4.0.ebuild 7880 RMD160 2157269f5e1d0256d0dff2dbe3538f6e7a5bd158 SHA1 729c24c50cbc9ba3353a92112c09e90a4fda9e89 SHA256 276e870ccbfcc549d1062bc3c415535e208c3ba228c7b45f34f2aa1c233eadbe
-MISC ChangeLog 19216 RMD160 89fc43e88e038b72b40edd1542d6410897aba8d4 SHA1 df2e10570bd0850856c3ce35607009f71a0f110a SHA256 5072abbf0693ba055313d3c546853aa7804b45f6b86541f8fff26533f2da7b6b
+EBUILD grass-6.3.0.ebuild 8165 RMD160 33ca3cee2c22d2aa8f1961bb8cd3924e2bae5af2 SHA1 fdbfb17c4615b71656d864a76fdcbe8aeb016b26 SHA256 52ef4a7995dfdd0cabeb2a4b401c2237cfcb29b6118464c884472aca5597d0b9
+EBUILD grass-6.4.0.ebuild 7876 RMD160 26919996f19bba0153b838a1c7540a979a6fd35e SHA1 68b7fa5cf5964b96f02b332706986e77e16be4f6 SHA256 9d33c4f88d05d1f8121f9015051841ac465328b8b92b9507ec615b874217f3c1
+MISC ChangeLog 19428 RMD160 9929e5c3875a8bcb2ececec63769d2d02a083ef0 SHA1 bb59d020942ff848e89d466229b08ebc92533e67 SHA256 3d81a4b4526944d4fcdaa845df92a908453b98265da43f74860eeebd6424feb4
 MISC metadata.xml 623 RMD160 f3ab7360eb95e18d25fa0f35bd8817e8628e3246 SHA1 497c577a971010147239a61515ab66a678881569 SHA256 d6200460324878b71cae01dc1193c77749b88b7c2e723041d9f426487c50c85f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2LsRAACgkQiqiDRvmkBmIKUwCeNRxCo67hP+otoN+UMvBcQR10
-tnIAoMgdR3wh86JiFJf8VeNadoLa8DJ0
-=coAg
------END PGP SIGNATURE-----
diff --git a/sci-geosciences/grass/grass-6.3.0.ebuild b/sci-geosciences/grass/grass-6.3.0.ebuild
index 8c34e9d156c1..deb0f1f027fc 100644
--- a/sci-geosciences/grass/grass-6.3.0.ebuild
+++ b/sci-geosciences/grass/grass-6.3.0.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-geosciences/grass/grass-6.3.0.ebuild,v 1.21 2011/03/10 19:14:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v 1.22 2011/03/26 15:27:44 scarabeus Exp $
 
 EAPI=1
 
@@ -31,7 +31,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 )
+	ffmpeg? ( virtual/ffmpeg )
 	fftw? ( sci-libs/fftw )
 	gmath? ( virtual/blas
 	    virtual/lapack )
@@ -178,13 +178,7 @@ src_compile() {
 	if use ffmpeg; then
 	    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 you have 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
+	    myconf="${myconf} --with-ffmpeg-includes=/usr/include/libav*"
 	else
 		myconf="${myconf} --without-ffmpeg"
 	fi
diff --git a/sci-geosciences/grass/grass-6.4.0.ebuild b/sci-geosciences/grass/grass-6.4.0.ebuild
index b7d3b834e660..b7e4d76a1a72 100644
--- a/sci-geosciences/grass/grass-6.4.0.ebuild
+++ b/sci-geosciences/grass/grass-6.4.0.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-geosciences/grass/grass-6.4.0.ebuild,v 1.7 2011/03/24 20:54:40 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.0.ebuild,v 1.8 2011/03/26 15:27:44 scarabeus Exp $
 
 EAPI="3"
 
@@ -33,7 +33,7 @@ RDEPEND="
 	sys-libs/ncurses
 	sys-libs/zlib
 	cairo? ( x11-libs/cairo[X?,opengl?] )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( virtual/ffmpeg )
 	fftw? ( sci-libs/fftw:3.0 )
 	gmath? (
 		virtual/blas