Version BUmp

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

7 files changed, 211 insertions, 15 deletions

diff --git a/sci-chemistry/raster3d/ChangeLog b/sci-chemistry/raster3d/ChangeLog
index 9f964f0e9a37..2343a0c98ccf 100644
--- a/sci-chemistry/raster3d/ChangeLog
+++ b/sci-chemistry/raster3d/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/raster3d
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/ChangeLog,v 1.22 2010/12/17 07:57:02 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/ChangeLog,v 1.23 2011/02/27 10:40:36 jlec Exp $
+
+*raster3d-3.0.2 (27 Feb 2011)
+
+  27 Feb 2011; Justin Lecher <jlec@gentoo.org> +files/3.0.2-as-needed.patch,
+  +files/3.0.2-gentoo-prefix.patch, raster3d-2.7c.ebuild,
+  +raster3d-3.0.2.ebuild, metadata.xml:
+  Version BUmp
 
   17 Dec 2010; Justin Lecher <jlec@gentoo.org> raster3d-2.9.2.ebuild:
   Fix for fortran.eclass removal
diff --git a/sci-chemistry/raster3d/Manifest b/sci-chemistry/raster3d/Manifest
index a2854ff14ed5..2457478535ba 100644
--- a/sci-chemistry/raster3d/Manifest
+++ b/sci-chemistry/raster3d/Manifest
@@ -2,17 +2,21 @@
 Hash: SHA1
 
 AUX 2.9.1-as-needed.patch 1126 RMD160 885a28b9888a7a7749f2f37b57ab33b37e243ff6 SHA1 700026b207bd53a873ea8cddfe697992c420f96b SHA256 b482bc2e1b6aea6144f8bb37beb6b9b98302067eb0d84c77d9e91cb9e6247176
+AUX 3.0.2-as-needed.patch 1576 RMD160 5f636e5adf4049cc66a270f0c6fb0a30ccafa718 SHA1 8683d948d3eed3a7a29b30c031d49d718eada21c SHA256 8cb6e39945d94d6773a0b536d956c40d8dd06c2d061f58b1b977e939665b3607
+AUX 3.0.2-gentoo-prefix.patch 738 RMD160 d4c5efd9ee1eca6396698449aa0fa9733e258f38 SHA1 b75b821537dceb8aefe275e1db11070faeaf292b SHA256 4d7f94ad57280254177cfecec0f0a6f5610f1d3b4c7c4b7439ab68262e285515
 AUX raster3d-gcc-4.1-gentoo.patch 2994 RMD160 3341eb4071b46b9fbec7fef51c0a76c257041ba3 SHA1 0d23cdcd54a31fb2f77f7ea8bb8768d3f12b0775 SHA256 b1a9ea24005c0ddb9fcd54e71196417186bea0a92b1bcf47ecea978d1faf2cc3
 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
-EBUILD raster3d-2.7c.ebuild 1684 RMD160 1c2e05adba4af5364def35b0e474fd29ecf3c0bf SHA1 f99775a03483998a17ce378c6e64667a6bd43253 SHA256 70929d3b24674d8f26589059a30a45a54f15558599050542ce8e747df4d47eac
+DIST Raster3D_3.0-2.tar 1743034 RMD160 5da8ec219e0e7421e61adad6f32fe29efa87047a SHA1 77ea7553a7741ae176f7ccae881890dfc1f0bba6 SHA256 a89bdfda61fae8d189820941f1b5685b40743b817128f57bc1225f983a47d984
+EBUILD raster3d-2.7c.ebuild 1685 RMD160 894c29e7feb71422b452ef09350b9d80c4aac35b SHA1 bbf6ded656a6fd16deffa25cb7c84ea625c5451e SHA256 55577dd86fafd246f2614a9762aecc9893d969b224eec26972fd3aa530487163
 EBUILD raster3d-2.9.2.ebuild 2135 RMD160 0d92dec0aa98b0d083454ed6272ad4154108ab57 SHA1 703fcbc48eb7aba6897f4474c7c5bafe1e7d403b SHA256 08fb4f0bcf095d845b3513a8f2498ca9546659e2bd6566167c3902f6f8b3de24
