Bump. Remove faulty libf2c dep; Add modular X deps.

Package-Manager: portage-2.0.53

6 files changed, 88 insertions, 2 deletions

diff --git a/sci-chemistry/ghemical/ChangeLog b/sci-chemistry/ghemical/ChangeLog
index a2b88c0336b9..e47be871ef1c 100644
--- a/sci-chemistry/ghemical/ChangeLog
+++ b/sci-chemistry/ghemical/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/ghemical
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ghemical/ChangeLog,v 1.13 2005/12/02 15:47:29 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ghemical/ChangeLog,v 1.14 2005/12/06 11:05:17 spyderous Exp $
+
+*ghemical-1.91 (06 Dec 2005)
+
+  06 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/ghemical-1.91-ghemical-server-fix.patch,
+  +files/1.91-gcc3.4-r1.patch, +ghemical-1.91.ebuild:
+  Bump. Remove faulty libf2c dep; Add modular X deps.
 
   02 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; ghemical-1.90.ebuild:
   libghemical moved from sci-chemistry to sci-libs.
diff --git a/sci-chemistry/ghemical/Manifest b/sci-chemistry/ghemical/Manifest
index d4363b4b937b..9558444f6551 100644
--- a/sci-chemistry/ghemical/Manifest
+++ b/sci-chemistry/ghemical/Manifest
@@ -1,14 +1,18 @@
-MD5 ef17eb4b0ee7a46e1c31e48126cfc414 ChangeLog 2622
+MD5 85365ec7201c1bb8c8574743d7b96d48 ChangeLog 2866
 MD5 dfee64c8a4cb7dc562e202b9b892f1ec files/1.90-gcc3.4-r1.patch 314
+MD5 dfee64c8a4cb7dc562e202b9b892f1ec files/1.91-gcc3.4-r1.patch 314
 MD5 fefd85f432335b478759ce408d355480 files/digest-ghemical-1.00 63
 MD5 ed929c4b181d11c1d2ab2e2fdfc65614 files/digest-ghemical-1.01 63
 MD5 ecf94e717ecddb04194c606ff2a1c7c5 files/digest-ghemical-1.02 63
 MD5 8a3e5b80ca59fca4b3bf452c38a6c1c9 files/digest-ghemical-1.90 63
+MD5 c81eadc04bb5f3140fc2880e8b8c67ea files/digest-ghemical-1.91 63
 MD5 d33b8f1ad096b3c68d0edcec13f0caaf files/gcc3.4-r1.patch 350
 MD5 bdb8f7d12899a6cae19b4d7ff183c752 files/gcc3.4.patch 1112
 MD5 1abfc18218d6f41913205984e107bdd2 files/ghemical-1.90-ghemical-server-fix.patch 624
+MD5 1abfc18218d6f41913205984e107bdd2 files/ghemical-1.91-ghemical-server-fix.patch 624
 MD5 7eee9f49213553ee1ee395ec0d8c2384 ghemical-1.00.ebuild 1169
 MD5 bbff2d1aa187874c26b9d4451e8a78c4 ghemical-1.01.ebuild 1173
 MD5 b964db1a386ee2360d177d654db9e8c2 ghemical-1.02.ebuild 1358
 MD5 21d12e918b6b747edf44c58630efe3c3 ghemical-1.90.ebuild 1341
