Missing instruction for fetch added, Keyworded for ~*-linux, bumped to EAPI=3, LDFLAGS are now respected

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 116 insertions, 6 deletions

diff --git a/sci-chemistry/molscript/ChangeLog b/sci-chemistry/molscript/ChangeLog
index fbe8819387b4..af2538346939 100644
--- a/sci-chemistry/molscript/ChangeLog
+++ b/sci-chemistry/molscript/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-chemistry/molscript
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/ChangeLog,v 1.7 2007/02/20 01:46:09 je_fro Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/ChangeLog,v 1.8 2010/03/28 09:06:22 jlec Exp $
+
+*molscript-2.1.2-r1 (28 Mar 2010)
+
+  28 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +files/2.1.2-ldflags.patch, molscript-2.1.2.ebuild,
+  +molscript-2.1.2-r1.ebuild:
+  Missing instruction for fetch added, Keyworded for ~*-linux, bumped to
+  EAPI=3, LDFLAGS are now respected
 
   20 Feb 2007; Jeff Gardner <je_fro@gentoo.org> molscript-2.1.2.ebuild:
   Removing old X dep per Bug 167408.
diff --git a/sci-chemistry/molscript/Manifest b/sci-chemistry/molscript/Manifest
index f3bdf92ced9f..2fd678c754b5 100644
--- a/sci-chemistry/molscript/Manifest
+++ b/sci-chemistry/molscript/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 2.1.2-ldflags.patch 818 RMD160 535c0d9750aa32e206b3cbb365477de6653f0e0d SHA1 39fdeeb7d24a329ebae5f4f96b0e14ccc3e93df5 SHA256 ef1f4079d7b11d69f8f9835266b7bf066fa74623ef2e34c1a5638125153771ab
 AUX fix-makefile-shared.patch 2057 RMD160 3eff611b5265244f24e29fc8e67ab0f0b8289da9 SHA1 323d657db92fad8e2824a18b123a79219745178a SHA256 fe9ee017add68c93e005cb47dbf31c3522a09dfa529858de3538b49c7fbfb51e
 AUX glutbitmap.h 845 RMD160 e06c28dee5a947cd0716d17ecc487b03294ad980 SHA1 6cb718dba3e394d752f5232d10ba5117b56b1a14 SHA256 ba4caf7c2e7135e80385c2d33d7c780a28f5e9fc3ac557e297f65b70ce925a81
 DIST molscript-2.1.2.tar.gz 412497 RMD160 9539b04c982c8bc855ae368d2743d8db48f15f34 SHA1 4bb4e0c2f1623e9889a3b0fbbc7fa2cd20ac3727 SHA256 01252931f5a3542d5659ddaa4ebceaed2e75becb8ed150dfa14b59da9a63ca01
