Remove apache1 support and dep upon mod_ssl.

Package-Manager: portage-2.1.2.7

4 files changed, 23 insertions, 31 deletions

diff --git a/net-www/mod_log_sql/ChangeLog b/net-www/mod_log_sql/ChangeLog
index 2355d9dc0585..5d4d870fe997 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/ChangeLog,v 1.30 2007/01/14 17:29:26 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/ChangeLog,v 1.31 2007/05/12 12:08:27 chtekk Exp $
+
+  12 May 2007; Luca Longinotti <chtekk@gentoo.org> mod_log_sql-1.100.ebuild,
+  mod_log_sql-1.101.ebuild:
+  Remove apache1 support and dep upon mod_ssl.
 
   14 Jan 2007; Luca Longinotti <chtekk@gentoo.org>
   -files/1.100/42_mod_log_sql.conf, -files/10_mod_log_sql.conf,
diff --git a/net-www/mod_log_sql/Manifest b/net-www/mod_log_sql/Manifest
index ef326e074aa5..706bc1507966 100644
--- a/net-www/mod_log_sql/Manifest
+++ b/net-www/mod_log_sql/Manifest
@@ -4,18 +4,18 @@ RMD160 5884ac0d6192d7fa2be4d2dfd97a279bcb24b6b7 files/42_mod_log_sql.conf 877
 SHA256 f9f02864e80d468a833ac54712eb01e425a365e39e2b9dad35b6e7519d10d082 files/42_mod_log_sql.conf 877
 DIST mod_log_sql-1.100.tar.bz2 122507 RMD160 a9e21fd46317d8ee120321b6702a9442a5ba3a3f SHA1 50edb735915a4fb7ea83a5d8e4928667a2a04801 SHA256 e9a49e01ecea00292ddec0a0bc4f33f0200dd7617bea11b0de92f1fd100025fc
 DIST mod_log_sql-1.101.tar.bz2 127500 RMD160 a61746e2a8cb62221a5b08f2ab4790d221971355 SHA1 2b38ede49621ec61e896e1f8aece14970e73c5f3 SHA256 0907579b0466844f7f1886af92a9ea36b4815ec869929ba577c74d32b6d69a5e
-EBUILD mod_log_sql-1.100.ebuild 1601 RMD160 0c9126c4863e2c91970c07e827c2d68a15fc0bca SHA1 9ef7c4abbfaa24eb60127da578c3d6ccdc29722c SHA256 a63422921cabfc252beac634b526de1442218cc6a66a5e5c490d2fe7ab24a810
-MD5 b49a23e7fc7cd1eb3e108a3e6a5d6528 mod_log_sql-1.100.ebuild 1601
-RMD160 0c9126c4863e2c91970c07e827c2d68a15fc0bca mod_log_sql-1.100.ebuild 1601
-SHA256 a63422921cabfc252beac634b526de1442218cc6a66a5e5c490d2fe7ab24a810 mod_log_sql-1.100.ebuild 1601
-EBUILD mod_log_sql-1.101.ebuild 1602 RMD160 4eca7b9aa05dd7b7453b5ee001704435caf3a1ae SHA1 f50c9594ae36006bd3e928914f1119e63d1b7580 SHA256 51ef4eb106f6c9bc8213908181bdf5078ad1344c676ae744d66522ec7f721190
-MD5 02776d40b609108b5cfe3862cc5f6af0 mod_log_sql-1.101.ebuild 1602
-RMD160 4eca7b9aa05dd7b7453b5ee001704435caf3a1ae mod_log_sql-1.101.ebuild 1602
-SHA256 51ef4eb106f6c9bc8213908181bdf5078ad1344c676ae744d66522ec7f721190 mod_log_sql-1.101.ebuild 1602
-MISC ChangeLog 5101 RMD160 96b4b6c2756641f83aaf5c95ed7af2a32624d066 SHA1 ae229ec03a85accc59ce492c9680e268409ae50e SHA256 226e523c36e23e3f0251383213abf2456f49ded65cd1bda0f7143fd2e9d1467c
-MD5 28329c2f1d6596ddc8aa1eb48c53a63b ChangeLog 5101
-RMD160 96b4b6c2756641f83aaf5c95ed7af2a32624d066 ChangeLog 5101
-SHA256 226e523c36e23e3f0251383213abf2456f49ded65cd1bda0f7143fd2e9d1467c ChangeLog 5101
+EBUILD mod_log_sql-1.100.ebuild 1380 RMD160 1cd92e0fb9f4d7e5f596441cd670838216fdcea1 SHA1 fb757a8dadec290521b0c9985059a7eadba20fd6 SHA256 e7e741a9e6372b3f0f9e9b75eaea90567c400a88586a6349fcd3ca939c270456
+MD5 03a2982b6fb7f090b875c1b974a6ae9a mod_log_sql-1.100.ebuild 1380
+RMD160 1cd92e0fb9f4d7e5f596441cd670838216fdcea1 mod_log_sql-1.100.ebuild 1380
+SHA256 e7e741a9e6372b3f0f9e9b75eaea90567c400a88586a6349fcd3ca939c270456 mod_log_sql-1.100.ebuild 1380
+EBUILD mod_log_sql-1.101.ebuild 1381 RMD160 c998e4a2bf5d21fd6d51005f74d320e126a3a855 SHA1 0ee96ec533245e4bacff736e75c71846131d645e SHA256 fe4461ff353c819bd67f219d0f73d666f9863bf77ef633022b7ed68688254bed
+MD5 d336e87d5054b9ecb545f5bb5053d303 mod_log_sql-1.101.ebuild 1381
+RMD160 c998e4a2bf5d21fd6d51005f74d320e126a3a855 mod_log_sql-1.101.ebuild 1381
+SHA256 fe4461ff353c819bd67f219d0f73d666f9863bf77ef633022b7ed68688254bed mod_log_sql-1.101.ebuild 1381
+MISC ChangeLog 5254 RMD160 d6326961e3c8a624af467db46e4d4db302d7452d SHA1 9ae9d1e7a8291f5f915cd0bb947250aca3ea9570 SHA256 08356ea30da12a8ed01213511447f65885b1e32c4d6707cf2ac7b9260f0ccdd6
+MD5 94ceaefea2166245d960a8be52c0538d ChangeLog 5254
+RMD160 d6326961e3c8a624af467db46e4d4db302d7452d ChangeLog 5254
+SHA256 08356ea30da12a8ed01213511447f65885b1e32c4d6707cf2ac7b9260f0ccdd6 ChangeLog 5254
 MISC metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e SHA1 fe9f7ce6f2281683065abb3255c8b731665c82ac SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8
 MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226
