Corrected Slotting of media-libs/libpng and media-libs/tiff

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

diff --git a/sci-chemistry/raster3d/ChangeLog b/sci-chemistry/raster3d/ChangeLog
index 2666f6d4d3f8d2442ff59990eb51ea0d8aec87b8..0df3b438bee8c806175bbedb6abd434048672feb 100644 (file)
--- a/sci-chemistry/raster3d/ChangeLog
+++ b/sci-chemistry/raster3d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/raster3d
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/ChangeLog,v 1.29 2011/10/09 15:00:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/ChangeLog,v 1.30 2011/11/16 09:58:55 jlec Exp $
+
+  16 Nov 2011; Justin Lecher <jlec@gentoo.org> raster3d-2.7c.ebuild,
+  raster3d-2.9.2.ebuild, raster3d-3.0.2.ebuild, metadata.xml:
+  Corrected Slotting of media-libs/libpng and media-libs/tiff
 
   09 Oct 2011; Markos Chandras <hwoarang@gentoo.org> raster3d-3.0.2.ebuild:
   Stable on amd64 wrt bug #385627

diff --git a/sci-chemistry/raster3d/Manifest b/sci-chemistry/raster3d/Manifest
index a64e76c7f2391544cc36cbf157cc86a4e4f4257a..b7092afbef61ad92ba26519fa4dd9ca9350e3a53 100644 (file)
--- a/sci-chemistry/raster3d/Manifest
+++ b/sci-chemistry/raster3d/Manifest
@@ -8,25 +8,15 @@ AUX raster3d-gcc-4.1-gentoo.patch 2994 RMD160 3341eb4071b46b9fbec7fef51c0a76c257
 DIST Raster3D_2.7c.tar.gz 1727387 RMD160 ebb41c0504646b8d965dbccad0f3cee1bfad0244 SHA1 b13e046d05b0f435dba6c09ebb0183454063b76d SHA256 7d5c450e83865fbafecbab3caabf38a8560b6c41982948a3b0e34d79c2c3381a
 DIST Raster3D_2.9-2.tar 4454400 RMD160 a0260d42facf58d027d1cdb7055482414e9755ac SHA1 49c55d0bb5ab1d039841047f759af79ba1d8f6c9 SHA256 46d50aa26e455f8075ff91d07fb9fd211be14065cc181f905ef7a799363a54fb
 DIST Raster3D_3.0-2.tar 1743034 RMD160 5da8ec219e0e7421e61adad6f32fe29efa87047a SHA1 77ea7553a7741ae176f7ccae881890dfc1f0bba6 SHA256 a89bdfda61fae8d189820941f1b5685b40743b817128f57bc1225f983a47d984
