Version bump, using autotools-utils. Remove old.

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)

4 files changed, 18 insertions, 191 deletions

diff --git a/sys-libs/freeipmi/ChangeLog b/sys-libs/freeipmi/ChangeLog
index 5a22fa423174..2ac5ed6d85e3 100644
--- a/sys-libs/freeipmi/ChangeLog
+++ b/sys-libs/freeipmi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/freeipmi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.64 2013/01/13 20:00:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.65 2013/02/28 06:07:43 flameeyes Exp $
+
+*freeipmi-1.2.5 (28 Feb 2013)
+
+  28 Feb 2013; Diego E. Pettenò <flameeyes@gentoo.org> +freeipmi-1.2.5.ebuild,
+  -freeipmi-1.2.3-r1.ebuild, -freeipmi-1.2.3.ebuild, -freeipmi-1.2.4.ebuild:
+  Version bump, using autotools-utils. Remove old.
 
 *freeipmi-1.2.4 (13 Jan 2013)
 
diff --git a/sys-libs/freeipmi/freeipmi-1.2.3-r1.ebuild b/sys-libs/freeipmi/freeipmi-1.2.3-r1.ebuild
deleted file mode 100644
index 9145e8953451..000000000000
--- a/sys-libs/freeipmi/freeipmi-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-1.2.3-r1.ebuild,v 1.1 2012/11/15 03:18:16 flameeyes Exp $
-
-EAPI=4
-
-inherit autotools eutils multilib
-
-DESCRIPTION="Provides Remote-Console and System Management Software as per IPMI v1.5/2.0"
-HOMEPAGE="http://www.gnu.org/software/freeipmi/"
-
-MY_P="${P/_/.}"
-S="${WORKDIR}"/${MY_P}
-[[ ${MY_P} == *.beta* ]] && ALPHA="-alpha"
-SRC_URI="mirror://gnu${ALPHA}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug nagios"
-
-RDEPEND="dev-libs/libgcrypt"
-DEPEND="${RDEPEND}
-		virtual/os-headers"
-RDEPEND="${RDEPEND}
-	nagios? (
-		|| ( net-analyzer/icinga net-analyzer/nagios )
-		dev-lang/perl
-	)
-	sys-apps/openrc"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.1.1-strictaliasing.patch
-
-	AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		--disable-dependency-tracking \
-		--enable-fast-install \
-		--disable-static \
-		--disable-init-scripts \
-		--localstatedir=/var
-}
-
-# There are no tests
-src_test() { :; }
-
-src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
-	find "${D}" -name '*.la' -delete
-
-	# freeipmi by defaults install _all_ commands to /usr/sbin, but
-	# quite a few can be run remotely as standard user, so move them
-	# in /usr/bin afterwards.
-	dodir /usr/bin
-	for file in ipmi{detect,ping,power,console}; do
-		mv "${D}"/usr/{s,}bin/${file} || die
-
-		# The default install symlinks these commands to add a dash
-		# after the ipmi prefix; we repeat those after move for
-		# consistency.
-		rm "${D}"/usr/sbin/${file/ipmi/ipmi-}
-		dosym ${file} /usr/bin/${file/ipmi/ipmi-}
-	done
-
-	# Install the nagios plugin in its proper place, if desired
-	if use nagios; then
-		dodir /usr/$(get_libdir)/nagios/plugins
-		mv "${D}"/usr/share/doc/${PF}/contrib/nagios/nagios_ipmi_sensors.pl \
-			"${D}"/usr/$(get_libdir)/nagios/plugins/ || die
-		fperms 0755 /usr/$(get_libdir)/nagios/plugins/nagios_ipmi_sensors.pl
-
-		insinto /etc/icinga/conf.d
-		newins "${FILESDIR}"/freeipmi.icinga freeipmi-command.cfg
-	fi
-
-	dodoc AUTHORS ChangeLog* DISCLAIMER* NEWS README* TODO doc/*.txt
-
-	keepdir \
-		/var/cache/ipmimonitoringsdrcache \
-		/var/lib/freeipmi \
-		/var/log/ipmiconsole
-
-	# starting from version 1.2.0 the two daemons are similar enough
-	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 ipmidetectd
-	newconfd "${FILESDIR}"/ipmidetectd.confd ipmidetectd
-
-	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 bmc-watchdog
-	newconfd "${FILESDIR}"/bmc-watchdog.confd bmc-watchdog
-
-	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 ipmiseld
-	newconfd "${FILESDIR}"/ipmiseld.confd ipmiseld
-}
diff --git a/sys-libs/freeipmi/freeipmi-1.2.3.ebuild b/sys-libs/freeipmi/freeipmi-1.2.3.ebuild
deleted file mode 100644
index 8d0133f93f88..000000000000
--- a/sys-libs/freeipmi/freeipmi-1.2.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-1.2.3.ebuild,v 1.1 2012/11/14 19:10:30 flameeyes Exp $
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="Provides Remote-Console and System Management Software as per IPMI v1.5/2.0"
-HOMEPAGE="http://www.gnu.org/software/freeipmi/"
-
-MY_P="${P/_/.}"
-S="${WORKDIR}"/${MY_P}
-[[ ${MY_P} == *.beta* ]] && ALPHA="-alpha"
-SRC_URI="mirror://gnu${ALPHA}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="dev-libs/libgcrypt"
-DEPEND="${RDEPEND}
-		virtual/os-headers"
-RDEPEND="${RDEPEND}
-	sys-apps/openrc"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.1.1-strictaliasing.patch
-
-	AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		--disable-dependency-tracking \
-		--enable-fast-install \
-		--disable-static \
-		--disable-init-scripts \
-		--localstatedir=/var
-}
-
-# There are no tests
-src_test() { :; }
-
-src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
-	find "${D}" -name '*.la' -delete
-
-	# freeipmi by defaults install _all_ commands to /usr/sbin, but
-	# quite a few can be run remotely as standard user, so move them
-	# in /usr/bin afterwards.
-	dodir /usr/bin
-	for file in ipmi{detect,ping,power,console}; do
-		mv "${D}"/usr/{s,}bin/${file} || die
-
-		# The default install symlinks these commands to add a dash
-		# after the ipmi prefix; we repeat those after move for
-		# consistency.
-		rm "${D}"/usr/sbin/${file/ipmi/ipmi-}
-		dosym ${file} /usr/bin/${file/ipmi/ipmi-}
-	done
-
-	dodoc AUTHORS ChangeLog* DISCLAIMER* NEWS README* TODO doc/*.txt
-
-	keepdir \
-		/var/cache/ipmimonitoringsdrcache \
-		/var/lib/freeipmi \
-		/var/log/ipmiconsole
-
-	# starting from version 1.2.0 the two daemons are similar enough
-	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 ipmidetectd
-	newconfd "${FILESDIR}"/ipmidetectd.confd ipmidetectd
-
-	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 bmc-watchdog
-	newconfd "${FILESDIR}"/bmc-watchdog.confd bmc-watchdog
-
-	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 ipmiseld
-	newconfd "${FILESDIR}"/ipmiseld.confd ipmiseld
-}
diff --git a/sys-libs/freeipmi/freeipmi-1.2.4.ebuild b/sys-libs/freeipmi/freeipmi-1.2.5.ebuild
index 27719d31fd5e..22104ae148ca 100644
--- a/sys-libs/freeipmi/freeipmi-1.2.4.ebuild
+++ b/sys-libs/freeipmi/freeipmi-1.2.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-1.2.4.ebuild,v 1.1 2013/01/13 20:00:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-1.2.5.ebuild,v 1.1 2013/02/28 06:07:43 flameeyes Exp $
 
-EAPI=4
+EAPI=5
 
-inherit autotools eutils multilib
+inherit autotools eutils multilib autotools-utils
 
 DESCRIPTION="Provides Remote-Console and System Management Software as per IPMI v1.5/2.0"
 HOMEPAGE="http://www.gnu.org/software/freeipmi/"
@@ -37,21 +37,21 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		$(use_enable debug) \
-		--disable-dependency-tracking \
-		--enable-fast-install \
-		--disable-static \
-		--disable-init-scripts \
+	local myeconfargs=(
+		$(use_enable debug)
+		--disable-static
+		--disable-init-scripts
 		--localstatedir=/var
+	)
+
+	autotools-utils_src_configure
 }
 
 # There are no tests
 src_test() { :; }
 
 src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
-	find "${D}" -name '*.la' -delete
+	autotools-utils_src_install docdir="/usr/share/doc/${PF}"
 
 	# freeipmi by defaults install _all_ commands to /usr/sbin, but
 	# quite a few can be run remotely as standard user, so move them