Bump.

Package-Manager: portage-2.1.4

5 files changed, 220 insertions, 6 deletions

diff --git a/sci-chemistry/webmo/ChangeLog b/sci-chemistry/webmo/ChangeLog
index 8f5ef0c5f6ca..b9a4d4713708 100644
--- a/sci-chemistry/webmo/ChangeLog
+++ b/sci-chemistry/webmo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/webmo
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/webmo/ChangeLog,v 1.14 2008/02/05 08:47:31 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/webmo/ChangeLog,v 1.15 2008/02/15 08:53:27 dberkholz Exp $
+
+*webmo-8.0.010 (15 Feb 2008)
+
+  15 Feb 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/8.0.010-add-gamess-data-directory.patch,
+  +files/8.0.010-gentoo-locations.patch, +webmo-8.0.010.ebuild:
+  Bump.
 
   05 Feb 2008; Benedikt Böhm <hollow@gentoo.org> webmo-6.1.010.ebuild,
   webmo-7.0.003.ebuild:
diff --git a/sci-chemistry/webmo/Manifest b/sci-chemistry/webmo/Manifest
index 781e5d70922b..f938cd027081 100644
--- a/sci-chemistry/webmo/Manifest
+++ b/sci-chemistry/webmo/Manifest
@@ -2,20 +2,24 @@
 Hash: SHA1
 
 AUX 7.0.003-gentoo-locations.patch 1936 RMD160 32aa3271b88c1404f9bc14c3abd43f571d3e6e66 SHA1 7e2b58918c714dc557685387c6f1e5f6cfce3815 SHA256 a6511aa4a2dbc065959b67e994077bdb218a347b55be436c09f2798a4b2b0a99
+AUX 8.0.010-add-gamess-data-directory.patch 2065 RMD160 1813b24d57578060d0873db6e7386b09a6bde88f SHA1 de551f8abc876583f4f31b22b43f873d51bb408d SHA256 293c86358a7ce67382f4f97282514314d70aae8970c8db178bb2815f53f912e0
+AUX 8.0.010-gentoo-locations.patch 1887 RMD160 acd821e96e724680e7189b3b9b64749e7d2d099b SHA1 93d7162da63e4b7196c7e76cc081a6c22ff48a61 SHA256 83865bebb0f407838d1f10771a8dee7887bbe0eb87c0199e6f97514a55227715
 AUX add-gamess-data-directory.patch 2112 RMD160 1cb6afe72d077b8e53c958276da054e581dffb80 SHA1 4b1d0fa9a2e38e1644969eed0d727fed6c03be2a SHA256 3f22a700679e762296593816a6ddac3fe048a069921dd890176b0a5863b0323d
 AUX dont-be-interactive-or-diagnose.patch 806 RMD160 f583bd3515fdd6388a842aa0ef6afc798bfbdf7b SHA1 9bb7e090322010b66a0314da80283b70f8e1af24 SHA256 0564216929993ff7180486da3b9166a829eb111a90d83b46f1a70099f67c2774
 AUX gentoo-locations.patch 1939 RMD160 c9f38a643ac722a05cd4287b1124f192b8524c35 SHA1 316655a00f562b8104482da71454b1a9a60f42ab SHA256 cc4604c3f520a4b6914f3f44a4971a761c3e96a1ae0c8941d6f956ab97aaba01
 AUX reconfig 1957 RMD160 68c3eac15df2acebdeeb9dd82938e5a3d5bc1aa9 SHA1 370883684b76277b409739819b22c3056fcf4130 SHA256 86faf48c67355367ca6d68a1b1e992602b760857b50ced0f2be78a9da9395ba5
 DIST WebMO.6.1.010.tar.gz 1221074 RMD160 2ed4385229b3c094891cc31131ca0f313eba59e5 SHA1 63440398ddb3daf591fa260a30204519889a7ab0 SHA256 99f53a346b32ee7b9ec9c0c7a4368b5c3e744e8dd960e57a776867558e35ec7b
 DIST WebMO.7.0.003.tar.gz 1491250 RMD160 42a73223370ad5e6e5b0baca95c9b3a1b01a8a09 SHA1 63f125d118610a9e40cea8fa14200675d5be1c6a SHA256 41018522a78f752bf07ad4ae6798c9eac0d678aba7d1f71f7c6dd5c4f00b2435
