Fix up the ebuild, closes bug #81495.

(Portage version: 2.0.51.16)

6 files changed, 50 insertions, 27 deletions

diff --git a/net-www/mod_log_sql/ChangeLog b/net-www/mod_log_sql/ChangeLog
index 7927bb49c68d..82d582b5f17d 100644
--- a/net-www/mod_log_sql/ChangeLog
+++ b/net-www/mod_log_sql/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-www/mod_log_sql
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/ChangeLog,v 1.16 2005/02/05 09:57:50 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/ChangeLog,v 1.17 2005/02/17 02:29:43 beu Exp $
+
+*mod_log_sql-1.98-r1 (17 Feb 2005)
+
+  17 Feb 2005; Elfyn McBratney <beu@gentoo.org> files/10_mod_log_sql.conf,
+  files/10_mod_log_sql_apache2.conf, +mod_log_sql-1.98-r1.ebuild,
+  -mod_log_sql-1.98.ebuild:
+  Version bump as the the previous version's ebuild was horribly broken:
+  just DEPEND on net-www/apache, add apache2 to IUSE, call detechapache in
+  pkg_postinst (bleh), documentation is now in "docs" (was in "Documentation"),
+  use dohtml instead of dodoc for HTML/XML docs, fix typo in 10_mod_log_sql.conf
+  and disable SSL support (which is not currently detected on 1.3 or 2.0).  Oh
+  yeah, and actually install the modules!  Closes bug #81495.
 
   05 Feb 2005; Christian Parpart <trapni@gentoo.org>
   mod_log_sql-1.100.ebuild:
diff --git a/net-www/mod_log_sql/Manifest b/net-www/mod_log_sql/Manifest
index 1c370fe1a10a..3b0127418bd1 100644
--- a/net-www/mod_log_sql/Manifest
+++ b/net-www/mod_log_sql/Manifest
@@ -1,12 +1,12 @@
-MD5 1195e2875fd145a4048a4acc2675a983 ChangeLog 2583
+MD5 e4b781d6605e14da6fde9608ee7e161e ChangeLog 3219
 MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
-MD5 fa48395a7a22603bd80cc2338efdeb13 mod_log_sql-1.97.ebuild 3095
-MD5 b27039594dd70548045bc171e11b7337 mod_log_sql-1.98.ebuild 2831
 MD5 f4fbc7f80c19b9b6910584fc590167d0 mod_log_sql-1.100.ebuild 1622
-MD5 b88eebdc5005a5c7150c2a9bf8bef809 files/10_mod_log_sql.conf 1282
-MD5 6b39011ec430408c5df2b067627ac3e1 files/10_mod_log_sql_apache2.conf 1111
+MD5 fa48395a7a22603bd80cc2338efdeb13 mod_log_sql-1.97.ebuild 3095
+MD5 f31e0eabefc5e8deafb67a6fc0fcf0de mod_log_sql-1.98-r1.ebuild 2988
+MD5 390ab3cee83f80c19f7102a98e2ec510 files/10_mod_log_sql.conf 1287
+MD5 1224e8eacc308462c8a4eb86b12f6ac7 files/10_mod_log_sql_apache2.conf 1114
+MD5 86f476a1d8473e45132caa3f88a6a5bc files/digest-mod_log_sql-1.100 70
 MD5 7a6e57cfb8898c79734fcf40291206cb files/digest-mod_log_sql-1.97 68
-MD5 37cf2cb766664bd12fc8af5c9dd4444f files/digest-mod_log_sql-1.98 68
 MD5 9081e8e239b5a17a817f21f7370afecc files/mod_log_sql-1.97-gentoo.patch 913
-MD5 86f476a1d8473e45132caa3f88a6a5bc files/digest-mod_log_sql-1.100 70
+MD5 37cf2cb766664bd12fc8af5c9dd4444f files/digest-mod_log_sql-1.98-r1 68
 MD5 120ac88176608bba1188f5b7f3d48804 files/1.100/10_mod_log_sql.conf 1066
diff --git a/net-www/mod_log_sql/files/10_mod_log_sql.conf b/net-www/mod_log_sql/files/10_mod_log_sql.conf
index 27a8af398b4a..bba0174c793a 100644
--- a/net-www/mod_log_sql/files/10_mod_log_sql.conf
+++ b/net-www/mod_log_sql/files/10_mod_log_sql.conf
@@ -3,15 +3,15 @@
     # Load the module first
     <IfModule !mod_log_sql.c>
         LoadModule log_sql_module    extramodules/mod_log_sql.so
-	LoadModule log_sql_mysql_modules extramoudles/mod_log_sql_mysql.so
-        <IfModule mod_ssl.c>
-            LoadModule log_sql_ssl_module extramodules/mod_log_sql_ssl.so
-        </IfModule>
+	LoadModule log_sql_mysql_module extramoudles/mod_log_sql_mysql.so
+#        <IfModule mod_ssl.c>
+#            LoadModule log_sql_ssl_module extramodules/mod_log_sql_ssl.so
+#        </IfModule>
 
         AddModule mod_log_sql.c
