Version bump, fixing 238302

(Portage version: 2.2_rc62/cvs/Linux x86_64)

5 files changed, 170 insertions, 6 deletions

diff --git a/sci-chemistry/rasmol/ChangeLog b/sci-chemistry/rasmol/ChangeLog
index a1653f48454c..98414c38f92e 100644
--- a/sci-chemistry/rasmol/ChangeLog
+++ b/sci-chemistry/rasmol/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-chemistry/rasmol
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.13 2007/07/22 07:26:04 dberkholz Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.14 2010/02/03 22:35:31 jlec Exp $
+
+*rasmol-2.7.5 (03 Feb 2010)
+
+  03 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +files/2.7.5-bundled-lib.patch, rasmol-2.7.2.1.1-r1.ebuild,
+  +rasmol-2.7.5.ebuild, +files/ldflags.patch:
+  Version Bump
+  Only providing 32bit colordepth gtk interface now
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   rasmol-2.7.2.1.1-r1.ebuild:
diff --git a/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch b/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch
new file mode 100644
index 000000000000..7d5ad5f49baf
--- /dev/null
+++ b/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch
@@ -0,0 +1,67 @@
+--- Imakefile	2009-07-20 16:08:43.000000000 +0200
++++ Imakefile.new	2009-07-25 14:07:08.000000000 +0200
+@@ -276,17 +276,10 @@
+ 
+ #ifndef USE_XFORMSLIB
+ DEFINES = $(GTKCFLAGS) $(GUIDEF) -DRASMOLDIR=\"$(RASMOLDIR)\" $(DEPTHDEF) $(LOCALEDEF) \
+-          -D_USE_RASMOL_H_ $(GUIOPTION) -I$(CBFLIB_INCLUDE_DIR) \
+-          -I$(CQRLIB_INCLUDE_DIR) \
+-          -I$(CVECTOR_INCLUDE_DIR) \
+-          -I$(NEARTREE_INCLUDE_DIR)
++          -D_USE_RASMOL_H_ $(GUIOPTION) -IEPREFIX/usr/include -IEPREFIX/usr/include/cbflib
+ #else
+ DEFINES = $(GTKCFLAGS) $(GUIDEF) -DRASMOLDIR=\"$(RASMOLDIR)\" $(DEPTHDEF) $(LOCALEDEF) \
+-	-D_USE_RASMOL_H_ $(GUIOPTION) -I$(CBFLIB_INCLUDE_DIR) \
+-	-I$(CQRLIB_INCLUDE_DIR) \
+-	-I$(CVECTOR_INCLUDE_DIR) \
+-	-I$(NEARTREE_INCLUDE_DIR) \
+-  	-I$(XFORMSLIB_INCLUDE_DIR)
++	-D_USE_RASMOL_H_ $(GUIOPTION) -IEPREFIX/usr/include -IEPREFIX/usr/include/cbflib
+ #endif
+ 
+ 
+@@ -312,11 +305,11 @@
+ # Additional RS6000 AIX MITSHM Library
+ # LDLIBS = -lm -lXi -lXextSam $(XLIB)
+ 
+-LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) $(XFORMSLIB) $(GTKLIBS) \
+-			$(CBFLIB_LDLIB) \
+-			$(CQRLIB_LDLIB) \
+-			$(CVECTOR_LDLIB) \
+-			$(NEARTREE_LDLIB) $(XFORMSLIB_LDLIB)
++LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) -lforms $(GTKLIBS) \
++			-lcbf \
++			-lCQRlib \
++			-lCVector \
++			-lCNearTree -lforms -lgfortran
+ 
+ 
+ #
+@@ -420,11 +413,11 @@
+ $(NEARTREE_DIR)/CNearTree.c: $(NEARTREE_DIR)
+ #endif		  
+ 
+-$(OBJS):  $(EXTPKGDIR) $(CBFLIB_OBJDEP) \
+-			$(CQRLIB_OBJDEP) \
+-			$(CVECTOR_OBJDEP) \
+-			$(NEARTREE_OBJDEP) \
+-			$(XFORMSLIB_OBJDEP)
++# $(OBJS):  $(EXTPKGDIR) $(CBFLIB_OBJDEP) \
++#			$(CQRLIB_OBJDEP) \
++#			$(CVECTOR_OBJDEP) \
++#			$(NEARTREE_OBJDEP) \
++#			$(XFORMSLIB_OBJDEP)
+ 
+ 
+ gtkwin.c: gtkui.h
+--- Makefile.in	2009-07-14 18:39:18.000000000 +0200
++++ Makefile.in.new	2009-07-25 14:08:11.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/files/ldflags.patch b/sci-chemistry/rasmol/files/ldflags.patch
new file mode 100644
index 000000000000..733cd552eb7c
--- /dev/null
+++ b/sci-chemistry/rasmol/files/ldflags.patch
@@ -0,0 +1,11 @@
+--- src/Makefile	2009-06-04 14:25:15.000000000 +0200
++++ src/Makefile.new	2009-06-04 14:27:35.000000000 +0200
+@@ -1175,7 +1175,7 @@
+ 
+ rasmol: $(OBJS) $(DEPLIBS)
+ 	$(RM) $@
+-	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LOCAL_LIBRARIES) $(LDLIBS)  $(EXTRA_LOAD_FLAGS)
++	$(CCLINK) $(LDOPTIONS) $(LDFLAGS) -o $@ $(OBJS) $(LOCAL_LIBRARIES) $(LDLIBS)  $(EXTRA_LOAD_FLAGS)
+ 
+ install:: rasmol
+ 	@if [ -d $(DESTDIR)$(BINDIR) ]; then \
diff --git a/sci-chemistry/rasmol/rasmol-2.7.2.1.1-r1.ebuild b/sci-chemistry/rasmol/rasmol-2.7.2.1.1-r1.ebuild
index 33cb6cad875e..d814910885cb 100644
--- a/sci-chemistry/rasmol/rasmol-2.7.2.1.1-r1.ebuild
+++ b/sci-chemistry/rasmol/rasmol-2.7.2.1.1-r1.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/rasmol/rasmol-2.7.2.1.1-r1.ebuild,v 1.6 2007/07/22 07:26:04 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.2.1.1-r1.ebuild,v 1.7 2010/02/03 22:35:31 jlec Exp $
 
 inherit toolchain-funcs
 
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# Hack required for build
 	cd src
