Turn 2 patches into a single one with 4 lines of changes.

Package-Manager: portage-2.0.53

6 files changed, 41 insertions, 174 deletions

diff --git a/sci-chemistry/webmo/ChangeLog b/sci-chemistry/webmo/ChangeLog
index 1b038d44cb30..4a1035856692 100644
--- a/sci-chemistry/webmo/ChangeLog
+++ b/sci-chemistry/webmo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/webmo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/webmo/ChangeLog,v 1.1 2005/12/04 08:27:33 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/webmo/ChangeLog,v 1.2 2005/12/04 08:42:14 spyderous Exp $
+
+  04 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/dont-be-interactive-if-root.patch,
+  +files/dont-be-interactive-or-diagnose.patch,
+  -files/dont-check-unneeded-things.patch, webmo-6.0.003.ebuild:
+  Turn 2 patches into a single one with 4 lines of changes.
 
 *webmo-6.0.003 (04 Dec 2005)
 
diff --git a/sci-chemistry/webmo/Manifest b/sci-chemistry/webmo/Manifest
index c64a3c401fde..e7689a99dd04 100644
--- a/sci-chemistry/webmo/Manifest
+++ b/sci-chemistry/webmo/Manifest
@@ -1,8 +1,7 @@
-MD5 336f6fef59572dd7dfe57b35d198a3d0 ChangeLog 819
+MD5 ee74d8b0d6fcb4b7a6b5aa16b6298396 ChangeLog 1092
 MD5 8e94349e3989b4b0219b8b5d8616ff4a files/add-gamess-data-directory.patch 2112
 MD5 ea0135b660aec5e5627dd9929a937a41 files/digest-webmo-6.0.003 66
-MD5 b796d945112067cc23afa05e1c0f7463 files/dont-be-interactive-if-root.patch 1851
-MD5 ebcb1f46115574118ae40fc9fd01023d files/dont-check-unneeded-things.patch 3577
+MD5 6a9f136cdce79131896e4815b19cdeab files/dont-be-interactive-or-diagnose.patch 806
 MD5 c3f7daf2719dca6df3f68a7193213e63 files/gentoo-locations.patch 1939
 MD5 af1bfbb0777267a03e889b08173f2757 metadata.xml 248
