Use proper autotools-utils and avoid useless patch.

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

3 files changed, 12 insertions, 105 deletions

diff --git a/sys-libs/freeipmi/ChangeLog b/sys-libs/freeipmi/ChangeLog
index c33726f36cd1..0de6a819cc59 100644
--- a/sys-libs/freeipmi/ChangeLog
+++ b/sys-libs/freeipmi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/freeipmi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.86 2014/10/29 23:35:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.87 2014/11/12 01:16:31 flameeyes Exp $
+
+*freeipmi-1.4.6-r1 (12 Nov 2014)
+
+  12 Nov 2014; Diego E. Pettenò <flameeyes@gentoo.org>
+  +freeipmi-1.4.6-r1.ebuild, -freeipmi-1.4.5.ebuild, -freeipmi-1.4.6.ebuild:
+  Use proper autotools-utils and avoid useless patch.
 
 *freeipmi-1.4.6 (29 Oct 2014)
 
diff --git a/sys-libs/freeipmi/freeipmi-1.4.5.ebuild b/sys-libs/freeipmi/freeipmi-1.4.6-r1.ebuild
index d13c8b1ee24e..b4c76281ca4d 100644
--- a/sys-libs/freeipmi/freeipmi-1.4.5.ebuild
+++ b/sys-libs/freeipmi/freeipmi-1.4.6-r1.ebuild
@@ -1,10 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-1.4.5.ebuild,v 1.1 2014/08/01 22:15:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-1.4.6-r1.ebuild,v 1.1 2014/11/12 01:16:31 flameeyes Exp $
 
 EAPI=5
 
-inherit autotools eutils multilib autotools-utils
+#AUTOTOOLS_AUTORECONF=1
+AT_M4DIR="config"
+
+inherit 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/"
@@ -29,12 +32,6 @@ RDEPEND="${RDEPEND}
 	)
 	sys-apps/openrc"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.1-strictaliasing.patch
-
-	AT_M4DIR="config" eautoreconf
-}
-
 src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
diff --git a/sys-libs/freeipmi/freeipmi-1.4.6.ebuild b/sys-libs/freeipmi/freeipmi-1.4.6.ebuild
deleted file mode 100644
index 5d4eff322df9..000000000000
--- a/sys-libs/freeipmi/freeipmi-1.4.6.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-1.4.6.ebuild,v 1.1 2014/10/29 23:35:02 flameeyes Exp $
-
-EAPI=5
-
-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/"
-
-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:0"
-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() {
-	local myeconfargs=(
-		$(use_enable debug)
-		--disable-static
-		--disable-init-scripts
-		--localstatedir=/var
-	)
-
-	autotools-utils_src_configure
-}
-
-# There are no tests
-src_test() { :; }
-
-src_install() {
-	autotools-utils_src_install
-
-	# 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
-}