-MISC ChangeLog 3979 RMD160 614ae5861cbc2f464de1e3e122a32babef19a529 SHA1 7d0ef122745e4d94cce82bd525f7a55e28ae36f6 SHA256 96c9c56d10aaa432a92edec0d77e234dfc9d11154282d1f15169992f1f4cd4cc
-MISC metadata.xml 265 RMD160 7a18d1766684e5d081b5a39499b2501bc0ed818d SHA1 acb0b82f46254db5363303198ddc8fe96d5f5239 SHA256 6cf9ab6dd1bdee7edeac984fc40afb0477763818193a34f231498114418974c3
+EBUILD raster3d-3.0.2.ebuild 2573 RMD160 dde35243b8b178f16da537ce449d5b0449b076e9 SHA1 a9167bde7311a767261a5da825c5807a2ca9a112 SHA256 66e07626839b6c8b54f94fb7acb81e2422af03a1e4db7e20f33356eeba83182e
+MISC ChangeLog 4201 RMD160 44483d754481d12295d9a33bc531b500a027cb24 SHA1 b9638e43a4c0b67154aff9cef6bfcdaefad93cef SHA256 62088667c67b23ab6b37e0f6f4ae7b81d6e07ebb756800ec875ba3ae1e49f2b1
+MISC metadata.xml 342 RMD160 146bb1778ddbb78054f953f192447f547fa3f602 SHA1 55c017f5f4128f26fda76329bf57d3dcd9355309 SHA256 603f3d6ebf98ff139dbbfe7ab90fde5278c653df9c261527beca196461e77485
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0LF9QACgkQgAnW8HDreRZz/gCgluW3/xK5Si/i0mOJNr8BMY63
-5akAmwaJkE9q01mseKg/bn/LkwAadD3T
-=s//V
+iEYEARECAAYFAk1qKikACgkQgAnW8HDreRZPeQCgxZYmZaf0DT74lPBRF3wY983c
+dcEAn2jzLdNPLcPb5GBuVBybwT+AqaX+
+=iVBC
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/raster3d/files/3.0.2-as-needed.patch b/sci-chemistry/raster3d/files/3.0.2-as-needed.patch
new file mode 100644
index 000000000000..b127d9450661
--- /dev/null
+++ b/sci-chemistry/raster3d/files/3.0.2-as-needed.patch
@@ -0,0 +1,50 @@
+diff --git a/Makefile b/Makefile
+index 1a1c549..4d74dd0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -58,7 +58,7 @@ linux:
+ 	@echo OSDEFS =  -DLINUX -DNETWORKBYTEORDER       >> Makefile.incl
+ 	@echo include Makefile.package        >> Makefile.incl
+ 	@echo                                 >> Makefile.incl
+-	@echo qinp.o: qinp.f                  >> Makefile.incl
++	@echo qinp.o: qinp.f normal3d.o       >> Makefile.incl
+ 	@echo "	\$$(FC) -g -O0 -Wall -Wtabs -c -o qinp.o qinp.f" >> Makefile.incl
+ 	@echo                                 >> Makefile.incl
+ 
+@@ -214,20 +214,20 @@ ribbon:	ribbon.f ribbon1.f modsubs.f
+ 	ribbon.f ribbon1.f modsubs.f -o ribbon
+ 
+ rastep:	rastep.f quadric.o suv.o
+-	$(FC) $(FFLAGS) \
+-	rastep.f quadric.o suv.o $(LDFLAGS) \
++	$(FC) $(FFLAGS) $(LDFLAGS) \
++	rastep.f quadric.o suv.o \
+ 	-o rastep 
+ 
+ render:	render.o local.o quadric.o parse.o r3dtogd.o ungz.o qinp.o
+-	$(FC) $(FFLAGS) \
++	$(FC) $(FFLAGS) $(LDFLAGS) \
+ 	render.o local.o quadric.o parse.o r3dtogd.o ungz.o \
+ 	qinp.o \
+-	$(LIBS) $(LDFLAGS) \
+-	-o render
++	-o render \
++	$(LIBS)
+ 
+ normal3d:	normal3d.o quadric.o qinp.o ungz.o parameters.incl
+-	$(FC) $(FFLAGS) \
+-	normal3d.o quadric.o ungz.o qinp.o $(LDFLAGS) \
++	$(FC) $(FFLAGS) $(LDFLAGS) \
++	normal3d.o quadric.o ungz.o qinp.o \
+ 	-o normal3d
+ 
+ stereo3d:
+@@ -264,7 +264,7 @@ example1.png: render_small
+ 	./render_small
+ 
+ render_small: render_small.o local.o quadric.o parse_small.o r3dtogd.o ungz.o qinp_small.o
+-	$(FC) $(FFLAGS) $^ $(LIBS) $(LDFLAGS) -o $@
++	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ .SUFFIXES: .incl
+ SMALL=10
diff --git a/sci-chemistry/raster3d/files/3.0.2-gentoo-prefix.patch b/sci-chemistry/raster3d/files/3.0.2-gentoo-prefix.patch
new file mode 100644
index 000000000000..19b6cac3a6fe
--- /dev/null
+++ b/sci-chemistry/raster3d/files/3.0.2-gentoo-prefix.patch
@@ -0,0 +1,24 @@
+diff --git a/Makefile.template b/Makefile.template
+index 59de553..0ed283d 100644
+--- a/Makefile.template
++++ b/Makefile.template
+@@ -8,15 +8,15 @@ include VERSION
+ #
+ # Where to install the program, data files, and manuals
+ #
+-prefix  = /usr/local
++prefix  = @GENTOO_PORTAGE_EPREFIX@/usr/
+ bindir  = $(prefix)/bin
+ datadir = $(prefix)/share/Raster3D/materials
+ mandir  = $(prefix)/man/manl
+-htmldir = $(prefix)/share/Raster3D/html
++htmldir = $(prefix)/share/doc/MYPF/html
+ examdir = $(prefix)/share/Raster3D/examples
+ 
+-INCDIRS  =	-I/usr/include -I/usr/local/include
+-LIBDIRS  =	-L/usr/local/lib
++INCDIRS  =	-I@GENTOO_PORTAGE_EPREFIX@/usr/include
++LIBDIRS  =	-L@GENTOO_PORTAGE_EPREFIX@/usr/MYLIB
+ 
+ #
+ # TIFF support (enabled by default)
diff --git a/sci-chemistry/raster3d/metadata.xml b/sci-chemistry/raster3d/metadata.xml
index 3fe03418e735..8dd621fd584b 100644
--- a/sci-chemistry/raster3d/metadata.xml
+++ b/sci-chemistry/raster3d/metadata.xml
@@ -5,4 +5,8 @@
 <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 65bdd634a648..abdc1da5e2ac 100644
