fix libtool issues, bug #265964.

Package-Manager: portage-2.1.6.11/cvs/Linux i686

3 files changed, 226 insertions, 2 deletions

diff --git a/sys-power/nut/ChangeLog b/sys-power/nut/ChangeLog
index 212ddd5881da..16b640082b89 100644
--- a/sys-power/nut/ChangeLog
+++ b/sys-power/nut/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-power/nut
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.62 2009/04/15 12:27:43 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.63 2009/05/11 03:45:52 rajiv Exp $
+
+*nut-2.4.1-r1 (11 May 2009)
+
+  11 May 2009; Rajiv Aaron Manglani <rajiv@gentoo.org> +nut-2.4.1-r1.ebuild:
+  fix libtool issues, bug #265964.
 
   15 Apr 2009; Brent Baude <ranger@gentoo.org> nut-2.2.2.ebuild:
   Marking nut-2.2.2 ppc64 for bug 264897
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 741d39a915e4..f3c13bfa13ae 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -15,6 +15,7 @@ DIST nut-2.2.2.tar.gz 1184406 RMD160 4dc1d2b729fc0e02c0475008c44bc62e1901f705 SH
 DIST nut-2.4.1.tar.gz 1121152 RMD160 d046a711fb8f94b1a3652dea774d201684292272 SHA1 c8e999da718cfe14211977c19dd9b055cfc6fada SHA256 9e2441e1a7046627715cfe78e22f82f7bb05bf380735f803731b64e06bd19f3c
 EBUILD nut-2.0.5-r2.ebuild 5267 RMD160 f362f6a45271e42790628cd7b5713f64c3901feb SHA1 007caacbb0b61fc2c1a73eb0e3abde8720b0d311 SHA256 025dda38a95e65de8b32c0a329fba2325196cb0fd007a5ff670ab467a8479717
 EBUILD nut-2.2.2.ebuild 6458 RMD160 b43aece6c4ef2097aac183912212a32d64d4bf03 SHA1 3e82ca95ad5644f6ecfcfb480b1f29f4ee912b38 SHA256 bb9a5d1cc2a2e44bab9564a1a80e314eb8a750ded32a0cb9af6b2a1a121ba62c
+EBUILD nut-2.4.1-r1.ebuild 6708 RMD160 b09c54c61b711d294df78a38a22458530c1b4f5b SHA1 9c0d8c245fc43b5515f6981b8fe04e3cce1f5a61 SHA256 8f2241ae8404eaf1d8d6cf063a79e0dfae24b5796c1f293c2c94fef010037f92
 EBUILD nut-2.4.1.ebuild 6672 RMD160 db23ca0fb5736de1cc1486cd28401d2c7d22e4c3 SHA1 680b2fd8de36131b8650cd84d739c820556e0741 SHA256 bdb491a06e5b40b70b06d7ad98d8a527e9268d6d837569affe73b6913e144f2d
-MISC ChangeLog 16378 RMD160 1550930d89bc55b8a058c1bdebc7dbbb296ca006 SHA1 76203d050e57fe8dd1661b5fd3273ffe5814f3cf SHA256 6b9d40dffcc68433cad47b7f6c69fdd80738079a3bf57c02b8264cbc77ed62d4
+MISC ChangeLog 16519 RMD160 a294318408dc1c2ee899b45bfb25ab23b4f12a55 SHA1 a4091857f01692fd3bb2c4550f300377775fc0f0 SHA256 e1811e7f60a3dc59c5c0855624c17bd0da56d3b9dddb644579d252ec772dbb20
 MISC metadata.xml 219 RMD160 7737543ce33cd412792e332121aa1c6ed452adfc SHA1 6c360930b80d6f4168ba1a486a25ad176505ea63 SHA256 8b2ef93d0d6f03a1ad115651dc46a7752e7775a62a32a7046c3294e50b14725b