-        <IfModule mod_ssl.c>
-            AddModule mod_log_sql_ssl.c
-        </IfModule>
+#        <IfModule mod_ssl.c>
+#            AddModule mod_log_sql_ssl.c
+#        </IfModule>
     </IfModule>
 
     <IfModule mod_log_sql.c>
diff --git a/net-www/mod_log_sql/files/10_mod_log_sql_apache2.conf b/net-www/mod_log_sql/files/10_mod_log_sql_apache2.conf
index 4ce14507298a..f0909ef98b33 100644
--- a/net-www/mod_log_sql/files/10_mod_log_sql_apache2.conf
+++ b/net-www/mod_log_sql/files/10_mod_log_sql_apache2.conf
@@ -4,9 +4,9 @@
     <IfModule !mod_log_sql.c>
         LoadModule log_sql_module    extramodules/mod_log_sql.so
 	LoadModule log_sql_mysql_module extramodules/mod_log_sql_mysql.so
-        <IfModule mod_ssl.c>
-            LoadModule log_sql_ssl_module extramodules/mod_log_sql_ssl.so
-        </IfModule>
+#        <IfModule mod_ssl.c>
+#            LoadModule log_sql_ssl_module extramodules/mod_log_sql_ssl.so
+#        </IfModule>
     </IfModule>
 
     <IfModule mod_log_sql.c>
diff --git a/net-www/mod_log_sql/files/digest-mod_log_sql-1.98 b/net-www/mod_log_sql/files/digest-mod_log_sql-1.98-r1
index 18e14030455a..18e14030455a 100644
--- a/net-www/mod_log_sql/files/digest-mod_log_sql-1.98
+++ b/net-www/mod_log_sql/files/digest-mod_log_sql-1.98-r1
diff --git a/net-www/mod_log_sql/mod_log_sql-1.98.ebuild b/net-www/mod_log_sql/mod_log_sql-1.98-r1.ebuild
index f55580256f2a..72665c64417f 100644
--- a/net-www/mod_log_sql/mod_log_sql-1.98.ebuild
+++ b/net-www/mod_log_sql/mod_log_sql-1.98-r1.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/net-www/mod_log_sql/mod_log_sql-1.98.ebuild,v 1.6 2005/01/30 14:03:20 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/mod_log_sql-1.98-r1.ebuild,v 1.1 2005/02/17 02:29:43 beu Exp $
 
 inherit eutils
 
@@ -10,11 +10,11 @@ SRC_URI="http://www.outoforder.cc/downloads/mod_log_sql/${P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~x86 ppc"
-IUSE="ssl"
+KEYWORDS="~x86 ~ppc"
+IUSE="apache2"
 
 DEPEND=">=dev-db/mysql-3.23.15
-	>=net-www/apache-1*"
+	net-www/apache"
 
 detectapache() {
 	local domsg=
@@ -61,30 +61,41 @@ detectapache() {
 
 src_compile() {
 	detectapache
-	myconf="--with-apxs=${APXS}"
+	local myconf="--with-apxs=${APXS}"
 
 	#epatch ${FILESDIR}/mod_log_sql-1.97-gentoo.patch || die "Patch failed."
-	use ssl && myconf="${myconf} --enable-ssl"
+	#use ssl && myconf="${myconf} --enable-ssl"
 	./configure ${myconf}
 	emake || die
 }
 
 src_install() {
 	detectapache
+
 	exeinto ${APACHE_MODULES_DIR}
-	doexe mod_log_sql_mysql.so
+	if use apache2; then
+		doexe .libs/mod_log_sql.so .libs/mod_log_sql_mysql.so
+	else
+		doexe mod_log_sql.so mod_log_sql_mysql.so
+	fi
 
 	cat ${CONFIG_FILE} | sed -e "s#machine_id#`hostname -f`#" > 10_mod_log_sql.conf
 	insinto ${APACHE_MODULES_CONFIG_DIR}
 	doins 10_mod_log_sql.conf
 
-	dodoc AUTHORS CHANGELOG INSTALL LICENSE TODO Documentation/README Documentation/manual.html Documentation/manual.xml
+	dodoc AUTHORS CHANGELOG INSTALL LICENSE TODO docs/README
+	dohtml docs/manual.html docs/manual.xml
 	docinto contrib
 	dodoc contrib/create_tables.sql contrib/make_combined_log.pl contrib/mysql_import_combined_log.pl
 }
 
 pkg_postinst() {
-	einfo "Please add '-D LOG_SQL' to your /etc/conf.d/apache APACHE_OPTS setting"
+	detectapache
+
+	local cfver=
+	use apache2 && cfgfile=2
+
+	einfo "Please add '-D LOG_SQL' to your /etc/conf.d/apache${cfver} APACHE_OPTS setting"
 
 	einfo "Do not forget to adapt ${APACHE_MODULES_CONFIG_DIR}/10_mod_log_sql.conf to your needs."
 	einfo "See /usr/share/doc/${PF}/contrib/create_tables.sql.gz on how to create logging tables.\n"