--- a/sci-chemistry/raster3d/raster3d-2.7c.ebuild
+++ b/sci-chemistry/raster3d/raster3d-2.7c.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.11 2010/12/16 13:55:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-2.7c.ebuild,v 1.12 2011/02/27 10:40:36 jlec Exp $
 
 inherit toolchain-funcs
 
 NAME="Raster3D"
 
-DESCRIPTION="a set of tools for generating high quality raster images of proteins or other molecules"
-LICENSE="as-is"
+DESCRIPTION="A set of tools for generating high quality raster images of proteins or other molecules"
 HOMEPAGE="http://www.bmsc.washington.edu/raster3d/raster3d.html"
 SRC_URI="http://www.bmsc.washington.edu/${PN}/${NAME}_${PV}.tar.gz"
 
+LICENSE="as-is"
 SLOT="0"
 IUSE=""
 KEYWORDS="ppc x86"
 
-RDEPEND="virtual/jpeg
+RDEPEND="
+	virtual/jpeg
 	media-libs/libpng
 	media-libs/tiff"
-
 DEPEND="${RDEPEND}
 	x11-misc/imake"
 
diff --git a/sci-chemistry/raster3d/raster3d-3.0.2.ebuild b/sci-chemistry/raster3d/raster3d-3.0.2.ebuild
new file mode 100644
index 000000000000..9371539870d2
--- /dev/null
+++ b/sci-chemistry/raster3d/raster3d-3.0.2.ebuild
@@ -0,0 +1,107 @@
+# 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.1 2011/02/27 10:40:36 jlec Exp $
+
+EAPI="4"
+
+inherit flag-o-matic multilib toolchain-funcs versionator prefix
+
+MY_PN="Raster3D"
+MY_PV=$(replace_version_separator 2 -)
+MY_P="${MY_PN}_${MY_PV}"
+
+DESCRIPTION="A set of tools for generating high quality raster images of proteins or other molecules"
+HOMEPAGE="http://www.bmsc.washington.edu/raster3d/raster3d.html"
+SRC_URI="http://www.bmsc.washington.edu/${PN}/${MY_P}.tar.gz -> ${MY_P}.tar"
+
+LICENSE="as-is"
+SLOT="0"
+IUSE="gd tiff"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	tiff? ( media-libs/tiff )
+	gd? ( media-libs/gd[jpeg,png] )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PV}-as-needed.patch \
+		"${FILESDIR}"/${PV}-gentoo-prefix.patch
+
+	sed \
+		-e "s:MYPF:${PF}:" \
+		-e "s:MYLIB:$(get_libdir):g" \
+		-i Makefile.template || \
+		die "Failed to patch makefile.template"
+
+	if ! use gd; then
+		sed \
+			-e "/GDLIBS/s:^:#:g" \
+			-e "/GDDEFS/s:^:#:g" \
+			-i Makefile.template || die
+	fi
+
+	if ! use tiff; then
+		sed \
+			-e "/TLIBS/s:^:#:g" \
+			-e "/TDEFS/s:^:#:g" \
+			-i Makefile.template || die
+	fi
+
+	if [[ $(tc-getFC) =~ gfortran ]]; then
+		append-cflags -Dgfortran
+	fi
+
+	append-fflags -ffixed-line-length-132
+
+	eprefixify Makefile.template
+	cp Makefile.template Makefile.incl || die
+}
+
+src_compile() {
+	local target
+	local i
+
+	if [[ $(tc-getFC) =~ gfortran ]]; then
+		target="linux"
+	else
+		target="linux-$(tc-getFC)"
+	fi
+
+	for i in ${target} all; do
+		emake \
+			CFLAGS="${CFLAGS}" \
+			LDFLAGS="${LDFLAGS}" \
+			FFLAGS="${FFLAGS}" \
+			CC="$(tc-getCC)"\
+			FC="$(tc-getFC)" \
+			INCDIRS="-I${EPREFIX}/usr/include" \
+			LIBDIRS="-L${EPREFIX}/usr/$(get_libdir)" \
+			${i}
+	done
+}
+
+src_install() {
+	emake prefix="${ED}"/usr \
+			bindir="${ED}"/usr/bin \
+			datadir="${ED}"/usr/share/Raster3D/materials \
+			mandir="${ED}"/usr/share/man/man1 \
+			htmldir="${ED}"/usr/share/doc/${PF}/html \
+			examdir="${ED}"/usr/share/Raster3D/examples \
+			install
+
+	dodir /etc/env.d
+	echo -e "R3D_LIB=${EPREFIX}/usr/share/${NAME}/materials" > \
+		"${ED}"/etc/env.d/10raster3d || \
+		die "Failed to install env file."
+}
+
+pkg_postinst() {
+	elog "Add following line:"
+	elog "<delegate decode=\"r3d\" command='\"render\" < \"%i\" > \"%o\"' />"
+	elog "to ${EPREFIX}/usr/$(get_libdir)/ImageMagick-6.5.8/config/delegates.xml"
+	elog "to make imagemagick use raster3d for .r3d files"
+}