--- /usr/portage/app-admin/webalizer/webalizer-2.01.10-r2.ebuild	2003-02-13 06:51:23.000000000 +0100
+++ /usr/portage/app-admin/webalizer/webalizer-2.01.10-r2.ebuild	2003-04-05 19:32:35.000000000 +0200
@@ -26,9 +26,12 @@ 
 }
 
 src_compile() {
+	has_version =net-www/apache-2* \
+	  && myconf='--with-etcdir=/etc/apache2/conf' \
+	  || myconf='--with-etcdir=/etc/apache/conf'
 	econf \
 		--enable-dns \
-		--with-etcdir=/etc/apache/conf || die
+		${myconf} || die
 	make || die
 }
 
@@ -37,9 +40,17 @@ 
 	dobin webalizer
 	dosym webalizer /usr/bin/webazolver
 	doman webalizer.1
-	insinto /etc/apache/conf
+	has_version =net-www/apache-2* \
+	  && insinto /etc/apache2/conf \
+	  || insinto /etc/apache2/conf
 	newins ${FILESDIR}/webalizer-${PV}.conf webalizer.conf
-	insinto /etc/apache/conf/addon-modules
+	has_version =net-www/apache-2* \
+	  && cp ${D}/etc/apache2/conf/webalizer.conf ${D}/etc/apache2/conf/webalizer.conf.1;
+		 sed -e "s/apache/apache2/g" ${D}/etc/apache2/conf/webalizer.conf.1 > ${D}/etc/apache2/conf/webalizer.conf;
+		 rm ${D}/etc/apache2/conf/webalizer.conf.1
+	has_version =net-www/apache-2* \
+	  && insinto /etc/apache2/conf/addon-modules \
+	  || insinto /etc/apache2/conf/addon-modules
 	doins ${FILESDIR}/apache.webalizer
 	dodoc README* CHANGES COPYING Copyright sample.conf
 	dodir /home/httpd/htdocs/webalizer
@@ -53,6 +64,9 @@ 
 }
 
 pkg_config() {
+	has_version =net-www/apache-2* \
+	  && CONF='/etc/apache2/conf/apache2.conf' \
+	  || CONF='/etc/apache/conf/apache.conf'
 	echo "Include  conf/addon-modules/apache.webalizer" \
-		>> ${ROOT}/etc/apache/conf/apache.conf
+		>> ${ROOT}${CONF}
 }