fix media-libs/gd dep per bug #69959; clean out nut-1
authorMichael Sterrett <mr_bones_@gentoo.org>
Mon, 8 Nov 2004 09:17:23 +0000 (09:17 +0000)
committerMichael Sterrett <mr_bones_@gentoo.org>
Mon, 8 Nov 2004 09:17:23 +0000 (09:17 +0000)
www-apps/nut/ChangeLog
www-apps/nut/Manifest
www-apps/nut/files/digest-nut-1.2.2 [deleted file]
www-apps/nut/files/digest-nut-1.4.1 [deleted file]
www-apps/nut/files/digest-nut-1.5.12 [deleted file]
www-apps/nut/nut-1.2.2.ebuild [deleted file]
www-apps/nut/nut-1.4.1.ebuild [deleted file]
www-apps/nut/nut-1.5.12.ebuild [deleted file]
www-apps/nut/nut-2.0.0.ebuild

index d806a7309318fc99a301e35bf374820378066d22..12a7990a80cc3ce557cf8225cd39256e89265e54 100644 (file)
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/nut
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/ChangeLog,v 1.6 2004/09/27 22:17:56 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/ChangeLog,v 1.7 2004/11/08 09:17:23 mr_bones_ Exp $
+
+  08 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> nut-2.0.0.ebuild:
+  fix media-libs/gd dep per bug #69959; clean out nut-1
 
   28 Sep 2004; Bryan Ã˜stergaard,,, <kloeri@gentoo.org> nut-2.0.0.ebuild:
   Add ~alpha.
index 79dd4ff55bc8042a479127ff413901c987f25b9c..9c4f98ed746d50abd570df9c93851f850ec940dd 100644 (file)
@@ -1,15 +1,9 @@
-MD5 551e8eba9f0afb98bc867fa27bd6ff97 nut-2.0.0.ebuild 3078
-MD5 69c77e31c3ad555bdd7aa96ef60679c3 nut-1.5.12.ebuild 3298
-MD5 b645febb63df0482b4bedb5903963f7e nut-1.4.1.ebuild 2312
-MD5 8fc5649ef2a19be3f1ff9969745da40e nut-1.2.2.ebuild 3374
-MD5 6a9706a588ce105811248d6a39eba39e ChangeLog 6195
+MD5 57eb09f7b7c189e851a978a47139c6c7 ChangeLog 6328
 MD5 91a159b983332d5ed0fb985cc1fe1b80 metadata.xml 330
-MD5 ab96c8181bf3780dae5e3377987b05c2 files/digest-nut-1.2.2 61
-MD5 af157fac0a88e11c79527d952fce75ec files/digest-nut-1.4.1 61
+MD5 493f0d79357878944971448f83d8000e nut-2.0.0.ebuild 3077
 MD5 891b50cff5827a4e77573ee8f2f40e48 files/digest-nut-2.0.0 61
-MD5 5ebf68a5c1e2be25b436841a91ccac0a files/upsmon-init 472
-MD5 7b76eef352ad93b1369096360bbc3a11 files/digest-nut-1.5.12 62
+MD5 aff23b23415c3ce12e107ef874db2607 files/upsd-init 577
 MD5 057b35a5ced412ebf01c952b55d2e4db files/upsd.rc6 585
 MD5 d369e7d9bf8a83e47b0a958ec30baf43 files/upsdrv.rc6 477
+MD5 5ebf68a5c1e2be25b436841a91ccac0a files/upsmon-init 472
 MD5 5962635c2a91e3df315cc69f5aa52f6a files/upsmon.rc6 471