+DIST WebMO.8.0.010.tar.gz 1350339 RMD160 8a266c3f718e8e67bac237703e0e53380f8c010c SHA1 e6987b67a9d5316cb92e4a712e8620a78eb349ad SHA256 e410bb63e07ecc34bd0ee3d0325055e730902dd09bb28c2e9469fafbfa2c0071
 EBUILD webmo-6.1.010.ebuild 3444 RMD160 c50514aa6f060657ddcbca727511854b82400ef9 SHA1 b1cd8fad2157afa60e013557fe3174f8be864933 SHA256 5f611c01e8ad10de5eb897c48f7bcb180d486d2ea6ce3ef7117fae7b2c51529a
 EBUILD webmo-7.0.003.ebuild 3450 RMD160 231496b616ea9acce9f037c4363c2c094dae32ad SHA1 21227502481c2aeda930fa3a886bb631e37509b0 SHA256 8c2dffa0ed04a44fd596bb550b515b7d9a5d674d764766dea5bef8940e856b05
-MISC ChangeLog 3509 RMD160 400855d1011ca85125ff289f240861a79b1d9ef9 SHA1 94e5c304be942d6c504f7c3b785264e74c5883ba SHA256 28b55765f101c109a6bb3f5725aed106f39a0010b3df98314c9e66a9a981ea4a
+EBUILD webmo-8.0.010.ebuild 3463 RMD160 862c1235f069992c91ebaecd4eb296546e64c138 SHA1 5b7ef671ec619f9e78a02d4c069331e7ae34d7df SHA256 85b3513aac58e8340b1e4d4372f66e95040977356f9d1a1c06035812c280410b
+MISC ChangeLog 3720 RMD160 9473e45ad9b9db73ae00a9edab842df7366c65e0 SHA1 82b389e4e7105851f1f542ec0e3cc728998421c1 SHA256 6a673194e23b9180aa2c2910b38c679abe3209be8463a7178e2229ba78e873bc
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkeoIqwACgkQmPFBzbX68WFcMgCfYQPo+/zBK2jw7td74JjHqig0
-l8oAnR0zGB94tq/TJOSaAxLmyKpJ88xK
-=z3iF
+iD8DBQFHtVMPXVaO67S1rtsRAkLqAKDQkLrnKQEMLHaRJg9uk/rjByK1GwCgy3S1
+EssPzI6X9zIdohv+UmqB088=
+=3Bzl
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/webmo/files/8.0.010-add-gamess-data-directory.patch b/sci-chemistry/webmo/files/8.0.010-add-gamess-data-directory.patch
new file mode 100644
index 000000000000..67447d6059ba
--- /dev/null
+++ b/sci-chemistry/webmo/files/8.0.010-add-gamess-data-directory.patch
@@ -0,0 +1,42 @@
+diff -ur WebMO.install.orig/cgi-bin/interfaces/gamess.int.disabled WebMO.install/cgi-bin/interfaces/gamess.int.disabled
+--- WebMO.install.orig/cgi-bin/interfaces/gamess.int.disabled	2008-02-15 00:37:31.000000000 -0800
++++ WebMO.install/cgi-bin/interfaces/gamess.int.disabled	2008-02-15 00:37:56.000000000 -0800
+@@ -3,6 +3,7 @@
+ interfaceDescription{'gamess_name'}="Gamess"
+ gamessVersion="2007"
+ gamessGMSPATH="/usr/bin"
++gamessDATAPATH="/usr/share/gamess/ericfmt"
+ gamessBinary="gamess.00.x"
+ gamessDdikick="ddikick.x"
+ cpuMin="0"
+diff -ur WebMO.install.orig/cgi-bin/run_gamess.cgi WebMO.install/cgi-bin/run_gamess.cgi
+--- WebMO.install.orig/cgi-bin/run_gamess.cgi	2008-02-15 00:37:31.000000000 -0800
++++ WebMO.install/cgi-bin/run_gamess.cgi	2008-02-15 00:38:12.000000000 -0800
+@@ -30,7 +30,7 @@
+ $ENV{'IRCDATA'} = $output_file.".irc";
+ $ENV{'PUNCH'} = $output_file.".dat";
+ $ENV{'INPUT'} = "$input_file.inp";
+-$ENV{'ERICFMT'} = "$gamessGMSPATH/ericfmt.dat";
++$ENV{'ERICFMT'} = "$gamessDATAPATH/ericfmt.dat";
+ $ENV{'PATH'} = $ENV{'PATH'}.":".$gamessGMSPATH;
+ $ENV{'DDI_RSH'}=$serverShell;
+ 
+diff -ur WebMO.install.orig/source/gamessmgr_admin.html WebMO.install/source/gamessmgr_admin.html
+--- WebMO.install.orig/source/gamessmgr_admin.html	2008-02-15 00:37:31.000000000 -0800
++++ WebMO.install/source/gamessmgr_admin.html	2008-02-15 00:38:57.000000000 -0800
+@@ -30,10 +30,14 @@
+ 							<TD><INPUT TYPE="text" NAME="gamessVersion" VALUE="<PERL>$gamessVersion</PERL>" SIZE=50></TD>
+ 						</TR>
+ 						<TR>
+-							<TD><B>GAMESS directory</B></TD>
++							<TD><B>GAMESS binary directory</B></TD>
+ 							<TD><INPUT TYPE="text" NAME="gamessGMSPATH" VALUE="<PERL>$gamessGMSPATH</PERL>" SIZE=50></TD>
+ 						</TR>
+ 						<TR>
++							<TD><B>GAMESS data directory</B></TD>
++							<TD><INPUT TYPE="text" NAME="gamessDATAPATH" VALUE="<PERL>$gamessDATAPATH</PERL>" SIZE=50></TD>
++						</TR>
++						<TR>
+ 							<TD><B>GAMESS binary (name, not path)</B></TD>
+ 							<TD><INPUT TYPE="text" NAME="gamessBinary" VALUE="<PERL>$gamessBinary</PERL>" SIZE=50></TD>
+ 						</TR>
diff --git a/sci-chemistry/webmo/files/8.0.010-gentoo-locations.patch b/sci-chemistry/webmo/files/8.0.010-gentoo-locations.patch
new file mode 100644
index 000000000000..5c13919b8e1f
--- /dev/null
+++ b/sci-chemistry/webmo/files/8.0.010-gentoo-locations.patch
@@ -0,0 +1,40 @@
+diff -ur WebMO.install.orig/cgi-bin/interfaces/gamess.int.disabled WebMO.install/cgi-bin/interfaces/gamess.int.disabled
+--- WebMO.install.orig/cgi-bin/interfaces/gamess.int.disabled	2008-02-15 00:35:02.000000000 -0800
++++ WebMO.install/cgi-bin/interfaces/gamess.int.disabled	2008-02-15 00:35:28.000000000 -0800
+@@ -2,7 +2,7 @@
+ interfaceDescription{'gamess_admin'}="Edit preferences specific to Gamess"
+ interfaceDescription{'gamess_name'}="Gamess"
+ gamessVersion="2007"
+-gamessGMSPATH="/usr/local/gamess"
++gamessGMSPATH="/usr/bin"
+ gamessBinary="gamess.00.x"
+ gamessDdikick="ddikick.x"
+ cpuMin="0"
+diff -ur WebMO.install.orig/cgi-bin/interfaces/mopac.int.disabled WebMO.install/cgi-bin/interfaces/mopac.int.disabled
+--- WebMO.install.orig/cgi-bin/interfaces/mopac.int.disabled	2008-02-15 00:35:02.000000000 -0800
++++ WebMO.install/cgi-bin/interfaces/mopac.int.disabled	2008-02-15 00:35:42.000000000 -0800
+@@ -2,7 +2,7 @@
+ interfaceDescription{'mopac_admin'}="Edit preferences specific to Mopac"
+ interfaceDescription{'mopac_name'}="Mopac"
+ mopacVersion="7"
+-mopacPath="/usr/local/mopac7/mopac.exe"
++mopacPath="/usr/bin/mopac7"
+ mopacExternal="/usr/local/mopac7"
+ cpuMin="0"
+ cpuMax="100"
+diff -ur WebMO.install.orig/cgi-bin/interfaces/tinker.int.disabled WebMO.install/cgi-bin/interfaces/tinker.int.disabled
+--- WebMO.install.orig/cgi-bin/interfaces/tinker.int.disabled	2008-02-15 00:35:02.000000000 -0800
++++ WebMO.install/cgi-bin/interfaces/tinker.int.disabled	2008-02-15 00:36:02.000000000 -0800
+@@ -2,9 +2,9 @@
+ interfaceDescription{'tinker_admin'}="Edit preferences specific to Tinker"
+ interfaceDescription{'tinker_name'}="Tinker"
+ tinkerVersion="4.2"
+-tinkerBinDir="/usr/local/tinker/bin"
+-tinkerBinExt="x"
+-tinkerParamDir="/usr/local/tinker/params"
++tinkerBinDir="/usr/bin"
++tinkerBinExt=""
++tinkerParamDir="/usr/share/tinker/params"
+ cpuMin="0"
+ cpuMax="100"
+ cpuDefault="100"
diff --git a/sci-chemistry/webmo/webmo-8.0.010.ebuild b/sci-chemistry/webmo/webmo-8.0.010.ebuild
new file mode 100644
index 000000000000..0d3a517f69e3
--- /dev/null
+++ b/sci-chemistry/webmo/webmo-8.0.010.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/webmo/webmo-8.0.010.ebuild,v 1.1 2008/02/15 08:53:27 dberkholz Exp $
+
+inherit eutils webapp depend.apache
+
+MY_SRC_PN="WebMO"
+MY_SRC_P="${MY_SRC_PN}.${PV}"
+DESCRIPTION="Web-based interface to computational chemistry packages"
+HOMEPAGE="http://webmo.net/"
+SRC_URI="${MY_SRC_P}.tar.gz"
+
+LICENSE="WebMO"
+SLOT="${PVR}"
+KEYWORDS="~x86"
+RESTRICT="fetch"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+need_apache2
+
+S="${WORKDIR}/${MY_SRC_PN}.install"
+
+pkg_nofetch() {
+	einfo "Go to http://webmo.net/ and register for a free license."
+	einfo "Download ${SRC_URI} and place it in ${DISTDIR}."
+}
+
+src_unpack() {
+	# We need a license number to proceed
+	if [[ -z ${WEBMO_LICENSE} ]]; then
+		msg="You must set WEBMO_LICENSE to your license number in make.conf."
+		ewarn "$msg"
+		die "$msg"
+	fi
+
+	# Check for invalid license values. Valid are dddd-dddd-dddd
+	if [[ ${WEBMO_LICENSE} != [0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9] ]]; then
+		msg="Invalid license format. Licenses should be DDDD-DDDD-DDDD (D is a digit)."
+		ewarn "$msg"
+		die "$msg"
+	fi
+
+	unpack ${A}
+
+	# Set up program locations to match where portage installs them
+	epatch "${FILESDIR}"/8.0.010-gentoo-locations.patch
+
+	# Add a data directory for gamess, because WebMO expects everything
+	# in one directory instead of FHS
+	# (Depends on gentoo-locations.patch)
+	epatch "${FILESDIR}"/8.0.010-add-gamess-data-directory.patch
+
+	# Don't run diagnose.pl or ask about being root user
+	epatch "${FILESDIR}"/dont-be-interactive-or-diagnose.patch
+
+	# Make setup.conf
+	create_setup_conf
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# Install everything
+	perl setup.pl || die "Check '${S}'/diagnose.html for errors"
+
+	# Get ${D} out of main config file
+	dosed "${MY_CGIBINDIR}/webmo/interfaces/globals.int"
+
+	webapp_hook_script "${FILESDIR}"/reconfig
+
+	local files=$(find "${D}"${MY_HOSTROOTDIR}/webmo "${D}"${MY_CGIBINDIR}/webmo/interfaces)
+	# Add the directories themselves
+	files="${files} ${MY_HOSTROOTDIR}/webmo ${MY_CGIBINDIR}/webmo/interfaces"
+	files=${files//${D}/}
+	for file in ${files}; do
+		webapp_configfile "${file}"
+		webapp_serverowned "${file}"
+	done
+
+	ebegin "Fixing permissions"
+	pushd "${D}" > /dev/null
+	find . -perm /o+w -type f | xargs fperms 664
+	find . -perm /o+w -type d | xargs fperms 775
+	popd > /dev/null
+	eend 0
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog
+	elog "Be sure that this line is uncommented in httpd.conf:"
+	elog "AddHandle cgi-scripts .cgi"
+	elog
+	elog "The diagnose.pl script can be run if WebMO doesn't work properly."
+	elog
+	ewarn "Be careful never to overwrite your user, group or job databases"
+	ewarn "when using etc-update after an upgrade."
+
+	webapp_pkg_postinst
+}
+
+create_setup_conf() {
+	local SETUP_CONF="${S}/setup.conf"
+
+	echo_setup perlPath /usr/bin/perl "${SETUP_CONF}"
+	echo_setup htmlBase "${D}${MY_HTDOCSDIR}" "${SETUP_CONF}"
+	echo_setup url_htmlBase /webmo "${SETUP_CONF}"
+	echo_setup cgiBase "${D}${MY_CGIBINDIR}/webmo" "${SETUP_CONF}"
+	echo_setup url_cgiBase /cgi-bin/webmo "${SETUP_CONF}"
+	echo_setup userBase "${D}${MY_HOSTROOTDIR}/webmo" "${SETUP_CONF}"
+	echo_setup license "${WEBMO_LICENSE}" "${SETUP_CONF}"
+}
+
+# Takes three arguments:
+# 1: variable, 2: value, 3: file to echo them to
+echo_setup() {
+	# All values must be double-quoted, so escape the inner quotes.
+	echo "${1}=\"${2}\"" >> ${3}
+}