Version bump and remove old.

(Portage version: 2.2.0_alpha80/cvs/Linux x86_64)

4 files changed, 28 insertions, 74 deletions

diff --git a/sys-libs/freeipmi/ChangeLog b/sys-libs/freeipmi/ChangeLog
index f83054ef429a..c26100f25456 100644
--- a/sys-libs/freeipmi/ChangeLog
+++ b/sys-libs/freeipmi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/freeipmi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.44 2011/12/09 21:26:09 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.45 2011/12/14 03:58:02 flameeyes Exp $
+
+*freeipmi-1.0.10 (14 Dec 2011)
+
+  14 Dec 2011; Diego E. Pettenò <flameeyes@gentoo.org> +freeipmi-1.0.10.ebuild,
+  -files/bmc-watchdog.initd, -files/ipmidetectd.initd, -freeipmi-0.8.9.ebuild:
+  Version bump and remove old.
 
   09 Dec 2011; Markos Chandras <hwoarang@gentoo.org> freeipmi-1.0.8.ebuild:
   Stable on amd64 wrt bug #364485
diff --git a/sys-libs/freeipmi/files/bmc-watchdog.initd b/sys-libs/freeipmi/files/bmc-watchdog.initd
deleted file mode 100644
index e1e63515b808..000000000000
--- a/sys-libs/freeipmi/files/bmc-watchdog.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/files/bmc-watchdog.initd,v 1.3 2010/08/09 19:35:40 flameeyes Exp $
-
-start() {
-	ebegin "Starting bmc-watchdog"
-	if [ -f /var/run/bmc-watchdog.pid ] ; then
-		ewarn "/var/run/bmc-watchdog.pid already exists,"
-		ewarn "removing it but you might want to find out"
-		ewarn "why this happened."
-		rm /var/run/bmc-watchdog.pid
-	fi
-	start-stop-daemon --background --make-pidfile \
-		--start --quiet --exec /usr/sbin/bmc-watchdog \
-		--pidfile /var/run/bmc-watchdog.pid -- ${OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping bmc-watchdog"
-	start-stop-daemon \
-		--stop --quiet \
-		--pidfile /var/run/bmc-watchdog.pid
-	eend $?
-	rm /var/run/bmc-watchdog.pid
-}
diff --git a/sys-libs/freeipmi/files/ipmidetectd.initd b/sys-libs/freeipmi/files/ipmidetectd.initd
deleted file mode 100644
index a9b274c91eae..000000000000
--- a/sys-libs/freeipmi/files/ipmidetectd.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/files/ipmidetectd.initd,v 1.3 2010/08/09 19:35:40 flameeyes Exp $
-
-start() {
-	ebegin "Starting ipmidetectd"
-	if [ -f /var/run/ipmidetectd.pid ] ; then
-		ewarn "/var/run/ipmidetectd.pid already exists,"
-		ewarn "removing it but you might want to find out"
-		ewarn "why this happened."
-		rm /var/run/ipmidetectd.pid
-	fi
-	start-stop-daemon --background --make-pidfile \
-		--start --quiet --exec /usr/sbin/ipmidetectd \
-		--pidfile /var/run/ipmidetectd.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ipmidetectd"
-	start-stop-daemon \
-		--stop --quiet \
-		--pidfile /var/run/ipmidetectd.pid
-	eend $?
-	rm /var/run/ipmidetectd.pid
-}
diff --git a/sys-libs/freeipmi/freeipmi-0.8.9.ebuild b/sys-libs/freeipmi/freeipmi-1.0.10.ebuild
index 6798c5890d37..e53a1b5e7bb6 100644
--- a/sys-libs/freeipmi/freeipmi-0.8.9.ebuild
+++ b/sys-libs/freeipmi/freeipmi-1.0.10.ebuild
@@ -1,27 +1,28 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-0.8.9.ebuild,v 1.4 2011/11/10 17:34:29 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-1.0.10.ebuild,v 1.1 2011/12/14 03:58:02 flameeyes Exp $
 
-EAPI=2
+EAPI=4
 
-inherit autotools
+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/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 	http://ftp.gluster.com/pub/${PN}/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="dev-libs/libgcrypt"
 DEPEND="${RDEPEND}
 		virtual/os-headers"
+RDEPEND="${RDEPEND}
+	sys-apps/openrc"
 
 src_prepare() {
-	# Fix build mistake, only causes warnings but at least stop it.
-	sed -i -e '/-module/d' "${S}"/libfreeipmi/src/Makefile.am || die
+	epatch "${FILESDIR}"/${PN}-1.0.5-strictaliasing.patch
 
 	AT_M4DIR="config" eautoreconf
 }
@@ -34,8 +35,7 @@ src_configure() {
 		--disable-static \
 		--disable-init-scripts \
 		--enable-logrotate-config \
-		--localstatedir=/var \
-		--sysconfdir=/etc/freeipmi
+		--localstatedir=/var
 }
 
 # There are no tests
@@ -49,23 +49,25 @@ src_install() {
 	# 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,monitoring,power,console}; do
+	for file in ipmi{detect,ping,power,console}; do
 		mv "${D}"/usr/{s,}bin/${file} || die
-	done
 
-	# We try not to use /etc/ directly for all its config files,
-	# instead use /etc/freeipmi, but then we got to move the
-	# logrotate.d directory...
-	mv "${D}"/etc/{freeipmi/,}logrotate.d || 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 || die
+	dodoc AUTHORS ChangeLog* DISCLAIMER* NEWS README* TODO doc/*.txt
 
 	keepdir \
 		/var/cache/ipmimonitoringsdrcache \
 		/var/lib/freeipmi \
 		/var/log/{freeipmi,ipmiconsole}
 
-	newinitd "${FILESDIR}/ipmidetectd.initd" ipmidetectd
-	newinitd "${FILESDIR}/bmc-watchdog.initd" bmc-watchdog
-	newconfd "${FILESDIR}/bmc-watchdog.confd" bmc-watchdog
+	newinitd "${FILESDIR}"/ipmidetectd.initd.3 ipmidetectd
+
+	newinitd "${FILESDIR}"/bmc-watchdog.initd.3 bmc-watchdog
+	newconfd "${FILESDIR}"/bmc-watchdog.confd bmc-watchdog
 }