Fix tcl/tk slotting

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index a168b5f61e5d4e1d1a34ef9ef98f8563b88a2760..ae1d9417d33233f4ded437721779bb0773744224 100644 (file)
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-geosciences/grass
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.126 2014/12/28 16:47:14 titanofold Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.127 2015/03/20 15:24:07 jlec Exp $
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org> grass-6.4.2.ebuild:
+  Fix tcl/tk slotting
 
   28 Dec 2014; Aaron W. Swenson <titanofold@gentoo.org> grass-6.4.2.ebuild:
   Rename virtual/postgresql to dev-db/postgresql

diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index a26b9c314f54cb371adca84023b02777e8181804..98272497932ae4d53903d30b077ca03558a4761d 100644 (file)
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX grass-6.4.0-html-nonviz.patch 1774 SHA256 6da939c90fa851c50895aeb26c54bd9a512e2e7ca14c3da3268e1daa672442ff SHA512 41d5e2fb8fcb86e42557e2e3f15bad65db0b122bc9e1790af24e8de8892d423bb05d0dc50ff6c3ac9d2b8257e43b39ecb4ebd9092006074874239c01c3570c76 WHIRLPOOL ae8ffdb3df96fa0597396e534ccee9542fab0e563541dcb190f41821ea72ae4049dbd36a7a785d6a68a73afaf9d84df579923d062da08f9021e57e8f8fd5a6da
 AUX grass-6.4.1-libav-0.8.patch 1877 SHA256 2369d03d3d769624794033ab7d3824624552cc817fa810c16db4fa3c0d8cbd10 SHA512 7db2f29def90a1a853510a915f0cca474bcf67fbc376d76ee318a2a30ce5d0371daa519e957a864973bee9133277e7ebbe7f1a26674b3e09e986f3abf2998dd0 WHIRLPOOL d04a70af559b7793b4159fc2f330ef13ab9a33ed880f2e36740063108029839c65485314a5d93d6d2c6838b4629bc8316ae8a9194872108c8b273ab7169cc9d8
@@ -11,13 +11,25 @@ AUX grass-6.4.2-ffmpeg-1.patch 2271 SHA256 290eaeed4f74d68b36460fbf2c936d25efd46
 AUX grass-6.4.2-libav-9.patch 354 SHA256 828dee79382d9980cee279f9b405d0a5538b74be99e1c5d26aff1b6c27f67b90 SHA512 2864751b07fc9ffe72b179dff3bcf3eb28dc2c2b9fc4e377904bafb8756eae61aeb522474cce2decdda7d6997327568f5371175d4e88d45323e84a1b11463406 WHIRLPOOL 9058ad5e7351e2e7347671cd543a770fa9523a0c1e7dcd91baa18b4504310649d2a0280572d3cd1edc326940e7bb839ebf8678be6121b3c1a27ad88464314389
 AUX grass-pkgconf.patch 1322 SHA256 2d80c1a3851cd82bdcd7401c537348ec43e488c8b475718727d65ac423a5640c SHA512 61ef0b337844f6e855de059e11c3d26f2c798914a86373b200cf733614644f703fda811f264151bcd51a628f8f5715148e3ff02f7f52d5b2771044ad6983b348 WHIRLPOOL c49f58d308355c955d1efcaf864c21f532665792cd490d3ead55bdacf7ef110c7f4465919434f5f3b1ab41fa6dfb0595f798eabd24f9d653c40df8cd48e2327f
 DIST grass-6.4.2.tar.gz 24097202 SHA256 670bb74d3000ea0932b7e988d3080d0c629f9eb22a8479bb2987ded473f7b4ca SHA512 537905942965ca949ce241c9e147bb340837f1815d36a1d0170cf18482f66936cb24bda540345d8287a98e4a9275fc129bbc4decf7c3053d123e0f90819b2e5b WHIRLPOOL 65e71c9846f59226bf2ccb3cf224628ac4065dfb2385454083e1db21361e1872192e05763c8a28154f1b536d9b276084efdeb58d730a40f99402ff3e5bf13eb4
-EBUILD grass-6.4.2.ebuild 7579 SHA256 cdb3e0c3086e120d8c39b3143cda42de52f28cb3996a632e9b1c6c4a68c1ba4d SHA512 47ceeb25a5cd0ac33224bff15e41d3d8f368331f7ff884f5c0906f2499bcb2aa03d1e9067039253013495465a577218445ab7c84c90aa50f76a958e38436ae7d WHIRLPOOL 591ec59028e2fd61b86999729bcf58f76bc75fb4371fa50a8d329920d1eb6d24540cc6ff449c07b44320ad8576237239e7a3dbfe0a83ab64e34f3cdb8a6217c3
-MISC ChangeLog 23684 SHA256 af0e4e9f9fe3f45a3b593f605cd913c2ada70862fdaf251bbc0c315b6ab6c450 SHA512 e61bd1bd9902ce17accfbae354db52e272042da59e79e157060fea725ee3342d393d18d18de8d5c0265d8b957ba418ac3f8b3bcf2dd2e5b4ec0d3761d8d60924 WHIRLPOOL 278e72d179d410ec44ee7cd8366cafadf9f9137830e22f041c19b8ca663157c99fad09c081b3f28f630bc3084c71c0ceab3534fbed778f7afe653c610a0e5948
+EBUILD grass-6.4.2.ebuild 7587 SHA256 01d35f64d39935d80364567d10b77b8a0aaab267b09d024e47748c2cfceb4190 SHA512 3a78eb683c774f3ba4b14a5d0a6133a8552531355d2831aaee043494f970e8602a1d1f1dd0b7dcfb0b00dab1be2bcd9a09072b7e840fb6a46ca22a9e7f0b0b60 WHIRLPOOL 0998b8c2d8c7fe662c9a7097ee3515314dc6f4f21e80bebd32511e61faffe251f9ee19fda020141dd5116a3043e2256d1495e40dca0e34d1e6837bf1a0ad0f02
+MISC ChangeLog 23768 SHA256 3cc05c7cc7eb3d2513fa6ee7c2aa0655496c9d7c3da918616a8ad481b54439f2 SHA512 e6ca23b097939b549917911ab03a90e0c4e72d16bee83806a382979b49a673c656f6ac86400d1c66e5101dd28b429d5cbb3ce061d27585aca861ad358b8ed94a WHIRLPOOL 675110932a10a26d51571ec36770803203b86b30a42f6104ced7d8ea5e39ff86349213b61693d2f6359bb40cd41c187a2c869845542378bb910d67ebf94fc6a4
 MISC metadata.xml 542 SHA256 d6f9bcb14ec237e0589d92e5308f324be400a9d4203ba4489393b23d827d6daf SHA512 7e7cf91121ace3c25b832c0f3090b00b43903efc2e12dbdd3af052aab2f4d10b775bde953dd92f879608792173b4123bf05af767dc5708b8ca7f5a3a1486bd2f WHIRLPOOL 001818f36ed4cde9b3743af70b6cb67890c6a5b68bb75826fffda2ced6d818a4bf1f354d4064423e39f22dd4aad3df8268c87ed69e1e4ef2a23c86ce1b0b9ce2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlSgNBMACgkQVxOqA9G7/aDzRAD/ey69Bx/CS2Ba3lYzCnWuhuki
