From: Michael Imhof <tantive@gentoo.org>
Date: Tue, 23 Nov 2004 22:09:23 +0000 (+0000)
Subject: New revision. Added support for the gd USE-flag. Closes #68935.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=74213b0d0c0d9e3d567695c838df8c762a56b53b;p=gentoo.git

New revision. Added support for the gd USE-flag. Closes #68935.
---

diff --git a/sys-apps/apcupsd/ChangeLog b/sys-apps/apcupsd/ChangeLog
index b839625cfa28..0ecb4d9d07ef 100644
--- a/sys-apps/apcupsd/ChangeLog
+++ b/sys-apps/apcupsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/apcupsd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.50 2004/11/12 01:07:37 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.51 2004/11/23 22:09:23 tantive Exp $
+
+*apcupsd-3.10.16-r1 (23 Nov 2004)
+
+  23 Nov 2004; Michael Imhof <tantive@gentoo.org> +apcupsd-3.10.16-r1.ebuild,
+  -apcupsd-3.10.16.ebuild:
+  New revision. Added support for the gd USE-flag. Closes #68935.
 
 *apcupsd-3.10.16 (12 Nov 2004)
 
diff --git a/sys-apps/apcupsd/Manifest b/sys-apps/apcupsd/Manifest
index 9a1328099144..15f1bbaf9ae5 100644
--- a/sys-apps/apcupsd/Manifest
+++ b/sys-apps/apcupsd/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a9d6ca4722a22fed35f45c47aca54333 apcupsd-3.10.16.ebuild 2488
 MD5 27ae5add10fc42e77804f1ecd768df87 metadata.xml 226
 MD5 74e598a06446374ea9bbc4c86d8501a7 apcupsd-3.10.15-r1.ebuild 2486
-MD5 44ff47cb475b265dc9a400dd2289a101 ChangeLog 9249
-MD5 ed12d329ca566b8f2632d425828ea5d7 files/digest-apcupsd-3.10.16 68
+MD5 322a4a169681e37c815134275e8f15dc ChangeLog 9456
+MD5 78c71d3166cbab28dc18acf908dd65bd apcupsd-3.10.16-r1.ebuild 2543
+MD5 ed12d329ca566b8f2632d425828ea5d7 files/digest-apcupsd-3.10.16-r1 68
 MD5 ec48a12c6d8b56aeffbeaa629f8835ad files/digest-apcupsd-3.10.15-r1 68
 MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.16/smtp.patch 2663
 MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.16/ucd-snmp.patch 425
@@ -18,7 +18,7 @@ MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.15/apcupsd.in.patch 315
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBlBpXKtJO8LeSoosRAoXbAJ9q+nIuhN16yuAnHC2EAoQtNLHRkgCglMDW
-3HHl2DOi/PaKseFZ87yL41o=
-=oWnw
+iD8DBQFBo8MoKtJO8LeSoosRAp8kAJoCD4oVneCKlpU4FkuROqEZ1zI1wACfetCU
+WLwE96kIO8djzK4iPX8ie6w=
+=hBlz
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/apcupsd/apcupsd-3.10.16.ebuild b/sys-apps/apcupsd/apcupsd-3.10.16-r1.ebuild
similarity index 79%
rename from sys-apps/apcupsd/apcupsd-3.10.16.ebuild
rename to sys-apps/apcupsd/apcupsd-3.10.16-r1.ebuild
index 3d217768968f..cf35b5f48ccf 100644
--- a/sys-apps/apcupsd/apcupsd-3.10.16.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.16.ebuild,v 1.1 2004/11/12 01:07:37 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.16-r1.ebuild,v 1.1 2004/11/23 22:09:23 tantive Exp $
 
 inherit eutils
 
@@ -11,13 +11,13 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
-IUSE="doc snmp usb apache2"
+IUSE="doc snmp usb apache2 gd"
 
 DEPEND=">=sys-apps/baselayout-1.8.4
 	virtual/libc
 	virtual/mta
 	snmp? ( virtual/snmp )
-	>=media-libs/gd-1.8.4
+	gd? ( >=media-libs/gd-1.8.4 )
 	sys-libs/ncurses"
 RDEPEND="${DEPEND}
 	usb? ( sys-apps/hotplug )"
@@ -41,6 +41,7 @@ src_unpack() {
 src_compile() {
 	local myconf
 	use snmp && myconf="--enable-net-snmp"
+	use gd && myconf="${myconf} --enable-cgi --with-css-dir=/var/www/apcupsd --with-cgi-bin=/var/www/apcupsd"
 	APCUPSD_MAIL=/usr/sbin/sendmail ./configure \
 		--prefix=/usr \
 		--sbindir=/usr/sbin \
@@ -59,10 +60,7 @@ src_compile() {
 		--enable-oldnet \
 		--enable-master-slave \
 		--enable-powerflute \
-		--enable-pthreads \
-		--with-css-dir=/var/www/apcupsd \
-		--with-cgi-bin=/var/www/apcupsd \
-		--enable-cgi \
+		--enable-pthreads
 		${myconf} \
 		|| die
 	make || die
@@ -71,11 +69,14 @@ src_compile() {
 src_install () {
 	make DESTDIR=${D} install || die "installed failed"
 
-	use apache2 || insinto /etc/apache/conf/addon-modules
-	use apache2 || newins  ${FILESDIR}/${PV}/apache.conf apcupsd.conf
+	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
+		use apache2 && insinto /etc/apache2/conf/modules.d
+		use apache2 && newins ${FILESDIR}/${PV}/apache.conf 60_apcupsd.conf
+	fi
 
 	insinto /etc/apcupsd
 	newins examples/safe.apccontrol safe.apccontrol
diff --git a/sys-apps/apcupsd/files/digest-apcupsd-3.10.16 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.16-r1
similarity index 100%
rename from sys-apps/apcupsd/files/digest-apcupsd-3.10.16
rename to sys-apps/apcupsd/files/digest-apcupsd-3.10.16-r1