Version Bump, fixing bug 212689, 232292, 246414, thanks rei4dan for working on patches, Cleaned old buggy versions, Fixed wrong path for html installation

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

7 files changed, 71 insertions, 180 deletions

diff --git a/sci-chemistry/ghemical/ChangeLog b/sci-chemistry/ghemical/ChangeLog
index d25ffded79a8..b6bc81559a92 100644
--- a/sci-chemistry/ghemical/ChangeLog
+++ b/sci-chemistry/ghemical/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-chemistry/ghemical
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ghemical/ChangeLog,v 1.29 2009/02/23 16:30:32 josejx Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ghemical/ChangeLog,v 1.30 2010/06/21 14:33:53 jlec Exp $
+
+*ghemical-2.99.2 (21 Jun 2010)
+
+  21 Jun 2010; Justin Lecher <jlec@gentoo.org> +files/2.99.2-docs.patch,
+  -ghemical-2.10.ebuild, -ghemical-2.95.ebuild, -ghemical-2.98.ebuild,
+  +ghemical-2.99.2.ebuild:
+  Version Bump, fixing bug 212689, 232292, 246414, thanks rei4dan for working
+  on patches, Cleaned old buggy versions, Fixed wrong path for html installation
 
   23 Feb 2009; Joseph Jezak <josejx@gentoo.org> ghemical-2.10.ebuild,
   ghemical-2.98.ebuild:
diff --git a/sci-chemistry/ghemical/Manifest b/sci-chemistry/ghemical/Manifest
index b260611ef05e..7bf8a82e337e 100644
--- a/sci-chemistry/ghemical/Manifest
+++ b/sci-chemistry/ghemical/Manifest
@@ -1,11 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 2.99.2-docs.patch 787 RMD160 11d6c8f0019b4511e93d150441c2c49bd357fe55 SHA1 b5225edea9d754fc594ba1a9a929c5e354889ac3 SHA256 ff48abc8a8d27491b94eb81270f5a1f0fcb9b8487605b754a3ba877028a01286
 AUX ghemical-gcc43.patch 403 RMD160 7ed2b8633e0ec98024e97417cd1751cea2a33a96 SHA1 bcb7336fddf379c202abc61a8423d5c9f9be8d91 SHA256 de2ed1a0190a5fb450c88217fa88c62b99c6243c3547776e0f806c1acd0b0630
 DIST ghemical-2.01.tar.gz 2060867 RMD160 18332ba3067c463948671d220f7b0a693fe47aa1 SHA1 b5503e178fce2bf449e19b59a62c9bc12003fa85 SHA256 a0d5cc14b53cf132634f053f8779d0e720eb3d92e90ae154d4f41133beb8c4ae
-DIST ghemical-2.10.tar.gz 2153033 RMD160 1707c0fbb0a7b83b3d2be868b9c3a893b153ea9d SHA1 357f57c786816b4b99f59a79a0786954324a1627 SHA256 9ab934eabafef5ec6375ded7b334f4c54f74dbdcf72330303a3888907922215e
-DIST ghemical-2.95.tar.gz 2062097 RMD160 866cb26b7980d9cdfc1f73ddc03240df583ded20 SHA1 ac9419292554103f2b9bc7be8dfc921906134351 SHA256 1083bd02aba1a73fe7008a2f23d1b974147ac95f34f7ef2f90d8d2f9a823e8cc
-DIST ghemical-2.98.tar.gz 2065429 RMD160 836e1ec7a45615b58aa4a369d2fc21f5d599fbf4 SHA1 d4212aefe12b4d1f98ce6859e0f0d0a658c64a5d SHA256 2163b321df97698487017d32df77fdf4a9afb385b60f93145fd161a277c7ae82
+DIST ghemical-2.99.2.tar.gz 2168844 RMD160 2d8a4d4f3d38c6b2e8b70d14f1b748c40c760334 SHA1 b84b3f750ccd05a9cc0b1a8318abb3a24f2be9c1 SHA256 dbe4796582f8a125121e70c0171bc834d4a8121200354f2ef620583b767e6c4d
 EBUILD ghemical-2.01.ebuild 1294 RMD160 c7c6ef108158fd5042c81c5bc99b417cf5160c4f SHA1 0d33daedf8a508412964622cdd0c9d3c6ee7a1ae SHA256 8b386920a7c27b217ff91c8b21ed2d0292d281b18874ee348e697208dbe7aada