-MD5 aff23b23415c3ce12e107ef874db2607 files/upsd-init 577
diff --git a/www-apps/nut/files/digest-nut-1.2.2 b/www-apps/nut/files/digest-nut-1.2.2
deleted file mode 100644 (file)
index 648c7b4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 77523931f32fc1dffcfbe2f8de37df15 nut-1.2.2.tar.gz 459992
diff --git a/www-apps/nut/files/digest-nut-1.4.1 b/www-apps/nut/files/digest-nut-1.4.1
deleted file mode 100644 (file)
index ab239bb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ae91ea3d643d7665bda0a95ce62957a0 nut-1.4.1.tar.gz 550238
diff --git a/www-apps/nut/files/digest-nut-1.5.12 b/www-apps/nut/files/digest-nut-1.5.12
deleted file mode 100644 (file)
index 0e168a8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 26eefc05469d500130b84ab9bc2aa738 nut-1.5.12.tar.gz 510378
diff --git a/www-apps/nut/nut-1.2.2.ebuild b/www-apps/nut/nut-1.2.2.ebuild
deleted file mode 100644 (file)
index 2957a2b..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/nut-1.2.2.ebuild,v 1.1 2004/08/15 15:19:10 stuart Exp $
-
-DESCRIPTION="Network-UPS Tools"
-HOMEPAGE="http://www.exploits.org/nut/"
-SRC_URI="http://www.exploits.org/nut/release/${PV%.*}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sys-apps/baselayout-1.8.2"
-
-APACHE=""
-function setapache() {
-       APACHE="`which apache 2>/dev/null`"
-       if [ -z "${APACHE}" -a -x /usr/sbin/apache ]; then
-               APACHE=/usr/sbin/apache
-       fi
-}
-
-if [ -n "${APACHE}" ]; then
-       DEPEND="${DEPEND} =sys-libs/zlib-1* =media-libs/gd-1* =media-libs/libpng-1.2*"
-       RDEPEND="${RDEPEND} net-www/apache"
-fi
-RDEPEND="${RDEPEND} ${DEPEND}"
-DEPEND="$DEPEND >=sys-devel/autoconf-2.58"
-
-src_unpack() {
-       unpack ${A} || die
-       cd ${S} || die
-       cp configure.in configure.in.orig
-       sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
-               configure.in.orig >configure.in
-       WANT_AUTOCONF=2.5 autoconf || die
-}
-
-src_compile() {
-       local myconf
-       setapache
-       [ -n "${APACHE}" ] && myconf="--with-cgi --with-cgipath=/home/httpd/cgi-bin"
-       [ -n "${APACHE}" ] || myconf="--without-cgi"
-
-       #default is to build all drivers; but the following is common:
-       #--with-drivers=apcsmart,hidups
-       ./configure \
-               --prefix=/usr \
-               --with-user=nut \
-               --with-group=nut \
-               --with-port=3493 \
-               --with-drvpath=/sbin \
-               --sysconfdir=/etc/nut \
-               --mandir=/usr/share/man \
-               --with-pidpath=/var/run \
-               --with-logfacility=LOG_DAEMON \
-               --with-statepath=/var/state/nut \
-               --with-altpidpath=/var/state/nut \
-               --with-linux-hiddev \
-               --host=${CHOST} ${myconf} || die
-
-       cp ${S}/drivers/Makefile ${S}/drivers/Makefile.orig
-       sed -e "s:= bestups:= hidups bestups:" ${S}/drivers/Makefile.orig \
-               > ${S}/drivers/Makefile
-       cp ${S}/man/Makefile ${S}/man/Makefile.orig
-       sed -e "s:= powercom.8:= hidups.8 powercom.8:" \
-               ${S}/man/Makefile.orig > ${S}/man/Makefile
-
-       emake || die
-
-       if [ -n "${APACHE}" ]
-       then
-               emake cgi || die
-       fi
-}
-
-src_install() {
-       setapache
-       # Makefile: user/group nut might not exist until after
-       # pkg_preinst() runs; so use root for now, and fix it
-       # up in pkg_postinst().
-       make DESTDIR=${D} RUNUID=root RUNGID=root install || die
-
-       if [ -n "${APACHE}" ]
-       then
-               make DESTDIR=${D} install-cgi || die
-       fi
-       # see above note...
-       rm -rf ${D}/var/state/nut
-
-       dodoc CHANGES COPYING CREDITS INSTALL NEWS README \
-               UPGRADING docs/{FAQ,*.txt,driver.list}
-       docinto cables ; dodoc docs/cables/*
-       docinto drivers ; dodoc docs/drivers/*
-
-       # clean up /etc/nut/*.sample files
-       cd ${D}/etc/nut
-       for i in *.sample
-       do
-               mv $i ${i/.sample/}
-       done
-
-       exeinto /etc/init.d
-       newexe ${FILESDIR}/upsd-init upsd
-       newexe ${FILESDIR}/upsmon-init upsmon
-}
-
-pkg_preinst() {
-       if ! groupmod nut ; then
-               groupadd -g 84 nut || die "problem adding group nut"
-       fi
-
-       # usermod returns 2 on user-exists-but-no-flags-given
-       usermod nut &>/dev/null
-       if [ $? != 2 ] ; then
-               useradd -u 84 -g nut -s /bin/false -c "nut" \
-                       -d /var/state/nut nut || die "problem adding user nut"
-       fi
-}
-
-pkg_postinst() {
-       install -m0700 -o nut -g nut -d ${ROOT}/var/state/nut
-       chown root:nut ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-       chmod 640 ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-       ewarn "Dont forget to merge any changes in /etc/init.d/._cfgXXXX_halt.sh"
-}
diff --git a/www-apps/nut/nut-1.4.1.ebuild b/www-apps/nut/nut-1.4.1.ebuild
deleted file mode 100644 (file)
index 5182498..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/nut-1.4.1.ebuild,v 1.1 2004/08/15 15:19:10 stuart Exp $
-
-DESCRIPTION="Network-UPS Tools."
-HOMEPAGE="http://www.networkupstools.org/"
-SRC_URI="mirror://nut/source/${PV%.*}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-IUSE="cgi"
-
-RDEPEND="cgi? ( =media-libs/gd-1* )"
-DEPEND="$RDEPEND
-       >=sys-apps/sed-4
-       >=sys-devel/autoconf-2.58"
-
-src_unpack() {
-       unpack ${A} && cd "${S}"
-
-       sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
-               -i configure.in || die "sed failed"
-
-       ebegin "Recreating configure"
-       WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
-       eend $?
-}
-
-src_compile() {
-       local myconf
-       myconf="${myconf} `use_with cgi` `use_with cgi cgipath /usr/share/nut`"
-
-       econf \
-               --with-user=nut \
-               --with-group=nut \
-               --with-drvpath=/lib/nut \
-               --sysconfdir=/etc/nut \
-               --with-logfacility=LOG_DAEMON \
-               --with-statepath=/var/lib/nut \
-               --with-linux-hiddev \
-               ${myconf} || die "econf failed"
-
-       sed -e "s:= bestups:= hidups bestups:" \
-               -i drivers/Makefile || die "sed failed"
-       sed -e "s:= powercom.8:= hidups.8 powercom.8:" \
-               -i man/Makefile || die "sed failed"
-
-       emake || die "compile problem"
-
-       if use cgi ; then
-               emake cgi || die "compile cgi problem"
-       fi
-}
-
-src_install() {
-       make DESTDIR="${D}" install || die "make install failed"
-
-       dodir /sbin
-       dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
-
-       for i in "${D}"/etc/nut/*.sample ; do
-               mv "${i}" "${i/.sample/}"
-       done
-
-       if use cgi ; then
-               make DESTDIR="${D}" install-cgi || die "make install-cgi failed"
-               einfo "CGI monitoring scripts are installed in /usr/share/nut,"
-               einfo "copy them to your web server's ScriptPath to activate."
-       fi
-
-       dodoc CHANGES COPYING CREDITS INSTALL MAINTAINERS NEWS README UPGRADING \
-               docs/{FAQ,*.txt,driver.list}
-
-       docinto cables
-       dodoc docs/cables/*
-
-       exeinto /etc/init.d
-       newexe "${FILESDIR}/upsd.rc6" upsd
-       newexe "${FILESDIR}/upsdrv.rc6" upsdrv
-       newexe "${FILESDIR}/upsmon.rc6" upsmon
-
-       keepdir /var/lib/nut
-}
-
-pkg_postinst() {
-       chown nut:nut ${ROOT}/var/lib/nut
-       chmod 0700 ${ROOT}/var/lib/nut
-       chown root:nut ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-       chmod 0640 ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-}
diff --git a/www-apps/nut/nut-1.5.12.ebuild b/www-apps/nut/nut-1.5.12.ebuild
deleted file mode 100644 (file)
index 0ddaba4..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/nut-1.5.12.ebuild,v 1.1 2004/08/15 15:19:10 stuart Exp $
-
-inherit fixheadtails
-
-DESCRIPTION="Network-UPS Tools"
-HOMEPAGE="http://www.networkupstools.org/"
-SRC_URI="mirror://nut/source/${PV%.*}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-IUSE="cgi snmp"
-
-RDEPEND="cgi? ( =media-libs/gd-1* )
-       snmp? ( virtual/snmp )"
-DEPEND="$RDEPEND
-       >=sys-apps/sed-4
-       >=sys-devel/autoconf-2.58"
-
-src_unpack() {
-       unpack ${A} && cd "${S}"
-
-       sed -e "s/install: install-dirs/install: install-dirs install-conf/" \
-               -i Makefile.in || die "sed failed"
-
-       ht_fix_file configure.in config.guess
-
-       sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
-               -i configure.in || die "sed failed"
-
-       ebegin "Recreating configure"
-       WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
-       eend $?
-}
-
-src_compile() {
-       local myconf
-       myconf="${myconf} `use_with cgi` `use_with cgi cgipath /usr/share/nut`"
-       if [ -z "${NUT_DRIVERS}" ]; then
-               NUT_DRIVERS="${NUT_DRIVERS} bestups fentonups apcsmart everups belkin masterguard \
-               powercom cyberpower tripplite victronups genericups mge-utalk bestuferrups \
-               isbmex etapro liebert sms esupssmart tripplitesu blazer safenet belkinunv \
-               oneac ippon cyberpower1100"
-               if use snmp; then
-                       NUT_DRIVERS="${NUT_DRIVERS} snmp-ups"
-               fi
-       fi
-       NUT_DRIVERS="`echo ${NUT_DRIVERS} | xargs`"
-       myconf="${myconf} --with-drivers=${NUT_DRIVERS// /,}"
-
-       econf \
-               --with-user=nut \
-               --with-group=nut \
-               --with-drvpath=/lib/nut \
-               --sysconfdir=/etc/nut \
-               --with-logfacility=LOG_DAEMON \
-               --with-statepath=/var/lib/nut \
-               --with-linux-hiddev \
-               ${myconf} || die "econf failed"
-
-       sed -e "s:= bestups:= hidups bestups:" \
-               -i drivers/Makefile || die "sed failed"
-       sed -e "s:= powercom.8:= hidups.8 powercom.8:" \
-               -i man/Makefile || die "sed failed"
-
-       emake || die "compile problem"
-
-       if use cgi; then
-               emake cgi || die "compile cgi problem"
-       fi
-}
-
-src_install() {
-       make DESTDIR="${D}" install || die "make install failed"
-
-       dodir /sbin
-       dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
-
-       for i in "${D}"/etc/nut/*.sample ; do
-               mv "${i}" "${i/.sample/}"
-       done
-
-       if use cgi; then
-               make DESTDIR="${D}" install-cgi || die "make install-cgi failed"
-               einfo "CGI monitoring scripts are installed in /usr/share/nut,"
-               einfo "copy them to your web server's ScriptPath to activate."
-       fi
-
-       dodoc CHANGES COPYING CREDITS INSTALL MAINTAINERS NEWS README UPGRADING \
-               docs/{FAQ,*.txt}
-
-       docinto cables
-       dodoc docs/cables/*
-
-       exeinto /etc/init.d
-       newexe "${FILESDIR}/upsd.rc6" upsd
-       newexe "${FILESDIR}/upsdrv.rc6" upsdrv
-       newexe "${FILESDIR}/upsmon.rc6" upsmon
-
-       keepdir /var/lib/nut
-
-       fperms 0700 /var/lib/nut
-       fperms 0640 /etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-       fowners nut:nut /var/lib/nut
-       fowners root:nut /etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-}
-
-pkg_postinst() {
-       # this is to ensure that everybody that installed old versions still has correct
-       # permissions
-       chown nut:nut ${ROOT}/var/lib/nut 2>/dev/null
-       chmod 0700 ${ROOT}/var/lib/nut 2>/dev/null
-       chown root:nut ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf} 2>/dev/null
-       chmod 0640 ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf} 2>/dev/null
-}
index eed758591300d08817e28bcafa18080541a56365..e2fc0acf3d45e4fece54f6b748a5429b0809c916 100644 (file)
@@ -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/www-apps/nut/nut-2.0.0.ebuild,v 1.5 2004/09/27 22:17:56 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nut/nut-2.0.0.ebuild,v 1.6 2004/11/08 09:17:23 mr_bones_ Exp $
 
 inherit fixheadtails
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="x86 sparc ppc ~alpha"
 IUSE="cgi snmp usb"
 
-RDEPEND="cgi? ( =media-libs/gd-1* )
+RDEPEND="cgi? ( media-libs/gd )
        snmp? ( virtual/snmp )"
 DEPEND="$RDEPEND
        >=sys-apps/sed-4