+MD5 a8544500e90b1f81c5b85193ba9c6df7 ghemical-1.91.ebuild 1432
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
diff --git a/sci-chemistry/ghemical/files/1.91-gcc3.4-r1.patch b/sci-chemistry/ghemical/files/1.91-gcc3.4-r1.patch
new file mode 100644
index 000000000000..5b359c1ca0a7
--- /dev/null
+++ b/sci-chemistry/ghemical/files/1.91-gcc3.4-r1.patch
@@ -0,0 +1,12 @@
+diff -ru src-old/objects.h src/objects.h
+--- src-old/objects.h	2005-01-04 16:21:49.000000000 +0100
++++ src/objects.h	2005-01-04 12:26:57.000000000 +0100
+@@ -177,7 +177,7 @@
+ {
+ 	protected:
+ 	
+-	friend obj_loc_data * dummy_object::GetLocDataRW(void) const;
++	friend class dummy_object;
+ 	
+ 	obj_loc_data * data;
+ 	
diff --git a/sci-chemistry/ghemical/files/digest-ghemical-1.91 b/sci-chemistry/ghemical/files/digest-ghemical-1.91
new file mode 100644
index 000000000000..2c891b678800
--- /dev/null
+++ b/sci-chemistry/ghemical/files/digest-ghemical-1.91
@@ -0,0 +1 @@
+MD5 e9c40239e2b7cde3ee2a4119d3f0fde4 ghemical-1.91.tgz 1389116
diff --git a/sci-chemistry/ghemical/files/ghemical-1.91-ghemical-server-fix.patch b/sci-chemistry/ghemical/files/ghemical-1.91-ghemical-server-fix.patch
new file mode 100644
index 000000000000..cbc473e897d6
--- /dev/null
+++ b/sci-chemistry/ghemical/files/ghemical-1.91-ghemical-server-fix.patch
@@ -0,0 +1,13 @@
+diff -urN ghemical-1.90.orig/Makefile.in ghemical-1.90/Makefile.in
+--- ghemical-1.90.orig/Makefile.in	2005-06-30 06:04:13.000000000 -0700
++++ ghemical-1.90/Makefile.in	2005-07-08 21:59:35.000000000 -0700
+@@ -72,7 +72,8 @@
+ 	## prefix? now goes into /usr/lib/bonobo/servers/
+ 	#################################################
+ 	@echo "Copying GNOME_Ghemical.server"
+-	cp -p $(top_srcdir)/GNOME_Ghemical.server /usr/lib/bonobo/servers/
++	$(top_srcdir)/mkinstalldirs @libdir@/bonobo/servers
++	cp -p $(top_srcdir)/GNOME_Ghemical.server @libdir@/bonobo/servers/
+ 	@echo ""
+ 	
+ 	## prefix? now goes into /usr/share/gnome-2.0/ui/
diff --git a/sci-chemistry/ghemical/ghemical-1.91.ebuild b/sci-chemistry/ghemical/ghemical-1.91.ebuild
new file mode 100644
index 000000000000..61c6e962f640
--- /dev/null
+++ b/sci-chemistry/ghemical/ghemical-1.91.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ghemical/ghemical-1.91.ebuild,v 1.1 2005/12/06 11:05:17 spyderous Exp $
+
+inherit eutils
+
+DESCRIPTION="Ghemical supports both quantum-mechanics (semi-empirical and ab initio) models and molecular mechanics models (there is an experimental Tripos 5.2-like force field for organic molecules). Also a tool for reduced protein models is included. Geometry optimization, molecular dynamics and a large set of visualization tools are currently available."
+HOMEPAGE="http://www.uku.fi/~thassine/ghemical/"
+SRC_URI="http://www.uku.fi/~thassine/ghemical/download/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE="threads"
+
+RDEPEND="virtual/glut
+	>=x11-libs/gtkglext-1.0.5
+	>=gnome-base/libglade-2.4.0
+	>=sci-libs/libghemical-1.90
+	threads? ( >=dev-libs/glib-2.4.0 )
+	|| ( (
+			media-libs/mesa
+			x11-libs/libXmu
+			x11-libs/libICE
+		)
+		virtual/x11
+	)"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.15"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc3.4-r1.patch
+	epatch ${FILESDIR}/${P}-ghemical-server-fix.patch
+}
+
+src_compile() {
+	./configure \
+		--prefix=/usr \
+		$(use_enable threads) || die "Configure failed"
+	emake || die "Make failed"
+}
+
+src_install() {
+	sed -e "s:^prefix=.*:prefix=${D}/usr:" -i Makefile
+	make install || die "Install failed"
+}