-EBUILD ghemical-2.10.ebuild 1797 RMD160 9a5c7738a3a7276594823ce4df714f8cf4816040 SHA1 681b752ea179ca746c8bf09ac7e00c75573a61a5 SHA256 c71f6f2c076d6be3ed9c5364871b06d4210dbbc09f373ddad3608a2cdad7a30b
-EBUILD ghemical-2.95.ebuild 1554 RMD160 5136628d5b9abb78a51934002481fd81520badd4 SHA1 e573c8187102fe215b06e2788fc04227e3bcca38 SHA256 6022ab919cdd9751ef264c31ea4187ad20b0af14dc4cf93c658cb5b8a839422f
-EBUILD ghemical-2.98.ebuild 1685 RMD160 80100265a2ef5de48ef5519bcc52ed85de6aae4d SHA1 912bfc1f318bd2284e2b5748dc398957417aa062 SHA256 9e2608f22176fdab0456a7fc001117bcb7c6bafca082f79b967b54cb4a81b6fd
-MISC ChangeLog 5177 RMD160 9c2ff22f48399b0286d0ecd9b7119cd229818a3b SHA1 b3f16274ea8a2bd52352c7dd03e690880ab87878 SHA256 5f9ef176556c676962599dc349300424633b7e828d7fda14714365300a999d4f
-MISC metadata.xml 917 RMD160 5ada96e4b3d836e6525a5613076ea6da69e5daec SHA1 bcaf353e9ba29dfa292785049d643f798e46f24a SHA256 3400c4d52b6b7864856cca423c808bbec063fe565bf570411283d66af3771a70
+EBUILD ghemical-2.99.2.ebuild 1392 RMD160 d71b349bfa2459c1037d548e5dde9f5aa81e7cc6 SHA1 65d1365c5f0df9949234acdeda3f6ab9e3bf4b38 SHA256 d5080aca6e74750f0da421ce406918db4d8324c2992fa4c2adeb0d4776667813
+MISC ChangeLog 5538 RMD160 4cb87f14eafcda4355ebda593c71094610b04579 SHA1 7431c27577f445c5b330a6597d67e809e966dab6 SHA256 7835e33ee3aeb15f81299993940dc18917a105d5c0c1c5cd69c2dc63bc264f69
+MISC metadata.xml 720 RMD160 f2685f9a0c36f291d06eefaef00b4c825c3b6813 SHA1 6861345146106ce13adee9120ca71d0107376cf7 SHA256 eb07ffd16a5e534f37c4e50e8e295c8de4af002bab159f34f73bd362ed9bab7e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwfeFcACgkQgAnW8HDreRbq1wCfbMiGIJMdGGOqsaCLUSqqe6lS
+SjIAoKOHcwojCrqzFxnJ/vuRdFo8M6qB
+=XmIm
+-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ghemical/files/2.99.2-docs.patch b/sci-chemistry/ghemical/files/2.99.2-docs.patch
new file mode 100644
index 000000000000..572693487c33
--- /dev/null
+++ b/sci-chemistry/ghemical/files/2.99.2-docs.patch
@@ -0,0 +1,22 @@
+diff --git a/docs/user-docs/Makefile.am b/docs/user-docs/Makefile.am
+index 030f67c..dcb207b 100644
+--- a/docs/user-docs/Makefile.am
++++ b/docs/user-docs/Makefile.am
+@@ -1,6 +1,6 @@
+ SUBDIRS = images
+ 
+-helpfilesdir = $(datadir)/ghemical/@APPVERSION@/user-docs
++helpfilesdir = $(datadir)/docs/ghemical-@APPVERSION@/html
+ helpfiles_DATA = *.css *.html
+ 
+ EXTRA_DIST = $(helpfiles_DATA)
+diff --git a/docs/user-docs/images/Makefile.am b/docs/user-docs/images/Makefile.am
+index fae0ffd..a569151 100644
+--- a/docs/user-docs/images/Makefile.am
++++ b/docs/user-docs/images/Makefile.am
+@@ -1,4 +1,4 @@
+-helpimagesdir = $(datadir)/ghemical/@APPVERSION@/user-docs/images
++helpimagesdir = $(datadir)/docs/ghemical-@APPVERSION@/html/images
+ helpimages_DATA = *.png
+ 
+ EXTRA_DIST = $(helpimages_DATA)
diff --git a/sci-chemistry/ghemical/ghemical-2.10.ebuild b/sci-chemistry/ghemical/ghemical-2.10.ebuild
deleted file mode 100644
index 10c7452f4c76..000000000000
--- a/sci-chemistry/ghemical/ghemical-2.10.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ghemical/ghemical-2.10.ebuild,v 1.3 2009/02/23 16:30:32 josejx Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Chemical quantum mechanics and molecular mechanics"
-HOMEPAGE="http://bioinformatics.org/ghemical/"
-
-SRC_URI="http://bioinformatics.org/ghemical/download/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="threads openbabel gamess mopac7 toolbar seamonkey"
-RDEPEND="virtual/glut
-	virtual/glu
-	virtual/opengl
-	sci-chemistry/mpqc
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/pango
-	>=x11-libs/gtk+-2.6
-	>=x11-libs/gtkglext-1.0.5
-	>=gnome-base/libglade-2.4
-	>=sci-libs/libghemical-2.10
-	openbabel? ( >=sci-chemistry/openbabel-2 )
-	threads? ( >=dev-libs/glib-2.4 )
-	mopac7? ( sci-chemistry/mopac7 )
-	gamess? ( sci-chemistry/gamess
-			sci-chemistry/gtk-gamess )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.15"
-
-src_compile() {
-
-# With amd64, if you want gamess I recommend adding gamess and gtk-gamess to package.provided for now.
-
-# Change the built-in help browser.
-	if use seamonkey ; then
-		sed -i -e 's|mozilla|seamonkey|g' src/main.cpp || die "sed failed for seamonkey!"
-	else
-		sed -i -e 's|mozilla|firefox|g' src/main.cpp || die "sed failed for seamonkey!"
-	fi
-
-	# For libf2c
-	if use mopac7; then
-		append-ldflags -lf2c -lm -Xlinker -defsym -Xlinker MAIN__=main
-	fi
-
-	econf \
-		$(use_enable toolbar shortcuts) \
-		$(use_enable openbabel) \
-		$(use_enable threads) \
-		$(use_enable gamess) \
-		|| die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-
-	make DESTDIR="${D}" install || die "install failed"
-}
diff --git a/sci-chemistry/ghemical/ghemical-2.98.ebuild b/sci-chemistry/ghemical/ghemical-2.98.ebuild
deleted file mode 100644
index ea59049d59b1..000000000000
--- a/sci-chemistry/ghemical/ghemical-2.98.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ghemical/ghemical-2.98.ebuild,v 1.3 2009/02/23 16:30:32 josejx Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Chemical quantum mechanics and molecular mechanics"
-HOMEPAGE="http://bioinformatics.org/ghemical/"
-
-SRC_URI="http://bioinformatics.org/ghemical/download/current/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="threads openbabel seamonkey"
-RDEPEND="virtual/glut
-	virtual/glu
-	virtual/opengl
-	sci-chemistry/mpqc
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/pango
-	>=x11-libs/gtk+-2.6
-	>=x11-libs/gtkglext-1.0.5
-	>=gnome-base/libglade-2.4
-	>=sci-libs/libghemical-2.96
-	>=x11-libs/liboglappth-0.96
-	openbabel? ( >=sci-chemistry/openbabel-2 )
-	threads? ( >=dev-libs/glib-2.4 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.15"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "$FILESDIR"/ghemical-gcc43.patch || die "Failed to apply ghemical-gcc43.patch"
-}
-
-src_compile() {
-
-# With amd64, if you want gamess I recommend adding gamess and gtk-gamess to package.provided for now.
-
-# Change the built-in help browser.
-	if use seamonkey ; then
-		sed -i -e 's|mozilla|seamonkey|g' src/gtk_app.cpp || die "sed failed for seamonkey!"
-	else
-		sed -i -e 's|mozilla|firefox|g' src/gtk_app.cpp || die "sed failed for seamonkey!"
-	fi
-
-	econf \
-		$(use_enable openbabel) \
-		$(use_enable threads) \
-		|| die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}
diff --git a/sci-chemistry/ghemical/ghemical-2.95.ebuild b/sci-chemistry/ghemical/ghemical-2.99.2.ebuild
index 87c8c31d7b83..9aec8849a252 100644
--- a/sci-chemistry/ghemical/ghemical-2.95.ebuild
+++ b/sci-chemistry/ghemical/ghemical-2.99.2.ebuild
@@ -1,58 +1,52 @@
-# Copyright 1999-2008 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/ghemical/ghemical-2.95.ebuild,v 1.1 2008/07/08 07:13:09 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ghemical/ghemical-2.99.2.ebuild,v 1.1 2010/06/21 14:33:53 jlec Exp $
 
