Trim old version. Revbump stable with Dell patches from Ubuntu (they were posted to upstream years ago, but upstream seems dead).

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 88 insertions, 62 deletions

diff --git a/sys-apps/ipmitool/ChangeLog b/sys-apps/ipmitool/ChangeLog
index fbdde2030313..ac12123364f7 100644
--- a/sys-apps/ipmitool/ChangeLog
+++ b/sys-apps/ipmitool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/ipmitool
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmitool/ChangeLog,v 1.16 2009/10/24 11:38:54 nixnut Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmitool/ChangeLog,v 1.17 2012/01/21 20:06:22 robbat2 Exp $
+
+*ipmitool-1.8.11-r1 (21 Jan 2012)
+
+  21 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> +ipmitool-1.8.11-r1.ebuild,
+  -ipmitool-1.8.9.ebuild:
+  Trim old version. Revbump stable with Dell patches from Ubuntu (they were
+  posted to upstream years ago, but upstream seems dead).
 
   24 Oct 2009; nixnut <nixnut@gentoo.org> ipmitool-1.8.11.ebuild:
   ppc stable #282446
diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest
index 478049ddba12..0fec56bd4fc2 100644
--- a/sys-apps/ipmitool/Manifest
+++ b/sys-apps/ipmitool/Manifest
@@ -1,20 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 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.8.11.tar.gz 769964 RMD160 189b2232bcd148bc89c610dfae73c6f12f42fb36 SHA1 4cb6ff3736fd3e166abc5303d6373672327a5db1 SHA256 5612f4835d89a6f2cede588eef978a05d63435cf2646256300d9785d8020a13e
-DIST ipmitool-1.8.9.tar.gz 682029 RMD160 3c776919e33ba7e73b6c8913f95086d258e6cc53 SHA1 fc53d9347a83893296b38480fcfa46799189b95c SHA256 1d6bf2595d1fd0dbef206c300cc666d3d079548ba97f727077d61c4736a7e63a
+DIST ipmitool_1.8.11-5ubuntu1.diff.gz 38287 RMD160 8ba9dbc7538f9c7798938364d81f5e58393e6376 SHA1 43f0758b8942eca5750035b6c9eb509892f83c90 SHA256 b31584ae6394e30b56eff4d4441c344c7ecb6d7a79a5846fd388544f28223775
+EBUILD ipmitool-1.8.11-r1.ebuild 2303 RMD160 4a49cca2642d5e7a90116d6da25639282beb8002 SHA1 1b4d6f1456457b6833ccd7d5188e37469143f9a4 SHA256 adeee3123dd26b7608a6bf23418864dffe73137d42d9ad1ee04c9b323875e1c1
 EBUILD ipmitool-1.8.11.ebuild 1966 RMD160 f5bb141370c28bf1a6be2e029a01002bddb8be1a SHA1 013a35891340dcfe95d2916dbd8f51e62eeabb0d SHA256 29efb8378cf09549f2125d233bb84f549a80b786802f5545c1659b62bf2a73f3
-EBUILD ipmitool-1.8.9.ebuild 1486 RMD160 830562cd3c77a527846202d30488be3df0f0be1f SHA1 132363747ef4e9c352a82ae99681791560610da6 SHA256 17c5c5f76e5fe4b1d722799b6d5ed46ceab11004d0c4a0226e33be99134e921b
-MISC ChangeLog 2484 RMD160 42153f542d35f1a37eaff22269028bd01997c245 SHA1 9f5df1910023b3a368ab2f657f4b9cc8bde5d135 SHA256 48f11f2201d955fdb7b644ea3d78235dd4457ed885c67c5c22360dccb106ea0b
+MISC ChangeLog 2762 RMD160 e1b28d3e42766d8cbc1b81fd571403448074ddb6 SHA1 ffb515de6dc067e67b3c6e4cdf378d6fec42cc1a SHA256 d000bc5c11f3bb3e420a10530cae7e22a5e69c463c3abd37c3c1fccae03de461
 MISC metadata.xml 368 RMD160 389ae2d475715998f1b4144bb4d936abeb1bca62 SHA1 37492107387ed97157354db851f27fb47116df06 SHA256 8c362999862d1801b030418e6ceb899377cb02db15dee5608b7ee58ef6911cac
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59sbkACgkQfXuS5UK5QB15PwQAl8YCXcWb6ikK01FXzT0LD0+l
-KdK2TIrxXCONYRosXAgrUCB3BVCCTpQy1Q/IyQHaoHJCqL6F3dZX2HZbKMOsCXMU
-/RMZUOvmNB8m0XbXyar7Ph6qn7IJYQqg3sxJbkp1MCH+HV35sD3To83rMwvMYVKN
-k2zu5pgvYNqcZKCmRio=
-=pPvE
------END PGP SIGNATURE-----
diff --git a/sys-apps/ipmitool/ipmitool-1.8.11-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.11-r1.ebuild
new file mode 100644
index 000000000000..40ac49fe33d1
--- /dev/null
+++ b/sys-apps/ipmitool/ipmitool-1.8.11-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2012 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-r1.ebuild,v 1.1 2012/01/21 20:06:22 robbat2 Exp $
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Utility for controlling IPMI enabled devices."
+HOMEPAGE="http://ipmitool.sf.net/"
+DEBIAN_PR="5ubuntu1"
+DEBIAN_P="${P/-/_}"
+DEBIAN_PF="${DEBIAN_P}-${DEBIAN_PR}"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+         https://launchpad.net/ubuntu/+archive/primary/+files/${DEBIAN_PF}.diff.gz"
+#IUSE="freeipmi openipmi"
+IUSE="openipmi"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+LICENSE="BSD"
+
+RDEPEND="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_prepare() {
+	epatch "${DISTDIR}"/${DEBIAN_PF}.diff.gz
+	for p in $(cat debian/patches/series) ; do
+		epatch debian/patches/$p
+	done
+}
+
+src_configure() {
+	# - 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
+}
+
+src_compile() {
+	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
+
+	newinitd "${FILESDIR}"/${PN}-1.8.9-ipmievd.initd ipmievd
+	newconfd "${FILESDIR}"/${PN}-1.8.9-ipmievd.confd ipmievd
+}
diff --git a/sys-apps/ipmitool/ipmitool-1.8.9.ebuild b/sys-apps/ipmitool/ipmitool-1.8.9.ebuild
deleted file mode 100644
index 15fb133b5501..000000000000
--- a/sys-apps/ipmitool/ipmitool-1.8.9.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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.9.ebuild,v 1.4 2009/09/23 20:24:47 patrick Exp $
-
-DESCRIPTION="Utility for controlling IPMI enabled devices."
-HOMEPAGE="http://ipmitool.sf.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-IUSE=""
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~x86"
-LICENSE="BSD"
-
-RDEPEND="dev-libs/openssl"
-DEPEND="${RDEPEND}
-		sys-libs/openipmi
-		virtual/os-headers"
-
-src_compile() {
-	# LIPMI and BMC are the Solaris libs
-	# FreeIPMI is not included at the moment, as ipmitool does not use the
-	# correct number of arguments for functions in recent versions.
-	econf \
-		--enable-ipmievd --enable-ipmishell \
-		--enable-intf-lan --enable-intf-lanplus \
-		--enable-intf-open --disable-intf-free --enable-intf-imb \
-		--disable-intf-lipmi --disable-intf-lipmi \
-		--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
-	prepalldocs
-
-	newinitd "${FILESDIR}"/${PN}-1.8.9-ipmievd.initd ipmievd
-	newconfd "${FILESDIR}"/${PN}-1.8.9-ipmievd.confd ipmievd
-}