don't use deprecated ? : use syntax; don't assign default to S; tidy

4 files changed, 22 insertions, 24 deletions

diff --git a/net-www/mod_log_sql/ChangeLog b/net-www/mod_log_sql/ChangeLog
index c375e3203b24..a2b796f461b5 100644
--- a/net-www/mod_log_sql/ChangeLog
+++ b/net-www/mod_log_sql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/mod_log_sql
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/ChangeLog,v 1.3 2004/05/03 12:48:24 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/ChangeLog,v 1.4 2004/05/03 22:06:37 mr_bones_ Exp $
+
+  03 May 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  mod_log_sql-1.96.ebuild, mod_log_sql-1.97.ebuild:
+  don't use deprecated ? : use syntax; don't assign default to S; tidy
 
 *mod_log_sql-1.97 (04 May 2004)
 
diff --git a/net-www/mod_log_sql/Manifest b/net-www/mod_log_sql/Manifest
index c5237e523bee..842f66a3be6e 100644
--- a/net-www/mod_log_sql/Manifest
+++ b/net-www/mod_log_sql/Manifest
@@ -1,8 +1,8 @@
-MD5 c63253b61ccc9c133cc6160564bf47fe mod_log_sql-1.96.ebuild 3009
-MD5 ffc6dc6cbacb3447e903f4520e454d73 mod_log_sql-1.97.ebuild 3007
-MD5 9eff22959751ea8d66616c804be6afa5 ChangeLog 697
+MD5 189a0101fed2b278bc8ef5f1388c9f80 ChangeLog 882
 MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
-MD5 512a290da7324c6b25d5d474918cd338 files/digest-mod_log_sql-1.96 68
-MD5 7a6e57cfb8898c79734fcf40291206cb files/digest-mod_log_sql-1.97 68
+MD5 a5a6dd5d3ef2d2876eb29c8236cd64bb mod_log_sql-1.96.ebuild 3001
+MD5 0bc09fc1e766f2ff3f985b293dd41797 mod_log_sql-1.97.ebuild 3001
 MD5 32dd778c2b656fd5ef91cb63684203b0 files/10_mod_log_sql.conf 1214
 MD5 25f5f7d682fe530634cedbd495a700ba files/10_mod_log_sql_apache2.conf 1044
+MD5 512a290da7324c6b25d5d474918cd338 files/digest-mod_log_sql-1.96 68
+MD5 7a6e57cfb8898c79734fcf40291206cb files/digest-mod_log_sql-1.97 68
diff --git a/net-www/mod_log_sql/mod_log_sql-1.96.ebuild b/net-www/mod_log_sql/mod_log_sql-1.96.ebuild
index 879b4cb6349d..de11debbdb0d 100644
--- a/net-www/mod_log_sql/mod_log_sql-1.96.ebuild
+++ b/net-www/mod_log_sql/mod_log_sql-1.96.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/mod_log_sql-1.96.ebuild,v 1.2 2004/04/30 19:28:02 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/mod_log_sql-1.96.ebuild,v 1.3 2004/05/03 22:06:37 mr_bones_ Exp $
 
 DESCRIPTION="An Apache module for logging to an SQL (MySQL) database"
 HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_log_sql/"
-
-S=${WORKDIR}/${P}
 SRC_URI="http://www.outoforder.cc/downloads/mod_log_sql/${P}.tar.gz"
-DEPEND=">=dev-db/mysql-3.23.15
-	apache2? ( =net-www/apache-2* ) : ( >=net-www/apache-1* )"
+
 LICENSE="Apache-1.1"
+SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
-SLOT="0"
-
 
+DEPEND=">=dev-db/mysql-3.23.15
+	apache2? ( =net-www/apache-2* )
+	!apache2? ( >=net-www/apache-1* )"
 
 detectapache() {
 	local domsg=
@@ -59,8 +58,6 @@ detectapache() {
 	fi
 }
 
-
-
 src_compile() {
 	detectapache
 	myconf="--with-apxs=${APXS}"
diff --git a/net-www/mod_log_sql/mod_log_sql-1.97.ebuild b/net-www/mod_log_sql/mod_log_sql-1.97.ebuild
index 82427396c390..84d515c5658a 100644
--- a/net-www/mod_log_sql/mod_log_sql-1.97.ebuild
+++ b/net-www/mod_log_sql/mod_log_sql-1.97.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/mod_log_sql-1.97.ebuild,v 1.1 2004/05/03 12:48:24 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/mod_log_sql-1.97.ebuild,v 1.2 2004/05/03 22:06:37 mr_bones_ Exp $
 
 DESCRIPTION="An Apache module for logging to an SQL (MySQL) database"
 HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_log_sql/"
-
-S=${WORKDIR}/${P}
 SRC_URI="http://www.outoforder.cc/downloads/mod_log_sql/${P}.tar.gz"
-DEPEND=">=dev-db/mysql-3.23.15
-	apache2? ( =net-www/apache-2* ) : ( >=net-www/apache-1* )"
+
 LICENSE="Apache-1.1"
+SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
-SLOT="0"
-
 
+DEPEND=">=dev-db/mysql-3.23.15
+	apache2? ( =net-www/apache-2* )
+	!apache2? ( >=net-www/apache-1* )"
 
 detectapache() {
 	local domsg=
@@ -59,8 +58,6 @@ detectapache() {
 	fi
 }
 
-
-
 src_compile() {
 	detectapache
 	myconf="--with-apxs=${APXS}"