-EBUILD raster3d-2.7c.ebuild 1694 RMD160 4730bf193e3e1b28159b97d930fbb276eaa875fa SHA1 243a47e4c6b6183c965292adedb48853af7ad521 SHA256 8fb82cede5fd4a6d1c4459c6eded0d3ffcc4e18beeea842a1c4914dcd8a2210f
-EBUILD raster3d-2.9.2.ebuild 2142 RMD160 326e6b743aa76032365229624388f5090c089b6c SHA1 9a118ad71528f7f0669fb6f8065a19d9b56d15f9 SHA256 187685fe3f7f77facd21e5d2ffd582e728cc20904f9f7e321817d6ca127d349f
-EBUILD raster3d-3.0.2.ebuild 2591 RMD160 4a5a5775e7b784efe06176adb56a8860b87465a9 SHA1 c8a753370933951f23921a4369430fd6602b1b95 SHA256 0e5947eb509abf32ed14f0d6c0a49ca51d0a68902cf10e349238dd656bdaecef
-MISC ChangeLog 4934 RMD160 90af515f251b288cab66ae7548440e36b9901c37 SHA1 fa3f4b027e090610267fa97384bc39279f32ba5f SHA256 a5adc40a19700b191f7a5f82c1dacd5df2139f3d9162ce7d44f81b3279459719
-MISC metadata.xml 342 RMD160 146bb1778ddbb78054f953f192447f547fa3f602 SHA1 55c017f5f4128f26fda76329bf57d3dcd9355309 SHA256 603f3d6ebf98ff139dbbfe7ab90fde5278c653df9c261527beca196461e77485
+EBUILD raster3d-2.7c.ebuild 1693 RMD160 0544450cfad36ccbe03a059dd35f938378084c08 SHA1 a2bb86c78211ddf82bee2f6930630b0234132601 SHA256 4fbbc0a9993da84d96341dfbd78110636f48b90bcab75bf8c94c56e523161f85
+EBUILD raster3d-2.9.2.ebuild 2145 RMD160 a969b33eb925c549764288557b6cb4d96138a4f5 SHA1 62394219fd5c7a509bcd13389edb7574b660865e SHA256 360eb45f4d32af498d8663726c396aac298cd5e8e3a51ab5195461f8eeedb676
+EBUILD raster3d-3.0.2.ebuild 2588 RMD160 dc9baee9983fad8c17e0fac2ba474a5c1f5baa52 SHA1 2e972dff6e770fb967d588761e847df55c1a6ed0 SHA256 2d87029ebc0fc20dee138fa6e7620d995006ac0a80d15ead5e8dc44084da6398
+MISC ChangeLog 5124 RMD160 2332038dfe21000cc20e171ce40db43e98977ee1 SHA1 587e92453916888aa0386a1bf1c52c52471df202 SHA256 beef6badc29f4f65cdf40e95b8851f566946a7409ef308557c43e8ed867a1f58
+MISC metadata.xml 347 RMD160 0451c1f82f02824e8c0f12748e77301b4767138f SHA1 7f5e2ad42eb4aab976a1415a5c74abefb5b9dea5 SHA256 b5332048f95bb442b3715a550ff1217ab13dd4eb9bc860a6b43847c1e4f74e07
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOkbbXAAoJEPqDWhW0r/LCrUQP+wc3vCBwBDHh5Ff6Oi2e+VxI
-HcMer/SaKZPGlCuhz5piFQNmO/3hs6+lTDwR+gf8qVcLTk+cU/hs8CVMcNbZeR07
-EajtAujEuhNXZXVhoXMk6AJGIS9KkcZteWPRHZDS6YFZV3ikcbPQVOqVeehjQGou
-79gKCkw10Em3d900hZ+S5vpa7Kmm5U2Xge0Ds5QMEua/qiEq/S4nfQhPx9sCvzLY
-+FQdx9wf556d0qqh0jic14wUVPaDzqknH2MKgqOfWxpHgyEgzg03KQJyGmDiOGu4
-a9z8su27adgQsLYhBzVjnvGoQsYzB8XifS3UfW56yG4HkT4ZxLZCJytH4qdJ3pts
-mVvPQFm7TyVpx3GcFg3ra6a/lLK1xXDFvcW2+IizgqAm1YHuK+SZ+9N82nti15zU
-kUKh1MPF16VlXmWFRaQ7WdwKelwnrognKWvVFEQXU/lIR1WOQL7gPMxKHHgt7Lj2
-X7TQq38XiHnRlgY5aiTfVZD9ZQv7pU3Yz6PrHQcPghJWLobWLUYkClXVhjR6IT3Y
-pOogdAcDamjZM124jjcjHmIQDLA0CUXV20UTniY1V0SDu8XnusT5jzvQuLOaJN2C
-4yC/YFYwk7chbslYKNziTUhQoPw2SuQQNFzcCapbdMcnf/rqAUSL70cw7I5GuppU
-XCDDx/vgLj96+MYxGDJ1
-=2D1w
+iEYEAREKAAYFAk7DiWUACgkQgAnW8HDreRY9xACfbiBHCVsBVAdXlWtmd8MtOXlI
+SYoAniT+zq/fSvOILTaTrWB+AP+Xv7dh
+=WKf+
 -----END PGP SIGNATURE-----

