--- /usr/portage/sys-power/apcupsd/apcupsd-3.10.16-r3.ebuild	2005-03-15 00:27:27.000000000 +0100
+++ apcupsd-3.10.17.ebuild	2005-03-21 17:26:57.478800400 +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/"
@@ -11,14 +13,15 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
-IUSE="doc snmp usb apache2 gd"
+IUSE="doc snmp usb apache2 cgi threads ncurses nls"
 
-DEPEND=">=sys-apps/baselayout-1.8.4
-	virtual/libc
+DEPEND="virtual/libc
 	virtual/mta
 	snmp? ( net-analyzer/net-snmp )
-	gd? ( >=media-libs/gd-1.8.4 )
-	sys-libs/ncurses"
+	cgi? ( >=media-libs/gd-1.8.4
+		net-www/apache )
+	ncurses? ( sys-libs/ncurses )
+	nls? ( sys-devel/gettext )"
 RDEPEND="${DEPEND}
 	usb? ( sys-apps/hotplug )"
 
@@ -36,11 +39,13 @@
 
 src_compile() {
 	local myconf
-	use snmp && myconf="${myconf} --enable-net-snmp"
-	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 \
+	use cgi && 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 --enable-usb"
+	use !usb && myconf="${myconf} --with-upstype=apcsmart --with-upscable=apcsmart --disable-usb"
+
+	# We force the DISTNAME to gentoo so it will use gentoo's layout also
+	# when installed on non-linux systems.
+	DISTNAME=gentoo APCUPSD_MAIL=/usr/sbin/sendmail ./configure \
 		--prefix=/usr \
 		--sbindir=/usr/sbin \
 		--sysconfdir=${XSYSCONFDIR} \
@@ -53,8 +58,10 @@
 		--enable-net \
 		--enable-oldnet \
 		--enable-master-slave \
-		--enable-powerflute \
-		--enable-pthreads \
+		$(use_enable ncurses powerflute) \
+		$(use_enable threads pthreads) \
+		$(use_enable snmp net-snmp) \
+		$(use_enable nls) \
 		${myconf} \
 		|| die
 	make || die
@@ -63,13 +70,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 cgi; then
+		insinto ${APACHE_MODULEDIR}
+		newins ${FILEDIR}/${PV}/apache.conf 60_apcupsd.conf
 	fi
 
 	insinto /etc/apcupsd
@@ -80,8 +83,7 @@
 
 	ln -s onbattery powerout
 
-	if use doc
-	then
+	if use doc; then
 		einfo "Installing full documentation into /usr/share/doc/${P}..."
 		cd ${S}/doc
 		dodoc README.*