@@ -56,7 +56,7 @@ src_compile() {
 }
 
 src_install () {
-	newbin ${FILESDIR}/rasmol.sh.debian rasmol
+	newbin "${FILESDIR}"/rasmol.sh.debian rasmol
 	insinto /usr/lib/${PN}
 	doins doc/rasmol.hlp
 	exeinto /usr/lib/${PN}
diff --git a/sci-chemistry/rasmol/rasmol-2.7.5.ebuild b/sci-chemistry/rasmol/rasmol-2.7.5.ebuild
new file mode 100644
index 000000000000..c3b43c3d0cd2
--- /dev/null
+++ b/sci-chemistry/rasmol/rasmol-2.7.5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5.ebuild,v 1.1 2010/02/03 22:35:31 jlec Exp $
+
+EAPI="3"
+
+inherit toolchain-funcs eutils
+
+MY_P="RasMol_${PV}"
+VERS="23Jul09"
+
+DESCRIPTION="Molecular Graphics Visualisation Tool"
+HOMEPAGE="http://www.openrasmol.org/"
+SRC_URI="http://www.rasmol.org/software/${MY_P}.tar.gz"
+
+LICENSE="|| ( GPL-2 RASLIC )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/vte
+	>=x11-libs/xforms-1.0.91
+	dev-libs/cvector
+	sci-libs/cbflib
+	sci-libs/cqrlib
+	sci-libs/neartree"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xextproto
+	app-text/rman
+	x11-misc/imake"
+
+S="${WORKDIR}/${P}-${VERS}"
+
+src_prepare() {
+	cd src
+
+	use amd64 && \
+		mv rasmol.h rasmol_amd64_save.h && \
+		echo "#define _LONGLONG"|cat - rasmol_amd64_save.h > rasmol.h
+
+	mv Imakefile_base Imakefile
+	epatch "${FILESDIR}"/${PV}-bundled-lib.patch
+
+	sed "s:EPREFIX:${EPREFIX}:g" -i Imakefile || die
+
+	xmkmf -DGTKWIN ${myconf}|| die "xmkmf failed with ${myconf}"
+
+	epatch "${FILESDIR}"/ldflags.patch
+}
+
+src_compile() {
+	cd src
+	make clean
+	emake \
+		DEPTHDEF=-DTHIRTYTWOBIT \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		|| die "make failed"
+}
+
+src_install () {
+	libdir=$(get_libdir)
+	insinto /usr/${libdir}/${PN}
+	doins doc/rasmol.hlp || die
+	dobin src/rasmol || die
+	dodoc PROJECTS {README,TODO}.txt doc/*.{ps,pdf}.gz doc/rasmol.txt.gz || die
+	doman doc/rasmol.1 || die
+	insinto /usr/${libdir}/${PN}/databases
+	doins data/* || die
+
+	dohtml -r *html doc/*.html html_graphics || die
+}