-MD5 26984f00192195c379a9326c7aebe8d7 webmo-6.0.003.ebuild 3374
+MD5 383c3a88f27c0f499427fe84dce283c5 webmo-6.0.003.ebuild 3233
diff --git a/sci-chemistry/webmo/files/dont-be-interactive-if-root.patch b/sci-chemistry/webmo/files/dont-be-interactive-if-root.patch
deleted file mode 100644
index fdc7691cae88..000000000000
--- a/sci-chemistry/webmo/files/dont-be-interactive-if-root.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- WebMO.install.orig/setup.pl	2005-11-21 07:40:28.000000000 -0800
-+++ WebMO.install/setup.pl	2005-12-03 11:39:51.000000000 -0800
-@@ -82,26 +84,26 @@
- #get a username
- my $username = `whoami`; chomp $username;
- my $homedir = $ENV{'HOME'} ne "" ? $ENV{'HOME'} : `echo ~`; chomp $homedir;
--if ($username eq "root")
--{
--	print <<END;
--	
--You are installing WebMO as the user 'root'.  It is strongly suggested that
--you do not install WebMO as 'root', but rather do one of the following:
--  1) Create a new 'webmo'account; log into this account, and install WebMO
--     into the 'webmo' home directory
--  2) Log into an existing user acconut, and install WebMO into the home 
--     directory
--  3) Continue installation as 'root', but install WebMO into your system
--     wide html/cgi-bin directory (do not install into a user home directory
--     as 'root', as the cgi scripts may not run correctly)
--     
--END
--	print "Do you wish to continue with setup?";
--	my $choice = <STDIN>;
--	chomp $choice;
--	exit (0) unless ($choice =~ /^y/i);
--}
-+#if ($username eq "root")
-+#{
-+#	print <<END;
-+#	
-+#You are installing WebMO as the user 'root'.  It is strongly suggested that
-+#you do not install WebMO as 'root', but rather do one of the following:
-+#  1) Create a new 'webmo'account; log into this account, and install WebMO
-+#     into the 'webmo' home directory
-+#  2) Log into an existing user acconut, and install WebMO into the home 
-+#     directory
-+#  3) Continue installation as 'root', but install WebMO into your system
-+#     wide html/cgi-bin directory (do not install into a user home directory
-+#     as 'root', as the cgi scripts may not run correctly)
-+#     
-+#END
-+#	print "Do you wish to continue with setup?";
-+#	my $choice = <STDIN>;
-+#	chomp $choice;
-+#	exit (0) unless ($choice =~ /^y/i);
-+#}
- 
- #get license information
- &divider;
diff --git a/sci-chemistry/webmo/files/dont-be-interactive-or-diagnose.patch b/sci-chemistry/webmo/files/dont-be-interactive-or-diagnose.patch
new file mode 100644
index 000000000000..a8edd1b6cc38
--- /dev/null
+++ b/sci-chemistry/webmo/files/dont-be-interactive-or-diagnose.patch
@@ -0,0 +1,28 @@
+diff -urN WebMO.install.orig/setup.pl WebMO.install/setup.pl
+--- WebMO.install.orig/setup.pl	2005-11-21 07:40:28.000000000 -0800
++++ WebMO.install/setup.pl	2005-12-04 00:39:41.000000000 -0800
+@@ -82,7 +82,7 @@
+ #get a username
+ my $username = `whoami`; chomp $username;
+ my $homedir = $ENV{'HOME'} ne "" ? $ENV{'HOME'} : `echo ~`; chomp $homedir;
+-if ($username eq "root")
++if ($username eq "root" && !$unattended_setup)
+ {
+ 	print <<END;
+ 	
+@@ -693,6 +693,7 @@
+ print "finished\n";
+ 
+ #run DIAGNOSE
++if (!$unattended_setup) {
+ print "Running diagnostic tests...";
+ system("$perlPath scripts/diagnose.pl $cgiBase/interfaces/globals.int");
+ print "finished\n";
+@@ -714,6 +715,7 @@
+ 		system("$browsers[0] file:$cwd/diagnose.html");
+ 	}
+ }
++}
+ 
+ #setup computational servers
+ mkdir "$cgiBase/servers", 0777;
diff --git a/sci-chemistry/webmo/files/dont-check-unneeded-things.patch b/sci-chemistry/webmo/files/dont-check-unneeded-things.patch
deleted file mode 100644
index ad62f8021ce7..000000000000
--- a/sci-chemistry/webmo/files/dont-check-unneeded-things.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- WebMO.install.orig/scripts/diagnose.pl	2005-11-21 07:40:28.000000000 -0800
-+++ WebMO.install/scripts/diagnose.pl	2005-12-03 18:52:58.000000000 -0800
-@@ -80,26 +80,26 @@
- print handle "\n";
- 
- # Check home directory
--if ($ENV{'HOME'} ne "")
--{
--	print handle "<H3>Checking Home Directory</H3>";
--	my $stat_info = stat($ENV{'HOME'});
--	my $leng = length($ENV{'HOME'});
--
--	print handle "Checking home directory:";
--	if (($stat_info->mode & 00001) != 1)
--	{
--		print handle "&nbsp;" x (59 - $leng);
--		print handle "<FONT COLOR=\"red\"><B>Failed</B></FONT>\n";
--		printf handle "<B>Home directory must be world-executable if WebMO is installed there</B>\n"
--	}
--	else
--	{
--		print handle "&nbsp;" x (59 - $leng);
--		print handle "<FONT COLOR=\"green\"><B>Passed</B></FONT>\n";
--	}
--	print handle "\n";
--}
-+#if ($ENV{'HOME'} ne "")
-+#{
-+#	print handle "<H3>Checking Home Directory</H3>";
-+#	my $stat_info = stat($ENV{'HOME'});
-+#	my $leng = length($ENV{'HOME'});
-+#
-+#	print handle "Checking home directory:";
-+#	if (($stat_info->mode & 00001) != 1)
-+#	{
-+#		print handle "&nbsp;" x (59 - $leng);
-+#		print handle "<FONT COLOR=\"red\"><B>Failed</B></FONT>\n";
-+#		printf handle "<B>Home directory must be world-executable if WebMO is installed there</B>\n"
-+#	}
-+#	else
-+#	{
-+#		print handle "&nbsp;" x (59 - $leng);
-+#		print handle "<FONT COLOR=\"green\"><B>Passed</B></FONT>\n";
-+#	}
-+#	print handle "\n";
-+#}
- 
- # Check permissions
- print handle "<H3>Checking CGI Directory</H3>";
-@@ -345,36 +345,36 @@
- 	}
- 	
- 	# check for AddHandler for cgi scripts	
--	print  handle ($text = "Checking for AddHandler cgi-scripts enabled: ");
--	$len = length($text);
--	@results = grep(/AddHandler cgi\-script/, @contents);
--	if ($results[0] =~ /^#/)
--	{
--		print handle "&nbsp;" x (70 - $len);
--		print handle "<FONT COLOR=\"red\"><B>Failed</B></FONT>\n";
--		print handle "<B>Uncomment the line 'AddHandle cgi-scripts .cgi'</B>\n";
--	}
--	else
--	{
--		print handle "&nbsp;" x (70 - $len);
--		print handle "<FONT COLOR=\"green\"><B>Passed</B></FONT>\n";
--	}
-+#	print  handle ($text = "Checking for AddHandler cgi-scripts enabled: ");
-+#	$len = length($text);
-+#	@results = grep(/AddHandler cgi\-script/, @contents);
-+#	if ($results[0] =~ /^#/)
-+#	{
-+#		print handle "&nbsp;" x (70 - $len);
-+#		print handle "<FONT COLOR=\"red\"><B>Failed</B></FONT>\n";
-+#		print handle "<B>Uncomment the line 'AddHandle cgi-scripts .cgi'</B>\n";
-+#	}
-+#	else
-+#	{
-+#		print handle "&nbsp;" x (70 - $len);
-+#		print handle "<FONT COLOR=\"green\"><B>Passed</B></FONT>\n";
-+#	}
- 	
- 	# check for user directories
--	print  handle ($text = "Checking for UserDir enabled: ");
--	$len = length($text);
--	@results = grep(/UserDir /, @contents);
--	if ($results[0] =~ /^#/)
--	{
--		print handle "&nbsp;" x (70 - $len);
--		print handle "<FONT COLOR=\"red\"><B>Failed</B></FONT>\n";
--		print handle "<B>Uncomment the line 'UserDir public_html'</B>\n";
--	}
--	else
--	{
--		print handle "&nbsp;" x (70 - $len);
--		print handle "<FONT COLOR=\"green\"><B>Passed</B></FONT>\n";
--	}
-+#	print  handle ($text = "Checking for UserDir enabled: ");
-+#	$len = length($text);
-+#	@results = grep(/UserDir /, @contents);
-+#	if ($results[0] =~ /^#/)
-+#	{
-+#		print handle "&nbsp;" x (70 - $len);
-+#		print handle "<FONT COLOR=\"red\"><B>Failed</B></FONT>\n";
-+#		print handle "<B>Uncomment the line 'UserDir public_html'</B>\n";
-+#	}
-+#	else
-+#	{
-+#		print handle "&nbsp;" x (70 - $len);
-+#		print handle "<FONT COLOR=\"green\"><B>Passed</B></FONT>\n";
-+#	}
- 	
- 	# check for suexec
- 	print  handle ($text = "Checking for suExec enabled: ");
diff --git a/sci-chemistry/webmo/webmo-6.0.003.ebuild b/sci-chemistry/webmo/webmo-6.0.003.ebuild
index 22798675d2be..66b9196e0d7e 100644
--- a/sci-chemistry/webmo/webmo-6.0.003.ebuild
+++ b/sci-chemistry/webmo/webmo-6.0.003.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/webmo/webmo-6.0.003.ebuild,v 1.1 2005/12/04 08:27:33 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/webmo/webmo-6.0.003.ebuild,v 1.2 2005/12/04 08:42:14 spyderous Exp $
 
 inherit eutils webapp
 
@@ -50,11 +50,8 @@ src_unpack() {
 	# (Depends on gentoo-locations.patch)
 	epatch ${FILESDIR}/add-gamess-data-directory.patch
 
-	# Comment out section of setup script that is interactive if run as root
-	epatch ${FILESDIR}/dont-be-interactive-if-root.patch
-
-	# Don't check for user directories, because we aren't installing in ~
-	epatch ${FILESDIR}/dont-check-unneeded-things.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