diff --git a/sys-power/nut/nut-2.4.1-r1.ebuild b/sys-power/nut/nut-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..e2b8b4f8c707
--- /dev/null
+++ b/sys-power/nut/nut-2.4.1-r1.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.4.1-r1.ebuild,v 1.1 2009/05/11 03:45:52 rajiv Exp $
+
+EAPI="2"
+
+inherit eutils fixheadtails autotools bash-completion
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Network-UPS Tools"
+HOMEPAGE="http://www.networkupstools.org/"
+# Nut mirrors are presently broken
+SRC_URI="http://random.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="cgi snmp usb ssl hal xml"
+
+RDEPEND="cgi? ( >=media-libs/gd-2[png] )
+		snmp? ( net-analyzer/net-snmp )
+		usb? ( >=dev-libs/libusb-0.1.12 )
+		hal? ( >=sys-apps/hal-0.5.11 )
+		ssl? ( dev-libs/openssl )
+		xml? ( >=net-misc/neon-0.25.0 )
+		>=sys-fs/udev-114"
+DEPEND="$RDEPEND
+		>=sys-apps/sed-4
+		>=sys-devel/autoconf-2.58"
+
+# public files should be 644 root:root
+NUT_PUBLIC_FILES="/etc/nut/{ups,upssched}.conf"
+# private files should be 640 root:nut - readable by nut, writeable by root,
+NUT_PRIVATE_FILES="/etc/nut/{upsd.conf,upsd.users,upsmon.conf}"
+# public files should be 644 root:root, only installed if USE=cgi
+NUT_CGI_FILES="/etc/nut/{{hosts,upsset}.conf,upsstats{,-single}.html}"
+
+pkg_setup() {
+	enewgroup nut 84
+	enewuser nut 84 -1 /var/lib/nut nut,uucp
+	# As of udev-104, NUT must be in uucp and NOT in tty.
+	gpasswd -d nut tty 2>/dev/null
+	gpasswd -a nut uucp 2>/dev/null
+	use hal && gpasswd -a haldaemon nut 2>/dev/null
+	# in some cases on old systems it wasn't in the nut group either!
+	gpasswd -a nut nut 2>/dev/null
+	warningmsg ewarn
+}
+
+src_prepare() {
+	ht_fix_file configure.in
+
+	epatch "${FILESDIR}"/${PN}-2.4.1-no-libdummy.patch
+
+	sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
+		-i configure.in || die "sed failed"
+
+	sed -e "s:52.nut-usbups.rules:70-nut-usbups.rules:" \
+		-i scripts/udev/Makefile.am || die "sed failed"
+
+	rm -f ltmain.sh m4/lt* m4/libtool.m4
+
+	WANT_AUTOCONF=2.5 eautoreconf || die "autoconf failed"
+}
+
+src_configure() {
+	local myconf
+
+	if [ -n "${NUT_DRIVERS}" ]; then
+		myconf="${myconf} --with-drivers=${NUT_DRIVERS// /,}"
+	fi
+
+	econf \
+		--with-user=nut \
+		--with-group=nut \
+		--with-drvpath=/lib/nut \
+		--sysconfdir=/etc/nut \
+		--with-logfacility=LOG_DAEMON \
+		--with-statepath=/var/lib/nut \
+		--with-htmlpath=/usr/share/nut/html \
+		--datarootdir=/usr/share/nut \
+		--datadir=/usr/share/nut \
+		--with-dev \
+		$(use_with xml neonxml) \
+		$(use_with hal) \
+		$(use_with ssl) \
+		$(use_with usb) \
+		$(use_with snmp) \
+		$(use_with cgi) \
+		$(use_with cgi cgipath /usr/share/nut/cgi) \
+		${myconf} || die "econf failed"
+
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodir /sbin
+	dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
+	# This needs to exist for the scripts
+	dosym /lib/nut/upsdrvctl /usr/sbin/upsdrvctl
+
+	if use cgi; then
+		elog "CGI monitoring scripts are installed in /usr/share/nut/cgi."
+		elog "copy them to your web server's ScriptPath to activate (this is a"
+		elog "change from the old location)."
+		elog "If you use lighttpd, see lighttpd_nut.conf in the documentation."
+	fi
+
+	# this must be done after all of the install phases
+	for i in "${D}"/etc/nut/*.sample ; do
+		mv "${i}" "${i/.sample/}"
+	done
+
+	dodoc ChangeLog INSTALL MAINTAINERS NEWS README UPGRADING \
+			docs/{FAQ,*.txt} || die
+
+	newdoc lib/README README.lib || die
+
+	newdoc "${FILESDIR}"/lighttpd_nut.conf-2.2.0 lighttpd_nut.conf || die
+
+	docinto cables
+	dodoc docs/cables/* || die
+
+	newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsd upsd
+	newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv
+	newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsmon upsmon
+
+	# This sets up permissions for nut to access a UPS
+	insinto /etc/udev/rules.d/
+	newins scripts/udev/nut-usbups.rules 70-nut-usbups.rules
+
+	keepdir /var/lib/nut
+
+	einfo "Setting up permissions on files and directories"
+	fperms 0700 /var/lib/nut
+	fowners nut:nut /var/lib/nut
+
+	# Do not remove eval here, because the variables contain shell expansions.
+	eval fperms 0640 ${NUT_PRIVATE_FILES}
+	eval fowners root:nut ${NUT_PRIVATE_FILES}
+
+	# Do not remove eval here, because the variables contain shell expansions.
+	eval fperms 0644 ${NUT_PUBLIC_FILES}
+	eval fowners root:root ${NUT_PUBLIC_FILES}
+
+	# Do not remove eval here, because the variables contain shell expansions.
+	if use cgi; then
+		eval fperms 0644 ${NUT_CGI_FILES}
+		eval fowners root:root ${NUT_CGI_FILES}
+	fi
+
+	# this is installed for 2.4 and fbsd guys
+	if ! has_version sys-fs/udev; then
+		einfo "Installing non-udev hotplug support"
+		insinto /etc/hotplug/usb
+		insopts -m 755
+		doins scripts/hotplug/nut-usbups.hotplug
+	fi
+
+	if use hal; then
+		einfo "Installing HAL support"
+		insinto /usr/share/hal/fdi/information/20thirdparty/
+		doins scripts/hal/20-ups-nut-device.fdi
+		insinto /usr/libexec
+		insopts -m 755
+		doins drivers/hald-addon-*
+	    rm "${D}"/lib/nut/hald-addon-*
+	fi
+
+	dobashcompletion "${S}"/scripts/misc/nut.bash_completion
+}
+
+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
+
+	# Do not remove eval here, because the variables contain shell expansions.
+	eval chown root:nut "${ROOT}"${NUT_PRIVATE_FILES} 2>/dev/null
+	eval chmod 0640 "${ROOT}"${NUT_PRIVATE_FILES} 2>/dev/null
+
+	# Do not remove eval here, because the variables contain shell expansions.
+	eval chown root:root "${ROOT}"${NUT_PUBLIC_FILES} 2>/dev/null
+	eval chmod 0644 "${ROOT}"${NUT_PUBLIC_FILES} 2>/dev/null
+
+	# Do not remove eval here, because the variables contain shell expansions.
+	if use cgi; then
+		eval chown root:root "${ROOT}"${NUT_CGI_FILES} 2>/dev/null
+		eval chmod 0644 "${ROOT}"${NUT_CGI_FILES} 2>/dev/null
+	fi
+
+	warningmsg elog
+}
+
+warningmsg() {
+	msgfunc="$1"
+	[ -z "$msgfunc" ] && die "msgfunc not specified in call to warningmsg!"
+	${msgfunc} "Please note that NUT now runs under the 'nut' user."
+	${msgfunc} "NUT is in the uucp group for access to RS-232 UPS."
+	${msgfunc} "However if you use a USB UPS you may need to look at the udev or"
+	${msgfunc} "hotplug rules that are installed, and alter them suitably."
+	echo
+	${msgfunc} "If you use hald, you may be able to skip the normal init scripts."
+	echo
+	${msgfunc} "You are strongly advised to read the UPGRADING file provided by upstream."
+	echo
+	${msgfunc} "Please note that upsdrv is NOT automatically started by upsd anymore."
+	${msgfunc} "If you have multiple UPS units, you can use their NUT names to"
+	${msgfunc} "have a service per UPS:"
+	${msgfunc} "ln -s /etc/init.d/upsdrv /etc/init.d/upsdrv.\$UPSNAME"
+}