Bug #246799: version bump. Bug #204984: sys-libs/openipmi is optional.

Package-Manager: portage-2.2_rc27/cvs/Linux x86_64

4 files changed, 77 insertions, 4 deletions

diff --git a/sys-apps/ipmitool/ChangeLog b/sys-apps/ipmitool/ChangeLog
index 96eb02bc3af8..dbad78da46b1 100644
--- a/sys-apps/ipmitool/ChangeLog
+++ b/sys-apps/ipmitool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/ipmitool
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmitool/ChangeLog,v 1.11 2008/03/21 21:45:27 robbat2 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmitool/ChangeLog,v 1.12 2009/03/30 21:35:22 robbat2 Exp $
+
+*ipmitool-1.8.11 (30 Mar 2009)
+
+  30 Mar 2009; Robin H. Johnson <robbat2@gentoo.org> metadata.xml,
+  +ipmitool-1.8.11.ebuild:
+  Bug #246799: version bump. Bug #204984: sys-libs/openipmi is optional.
 
   21 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> ipmitool-1.8.9.ebuild:
   Stable on amd64 per bug #214174, tested with HP iLO by kingtaco.
diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest
index a979b4ef888a..bdb86cd75097 100644
--- a/sys-apps/ipmitool/Manifest
+++ b/sys-apps/ipmitool/Manifest
@@ -1,14 +1,16 @@
 AUX ipmitool-1.8.9-ipmievd.confd 646 RMD160 d76ec90912bb44fb969ac2e27c7634ba97e10db3 SHA1 31a6d1472cdad5dab57f36b83339118c4f5ee327 SHA256 3a56f0fa94f358f5fb9ee782a2f2a4755dbf5b19706553a673232d49c751fe04
 AUX ipmitool-1.8.9-ipmievd.initd 711 RMD160 664d776c7ff52cc1caf727596d7c007880989f9c SHA1 0b6b3a90aefbe0921ad86b9db2c3b5d6d59b10e9 SHA256 b6c53306685e892386e74b839d302fc0df6a89a44ff1e05b399aeaf817676ca1
 DIST ipmitool-1.6.0.tar.bz2 358005 RMD160 ad827e3f579dcab96ef16679d950f735bcf73ba6 SHA1 8d94ae06e494a98b07e7c98c7b0d6cb1a3b9fca2 SHA256 5a4aa7437fa664f35cc19ac1056377fd6a48b07e559d48c3cfa1d23eb4ebb681
+DIST ipmitool-1.8.11.tar.gz 769964 RMD160 189b2232bcd148bc89c610dfae73c6f12f42fb36 SHA1 4cb6ff3736fd3e166abc5303d6373672327a5db1 SHA256 5612f4835d89a6f2cede588eef978a05d63435cf2646256300d9785d8020a13e
 DIST ipmitool-1.8.2.tar.gz 556042 RMD160 0fe60b56af84c0feffd3262b1ab9eb4a224d711f SHA1 d7b260021143ca31f320308445b590bd2628df13 SHA256 21dec8166e0b5d89a9563f190a713a5bd1082ea8028047d1c9877818297034bb
 DIST ipmitool-1.8.6.tar.gz 611126 RMD160 640fc101de856bb7a861b1824173dc07959251dd SHA1 c6eac0ba062257fa770257dfe09abc8190f4f9ec SHA256 dcfe5961dbdcffb4dbeac87f2b8bd854a659af101628c6fa94d8077f16f63050
 DIST ipmitool-1.8.8.tar.gz 634899 RMD160 e01c3c9248988f06250093745861bec58a1bf8a3 SHA1 98381b7ae7471a6a58c5ebfeec343f07bac4df0a SHA256 5d0abd9131d066faf0119722159dc8e768ff373fa30cb1a49dc5c376c9e36909
 DIST ipmitool-1.8.9.tar.gz 682029 RMD160 3c776919e33ba7e73b6c8913f95086d258e6cc53 SHA1 fc53d9347a83893296b38480fcfa46799189b95c SHA256 1d6bf2595d1fd0dbef206c300cc666d3d079548ba97f727077d61c4736a7e63a
 EBUILD ipmitool-1.6.0.ebuild 1271 RMD160 64adddd1766e50454a2181ded7fd08680deddd75 SHA1 04348451d4a1237647cf2782ab477eded331f2e5 SHA256 7d81daeadcb5ea80394c608fdd53f5e4bb18409ed67fbdf2306283122db225bd
