Version bump (thanks to Oleg Gawriloff and Robert Varga in bug #420115); drop wrong hardened USE flag (bug #376805); rewrite wrapper to support hpacuscripting as well; remove call to ldconfig; don't add the install path to either user or root path.

Package-Manager: portage-2.2.0_alpha143/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

10 files changed, 107 insertions, 306 deletions

diff --git a/sys-block/hpacucli/ChangeLog b/sys-block/hpacucli/ChangeLog
index c397d6ec52ac..ba1d0de06b39 100644
--- a/sys-block/hpacucli/ChangeLog
+++ b/sys-block/hpacucli/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-block/hpacucli
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/hpacucli/ChangeLog,v 1.5 2012/05/15 05:57:27 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/hpacucli/ChangeLog,v 1.6 2012/12/01 21:01:59 flameeyes Exp $
+
+*hpacucli-9.30.15.0 (01 Dec 2012)
+
+  01 Dec 2012; Diego E. Pettenò <flameeyes@gentoo.org> +files/hpacucli-wrapper,
+  +hpacucli-9.30.15.0.ebuild, -files/hpacucli, -files/hpacucli-setarch,
+  -hpacucli-8.10.2.ebuild, -hpacucli-8.70.8.0.ebuild,
+  -hpacucli-8.75.12.0.ebuild, -hpacucli-9.0.24.0.ebuild, metadata.xml:
+  Version bump (thanks to Oleg Gawriloff and Robert Varga in bug #420115); drop
+  wrong hardened USE flag (bug #376805); rewrite wrapper to support
+  hpacuscripting as well; remove call to ldconfig; don't add the install path to
+  either user or root path.
 
   15 May 2012; Lance Albertson <ramereth@gentoo.org> hpacucli-9.0.24.0.ebuild:
   Version RDEPEND and add util-linux dep with correct version
@@ -28,4 +39,3 @@
   03 Nov 2008; Wolfram Schlich <wschlich@gentoo.org> +files/hpacucli,
   +metadata.xml, +hpacucli-8.10.2.ebuild:
   initial import
-
diff --git a/sys-block/hpacucli/Manifest b/sys-block/hpacucli/Manifest
index 915adf5d8dd0..5801cbfdb80c 100644
--- a/sys-block/hpacucli/Manifest
+++ b/sys-block/hpacucli/Manifest
@@ -1,22 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX hpacucli 544 RMD160 b6d720b1a70a46dc675b2a5c4ec5503fc02c9a81 SHA1 5178270fa1a696663e57fb9ee8093bc9851eb700 SHA256 eba79aac90f454870a2728fa11cd34420935a8910a8b5250ffc8d379424b4495
-AUX hpacucli-setarch 571 RMD160 36ac74a5d630a1335879605f32f776fa02b97e85 SHA1 6c74512a70be8bc3932d46f5d71ec0bd5673385a SHA256 dfe4e8f8781bbadb363fd98dd3e546efe00894350acd0c5a0133c4c931433a38
-DIST hpacucli-8.10-2.noarch.rpm 3099443 RMD160 0b76bc1fbb1c61d3f046e56592c5ffcd5a371c91 SHA1 e16fd48e6dd0a45d8a55f2a5ae50b04ea36ad213 SHA256 5feb2062ad623e39585ba5d317e099453f38b8d45d396e61f481dc9d2c0c6955
-DIST hpacucli-8.70-8.0.noarch.rpm 6131659 RMD160 c2b44f11a60ef1ce70fb3cd7658a43a770ebb74c SHA1 138812318c27eb989e61e71d00531102f95e2879 SHA256 0864f0a9823941116a049b7d842564db37938801be0e43d2caa7aff299b1372b
-DIST hpacucli-8.75-12.0.noarch.rpm 6228261 RMD160 4b4abea85f66b42e71d56e1e9f9c2d67cf9f9e48 SHA1 393033795553278c1a7a3dfb0eca0e821398fe0d SHA256 874bbf845aa678b12dd71fdb33105488d45e9c66b0adcbe3bfa5dad06e993eaf
-DIST hpacucli-9.0-24.0.noarch.rpm 6504897 RMD160 17f97a650bb3923067f2b1a05f8df3664d7e2ed9 SHA1 2026b503c394e53e7481c767ba3d85bf06205a49 SHA256 9db961482f07af26344946a9a2b9d32083d0b9081edba6526d8f28eb0458e7e7
-EBUILD hpacucli-8.10.2.ebuild 1663 RMD160 8af313b3fbd0d67305b23753517c7fb9e0361a4d SHA1 4dde9aa31ecd80fafb592fbf6b9606d3231afbb1 SHA256 039fdd8ee59e830103c349cd000ca4650d905e78ac4e23802f80b20b4e0851c2
-EBUILD hpacucli-8.70.8.0.ebuild 1639 RMD160 903101f0d9e36ae09c239438b4bac2801e265771 SHA1 f0b69a81073c4cc9c3f168804425333a852df428 SHA256 9c25f89b4a3a86cf61a27e19312c1244b8bee01bf7bae89470013e2881d524e9
-EBUILD hpacucli-8.75.12.0.ebuild 1877 RMD160 66ff61547773f8c495a07508b2c1098c8570f737 SHA1 c4837db5d1b43efaf9185f09d02c2a791aaf3154 SHA256 e053f265897332597d6f91cf680122f331979675b17657fc7d2e896171e3ce1f
-EBUILD hpacucli-9.0.24.0.ebuild 1928 RMD160 7f32f2864e3160b7a7a1975bcb08e0e5f30a9d26 SHA1 ecee00b6d239829d66e514a211fdaef83770c35c SHA256 1944ab1c569601f4dfb84830a140b73f55efb31426934861556ef0ec8b5f39f2
-MISC ChangeLog 1106 RMD160 02dc2da4895d9a79ebc07685c9ac2f79a283b4af SHA1 963333a71b80badf923e4e3e0d28eaa874f6edf1 SHA256 95db20ff5e5b542483e9b2189e12fc567f1c36dcedebead6758a9cafe7949d60
-MISC metadata.xml 431 RMD160 1dc5a3f71b7eed24b64c6cf50dbdf6586d613526 SHA1 e31340fcbbed5bc34effe811dbfd519ca548f7c2 SHA256 0efa1b94d791f59e63f538c2048b9e82e3522ac6a2af6a17d1cd8209c468e7ea
+AUX hpacucli-wrapper 577 SHA256 80effb1ababa457af9237f23c40085a5e0f8f07b13a9e739ba6ca54586eda68b SHA512 d7493b62f57b78f69218f3cc144b9ae7a91a7ddf7e0d63f03cc447a40f4468940f319493a6e82873d9a7b34adddaa701f8cc67aed0c8b05b5f7a1d5496e876af WHIRLPOOL 05d77428f59827c72dbeb1c155a597c475530322a7a6ad495aaddb6b4e2027e56d6fdee6a935ce2e2a046610b0cda4fbe64d5082017b722fda37e565412215cc
+DIST hpacucli-9.30-15.0.i386.rpm 6405071 SHA256 f1019a4a26c7d9adef1761fafb46b3add3034e77d48efe431bd499bbe5609312 SHA512 f628e5ca1f4e598700aaf8896e310e3ee59705d2ad9eae813179c0e873878b3ab6dd317fb34f738f901eb6972e8f4e9428b57a572dd1f8de73660b1c89213ce1 WHIRLPOOL cc41b16426a4298eafbf200a9c437501c8a2eb2456ca4e9d3f278bed64e203dade4e0de7c94a56e14ef20928a9c292440193c1e98071d9aaa661616c0ad6ea64
+DIST hpacucli-9.30-15.0.x86_64.rpm 6367162 SHA256 d25b4fc593e11e00f2ca2b83417b23d1b1e12e6bff3afcda5333b274dea89901 SHA512 ad53b7452feffc7457220b9f1df8fd435637e7d1d61b42bdaffe75e62c8245a127b7a80435a40ac5675f0a64e14cc9a99fa556dbecb0e37ae70dda51927afd6e WHIRLPOOL 0ba12328989bd5dce8eb5d83377768605f931ca78dd0e534bdbf65c93a17536499a7a9ea77816f4640ec86be8bdb620ae578fa14f7f7542c18ef95ac6efa3d27
+EBUILD hpacucli-9.30.15.0.ebuild 1745 SHA256 1c2bbf85e6a8c8d86b10abdf62644d856fa5a17727c4f816d4452b0cc074da49 SHA512 c51b0fbe09aeb53f4a157a9fa7676f6047b7e65c8d9918856c7949941f41ee3747f6041ce9149cfde04a5bfeb6bbeb63b82b2c8f27ad70d0a7a0897140ac3fea WHIRLPOOL 5d1807b0886ada13e1c11ebe3ed34c358e13b8f2c7fc3ecd8a8b36b134ffe1445e8fe93dfe4cb5fa31f13afe496f8782d245757e245d00585bb982d670324841
+MISC ChangeLog 1677 SHA256 6e35364d8a604f97dc14f091bc659d3abbc657e49e15b95e2edc7a4c88034e90 SHA512 01a497ba996703c59467c76c5fce6ee0d09a23e666dccced081e9f8b29910e6fc9762a9c3495036a4ccece21971e75ee8eb0fddc9f5ddc010bb0bf24147913a8 WHIRLPOOL 7ccae64a22c08a1265673709bb0090bd54bf396423ba5b042dd13e711ee25312cdc4f9d916c74cbb7910eb47df5a31a2ca646ccbe7959f87a3b6b811e714f547
+MISC metadata.xml 401 SHA256 eebbb68fda1d78302f010c78128622be6247ab741dac20ea77e99624e2e60929 SHA512 1cc4a1fdccad01267065fc9002d158a6f6d2af19d848455791e31cb4df812903a063f2ef84188054916400b4c8a4912e7576b624db91475e2fe4e540a6fd37c6 WHIRLPOOL 7f6720c21ef3571fc4a20fd58d5ee51fdc4f390bb2f00b07904746ec1f3969e2e97452bb7e9412976b571b890c7ffb4a04c59fb664a4ebfbc635735e8a686fdb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iD8DBQFPsfBOQW+hXSf0t0IRAoReAKDMEuQt3jAb4imtjWIlTyvzwFq4mwCfZIQi
-56Hazz4gN4lCsIdEBHzhIJQ=
-=BlkZ
+iQEcBAEBCAAGBQJQunBPAAoJEBzRPIrUMBNCxOsH/22dgIBoMs3OT/99HaaK0w+L
+ayEHBnrrlZEdzgWJ49N/p/yhvSEuYlar5uzIMkxlQllydjq/DmrNiB+ZtRK58SzQ
+FrCS5tY6dlwz823N6RH8zb4QO7GOdXhiBnUq0QzEGioFDSk+NZxdgiq7b+F8bz+Q
+7iJPDuJvDyxT6qjPfUY8TEDkEsCUp6H3MlHED40KWxJgUWaEJ8x+dLDl67V8W8gK
+tLWFvA+YQpuZbsM30lA0TpDgvdEWyMU13cMVrB2T+/6KLQRZFBimrvjK3EYH03wh
+m3kcc76yp7rsxWS9x0LRq5XpF9ggTkayhwwbUnGceXrpzO9HTN/e0PsZ8dgoTCA=
+=d9j0
 -----END PGP SIGNATURE-----
diff --git a/sys-block/hpacucli/files/hpacucli-setarch b/sys-block/hpacucli/files/hpacucli-setarch
deleted file mode 100755
index 0c19eb8bf60f..000000000000
--- a/sys-block/hpacucli/files/hpacucli-setarch
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-HPACUCLI_BASEDIR="/opt/hp/hpacucli"
-HPACUCLI_LOCKDIR="/var/lock/hpacucli"
-HPACUCLI_LOCK="${HPACUCLI_LOCKDIR}/CPQACU_MUTEX"
-HPACUCLI_BIN="${HPACUCLI_BASEDIR}/hpacucli.bin"
-
-if pgrep -x "${HPACUCLI_BIN##*/}"; then
-        echo "Another instance of hpacucli is running! Stop it first."
-        exit 1
-fi
-
-if ! [ -f "${HPACUCLI_LOCK}" ]; then
-	mkdir -p -m 700 "${HPACUCLI_LOCKDIR}"
-	touch "${HPACUCLI_LOCK}"
-fi
-
-export LD_LIBRARY_PATH="${HPACUCLI_BASEDIR}"
-export ACUXE_LOCK_FILES_DIR="${HPACUCLI_LOCKDIR}/"
-exec setarch x86_64 --uname-2.6 "${HPACUCLI_BIN}" "${@}"
diff --git a/sys-block/hpacucli/files/hpacucli b/sys-block/hpacucli/files/hpacucli-wrapper
index 3d127ae7316e..c60c205f9cfc 100755..100644
--- a/sys-block/hpacucli/files/hpacucli
+++ b/sys-block/hpacucli/files/hpacucli-wrapper
@@ -1,11 +1,14 @@
 #!/bin/sh
+
+cmd="$(basename "$0")"
+
 HPACUCLI_BASEDIR="/opt/hp/hpacucli"
-HPACUCLI_LOCKDIR="/var/lock/hpacucli"
+HPACUCLI_LOCKDIR="/var/lock/$cmd"
 HPACUCLI_LOCK="${HPACUCLI_LOCKDIR}/CPQACU_MUTEX"
-HPACUCLI_BIN="${HPACUCLI_BASEDIR}/hpacucli.bin"
+HPACUCLI_BIN="${HPACUCLI_BASEDIR}/$cmd.bin"
 
-if pgrep -x "${HPACUCLI_BIN##*/}"; then
-        echo "Another instance of hpacucli is running! Stop it first."
+if pgrep -x "$cmd.bin"; then
+        echo "Another instance of $cmd is running! Stop it first."
         exit 1
 fi
 
@@ -16,4 +19,4 @@ fi
 
 export LD_LIBRARY_PATH="${HPACUCLI_BASEDIR}"
 export ACUXE_LOCK_FILES_DIR="${HPACUCLI_LOCKDIR}/"
-exec "${HPACUCLI_BIN}" "${@}"
+exec setarch `uname -m` --uname-2.6 "${HPACUCLI_BIN}" "${@}"
diff --git a/sys-block/hpacucli/hpacucli-8.10.2.ebuild b/sys-block/hpacucli/hpacucli-8.10.2.ebuild
deleted file mode 100644
index da6735dadbf0..000000000000
--- a/sys-block/hpacucli/hpacucli-8.10.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/hpacucli/hpacucli-8.10.2.ebuild,v 1.1 2008/11/03 16:02:16 wschlich Exp $
-
-inherit rpm versionator
-
-MY_PV=$(replace_version_separator 2 '-')
-
-SRC_URI_BASE="ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux"
-
-DESCRIPTION="HP Array Configuration Utility Command Line Interface (HPACUCLI, formerly CPQACUXE)"
-HOMEPAGE="http://h18000.www1.hp.com/products/servers/linux/documentation.html"
-SRC_URI="${SRC_URI_BASE}/p414707558/v47111/${PN}-${MY_PV}.noarch.rpm"
-LICENSE="hp-proliant-essentials"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND="sys-apps/coreutils
-	sys-process/procps
-	x86? ( sys-libs/lib-compat )
-	amd64? ( app-emulation/emul-linux-x86-compat )"
-SLOT="0"
-RESTRICT="strip"
-S="${WORKDIR}"
-
-HPACUCLI_BASEDIR="/opt/hp/hpacucli"
-HPACUCLI_LOCKDIR="/var/lock/hpacucli"
-
-src_install() {
-	local MY_S="${S}/opt/compaq/${PN}/bld"
-	dosbin "${FILESDIR}"/${PN}
-	exeinto "${HPACUCLI_BASEDIR}"
-	newexe "${MY_S}"/.${PN} ${PN}.bin
-	insinto "${HPACUCLI_BASEDIR}"
-	doins "${MY_S}"/*.so
-	dodoc "${MY_S}/${PN}-${MY_PV}.linux.txt"
-	doman "${S}"/usr/man/man?/*
-	diropts -m0700
-	dodir ${HPACUCLI_LOCKDIR}
-	cat <<-EOF >"${T}"/45${PN}
-		PATH=${HPACUCLI_BASEDIR}
-		ROOTPATH=${HPACUCLI_BASEDIR}
-		LDPATH=${HPACUCLI_BASEDIR}
-		EOF
-	doenvd "${T}"/45${PN} || die "Failed installing env.d file"
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ] ; then
-		PATH="${PATH}:/sbin" ldconfig -n "${HPACUCLI_BASEDIR}"
-	fi
-	einfo
-	einfo "For more information regarding this utility, please read"
-	einfo "/usr/share/doc/${P}/${PN}-${MY_PV}.linux.txt"
-	einfo
-}
diff --git a/sys-block/hpacucli/hpacucli-8.70.8.0.ebuild b/sys-block/hpacucli/hpacucli-8.70.8.0.ebuild
deleted file mode 100644
index 5171eb700d98..000000000000
--- a/sys-block/hpacucli/hpacucli-8.70.8.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/hpacucli/hpacucli-8.70.8.0.ebuild,v 1.1 2011/05/30 00:24:10 ramereth Exp $
-
-EAPI="4"
-
-inherit rpm versionator
-
-MY_PV=$(replace_version_separator 2 '-')
-
-SRC_URI_BASE="ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux"
-
-DESCRIPTION="HP Array Configuration Utility Command Line Interface (HPACUCLI, formerly CPQACUXE)"
-HOMEPAGE="http://h18000.www1.hp.com/products/servers/linux/documentation.html"
-SRC_URI="${SRC_URI_BASE}/p414707558/v63381/${PN}-${MY_PV}.noarch.rpm"
-LICENSE="hp-proliant-essentials"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND="sys-apps/coreutils
-	sys-process/procps
-	x86? ( sys-libs/lib-compat )
-	amd64? ( app-emulation/emul-linux-x86-compat )"
-SLOT="0"
-RESTRICT="strip"
-S="${WORKDIR}"
-
-HPACUCLI_BASEDIR="/opt/hp/hpacucli"
-HPACUCLI_LOCKDIR="/var/lock/hpacucli"
-
-src_install() {
-	local MY_S="${S}/opt/compaq/${PN}/bld"
-	dosbin "${FILESDIR}"/${PN}
-	exeinto "${HPACUCLI_BASEDIR}"
-	newexe "${MY_S}"/.${PN} ${PN}.bin
-	insinto "${HPACUCLI_BASEDIR}"
-	doins "${MY_S}"/*.so
-	dodoc "${MY_S}/${PN}-${MY_PV}.noarch.txt"
-	doman "${S}"/usr/man/man?/*
-	diropts -m0700
-	dodir ${HPACUCLI_LOCKDIR}
-	cat <<-EOF >"${T}"/45${PN}
-		PATH=${HPACUCLI_BASEDIR}
-		ROOTPATH=${HPACUCLI_BASEDIR}
-		LDPATH=${HPACUCLI_BASEDIR}
-		EOF
-	doenvd "${T}"/45${PN}
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ] ; then
-		PATH="${PATH}:/sbin" ldconfig -n "${HPACUCLI_BASEDIR}"
-	fi
-	einfo
-	einfo "For more information regarding this utility, please read"
-	einfo "/usr/share/doc/${P}/${PN}-${MY_PV}.noarch.txt"
-	einfo
-}
diff --git a/sys-block/hpacucli/hpacucli-8.75.12.0.ebuild b/sys-block/hpacucli/hpacucli-8.75.12.0.ebuild
deleted file mode 100644
index 990b810e4b43..000000000000
--- a/sys-block/hpacucli/hpacucli-8.75.12.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/hpacucli/hpacucli-8.75.12.0.ebuild,v 1.1 2011/07/02 17:10:18 idl0r Exp $
-
-EAPI="4"
-
-inherit rpm versionator pax-utils
-
-MY_PV=$(replace_version_separator 2 '-')
-
-SRC_URI_BASE="ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux"
-
-DESCRIPTION="HP Array Configuration Utility Command Line Interface (HPACUCLI, formerly CPQACUXE)"
-HOMEPAGE="http://h18000.www1.hp.com/products/servers/linux/documentation.html"
-SRC_URI="${SRC_URI_BASE}/p414707558/v65771/${PN}-${MY_PV}.noarch.rpm"
-
-LICENSE="hp-proliant-essentials"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hardened"
-
-DEPEND=""
-RDEPEND="sys-apps/coreutils
-	sys-process/procps
-	x86? ( sys-libs/lib-compat )
-	amd64? ( app-emulation/emul-linux-x86-compat )"
-
-S="${WORKDIR}"
-
-HPACUCLI_BASEDIR="/opt/hp/hpacucli"
-HPACUCLI_LOCKDIR="/var/lock/hpacucli"
-
-QA_PRESTRIPPED="/opt/hp/hpacucli/hpacucli.bin"
-QA_EXECSTACK="opt/hp/hpacucli/libcpqimgr.so
-	opt/hp/hpacucli/hpacucli.bin"
-
-src_install() {
-	local MY_S="${S}/opt/compaq/${PN}/bld"
-
-	dosbin "${FILESDIR}"/${PN} || die
-
-	exeinto "${HPACUCLI_BASEDIR}"
-	newexe "${MY_S}"/.${PN} ${PN}.bin || die
-
-	insinto "${HPACUCLI_BASEDIR}"
-	doins "${MY_S}"/*.so || die
-
-	dodoc "${MY_S}/${PN}-${MY_PV}.noarch.txt"
-	doman "${S}"/usr/man/man?/*
-
-	diropts -m0700
-	dodir ${HPACUCLI_LOCKDIR}
-	cat <<-EOF >"${T}"/45${PN}
-		PATH=${HPACUCLI_BASEDIR}
-		ROOTPATH=${HPACUCLI_BASEDIR}
-		LDPATH=${HPACUCLI_BASEDIR}
-		EOF
-	doenvd "${T}"/45${PN}
-
-	if use hardened; then
-		pax-mark m "${D}/opt/hp/hpacucli/hpacucli.bin"
-	fi
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ] ; then
-		PATH="${PATH}:/sbin" ldconfig -n "${HPACUCLI_BASEDIR}"
-	fi
-	einfo
-	einfo "For more information regarding this utility, please read"
-	einfo "/usr/share/doc/${P}/${PN}-${MY_PV}.noarch.txt"
-	einfo
-}
diff --git a/sys-block/hpacucli/hpacucli-9.0.24.0.ebuild b/sys-block/hpacucli/hpacucli-9.0.24.0.ebuild
deleted file mode 100644
index 933542d61fd7..000000000000
--- a/sys-block/hpacucli/hpacucli-9.0.24.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/hpacucli/hpacucli-9.0.24.0.ebuild,v 1.2 2012/05/15 05:57:27 ramereth Exp $
-
-EAPI="4"
-
-inherit rpm versionator pax-utils
-
-MY_PV=$(replace_version_separator 2 '-')
-
-SRC_URI_BASE="ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux"
-
-DESCRIPTION="HP Array Configuration Utility Command Line Interface (HPACUCLI, formerly CPQACUXE)"
-HOMEPAGE="http://h18000.www1.hp.com/products/servers/linux/documentation.html"
-SRC_URI="${SRC_URI_BASE}/p414707558/v68034/${PN}-${MY_PV}.noarch.rpm"
-
-LICENSE="hp-proliant-essentials"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hardened"
-
-DEPEND=""
-RDEPEND="sys-apps/coreutils
-	sys-process/procps
-	>=sys-apps/util-linux-2.20.1
-	x86? ( sys-libs/lib-compat )
-	amd64? ( app-emulation/emul-linux-x86-compat )"
-
-S="${WORKDIR}"
-
-HPACUCLI_BASEDIR="/opt/hp/hpacucli"
-HPACUCLI_LOCKDIR="/var/lock/hpacucli"
-
-QA_PRESTRIPPED="/opt/hp/hpacucli/hpacucli.bin"
-QA_EXECSTACK="opt/hp/hpacucli/libcpqimgr.so
-	opt/hp/hpacucli/hpacucli.bin"
-
-src_install() {
-	local MY_S="${S}/opt/compaq/${PN}/bld"
-
-	newsbin "${FILESDIR}"/"${PN}-setarch" hpacucli|| die
-
-	exeinto "${HPACUCLI_BASEDIR}"
-	newexe "${MY_S}"/.${PN} ${PN}.bin || die
-
-	insinto "${HPACUCLI_BASEDIR}"
-	doins "${MY_S}"/*.so || die
-
-	dodoc "${MY_S}/${PN}-${MY_PV}.noarch.txt"
-	doman "${S}"/usr/man/man?/*
-
-	diropts -m0700
-	dodir ${HPACUCLI_LOCKDIR}
-	cat <<-EOF >"${T}"/45${PN}
-		PATH=${HPACUCLI_BASEDIR}
-		ROOTPATH=${HPACUCLI_BASEDIR}
-		LDPATH=${HPACUCLI_BASEDIR}
-		EOF
-	doenvd "${T}"/45${PN}
-
-	if use hardened; then
-		pax-mark m "${D}/opt/hp/hpacucli/hpacucli.bin"
-	fi
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ] ; then
-		PATH="${PATH}:/sbin" ldconfig -n "${HPACUCLI_BASEDIR}"
-	fi
-	einfo
-	einfo "For more information regarding this utility, please read"
-	einfo "/usr/share/doc/${P}/${PN}-${MY_PV}.noarch.txt"
-	einfo
-}
diff --git a/sys-block/hpacucli/hpacucli-9.30.15.0.ebuild b/sys-block/hpacucli/hpacucli-9.30.15.0.ebuild
new file mode 100644
index 000000000000..d1405c3dd1a7
--- /dev/null
+++ b/sys-block/hpacucli/hpacucli-9.30.15.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/hpacucli/hpacucli-9.30.15.0.ebuild,v 1.1 2012/12/01 21:01:59 flameeyes Exp $
+
+EAPI=5
+
+inherit rpm versionator pax-utils
+
+MY_PV=$(replace_version_separator 2 '-')
+
+SRC_URI_BASE="ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux"
+AMD64_PID="1257348637"
+AMD64_VID="77370"
+X86_PID="414707558"
+X86_VID="77371"
+
+DESCRIPTION="HP Array Configuration Utility Command Line Interface (HPACUCLI, formerly CPQACUXE)"
+HOMEPAGE="http://h18000.www1.hp.com/products/servers/linux/documentation.html"
+SRC_URI="
+	amd64? ( ${SRC_URI_BASE}/p${AMD64_PID}/v${AMD64_VID}/${PN}-${MY_PV}.x86_64.rpm )
+	x86? ( ${SRC_URI_BASE}/p${X86_PID}/v${X86_VID}/${PN}-${MY_PV}.i386.rpm )"
+
+LICENSE="hp-proliant-essentials"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="sys-apps/coreutils
+	sys-process/procps
+	>=sys-apps/util-linux-2.20.1"
+
+S="${WORKDIR}"
+
+HPACUCLI_BASEDIR="/opt/hp/hpacucli"
+QA_PREBUILT="${HPACUCLI_BASEDIR}/*"
+
+src_install() {
+	local MY_S="${S}/opt/compaq/${PN}/bld"
+
+	newsbin "${FILESDIR}"/"${PN}-wrapper" hpacucli
+	dosym /usr/sbin/hpacucli /usr/sbin/hpacuscripting
+
+	exeinto "${HPACUCLI_BASEDIR}"
+	for bin in "${MY_S}"/.hp*; do
+		local basename=$(basename "${bin}")
+		newexe "${bin}" ${basename#.}.bin
+	done
+
+	insinto "${HPACUCLI_BASEDIR}"
+	doins "${MY_S}"/*.so
+
+	dodoc "${MY_S}"/*.txt
+	doman "${S}"/usr/man/man*/*
+
+	cat <<-EOF >"${T}"/45${PN}
+		LDPATH=${HPACUCLI_BASEDIR}
+		EOF
+	doenvd "${T}"/45${PN}
+
+	pax-mark m "${D}/opt/hp/hpacucli/"*
+}
+
+pkg_postinst() {
+	elog
+	elog "For more information regarding this utility, please read"
+	elog "/usr/share/doc/${P}/${PN}-${MY_PV}.noarch.txt"
+	elog
+}
diff --git a/sys-block/hpacucli/metadata.xml b/sys-block/hpacucli/metadata.xml
index 25a02426c127..0a180af3fa36 100644
--- a/sys-block/hpacucli/metadata.xml
+++ b/sys-block/hpacucli/metadata.xml
@@ -2,13 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>wschlich@gentoo.org</email>
-		<name>Wolfram Schlich</name>
+		<email>ramereth@gentoo.org</email>
+		<name>Lance Albertson</name>
 		<description>Primary maintainer</description>
 	</maintainer>
 	<maintainer>
-		<email>ramereth@gentoo.org</email>
-		<name>Lance Albertson</name>
+		<email>flameeyes@gentoo.org</email>
 		<description>Secondary maintainer</description>
 	</maintainer>
 </pkgmetadata>