diff --git a/net-www/mod_log_sql/mod_log_sql-1.100.ebuild b/net-www/mod_log_sql/mod_log_sql-1.100.ebuild
index c23ff5196d77..5054c1ada531 100644
--- a/net-www/mod_log_sql/mod_log_sql-1.100.ebuild
+++ b/net-www/mod_log_sql/mod_log_sql-1.100.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.100.ebuild,v 1.11 2007/01/14 17:29:26 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/mod_log_sql-1.100.ebuild,v 1.12 2007/05/12 12:08:27 chtekk Exp $
 
 inherit apache-module
 
@@ -15,16 +15,12 @@ IUSE="dbi ssl"
 
 DEPEND="virtual/mysql
 		dbi? ( dev-db/libdbi )
-		ssl? ( dev-libs/openssl !apache2? ( net-www/mod_ssl ) )"
+		ssl? ( dev-libs/openssl )"
 RDEPEND="${DEPEND}"
 
-APACHE1_MOD_CONF="42_${PN}"
 APACHE2_MOD_CONF="42_${PN}"
-
-APACHE1_MOD_DEFINE="LOG_SQL"
 APACHE2_MOD_DEFINE="LOG_SQL"
 
-APACHE1_EXECFILES="${PN}_mysql.so ${PN}_dbi.so ${PN}_ssl.so"
 APACHE2_EXECFILES=".libs/${PN}_mysql.so .libs/${PN}_dbi.so .libs/${PN}_ssl.so"
 
 DOCFILES="AUTHORS CHANGELOG docs/README docs/manual.html \
@@ -33,9 +29,7 @@ contrib/create_tables.sql contrib/make_combined_log.pl contrib/mysql_import_comb
 need_apache
 
 src_compile() {
-	local myconf=""
-	use apache2 && myconf="--with-apxs=${APXS2}"
-	use apache2 || myconf="--with-apxs=${APXS1}"
+	local myconf="--with-apxs=${APXS2}"
 	use ssl && myconf="${myconf} --with-ssl-inc=/usr"
 	use ssl || myconf="${myconf} --without-ssl-inc"
 	use dbi && myconf="${myconf} --with-dbi=/usr"
diff --git a/net-www/mod_log_sql/mod_log_sql-1.101.ebuild b/net-www/mod_log_sql/mod_log_sql-1.101.ebuild
index 88829275dbf0..7155a33ae0ba 100644
--- a/net-www/mod_log_sql/mod_log_sql-1.101.ebuild
+++ b/net-www/mod_log_sql/mod_log_sql-1.101.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.101.ebuild,v 1.2 2007/01/14 17:29:26 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/mod_log_sql-1.101.ebuild,v 1.3 2007/05/12 12:08:27 chtekk Exp $
 
 inherit apache-module
 
@@ -15,16 +15,12 @@ IUSE="dbi ssl"
 
 DEPEND="virtual/mysql
 		dbi? ( dev-db/libdbi )
-		ssl? ( dev-libs/openssl !apache2? ( net-www/mod_ssl ) )"
+		ssl? ( dev-libs/openssl )"
 RDEPEND="${DEPEND}"
 
-APACHE1_MOD_CONF="42_${PN}"
 APACHE2_MOD_CONF="42_${PN}"
-
-APACHE1_MOD_DEFINE="LOG_SQL"
 APACHE2_MOD_DEFINE="LOG_SQL"
 
-APACHE1_EXECFILES="${PN}_mysql.so ${PN}_dbi.so ${PN}_ssl.so"
 APACHE2_EXECFILES=".libs/${PN}_mysql.so .libs/${PN}_dbi.so .libs/${PN}_ssl.so"
 
 DOCFILES="AUTHORS CHANGELOG docs/README docs/manual.html \
@@ -33,9 +29,7 @@ contrib/create_tables.sql contrib/make_combined_log.pl contrib/mysql_import_comb
 need_apache
 
 src_compile() {
-	local myconf=""
-	use apache2 && myconf="--with-apxs=${APXS2}"
-	use apache2 || myconf="--with-apxs=${APXS1}"
+	local myconf="--with-apxs=${APXS2}"
 	use ssl && myconf="${myconf} --with-ssl-inc=/usr"
 	use ssl || myconf="${myconf} --without-ssl-inc"
 	use dbi && myconf="${myconf} --with-dbi=/usr"