--- /usr/portage/sys-power/apcupsd/apcupsd-3.10.16-r3.ebuild	2005-03-15 00:27:27.000000000 +0100
+++ apcupsd-3.10.16-r3.ebuild	2005-03-21 06:52:37.608780112 +0100
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.10.16-r3.ebuild,v 1.1 2005/03/14 23:27:27 ciaranm Exp $
 
-inherit eutils
+inherit eutils depend.apache
+
+need_apache
 
 DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
 HOMEPAGE="http://www.sibbald.com/apcupsd/"
@@ -17,7 +19,8 @@
 	virtual/libc
 	virtual/mta
 	snmp? ( net-analyzer/net-snmp )
-	gd? ( >=media-libs/gd-1.8.4 )
+	gd? ( >=media-libs/gd-1.8.4
+		net-www/apache )
 	sys-libs/ncurses"
 RDEPEND="${DEPEND}
 	usb? ( sys-apps/hotplug )"
@@ -40,7 +43,7 @@
 	use gd && myconf="${myconf} --enable-cgi --with-css-dir=/var/www/apcupsd --with-cgi-bin=/var/www/apcupsd"
 	use usb && myconf="${myconf} --with-upstype=usb --with-upscable=usb --with-serial-dev=/dev/usb/hiddev[0-9] --enable-usb"
 	use !usb && myconf="${myconf} --with-upstype=apcsmart --with-upscable=apcsmart --with-serial-dev=/dev/ttyS0 --disable-usb"
-	APCUPSD_MAIL=/usr/sbin/sendmail ./configure \
+	DISTNAME=gentoo APCUPSD_MAIL=/usr/sbin/sendmail ./configure \
 		--prefix=/usr \
 		--sbindir=/usr/sbin \
 		--sysconfdir=${XSYSCONFDIR} \
@@ -63,13 +66,9 @@
 src_install () {
 	make DESTDIR=${D} install || die "installed failed"
 
-	if use gd
-	then
-		use apache2 || insinto /etc/apache/conf/addon-modules
-		use apache2 || newins  ${FILESDIR}/${PV}/apache.conf apcupsd.conf
-
-		use apache2 && insinto /etc/apache2/conf/modules.d
-		use apache2 && newins ${FILESDIR}/${PV}/apache.conf 60_apcupsd.conf
+	if use gd; then
+		insinto ${APACHE_MODULEDIR}
+		newins ${FILEDIR}/${PV}/apache.conf 60_apcupsd.conf
 	fi
 
 	insinto /etc/apcupsd