-EBUILD molscript-2.1.2.ebuild 1439 RMD160 183b2c2853d9a6380a6b825a32dca4590d86348c SHA1 123baa41344469eb28ec6ccc1a270469ab0d2726 SHA256 136b72c62b8ed4376d215b379a99603e44cb539da20edae56e64e3f828a7aa24
-MISC ChangeLog 1187 RMD160 ad8c150f63b19e17ab1a9c800ab6d1bf35360d93 SHA1 917996a3d05a6064142c214dc1aae4f361564d49 SHA256 c9f37af0b6f19b2c6b7cba89e8bade4adb8cc022f426d6a8bc5ebe285718188a
+EBUILD molscript-2.1.2-r1.ebuild 1459 RMD160 e28cefb55ce381090094d6f06eedf7a02247f8fb SHA1 60673ec92b8e1c4c49208490d4cf4bcd06d4c6c6 SHA256 508e92e8bff28333270a158db141ec302ec19908830740aa900e8f174d6f34d7
+EBUILD molscript-2.1.2.ebuild 1542 RMD160 24daa384fec05d59c462a9dca2e254c0aeb72ea2 SHA1 1a25679f8fdf502611f0c4994328e68697ba5f79 SHA256 fd956fba2f2c4169c1ad63185f07e2b1d44e751cde48014eef964db547515eae
+MISC ChangeLog 1468 RMD160 70c07401840e78a9b31c37daf60eb9440183c573 SHA1 efcc730ca63a4b6c1f30c333a8b7f4a546e76796 SHA256 96599342adbcb2fc3efd0ad7d1f452f65b685c12506f59f41163a8219d2055cb
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuvHBQACgkQgAnW8HDreRbFywCguOwv3WPvOHpSredRvXOxDAA/
+4X8AoLYIGdHNvr5ssST+mbwqaULyhhMj
+=sfma
+-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/molscript/files/2.1.2-ldflags.patch b/sci-chemistry/molscript/files/2.1.2-ldflags.patch
new file mode 100644
index 000000000000..8867bc10a6b5
--- /dev/null
+++ b/sci-chemistry/molscript/files/2.1.2-ldflags.patch
@@ -0,0 +1,22 @@
+diff --git a/Makefile.complete b/Makefile.complete
+index 4ad535a..b565266 100644
+--- a/Makefile.complete
++++ b/Makefile.complete
+@@ -91,7 +91,7 @@ clean:
+ 
+ #------------------------------------------------------------
+ molscript: $(OBJ) clib/clib.a
+-	$(CC) -o molscript $(COPT) $(OBJ) $(YLIB) clib/clib.a \
++	$(CC) $(LDFLAGS) -o molscript $(COPT) $(OBJ) $(YLIB) clib/clib.a \
+               $(GLUTLINK) $(JPEGLINK) $(PNGLINK) $(GIFLINK) $(ZLIBLINK) -lm
+ 
+ molscript.tab.o: molscript.tab.c molscript.tab.h
+@@ -147,7 +147,7 @@ gif_img.o: gif_img.c gif_img.h global.h graphics.h image.h opengl.h
+ 
+ #------------------------------------------------------------
+ molauto: molauto.o clib/clib.a
+-	$(CC) -o molauto molauto.o clib/clib.a -lm
++	$(CC) $(LDFLAGS) -o molauto molauto.o clib/clib.a -lm
+ 
+ molauto.o: molauto.c
+ 
diff --git a/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild b/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..0917c932848f
--- /dev/null
+++ b/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild,v 1.1 2010/03/28 09:06:22 jlec Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Display molecular 3D structures, such as proteins, in both schematic and detailed representations"
+HOMEPAGE="http://www.avatar.se/molscript/"
+SRC_URI="${P}.tar.gz"
+
+LICENSE="glut molscript"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+RESTRICT="fetch"
+IUSE=""
+
+DEPEND="
+	media-libs/jpeg
+	media-libs/libpng
+	media-libs/gd
+	virtual/glut
+	|| (	x11-libs/libXmu
+			x11-libs/libXext
+			x11-libs/libX11	)"
+RDEPEND="${DEPEND}"
+
+pkg_nofetch() {
+	elog "Please visit ${HOMEPAGE}"
+	elog "and get ${A}."
+	elog "Place it in ${DISTDIR}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/fix-makefile-shared.patch
+	epatch "${FILESDIR}"/${PV}-ldflags.patch
+
+	# Provide glutbitmap.h, because freeglut doesn't have it
+	cp "${FILESDIR}"/glutbitmap.h "${S}"/clib/
+
+	# Stop an incredibly hacky include
+	sed -i -e 's:<../lib/glut/glutbitmap.h>:"glutbitmap.h":g' \
+		"${S}"/clib/ogl_bitmap_character.c
+}
+
+src_compile() {
+	# Prefix of programs it links with
+	export FREEWAREDIR="${EPREFIX}/usr"
+
+	ln -s Makefile.complete Makefile
+
+	emake \
+		CC="$(tc-getCC)" \
+		COPT="${CFLAGS}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	dobin molscript molauto || die
+	dohtml "${S}"/doc/*.html || die
+}
diff --git a/sci-chemistry/molscript/molscript-2.1.2.ebuild b/sci-chemistry/molscript/molscript-2.1.2.ebuild
index cf436323a443..a0831a71e600 100644
--- a/sci-chemistry/molscript/molscript-2.1.2.ebuild
+++ b/sci-chemistry/molscript/molscript-2.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/molscript-2.1.2.ebuild,v 1.4 2007/02/20 01:46:09 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/molscript-2.1.2.ebuild,v 1.5 2010/03/28 09:06:22 jlec Exp $
 
 inherit toolchain-funcs eutils
 
@@ -21,6 +21,12 @@ DEPEND="media-libs/jpeg
 			x11-libs/libX11	)"
 RDEPEND="${DEPEND}"
 
+pkg_nofetch() {
+	elog "Please visit ${HOMEPAGE}"
+	elog "and get ${A}."
+	elog "Place it in ${DISTDIR}"
+}
+
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/fix-makefile-shared.patch