-ul1Ijy6syqhuUnD9J1AA/2oqqKMxbb6er/r/BPaqIXQrxw9tbsLlu1nYCD6u265T
-=xKR9
+iQJ8BAEBCgBmBQJVDDuYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirwJ4QAJ5kQWrg4B5DpYsme1SVAlKS
+eiZT7/OVEYEXMCL7xL0dK4uGjrR6XytqEO/WHf4QVUQKiqeyhN5NecVxPUchBo7o
+wv1/zaC/Coi34UMkdOCVCpxnKF0WiG9jderjRTxLGmjijPcU/LhVXS0owNYKg8Su
+lHB4dnc5PCCSqf+p33T26We6teZVBnr/eIIgqVfk/yzgd0PU7IukX0I6TA+n2tYg
+NqERV3JX3NgzWHYN39q/pdF8OYhGLamAvd9cWmgVnrWUi+t8Cm7PWRK0vjTdgMm6
+ypybz/KRvuRMudcEBzqzYJ9/Mq6EVXApNnvMH1tWqdOPD0iXjI6x9aWX3Uz4JSDE
+WewH57Bb8bfVGnzwMgRE5GW5kIT8RIFAJWVcR6Fvi83GTvALdHT6SxTzK6CDCHCC
+aofiYRPuW/Nz/JdMMYO84jfX46PVCjbbtIlt2AFeKbcFCfYgwmMhWFNs+Lw+Hp+C
+AJLX5TqpeKpfpgDudSRXdeNhTOIlNUeoN+1Ahn9tEHGOzDRL2ZIPSF3tRcifZStc
+ERn/Ys2svcRLbyWz0kzziciz05Rq+wRQuO/tB+zInrxSP8uOksQw6Lmjd4k8J+eH
+BEefbJvH0PaajsZKeN3dAf4racCZAI01metk3PvX+vsqCtqc+DokKDtbg7ZEeO9h
+aYdExvPc/8zelPR45umF
+=fdDS
 -----END PGP SIGNATURE-----

diff --git a/sci-geosciences/grass/grass-6.4.2.ebuild b/sci-geosciences/grass/grass-6.4.2.ebuild
index 7565755cabd47db1be54f8d98d6fea1bfd1ec7ba..e6e6f3511743113f75887fe8f1689263295a4b1f 100644 (file)
--- a/sci-geosciences/grass/grass-6.4.2.ebuild
+++ b/sci-geosciences/grass/grass-6.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.2.ebuild,v 1.13 2014/12/28 16:47:14 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.2.ebuild,v 1.14 2015/03/20 15:24:07 jlec Exp $
 
 EAPI=4
 
@@ -23,8 +23,9 @@ KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="X cairo cxx ffmpeg fftw gmath jpeg motif mysql nls odbc opengl png postgres python readline sqlite tiff truetype wxwidgets"
 
 TCL_DEPS="
-       >=dev-lang/tcl-8.5
-       >=dev-lang/tk-8.5"
+       >=dev-lang/tcl-8.5:0
+       >=dev-lang/tk-8.5:0
+       "
 
 RDEPEND="
        >=app-admin/eselect-1.2
@@ -40,18 +41,18 @@ RDEPEND="
                virtual/blas
                virtual/lapack
        )
-       jpeg? ( virtual/jpeg )
+       jpeg? ( virtual/jpeg:0 )
        mysql? ( virtual/mysql )
        odbc? ( dev-db/unixODBC )
        opengl? (
                virtual/opengl
                ${TCL_DEPS}
        )
-       png? ( media-libs/libpng )
+       png? ( media-libs/libpng:0 )
        postgres? ( >=dev-db/postgresql-8.4 )
-       readline? ( sys-libs/readline )
+       readline? ( sys-libs/readline:0 )
        sqlite? ( dev-db/sqlite:3 )
-       tiff? ( media-libs/tiff )
+       tiff? ( media-libs/tiff:0 )
        truetype? ( media-libs/freetype:2 )
        wxwidgets? ( >=dev-python/wxpython-2.8.10.1[cairo,opengl?] )
        X? (