Python ABI fix #316173, keyworded for amd64, place things at the right position, fix startup issue #249508

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

3 files changed, 211 insertions, 2 deletions

diff --git a/sci-chemistry/gopenmol/ChangeLog b/sci-chemistry/gopenmol/ChangeLog
index 6f81c4c1bc7a..1dd25708e3fa 100644
--- a/sci-chemistry/gopenmol/ChangeLog
+++ b/sci-chemistry/gopenmol/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/gopenmol
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/ChangeLog,v 1.8 2007/07/22 07:22:46 dberkholz Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/ChangeLog,v 1.9 2010/05/20 11:40:28 jlec Exp $
+
+*gopenmol-3.00-r2 (20 May 2010)
+
+  20 May 2010; Justin Lecher <jlec@gentoo.org> +files/3.00-multilib.patch,
+  +gopenmol-3.00-r2.ebuild:
+  Python ABI fix #316173, keyworded for amd64, place things at the right
+  position, fix startup issue #249508
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   gopenmol-3.00-r1.ebuild:
diff --git a/sci-chemistry/gopenmol/files/3.00-multilib.patch b/sci-chemistry/gopenmol/files/3.00-multilib.patch
new file mode 100644
index 000000000000..9ca263808622
--- /dev/null
+++ b/sci-chemistry/gopenmol/files/3.00-multilib.patch
@@ -0,0 +1,104 @@
+diff --git a/src/config.mk.ac b/src/config.mk.ac
+index b1061d9..374bc77 100755
+--- a/src/config.mk.ac
++++ b/src/config.mk.ac
+@@ -18,7 +18,7 @@ gomroot          = $(libdir)/$(gomsubdir)
+ gomdataroot      = $(datadir)/$(gomsubdir)
+ gombindir        = $(gomroot)/bin
+ gomincdir        = $(includedir)/$(gomsubdir)
+-gomlibdir        = $(gomroot)/bin
++gomlibdir        = $(gomroot)/GENTOOLIBDIR
+ # Tcl/Tk entries.
+ TCL_LIBRARY      = @TCL_LIBRARY@
+ TK_LIBRARY       = @TK_LIBRARY@
+diff --git a/src/plugins/Makefile b/src/plugins/Makefile
+index bb9af64..cf8a97d 100755
+--- a/src/plugins/Makefile
++++ b/src/plugins/Makefile
+@@ -22,7 +22,7 @@ all install install-local uninstall: FORCE
+ build compile clean clean-libs clean-objs: FORCE
+ 	-@for dir in *; do \
+ 	    if test -f "$$dir/Makefile"; then \
+-		( cd "$$dir" && $(MAKE) $(MFLAGS) $@ ) ;\
++		( cd "$$dir" && $(MAKE) $(MFLAGS) $@ ) || exit 1;\
+ 	    fi ;\
+ 	done
+ 
+diff --git a/src/plugins/config.mk.ac b/src/plugins/config.mk.ac
+index 03e3f6b..eb30ea8 100755
+--- a/src/plugins/config.mk.ac
++++ b/src/plugins/config.mk.ac
+@@ -11,7 +11,7 @@ gomdataroot      = ${datadir}/${gomsubdir}
+ gombindir        = ${gomroot}/bin
+ gomincdir        = ${gomsrcdir}/include/gomlib
+ #INS gomincdir        = ${includedir}/${gomsubdir}
+-gomlibdir        = ${gomroot}/bin
++gomlibdir        = ${gomroot}/GENTOOLIBDIR
+ gomsrcdir        = @abs_top_srcdir@
+ gombltdir        = @abs_top_builddir@
+ #INS gomsrcdir        = ${gomroot}/src
+diff --git a/src/plugins/rules.mk b/src/plugins/rules.mk
+index d41ed47..da133c6 100755
+--- a/src/plugins/rules.mk
++++ b/src/plugins/rules.mk
+@@ -43,12 +43,12 @@ $(LIBRARY): $(libdeps)
+ 	@$(RM) alldeps.dT
+ 
+ link-CC: FORCE
+-	$(GOM_LINK_CC) $(PLUG_CFLAGS) -o $(LIBRARY) $(OBJECTS) \
+-	    $(PLUG_LDFLAGS) $(PLUG_LIBS) $(GOM_LINKFLAGS)
++	$(GOM_LINK_CC) $(GOM_LINKFLAGS) $(PLUG_CFLAGS) -o $(LIBRARY) $(OBJECTS) \
++	    $(PLUG_LDFLAGS) $(PLUG_LIBS)
+ 
+ link-CXX: FORCE
+-	$(GOM_LINK_CXX) $(PLUG_CXXFLAGS) -o $(LIBRARY) $(OBJECTS) \
+-	    $(PLUG_LDFLAGS) $(PLUG_LIBS) $(GOM_LINKFLAGS)
++	$(GOM_LINK_CXX) $(GOM_LINKFLAGS) $(PLUG_CXXFLAGS) -o $(LIBRARY) $(OBJECTS) \
++	    $(PLUG_LDFLAGS) $(PLUG_LIBS)
+ 
+ # Rule to compile the source files.
+ # First make:
+diff --git a/src/unix/make/install.mk b/src/unix/make/install.mk
+index 3018946..98c061a 100755
+--- a/src/unix/make/install.mk
++++ b/src/unix/make/install.mk
+@@ -36,7 +36,7 @@ mkinstalldirs: mkinstalldirs-local mkinstalldirs-shared FORCE ;
+ mkinstalldirs-local: FORCE
+ 	$(MKDIR_P) '$(gomroot)' || test -d '$(gomroot)'
+ 	@$(set_show); set -e; \
+-	for dir in bin src/plugins src/unix; do \
++	for dir in bin lib src/plugins src/unix; do \
+ 	    dir='$(gomroot)'/$$dir; \
+ 	    $$show $(MKDIR_P) "$$dir"; \
+ 	    $(MKDIR_P) "$$dir" || test -d "$$dir"; \
+diff --git a/src/unix/make/utility.mk.ac b/src/unix/make/utility.mk.ac
+index 21ad59d..ee25ac7 100755
+--- a/src/unix/make/utility.mk.ac
++++ b/src/unix/make/utility.mk.ac
+@@ -47,8 +47,7 @@ BINARIES_F   = ambera2b$(EXEEXT) \
+                xmol2bamber$(EXEEXT) \
+                xplor2charmm$(EXEEXT) \
+                gridasc2plt$(EXEEXT) \
+-               gridbin2plt$(EXEEXT) \
+-               icon8$(EXEEXT)
++               gridbin2plt$(EXEEXT)
+ 
+ BINARIES_JAR = xvibs.jar
+ 
+@@ -76,13 +75,13 @@ $(OBJECTS_C):
+ 	$(CC) -c $? $(CPPFLAGS) $(CFLAGS)
+ 
+ $(BINARIES_C):
+-	$(CC) -o $@ $? $(CPPFLAGS) $(CFLAGS) $(STD_LIBS) $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o $@ $? $(CPPFLAGS) $(CFLAGS) $(STD_LIBS)
+ 
+ $(BINARIES_CXX):
+-	$(CXX) -o $@ $? $(CPPFLAGS) $(CXXFLAGS) $(STD_LIBS) $(LDFLAGS)
++	$(CXX) $(LDFLAGS) -o $@ $? $(CPPFLAGS) $(CXXFLAGS) $(STD_LIBS)
+ 
+ $(BINARIES_F):
+-	$(F77) -o $@ $? $(FFLAGS) $(STD_LIBS) $(LDFLAGS)
++	$(F77) $(LDFLAGS) -o $@ $? $(FFLAGS) $(STD_LIBS)
+ 
+ $(BINARIES_JAR):
+ 	cp $? $@
diff --git a/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild b/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild
new file mode 100644
index 000000000000..938b1b90db50
--- /dev/null
+++ b/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild,v 1.1 2010/05/20 11:40:28 jlec Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+
+inherit eutils multilib prefix python
+
+DESCRIPTION="Tool for the visualization and analysis of molecular structures"
+HOMEPAGE="http://www.csc.fi/gopenmol"
+SRC_URI="${HOMEPAGE}/distribute/${P}-linux.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	=dev-lang/tk-8.4*
+	dev-tcltk/bwidget
+	media-libs/jpeg
+	virtual/glut
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXxf86vm"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/gOpenMol-${PV}/src"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-include-config-for-plugins.patch
+	epatch "${FILESDIR}"/${PV}-multilib.patch
+
+	sed \
+		-e "s:GENTOOLIBDIR:$(get_libdir):g" \
+		-i config.mk.ac plugins/config.mk.ac
+	sed "/GOM_TEMP/s:^.*$:GOM_TEMP=\"${EPREFIX}/tmp/:g" -i ../environment.txt || die
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	# Plugins are not built by default
+	cd ${S}/plugins
+	emake || die "emake plugins failed"
+
+	# Utilities are not built by default
+	cd ${S}/utility
+	emake || die "emake utility failed"
+}
+
+src_install() {
+	einstall || die "einstall failed"
+
+	cd ${S}/plugins
+	einstall || die "einstall plugins failed"
+
+	cd ${S}/utility
+	einstall || die "einstall utility failed"
+
+	dosed /usr/bin/rungOpenMol
+
+	dosym ../$(get_libdir)/gOpenMol-${PV}/bin/${PN} /usr/bin/${PN}
+
+	dodoc "${ED}"/usr/share/gOpenMol-${PV}/{docs/*,README*} || die
+
+	dodir /usr/share/doc/${PF}/html
+	mv -T "${ED}"/usr/share/gOpenMol-${PV}/help "${ED}"/usr/share/doc/${PF}/html || die
+	mv "${ED}"/usr/share/gOpenMol-${PV}/utility "${ED}"/usr/share/doc/${PF}/html || die
+
+	rm -rf \
+		"${ED}"/usr/$(get_libdir)/gOpenMol-${PV}/{src,install} \
+		"${ED}"/usr/share/gOpenMol-${PV}/{docs,README*,COPYRIGHT} || die
+
+	cat >> "${T}"/20${PN} <<- EOF
+	GOM_ROOT="${EPREFIX}"/usr/$(get_libdir)/gOpenMol-${PV}/
+	GOM_DATA="${EPREFIX}"/usr/share/gOpenMol-${PV}/data
+	GOM_HELP="${EPREFIX}"/usr/share/doc/${PVR}/html
+	GOM_DEMO="${EPREFIX}"/usr/share/gOpenMol-${PV}/demo
+	EOF
+
+	doenvd "${T}"/20${PN}
+}
+
+pkg_postinst() {
+	einfo "Run gOpenMol using the rungOpenMol script."
+}