+EBUILD ipmitool-1.8.11.ebuild 1985 RMD160 0e9adb0be10db07317a4653f81932593078265fc SHA1 11b448d411ce1f692860733eb3de40669063f20a SHA256 3a3e817e0ab5b63b4a4407b7a640c898437554e94e1270f12900e86f42c70cdd
 EBUILD ipmitool-1.8.2.ebuild 1381 RMD160 cf5509fa7a5af99f2894171c588a3dcf041372bd SHA1 76e7b7f6fd8b01901e855219b75753f6217b733a SHA256 8e8a1f17dfa4e67b8b973e65ab004cdbeb24aed8ab3d48a5d2d7ffb85bacb477
 EBUILD ipmitool-1.8.6.ebuild 1382 RMD160 d9bbb74f514bea42dc397091ecff11f224151ca9 SHA1 3e25a78d6b7dca52d71a074ee7de28f92edb3a56 SHA256 1b04c1b469c2beaa92b03a60355ba0c4139f435e69b619b6911c96eb2ee2a539
 EBUILD ipmitool-1.8.8.ebuild 1432 RMD160 3ea4e3c1b120d4916603ad727a760a7c700add9f SHA1 4e33bf632313f5efc72226bccf1e4852fb7016c1 SHA256 28c9759ec52e7056cf79ab73c0d31abcf7e7cf81d182c32ef363cac8195dbc82
 EBUILD ipmitool-1.8.9.ebuild 1501 RMD160 bad249563b6a8d02df90037bd5a4f422759a21ac SHA1 5ac175104d58e7d1563c1ab3874899f6a8b07f56 SHA256 caf0386d0ff558704a7b2bf5f369186537baba25abdbf27ca01910a57105ac2e
-MISC ChangeLog 1812 RMD160 e9d961684354d9e52836ac036105142bbd97f122 SHA1 32b17a3ebd06e9eba2965a7bbf0e5303c1ef6c24 SHA256 feea91f62531a8d98c8cfa4b42eeac2f0cac2cf88f6404448bba680a910f3775
-MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
+MISC ChangeLog 2012 RMD160 d8e6afbc98b7d98574fe087b00daf0cf1ae133b2 SHA1 b63665d47b8a8e5812b3c173e7ea4238de04263c SHA256 7b765d7ecc098f207792b6ab9787b71f826b31c08dc96e100f05b30e9318309e
+MISC metadata.xml 389 RMD160 b4eb70fe0fcf84a1964607aa2a7badae50ac7e1f SHA1 9a54e640b8376d235373cc737bf371c55abdcb38 SHA256 2bd2f562d94df8d08b50d6d91b57bcdf8c23c798620e814adbdd640eb80aa105
diff --git a/sys-apps/ipmitool/ipmitool-1.8.11.ebuild b/sys-apps/ipmitool/ipmitool-1.8.11.ebuild
new file mode 100644
index 000000000000..88d70b214a12
--- /dev/null
+++ b/sys-apps/ipmitool/ipmitool-1.8.11.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmitool/ipmitool-1.8.11.ebuild,v 1.1 2009/03/30 21:35:22 robbat2 Exp $
+
+DESCRIPTION="Utility for controlling IPMI enabled devices."
+HOMEPAGE="http://ipmitool.sf.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+#IUSE="freeipmi openipmi"
+IUSE="openipmi"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+LICENSE="BSD"
+
+RDEPEND="virtual/libc
+		dev-libs/openssl"
+DEPEND="${RDEPEND}
+		openipmi? ( sys-libs/openipmi )
+		virtual/os-headers"
+		#freeipmi? ( sys-libs/freeipmi )
+# ipmitool CAN build against || ( sys-libs/openipmi sys-libs/freeipmi )
+# but it doesn't actually need either.
+
+src_compile() {
+	# - LIPMI and BMC are the Solaris libs
+	# - OpenIPMI is unconditionally enabled in the configure as there is compat
+	# code that is used if the library itself is not available
+	# FreeIPMI does build now, but is disabled until the other arches keyword it
+	#	`use_enable freeipmi intf-free` \
+	econf \
+		--enable-ipmievd \
+		--enable-ipmishell \
+		--enable-intf-lan \
+		--enable-intf-lanplus \
+		--enable-intf-open \
+		--disable-intf-free \
+		--disable-intf-imb \
+		--disable-intf-lipmi \
+		--disable-intf-bmc \
+		--disable-internal-md5 \
+		--with-kerneldir=/usr --bindir=/usr/sbin \
+		|| die "econf failed"
+	# Fix linux/ipmi.h to compile properly. This is a hack since it doesn't
+	# include the below file to define some things.
+	echo "#include <asm/byteorder.h>" >>config.h
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PACKAGE="${PF}" install || die "emake install failed"
+
+	into /usr
+	dosbin contrib/bmclanconf
+	rm -f "${D}"/usr/share/doc/${PF}/COPYING
+	docinto contrib
+	cd "${S}"/contrib
+	dodoc collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh README
+	prepalldocs
+
+	newinitd "${FILESDIR}"/${PN}-1.8.9-ipmievd.initd ipmievd
+	newconfd "${FILESDIR}"/${PN}-1.8.9-ipmievd.confd ipmievd
+}
diff --git a/sys-apps/ipmitool/metadata.xml b/sys-apps/ipmitool/metadata.xml
index 5d9f5be9d49d..be8e5f634065 100644
--- a/sys-apps/ipmitool/metadata.xml
+++ b/sys-apps/ipmitool/metadata.xml
@@ -5,4 +5,8 @@
 <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
+	<use>
+		<flag name='openipmi'>Use the system OpenIPMI implementation.</flag>
+		<!-- <flag name='freeipmi'>Use the system FreeIPMI implementation.</flag> -->
+	</use>
 </pkgmetadata>