-inherit eutils flag-o-matic
+EAPI="3"
+
+inherit autotools eutils
 
 DESCRIPTION="Chemical quantum mechanics and molecular mechanics"
 HOMEPAGE="http://bioinformatics.org/ghemical/"
-
 SRC_URI="http://bioinformatics.org/ghemical/download/current/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="openbabel seamonkey threads"
 
-KEYWORDS="~amd64 ~x86"
-IUSE="threads openbabel seamonkey"
-RDEPEND="virtual/glut
-	virtual/glu
-	virtual/opengl
+RDEPEND="
+	dev-libs/glib:2
+	gnome-base/libglade
 	sci-chemistry/mpqc
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
+	>=sci-libs/libghemical-2.99
+	>=x11-libs/liboglappth-0.98
+	virtual/opengl
 	x11-libs/pango
-	>=x11-libs/gtk+-2.6
-	>=x11-libs/gtkglext-1.0.5
-	>=gnome-base/libglade-2.4
-	>=sci-libs/libghemical-2.96
-	>=x11-libs/liboglappth-0.96
-	openbabel? ( >=sci-chemistry/openbabel-2 )
-	threads? ( >=dev-libs/glib-2.4 )"
-
+	x11-libs/gtk+:2
+	x11-libs/gtkglext
+	openbabel? ( sci-chemistry/openbabel )"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.15"
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-docs.patch
+	eautoreconf
+}
 
