app-admin/hp-health: Move to multilib-minimal for hpasmd

Package-Manager: portage-2.2.10

3 files changed, 67 insertions, 32 deletions

diff --git a/app-admin/hp-health/ChangeLog b/app-admin/hp-health/ChangeLog
index 5f7b836d..f542123e 100644
--- a/app-admin/hp-health/ChangeLog
+++ b/app-admin/hp-health/ChangeLog
@@ -1,3 +1,6 @@
+  04 Apr 2014; Bertrand Jacquin <beber@meleeweb.net> hp-health-9.50.ebuild:
+  app-admin/hp-health: Move to multilib-minimal for hpasmd
+
   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
diff --git a/app-admin/hp-health/Manifest b/app-admin/hp-health/Manifest
index ebb5f6e5..c6041f57 100644
--- a/app-admin/hp-health/Manifest
+++ b/app-admin/hp-health/Manifest
@@ -1,5 +1,5 @@
 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
+EBUILD hp-health-9.50.ebuild 1982 SHA256 4375b5a33db142d2bd437988c838cd1c584eab8bbdc46094955dd17c0769e531 WHIRLPOOL cdfb9642f476e085a30a5224465477f8753be6c9bedfbca20f9e80a812d25f0121c6a0b258e4ee0bdec797bd831d33bb7add94e2e07a55dee3a41587ea371eb8
+MISC ChangeLog 514 SHA256 568a0244c73ad3dc68e23f178b7abc553c7922f8ede5606b7dcb97b38a47bb5e WHIRLPOOL bc23b7c063c5007fa2c44a56cd93a4d9d0eb593df10d2ef202e8fb0c9642ca9277f6adae98e405195d6a8482f8708c30665d85af4090e41b0b818430757db83f
 MISC metadata.xml 254 SHA256 c56bc3d6780712c960298c70bb86867aeb6661e97a317cc624516b0e16b72fcc WHIRLPOOL 2ebbfaa14ef0c1847284fe64a79f052cd7e73b25a724fba728c084aaaf2dd0692e068eedcf42ccef7e205077f00c35780ded7ec69118dc01ddb988b4802e46ae
diff --git a/app-admin/hp-health/hp-health-9.50.ebuild b/app-admin/hp-health/hp-health-9.50.ebuild
index a421d4c1..11d0c186 100644
--- a/app-admin/hp-health/hp-health-9.50.ebuild
+++ b/app-admin/hp-health/hp-health-9.50.ebuild
@@ -3,13 +3,16 @@
 # $Header: $
 
 EAPI=5
-inherit eutils toolchain-funcs rpm
+inherit eutils multilib-minimal rpm
+
+x86_VER="1628.33"
+amd64_VER="1628.32"
 
 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 )"
+SRC_URI_BASE="http://downloads.linux.hp.com/downloads/ServicePackforProLiant/RedHat/6"
+SRC_URI="abi_x86_32? ( ${SRC_URI_BASE}/i686/current/${P}-${x86_VER}.rhel6.i686.rpm )
+	abi_x86_64? ( ${SRC_URI_BASE}/x86_64/current/${P}-${amd64_VER}.rhel6.x86_64.rpm )"
 
 LICENSE="hp-value"
 SLOT="0"
@@ -21,7 +24,8 @@ RDEPEND="${DEPEND}
 	virtual/udev
 	virtual/modutils
 	sys-apps/pciutils
-	snmp? ( app-admin/hp-snmp-agents )"
+	virtual/udev"
+PDEPEND="snmp? ( app-admin/hp-snmp-agents )"
 
 RESTRICT="mirror"
 
@@ -30,36 +34,64 @@ QA_PREBUILT="opt/hp/${PN}/bin/*
 	sbin/*"
 
 S="${WORKDIR}"
+x86_S="${S}/build-x86"
+amd64_S="${S}/build-amd64"
+
+src_unpack() {
+	if use abi_x86_32 ; then
+		mkdir "${x86_S}"
+		cd "${x86_S}"
+		rpm_unpack "${P}-${x86_VER}.rhel6.i686.rpm"
+	fi
 
-src_install() {
-	rm -r "${ED}"
-	cp -ra "${S}" "${ED}" \
-		|| die "Fail to copy files"
+	if use abi_x86_64 ; then
+		mkdir "${amd64_S}"
+		cd "${amd64_S}"
+		rpm_unpack "${P}-${amd64_VER}.rhel6.x86_64.rpm"
+	fi
+}
 
-	rm "${ED}opt/hp/${PN}/hprpm.xpm"
-	rm "${ED}opt/hp/${PN}/${PN}.license"
-	rm -r "${ED}opt/hp/${PN}/examples"
+# Fake for nicer output
+multilib-minimal_src_configure() { :; }
+multilib-minimal_src_compile() { :; }
 
-	docinto examples
-	dodoc -r "opt/hp/${PN}/examples"
+multilib_src_install() {
+	local abi_S="${ABI}_S"
+	cd "${!abi_S}"
 
-	doman usr/share/man/man?/*
+	into /usr
+	# lib/ in x86 archive
+	# lib64/ in amd64 archive
+	dolib usr/lib*/*
 
-	keepdir "var/log/${PN}"
-	keepdir "var/spool/compaq" "var/spool/${PN}"
+	# hpasmd is only provided in x86 archive
+	if [[ ${ABI} == "x86" ]] ; then
+		into "/opt/hp/${PN}"
+		dobin "opt/hp/${PN}/bin/hpasmd"
+	fi
 }
 
-pkg_postinst() {
-	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
+multilib_src_install_all() {
+	local abi_S="${ABI}_S"
+	cd "${!abi_S}"
+
+	doinitd etc/init.d/*
+	doman usr/share/man/man?/*
+
+	into /
+	dosbin sbin/*
+
+	cd "opt/hp/${PN}"
+
+	into  "/opt/hp/${PN}"
+	dobin bin/*
+
+	exeinto "/opt/hp/${PN}/sh"
+	doexe   sh/*
+
+	docinto  examples
+	dodoc -r examples
+
+	keepdir "/var/log/${PN}"
+	keepdir "/var/spool/compaq" "/var/spool/${PN}"
 }