updated slotting of ver. 6 packages to address bug #234070

Package-Manager: portage-2.2_rc7/cvs/Linux 2.6.26.1 x86_64

6 files changed, 19 insertions, 26 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index f832d6926e47..1ca5405d8e55 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.61 2008/08/06 18:02:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.62 2008/08/14 07:07:57 nerdboy Exp $
+
+  14 Aug 2008; Steve Arnold <nerdboy@gentoo.org> grass-6.2.0-r1.ebuild,
+  grass-6.2.1.ebuild, grass-6.2.3.ebuild, grass-6.3.0.ebuild:
+  updated slotting of ver. 6 packages to address bug #234070
 
   06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 3e18809190c1..a1ed111ec500 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 99grass-6 100 RMD160 e62ea08a12a22039fbe8fb396e011fd9b769ff2f SHA1 8ef4acdbb4330b64a51e7b8304f9c68fce17c438 SHA256 dce426f95d7be7f7deae328537ad8666d4ff140dc6de0bb65495f23ad1a5e8f8
 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
@@ -19,16 +16,9 @@ DIST grass-6.2.3.tar.gz 12978605 RMD160 f0148cda0ad596807b35655466770145047274d7
 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.0-r1.ebuild 5419 RMD160 7a9792d9d38a52d78b3bab5ff4211d8bb210eee1 SHA1 e986e71631714428b3fd612dd1d5e70d5a0d9099 SHA256 5f78e8e6d19c4799b164d042c2ece9b526cfbd3f5625634cf712b91a0865e7d1
-EBUILD grass-6.2.1.ebuild 6508 RMD160 fe1e5d6c1c4b1ef45ef81e2d76ff4e56ba3829d6 SHA1 f71c2b34e887dc9f7817187ca95a748fb88ccb64 SHA256 8cb13c424f871a385722e093e487a6d284a8f11d8e1df8eb6a64aec3b1af9d29
-EBUILD grass-6.2.3.ebuild 7038 RMD160 eebcb453c8a431301cdf38c5d66d6c6a7404aec4 SHA1 013334b4273588de4f5a48bee14de9ca402ce49e SHA256 355fc4e430fd528ae22a13323d476e76733ead35b353ed398f1b67de99cbde7b
-EBUILD grass-6.3.0.ebuild 8486 RMD160 2cd60d2d60a7e7247b4de7d1d38cf6950154fbed SHA1 9a56aefead51d37fa26b5d0061cebef94e6a35c4 SHA256 9ee4e5f59b94481d491c9bba9810c621810e425617c8fcf3e85f7d988e9751db
-MISC ChangeLog 12734 RMD160 c5c7fa227534970061b72960ec845e8f3f87d978 SHA1 1a557d2a879ee290be2eeffdd72427e652fd86c3 SHA256 dbe2c8b14edb317d70574f9f912bb37c05f7ab1644dde42a1d3b83fc4cb9a7f3
+EBUILD grass-6.2.0-r1.ebuild 5419 RMD160 42562878ea957f71624c075d94d1cf219123093e SHA1 9eb7146dc71e5b65485a8caa50102fec635f9406 SHA256 71bc9f7a977860bbf8e2eae83efc205a57fd70c2cd00aa6a9dd98663c5f90bf3
+EBUILD grass-6.2.1.ebuild 6507 RMD160 4f383e98f43b50e6cc3ca594e33c1b80cafcfaed SHA1 fc78c4076f8d15f53ff568e5f031ac565f7705b4 SHA256 cbf66c333e16f85979aaaba47614fe8798aa6f30948083968ef30b83bd1a231a
+EBUILD grass-6.2.3.ebuild 7022 RMD160 5aaf43cbcf3cd3878e2439b24e8a0b5e9bcbcb26 SHA1 4080ab8f4bde1d41fb832d8a83f0119276d42d7f SHA256 3055f55ade77a246c9574c486d8e0273fed40e7283555f501ebcb3c3b6f9b843
+EBUILD grass-6.3.0.ebuild 8486 RMD160 99136c099ae16e5e9418ec7683df7c84b8165cbe SHA1 77d04fe44e07d4929977ada16754e0f9f0ca41a3 SHA256 b35a85fa662e6f5930901d9a2d378b052e700e56b798392c823daa80889ad2fd
+MISC ChangeLog 12934 RMD160 c8839bbf53c06de8f25a27cc0dfabcdb8b33aaed SHA1 3f2df7f3be1977e338ccb1a340e85168693ed37d SHA256 37285edb2dad4a8204498f86b3bbd4eddac7a2b70e54f54150660de4c9b93308
 MISC metadata.xml 874 RMD160 af77ae02605e55ba00b9b9214f675184920ca3f4 SHA1 28750209e745c85d4b1b1b5cd34b2db337f2882d SHA256 7793471ab20fc541e0c7fb7ec42593450a32efdee19da114ac656c57a118c781
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAkiZ51MACgkQOeoy/oIi7uwqpQCgnHr4PnPVcZvx2XWXkLwZONdB
-VOIAoKD+CEMLliBgJ8vSCD5cvDYTw3Tv
-=YNh3
------END PGP SIGNATURE-----
diff --git a/sci-geosciences/grass/grass-6.2.0-r1.ebuild b/sci-geosciences/grass/grass-6.2.0-r1.ebuild
index 0ddf1871ee2a..50cb5c588429 100644
--- a/sci-geosciences/grass/grass-6.2.0-r1.ebuild
+++ b/sci-geosciences/grass/grass-6.2.0-r1.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.0-r1.ebuild,v 1.12 2008/06/24 07:45:51 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.0-r1.ebuild,v 1.13 2008/08/14 07:07:57 nerdboy Exp $
 
 inherit eutils libtool
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://grass.itc.it/"
 SRC_URI="http://grass.itc.it/grass62/source/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="6"
 KEYWORDS="amd64 ppc sparc x86"
 # To-do: get ppc64 gdal deps fixed up
 
