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.

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

9 files changed, 92 insertions, 289 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/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>