diff --git a/sci-chemistry/raster3d/metadata.xml b/sci-chemistry/raster3d/metadata.xml
index 8dd621fd584b810c12e1f23d54ee78df1d6c7cce..ab5778df26e675823a4571afbdde93164dea178f 100644 (file)
--- a/sci-chemistry/raster3d/metadata.xml
+++ b/sci-chemistry/raster3d/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
-<upstream>
-       <changelog>http://skuld.bmsc.washington.edu/raster3d/CHANGELOG</changelog>
-</upstream>
-<use>
-  <flag name='gd'>libgd support for PNG and JPEG output</flag>
-</use>
-
+       <herd>sci-chemistry</herd>
+       <upstream>
+               <changelog>http://skuld.bmsc.washington.edu/raster3d/CHANGELOG</changelog>
+       </upstream>
+       <use>
+               <flag name="gd">libgd support for PNG and JPEG output</flag>
+       </use>
 </pkgmetadata>

diff --git a/sci-chemistry/raster3d/raster3d-2.7c.ebuild b/sci-chemistry/raster3d/raster3d-2.7c.ebuild
index ba40c9b4708c58e6b1134e63f1d44cd81a31e46a..88951bccfc025c39c6fb40ffbd00d977cca1d941 100644 (file)
--- a/sci-chemistry/raster3d/raster3d-2.7c.ebuild
+++ b/sci-chemistry/raster3d/raster3d-2.7c.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-chemistry/raster3d/raster3d-2.7c.ebuild,v 1.14 2011/06/21 15:57:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.7c.ebuild,v 1.15 2011/11/16 09:58:55 jlec Exp $
 
 inherit fortran-2 toolchain-funcs
 
@@ -16,11 +16,10 @@ KEYWORDS="ppc x86"
 IUSE=""
 
 RDEPEND="
-       virtual/fortran
-
-       virtual/jpeg
        media-libs/libpng
-       media-libs/tiff"
+       media-libs/tiff
+       virtual/fortran
+       virtual/jpeg"
 DEPEND="${RDEPEND}
        x11-misc/imake"
 

diff --git a/sci-chemistry/raster3d/raster3d-2.9.2.ebuild b/sci-chemistry/raster3d/raster3d-2.9.2.ebuild
index b56aceb9208b03c7b5ff401749f3796e7afdca97..9379d44d8909dfe602723c4b126d8702789c2582 100644 (file)
--- a/sci-chemistry/raster3d/raster3d-2.9.2.ebuild
+++ b/sci-chemistry/raster3d/raster3d-2.9.2.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-chemistry/raster3d/raster3d-2.9.2.ebuild,v 1.6 2011/06/21 15:57:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.9.2.ebuild,v 1.7 2011/11/16 09:58:55 jlec Exp $
 
 EAPI=3
 
@@ -20,11 +20,10 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
+       media-libs/libpng:0
+       media-libs/tiff:0
        virtual/fortran
-
-       virtual/jpeg
-       media-libs/libpng
-       media-libs/tiff"
+       virtual/jpeg"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"

diff --git a/sci-chemistry/raster3d/raster3d-3.0.2.ebuild b/sci-chemistry/raster3d/raster3d-3.0.2.ebuild
index 655abf7185446740665b979d3e6988c9271fd5cb..cedd8e763a2391d1cf5765f04b9bf0ab7d0ec413 100644 (file)
--- a/sci-chemistry/raster3d/raster3d-3.0.2.ebuild
+++ b/sci-chemistry/raster3d/raster3d-3.0.2.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-chemistry/raster3d/raster3d-3.0.2.ebuild,v 1.6 2011/10/09 15:00:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-3.0.2.ebuild,v 1.7 2011/11/16 09:58:55 jlec Exp $
 
 EAPI=4
 
@@ -21,8 +21,7 @@ IUSE="gd tiff"
 
 RDEPEND="
        virtual/fortran
-
-       tiff? ( media-libs/tiff )
+       tiff? ( media-libs/tiff:0 )
        gd? ( media-libs/gd[jpeg,png] )"
 DEPEND="${RDEPEND}"