+src_configure() {
 # With amd64, if you want gamess I recommend adding gamess and gtk-gamess to package.provided for now.
 
 # Change the built-in help browser.
 	if use seamonkey ; then
 		sed -i -e 's|mozilla|seamonkey|g' src/gtk_app.cpp || die "sed failed for seamonkey!"
 	else
-		sed -i -e 's|mozilla|firefox|g' src/gtk_app.cpp || die "sed failed for seamonkey!"
+		sed -i -e 's|mozilla|firefox|g' src/gtk_app.cpp || die "sed failed for firefox!"
 	fi
 
 	econf \
 		$(use_enable openbabel) \
-		$(use_enable threads) \
-		|| die "configure failed"
-	emake || die "make failed"
+		$(use_enable threads)
 }
 
 src_install() {
diff --git a/sci-chemistry/ghemical/metadata.xml b/sci-chemistry/ghemical/metadata.xml
index 962798860721..f0727764b96b 100644
--- a/sci-chemistry/ghemical/metadata.xml
+++ b/sci-chemistry/ghemical/metadata.xml
@@ -10,10 +10,6 @@ included. Geometry optimization, molecular dynamics and a large set of
 visualization tools are currently available.
 </longdescription>
 <use>
-  <flag name='gamess'>Add GAMESS interface for QM/MM
-    (<pkg>sci-chemistry/gamess</pkg>)</flag>
-  <flag name='mopac7'>Apply compilation fix for
-    <pkg>sci-chemistry/mopac7</pkg> support</flag>
   <flag name='openbabel'>Use <pkg>sci-chemistry/openbabel</pkg> for file
     conversions</flag>
   <flag name='toolbar'>Build the shortcuts toolbar</flag>