rasmol: bump to latest. also added new dep, cbflib. (#238302).

3 files changed, 119 insertions, 0 deletions

diff --git a/sci-chemistry/rasmol/Manifest b/sci-chemistry/rasmol/Manifest
new file mode 100644
index 0000000..d27a565
--- /dev/null
+++ b/sci-chemistry/rasmol/Manifest
@@ -0,0 +1,3 @@
+AUX cbflib.patch 1207 RMD160 65c1299349e8c9fe2883d5cbcd943fecd4051bf3 SHA1 1eb25e12aa62e56d6da075a8e6371c70d4b7ab48 SHA256 5b13163bf1cfd2029d8b32561f92279186fb503c3f79c3200a557545dcafc4d2
+DIST RasMol_2.7.4.2.tar.gz 6014461 RMD160 c8480e36ca758601cc2341049ff2ca72ee64c629 SHA1 2e8d15f430971379ad5d1930f3ecd4c0f7ede3f5 SHA256 6b426964f70c756a6856fc9bbdc10cf885f0f289ac7aa797bc082439a68f9571
+EBUILD rasmol-2.7.4.2.ebuild 1541 RMD160 175d37e52a92001ac249044350ea2c390c4f22e3 SHA1 58c96ee2a7c4658fc91fcab102029ca9710c7f5e SHA256 191891cebac3a1bf0fab3cfaea3d63aa62989728e9eb438dd508c15bd277d8e0
diff --git a/sci-chemistry/rasmol/files/cbflib.patch b/sci-chemistry/rasmol/files/cbflib.patch
new file mode 100644
index 0000000..15d643e
--- /dev/null
+++ b/sci-chemistry/rasmol/files/cbflib.patch
@@ -0,0 +1,41 @@
+--- src/Imakefile.orig	2008-09-18 17:11:31.000000000 +0200
++++ src/Imakefile	2008-09-18 17:13:03.000000000 +0200
+@@ -155,7 +155,7 @@
+ 
+ 
+ DEFINES = $(GTKCFLAGS) $(GUIDEF) -DRASMOLDIR=\"$(RASMOLDIR)\" $(DEPTHDEF) $(LOCALEDEF) \
+-          -D_USE_RASMOL_H_ $(GUIOPTION) -I$(CBFLIBDIR)/include
++          -D_USE_RASMOL_H_ $(GUIOPTION) -I/usr/include/cbflib
+ 
+ SRCS = rasmol.c rasmol.h molecule.c molecule.h abstree.c abstree.h \
+        cmndline.c cmndline.h command.c command.h tokens.h transfor.c \
+@@ -178,7 +178,7 @@
+ # LDLIBS = -lm -lXi -lXextSam $(XLIB)
+ 
+ LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) $(XFORMSLIB) $(GTKLIBS) \
+-			-L$(CBFLIBDIR)/lib -lcbf
++			-L/usr/lib -lcbf
+ 
+ 
+ 
+@@ -241,7 +241,8 @@
+ 		(cd $(CBFLIBDIR); make lib/libcbf.a)
+ 		  
+ 
+-$(OBJS):  $(CBFLIBDIR)/lib/libcbf.a
++$(OBJS):  
++#$(OBJS):  $(CBFLIBDIR)/lib/libcbf.a
+ 
+ gtkwin.c: gtkui.h
+ 
+--- src/Makefile.in.orig	2008-09-18 17:10:15.000000000 +0200
++++ src/Makefile.in	2008-09-18 17:11:19.000000000 +0200
+@@ -165,7 +165,7 @@
+ 
+ all:		postdownload rasmol rastxt
+ 
+-rasmol:		postdownload $(X11OBJS) $(CBFLIBDIR)/lib/libcbf.a
++rasmol:		postdownload $(X11OBJS)
+ 		$(CC) -o rasmol $(LFLAGS) $(X11OBJS) $(X11LIBS)
+ 		chmod 755 rasmol
+ 
diff --git a/sci-chemistry/rasmol/rasmol-2.7.4.2.ebuild b/sci-chemistry/rasmol/rasmol-2.7.4.2.ebuild
new file mode 100644
index 0000000..3c3fbf4
--- /dev/null
+++ b/sci-chemistry/rasmol/rasmol-2.7.4.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.2.1.1-r1.ebuild,v 1.6 2007/07/22 07:26:04 dberkholz Exp $
+
+EAPI=1
+
+inherit toolchain-funcs
+
+MY_P="RasMol_${PV}"
+MY_S_P="${MY_P}_10Apr08"
+
+DESCRIPTION="Free program that displays molecular structure."
+HOMEPAGE="http://www.rasmol.org/"
+SRC_URI="http://www.rasmol.org/software/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk"
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXi
+	sci-libs/cbflib
+	gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xextproto
+	app-text/rman
+	x11-misc/imake"
+
+S="${WORKDIR}/${MY_S_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Hack required for build
+	cd src
+	ln -s ../doc
+
+	# Patch out CBFLib, do as separate ebuild.
+	epatch "${FILESDIR}"/cbflib.patch
+}
+
+src_compile() {
+	local myconf
+	use gtk && myconf="${myconf} -DGTKWIN"
+
+	cd src
+	xmkmf ${myconf} || die
+	emake clean || die
+	emake \
+		DEPTHDEF=-DTHIRTYTWOBIT \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		|| die
+}
+
+src_install () {
+	local libdir=$(get_libdir)
+	insinto /usr/${libdir}/${PN}
+	doins doc/rasmol.hlp
+	dobin src/rasmol
+	dodoc INSTALL PROJECTS README TODO doc/*.{ps,pdf}.gz doc/rasmol.txt.gz
+	doman doc/rasmol.1
+	insinto /usr/${libdir}/${PN}/databases
+	doins data/*
+
+	cat <<- EOF >> "${T}"/envd
+	RASMOLPATH="/usr/${libdir}/rasmol"
+	RASMOLPDBPATH="/usr/${libdir}/rasmol/databases"
+	EOF
+
+	newenvd "${T}"/envd 80rasmol
+}