diff --git a/sci-geosciences/grass/grass-6.2.1.ebuild b/sci-geosciences/grass/grass-6.2.1.ebuild
index 2581664483a8..34901720b987 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.13 2008/07/17 08:10:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.1.ebuild,v 1.14 2008/08/14 07:07:57 nerdboy Exp $
 
 inherit eutils libtool
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://grass.itc.it/"
 SRC_URI="http://grass.itc.it/grass62/source/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="6"
 KEYWORDS="amd64 ppc sparc x86"
 # To-do: get ppc64 gdal deps fixed up
 
diff --git a/sci-geosciences/grass/grass-6.2.3.ebuild b/sci-geosciences/grass/grass-6.2.3.ebuild
index 90f34aca7b90..bb3faaf4a6b5 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.8 2008/06/24 07:45:51 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.3.ebuild,v 1.9 2008/08/14 07:07:57 nerdboy Exp $
 
 inherit eutils fdo-mime versionator
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://grass.itc.it/"
 SRC_URI="http://grass.itc.it/${MY_PM}/source/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="6"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="ffmpeg fftw glw gmath jpeg largefile mysql nls odbc opengl png \
@@ -154,8 +154,7 @@ src_compile() {
 	    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"
+	        myconf="${myconf} --with-ffmpeg-includes=/usr/include/libav*"
 	    else
 		myconf="${myconf} --with-ffmpeg-includes=/usr/include/ffmpeg"
 	    fi
diff --git a/sci-geosciences/grass/grass-6.3.0.ebuild b/sci-geosciences/grass/grass-6.3.0.ebuild
index 8130e5d1d012..e25e74eb5eba 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-2008 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.2 2008/06/25 04:28:50 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v 1.3 2008/08/14 07:07:57 nerdboy Exp $
 
 inherit eutils distutils fdo-mime versionator wxwidgets
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://grass.itc.it/"
 SRC_URI="http://grass.itc.it/${MY_PM}/source/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="6"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="ffmpeg fftw glw gmath jpeg largefile mysql nls odbc opengl png \