summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-11-16 09:58:55 +0000
committerJustin Lecher <jlec@gentoo.org>2011-11-16 09:58:55 +0000
commit850f0243ee7fa7258df2ff24e5a3a5618f59bb68 (patch)
tree8649e61a53385c10199234b36bd648431c89ff62 /sci-chemistry/raster3d
parentAdd debian patch for building against libav-0.8, #380681 (diff)
downloadgentoo-2-850f0243ee7fa7258df2ff24e5a3a5618f59bb68.tar.gz
gentoo-2-850f0243ee7fa7258df2ff24e5a3a5618f59bb68.tar.bz2
gentoo-2-850f0243ee7fa7258df2ff24e5a3a5618f59bb68.zip
Corrected Slotting of media-libs/libpng and media-libs/tiff
(Portage version: 2.2.0_alpha74/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry/raster3d')
-rw-r--r--sci-chemistry/raster3d/ChangeLog6
-rw-r--r--sci-chemistry/raster3d/metadata.xml15
-rw-r--r--sci-chemistry/raster3d/raster3d-2.7c.ebuild9
-rw-r--r--sci-chemistry/raster3d/raster3d-2.9.2.ebuild9
-rw-r--r--sci-chemistry/raster3d/raster3d-3.0.2.ebuild5
5 files changed, 22 insertions, 22 deletions
diff --git a/sci-chemistry/raster3d/ChangeLog b/sci-chemistry/raster3d/ChangeLog
index 2666f6d4d3f8..0df3b438bee8 100644
--- 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/metadata.xml b/sci-chemistry/raster3d/metadata.xml
index 8dd621fd584b..ab5778df26e6 100644
--- 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 ba40c9b4708c..88951bccfc02 100644
--- 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 b56aceb9208b..9379d44d8909 100644
--- 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 655abf718544..cedd8e763a23 100644
--- 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}"