app-admin/hp-health: Major rework

Package-Manager: portage-2.2.10

5 files changed, 60 insertions, 150 deletions

diff --git a/app-admin/hp-health/ChangeLog b/app-admin/hp-health/ChangeLog
index dc720f88..5f7b836d 100644
--- a/app-admin/hp-health/ChangeLog
+++ b/app-admin/hp-health/ChangeLog
@@ -1,3 +1,7 @@
+  02 Apr 2014; Bertrand Jacquin <beber@meleeweb.net> +metadata.xml,
+  -hp-health-9.1.0.42.ebuild, hp-health-9.50.ebuild:
+  app-admin/hp-health: Major rework
+
 *hp-health-9.1.0.42 (02 Apr 2014)
 *hp-health-9.50 (02 Apr 2014)
 
diff --git a/app-admin/hp-health/Manifest b/app-admin/hp-health/Manifest
index 6bfd33bb..ebb5f6e5 100644
--- a/app-admin/hp-health/Manifest
+++ b/app-admin/hp-health/Manifest
@@ -1,7 +1,5 @@
-DIST hp-health-9.1.0.42-54.rhel6.x86_64.rpm 831802 SHA256 8fba9204681896d696a3d6bbc1497d8d359080598cbe4ebc9351f113a99c234f
-DIST hp-health-9.1.0.42-58.rhel6.i386.rpm 950070 SHA256 a3ad4d1b7bbc6336fa0978f82ccce5b38fa98f9127f0d24adbc46ab6ef52e040
-DIST hp-health-9.50-1628.32.rhel6.x86_64.rpm 328532 SHA256 8dc1247dded64d620d72b02384997d3e6bf582233fa766ee9bd35c7ef17ecaed SHA512 e78c389ebc727c94d4952a82e8c70d4726c93dc9bb6e8bd73bc5b5a2c2ed4987742c610c800ae89e63f21df08712e01c52593842f7518944f33248a88d9f7995 WHIRLPOOL a14ab562e22fbbdb3415ec595151001559e8ddf43f90d93bfd90eda40ace80a299b56622226199120192036db9d506174fa1bc2ede544e28f1cdf79b18e73de8
-DIST hp-health-9.50-1628.33.rhel6.i686.rpm 408816 SHA256 7ee31c9843e5e8b06d42143c5b5f167fef5c62e5f22b759bd2da7caf84ce48ca SHA512 8b5feb178a4e0a65c156eadd94cd12e5a2d9d606a72e3b3267b43e9c006fa7f84f1e539b39fb8cee95c23a1248f9703e07e2b9e1c15a9481f17988d0b6777525 WHIRLPOOL 7207ba5af89b211b06e505f5334607c20792d8fac844c33e018bbf12054096612f9c60232a7629acf951b780fa2c19e457e5e6a410b1bf277c1b7d0449439ef3
-EBUILD hp-health-9.1.0.42.ebuild 2200 SHA256 4e512af34d5863f08444efe80396b2d705aef03fe97bf3d3e51b7dcd8b3df383 WHIRLPOOL ef63ddb7be68533880b4b0ccd3d1c1963ecb913e73bdd8b09b5f7983711e8922b707f421ce271467ed937c254a417c428e2ffaf53c2d10cc556c08cd47bfc557
-EBUILD hp-health-9.50.ebuild 2561 SHA256 8c9b48d44fce96ec6db38bae8bf9d19c314289d107d99c1b0899002e8718602d WHIRLPOOL 7c7e47f3fef694f49402afd14c81c7ebece45f763d514d3a89d1b61a84b4e7885bb4f847e905890ce2c5a3ee42cbf3e36ffaeb80f21aaf60c28460eae4d6a76b
-MISC ChangeLog 220 SHA256 65a924e9f52b061c683b9493860fe0d0dc4c0c0123115dbfa5eacbbcbbed1ba6 WHIRLPOOL e1e63136e65b5a20e3792a41d4d77cbf8587b4e889e85e964ae1bf8309c70c6f31d8d736b2089aafb0cbaaaec6466fae5649f330ba5bf78a262af1d7b0829ae3
+DIST hp-health-9.50-1628.32.rhel6.x86_64.rpm 328532 SHA256 8dc1247dded64d620d72b02384997d3e6bf582233fa766ee9bd35c7ef17ecaed WHIRLPOOL a14ab562e22fbbdb3415ec595151001559e8ddf43f90d93bfd90eda40ace80a299b56622226199120192036db9d506174fa1bc2ede544e28f1cdf79b18e73de8
+DIST hp-health-9.50-1628.33.rhel6.i686.rpm 408816 SHA256 7ee31c9843e5e8b06d42143c5b5f167fef5c62e5f22b759bd2da7caf84ce48ca WHIRLPOOL 7207ba5af89b211b06e505f5334607c20792d8fac844c33e018bbf12054096612f9c60232a7629acf951b780fa2c19e457e5e6a410b1bf277c1b7d0449439ef3
+EBUILD hp-health-9.50.ebuild 1607 SHA256 132340b0869ae3e7809713e2f39d59d4fbd461ef3ae8d7cb4efe3b92cf7f1f6d WHIRLPOOL 858925bd8204d5a0a8dc2184b6f42c6762a04326692050a36155ad55efd60ccafd649d62218620b3202cda25e3f9a0cf2c1cb6afcf25a81f41ccb4a9cf598354
+MISC ChangeLog 378 SHA256 2b2876fd6224d511cfedca97f1339ceeca941336a29845937b18296091b1c1e3 WHIRLPOOL a31b8dc3085ae8444f18bf8a7b31b96571efee0ff5b4d40d6910887e6fcda15b8621ea8a1e8d62f63b95772e6b379a44887afa335e31de46b4d01ea08d6fe7f9
+MISC metadata.xml 254 SHA256 c56bc3d6780712c960298c70bb86867aeb6661e97a317cc624516b0e16b72fcc WHIRLPOOL 2ebbfaa14ef0c1847284fe64a79f052cd7e73b25a724fba728c084aaaf2dd0692e068eedcf42ccef7e205077f00c35780ded7ec69118dc01ddb988b4802e46ae
diff --git a/app-admin/hp-health/hp-health-9.1.0.42.ebuild b/app-admin/hp-health/hp-health-9.1.0.42.ebuild
deleted file mode 100644
index df5c560d..00000000
--- a/app-admin/hp-health/hp-health-9.1.0.42.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils toolchain-funcs rpm
-
-DESCRIPTION="HP System Health Application and Insight Management Agents Package (Formerly HPASM)"
-HOMEPAGE="http://h18000.www1.hp.com/products/servers/linux/documentation.html"
-LICENSE="hp-value"
-KEYWORDS="amd64 x86"
-IUSE="ssl snmp X"
-DEPEND="${RDEPEND}
-        mail-client/mailx
-        app-arch/rpm2targz
-        sys-apps/pciutils
-        sys-libs/ncurses
-        dev-lang/python
-        sys-apps/ethtool
-        sys-apps/lm_sensors
-        snmp? ( net-analyzer/net-snmp )
-        ssl? ( dev-libs/openssl )"
-
-RDEPEND="${DEPEND}
-        app-arch/tar
-        sys-apps/sed"
-
-SRC_URI_BASE="http://downloads.linux.hp.com/SDR/psp/RedHatEnterpriseServer/6.2/"
-SRC_URI="x86? ( ${SRC_URI_BASE}/i686/current/${P}-58.rhel6.i386.rpm )
-                amd64? ( ${SRC_URI_BASE}/x86_64/current/${P}-54.rhel6.x86_64.rpm )"
-
-HP_HOME="/opt/hp"
-
-SLOT="0"
-S="${WORKDIR}"
-
-QA_EXECSTACK="${HP_HOME:1}/hp-health/bin/hpasmpld
-	${HP_HOME:1}/hp-health/bin/IrqRouteTbl
-	${HP_HOME:1}/hp-health/bin/hpasmlited
-	${HP_HOME:1}/hp-health/bin/hpasmxld
-	usr/$(get_libdir)/libhpev64.so.1.0
-	usr/sbin/hplog"
-
-src_unpack() {
-	rpm_src_unpack
-        cd ${S}
-#	find ./ -type l -exec rm -f {} \;
-}
-
-src_install() {
-        cd "${S}"
-	dodir ${HP_HOME}
-        cp -Rdp "${S}"${HP_HOME}/* "${D}${HP_HOME}"
-        dolib.so ./usr/$(get_libdir)/*.so*
-	dodir /var/log/hp-health
-	dodir /var/spool/compaq
-	dodir /var/spool/hp-health
-	doman usr/share/man/man?/*
-	dosbin sbin/*
-}
-
-pkg_postinst() {
-        if [ "${ROOT}" == "/" ] ; then
-                /sbin/ldconfig
-        fi
-        einfo
-        if ! use snmp ; then
-                einfo "If you want to use the web agent and other features"
-                einfo "then configure your /usr/share/snmp/snmpd.conf"
-                einfo
-                einfo "It is not required to have net-snmp"
-                einfo "running for basic hpasm functionality."
-                einfo
-        fi
-        einfo "You now need to execute /etc/init.d/hpasm configure"
-        einfo "in order to configure the installed package."
-        einfo
-} 
\ No newline at end of file
diff --git a/app-admin/hp-health/hp-health-9.50.ebuild b/app-admin/hp-health/hp-health-9.50.ebuild
index 2c4ec295..a421d4c1 100644
--- a/app-admin/hp-health/hp-health-9.50.ebuild
+++ b/app-admin/hp-health/hp-health-9.50.ebuild
@@ -2,87 +2,64 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=5
 inherit eutils toolchain-funcs rpm
 
 DESCRIPTION="HP System Health Application and Insight Management Agents Package (Formerly HPASM)"
 HOMEPAGE="http://h18000.www1.hp.com/products/servers/linux/documentation.html"
+SRC_URI_BASE="http://downloads.linux.hp.com/downloads/SPP/RedHatEnterpriseServer/6.5"
+SRC_URI="x86? ( ${SRC_URI_BASE}/i686/current/${P}-1628.33.rhel6.i686.rpm )
+	amd64? ( ${SRC_URI_BASE}/x86_64/current/${P}-1628.32.rhel6.x86_64.rpm )"
+
 LICENSE="hp-value"
-KEYWORDS="amd64 x86"
-IUSE="ssl snmp X"
-DEPEND="${RDEPEND}
-        mail-client/mailx
-        app-arch/rpm2targz
-        sys-apps/pciutils
-        sys-libs/ncurses
-        dev-lang/python
-        sys-apps/ethtool
-        sys-apps/lm_sensors
-        snmp? ( net-analyzer/net-snmp )
-        ssl? ( dev-libs/openssl )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="snmp"
 
+DEPEND=""
 RDEPEND="${DEPEND}
-        app-arch/tar
-        sys-apps/sed"
+	virtual/udev
+	virtual/modutils
+	sys-apps/pciutils
+	snmp? ( app-admin/hp-snmp-agents )"
 
-SRC_URI_BASE="http://downloads.linux.hp.com/downloads/SPP/RedHatEnterpriseServer/6.5"
-SRC_URI="x86? ( ${SRC_URI_BASE}/i686/current/${P}-1628.33.rhel6.i686.rpm )
-                amd64? ( ${SRC_URI_BASE}/x86_64/current/${P}-1628.32.rhel6.x86_64.rpm )"
+RESTRICT="mirror"
 
-HP_HOME="/opt/hp"
+QA_PREBUILT="opt/hp/${PN}/bin/*
+	usr/lib*/lib*
+	sbin/*"
 
-SLOT="0"
 S="${WORKDIR}"
 
-QA_EXECSTACK="${HP_HOME:1}/hp-health/bin/hpasmpld
-	${HP_HOME:1}/hp-health/bin/IrqRouteTbl
-	${HP_HOME:1}/hp-health/bin/hpasmlited
-	${HP_HOME:1}/hp-health/bin/hpasmxld
-	usr/$(get_libdir)/libhpev64.so.1.0
-	usr/sbin/hplog"
-QA_PRESTRIPPED="/opt/hp/hp-health/bin/hpasmlited
-    /opt/hp/hp-health/bin/hpasmpld
-    /opt/hp/hp-health/bin/hpasmxld
-    /opt/hp/hp-health/bin/hp-asrd
-    /usr/lib64/libcpqci64.so.3.0
-    /usr/lib64/libhpev64.so.1.0
-    /usr/lib64/libhpasmintrfc64.so.3.0
-    /usr/sbin/hpasmcli
-    /usr/sbin/hpbootcfg
-    /usr/sbin/hplog
-    /usr/sbin/hpuid"
+src_install() {
+	rm -r "${ED}"
+	cp -ra "${S}" "${ED}" \
+		|| die "Fail to copy files"
 
-src_unpack() {
-	rpm_src_unpack
-        cd ${S}
-#	find ./ -type l -exec rm -f {} \;
-}
+	rm "${ED}opt/hp/${PN}/hprpm.xpm"
+	rm "${ED}opt/hp/${PN}/${PN}.license"
+	rm -r "${ED}opt/hp/${PN}/examples"
+
+	docinto examples
+	dodoc -r "opt/hp/${PN}/examples"
 
-src_install() {
-        cd "${S}"
-	dodir ${HP_HOME}
-        cp -Rdp "${S}"${HP_HOME}/* "${D}${HP_HOME}"
-        dolib.so ./usr/$(get_libdir)/*.so*
-	dodir /var/log/hp-health
-	dodir /var/spool/compaq
-	dodir /var/spool/hp-health
 	doman usr/share/man/man?/*
-	dosbin sbin/*
+
+	keepdir "var/log/${PN}"
+	keepdir "var/spool/compaq" "var/spool/${PN}"
 }
 
 pkg_postinst() {
-        if [ "${ROOT}" == "/" ] ; then
-                /sbin/ldconfig
-        fi
-        einfo
-        if ! use snmp ; then
-                einfo "If you want to use the web agent and other features"
-                einfo "then configure your /usr/share/snmp/snmpd.conf"
-                einfo
-                einfo "It is not required to have net-snmp"
-                einfo "running for basic hpasm functionality."
-                einfo
-        fi
-        einfo "You now need to execute /etc/init.d/hpasm configure"
-        einfo "in order to configure the installed package."
-        einfo
-} 
+	if ! use snmp ; then
+		einfo
+		einfo "If you want to use the web agent and other features"
+		einfo "then configure your /usr/share/snmp/snmpd.conf"
+		einfo
+		einfo "It is not required to have net-snmp"
+		einfo "running for basic hpasm functionality."
+	fi
+	einfo
+	einfo "You now need to execute /etc/init.d/hpasm configure"
+	einfo "in order to configure the installed package."
+	einfo
+}
diff --git a/app-admin/hp-health/metadata.xml b/app-admin/hp-health/metadata.xml
new file mode 100644
index 00000000..933498d8
--- /dev/null
+++ b/app-admin/hp-health/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer>
+        <email>beber@meleeweb.net</email>
+        <name>Bertrand Jacquin</name>
+    </maintainer>
+</pkgmetadata>