app-admin/hp-snmp-agents: Major rewok

Package-Manager: portage-2.2.10

4 files changed, 51 insertions, 23 deletions

diff --git a/app-admin/hp-snmp-agents/ChangeLog b/app-admin/hp-snmp-agents/ChangeLog
index c2e0e7b8..65e65ca4 100644
--- a/app-admin/hp-snmp-agents/ChangeLog
+++ b/app-admin/hp-snmp-agents/ChangeLog
@@ -1,4 +1,7 @@
   04 Apr 2014; Bertrand Jacquin <beber@meleeweb.net> hp-snmp-agents-9.50.ebuild:
+  app-admin/hp-snmp-agents: Major rewok
+
+  04 Apr 2014; Bertrand Jacquin <beber@meleeweb.net> hp-snmp-agents-9.50.ebuild:
   app-admin/hp-snmp-agents: Ugly so hack for ugly tools
 
   03 Apr 2014; Bertrand Jacquin <beber@meleeweb.net> hp-snmp-agents-9.50.ebuild:
diff --git a/app-admin/hp-snmp-agents/Manifest b/app-admin/hp-snmp-agents/Manifest
index 4ae84b5d..fa00e563 100644
--- a/app-admin/hp-snmp-agents/Manifest
+++ b/app-admin/hp-snmp-agents/Manifest
@@ -1,5 +1,5 @@
-DIST hp-snmp-agents-9.50-2564.36.rhel6.i686.rpm 937524 SHA256 cd420d5b2862fafa9413aa8ac598eeaf28500619c549499b2f069e4d6ee12c51 SHA512 1142d807fe9f7ce489397bd98bd43a473213fa43193c234cc58f88aaff4c276efea96a3b57c9a16ec2042f3ca51bc5c6f237ab83ecfe2a46d90f498a5d95e02e WHIRLPOOL 1ccc240b41caaf387fcb86f83572bce2e3286abb3a7b094f4bfc80fa1848be4a54f0adc9466fa2d111d0de8ef773536eff9dfdaad5ad28fcd54f7f44dcadd16d
+DIST hp-snmp-agents-9.50-2564.36.rhel6.i686.rpm 937524 SHA256 cd420d5b2862fafa9413aa8ac598eeaf28500619c549499b2f069e4d6ee12c51 WHIRLPOOL 1ccc240b41caaf387fcb86f83572bce2e3286abb3a7b094f4bfc80fa1848be4a54f0adc9466fa2d111d0de8ef773536eff9dfdaad5ad28fcd54f7f44dcadd16d
 DIST hp-snmp-agents-9.50-2564.40.rhel6.x86_64.rpm 1013640 SHA256 a72a0d4335a356efb3322cbe37b1a5b94eeb4e9304aff9a266892289059a199a WHIRLPOOL 245b75f6cac534c21ec372329ac83473c38980bfcfa659a4ca7540b149f16314b60f2791a008695816b615533f1e2f71dfb73897c197a575bc7926a779884952
-EBUILD hp-snmp-agents-9.50.ebuild 2300 SHA256 40ff8c917b083d68f027ebc3a134c7c4832f975ca6fa2d91ac888158baad14ba WHIRLPOOL 3958d4ea7b2903ffe62b86734870bed5719d59cbbd4a937ad315279ec55f7d682feb7e07ac80500c8276674adfe57b7c196df7bd041b7b8fb14961d729915e4c
-MISC ChangeLog 680 SHA256 65c310ccab5fb9eda49866b04ecf5e69f009c131d4b65e7d3b1d3e58acacb2c5 WHIRLPOOL e72d71f82142fb197f00131b4ca86f8f8e2301aa0d18cbb60e476aa6e3827b29f8b1aabb6f388353e118f0b6f87288082fb6ddc4289849b739278f90ce6e39eb
+EBUILD hp-snmp-agents-9.50.ebuild 2557 SHA256 befa0970d91be6b20555032e29e020e84138fef5be23d718801fac51e4b9957c WHIRLPOOL 975b33f32b009abdcf4cadeeb83820d671f8226796221843561eb2f54d8d3b6165ab1627ff2ad6d6ce049cd3eddd835fa54411f91230802a531ff19f85a55809
+MISC ChangeLog 802 SHA256 b870938705fa99a04caa00e453653c4b994a1452d6b14877b0721f5e40b14779 WHIRLPOOL c687c38ac2cdda2247c5c351475ca7eec0e16b1c9fefb152c0b9a6b561904738b3b5d20e472a49c738bb3222c4a1cac49f603e93e051d39cece002db73176f42
 MISC metadata.xml 254 SHA256 c56bc3d6780712c960298c70bb86867aeb6661e97a317cc624516b0e16b72fcc WHIRLPOOL 2ebbfaa14ef0c1847284fe64a79f052cd7e73b25a724fba728c084aaaf2dd0692e068eedcf42ccef7e205077f00c35780ded7ec69118dc01ddb988b4802e46ae
diff --git a/app-admin/hp-snmp-agents/hp-snmp-agents-9.50.ebuild b/app-admin/hp-snmp-agents/hp-snmp-agents-9.50.ebuild
index 60cbda7c..8684e3de 100644
--- a/app-admin/hp-snmp-agents/hp-snmp-agents-9.50.ebuild
+++ b/app-admin/hp-snmp-agents/hp-snmp-agents-9.50.ebuild
@@ -18,6 +18,7 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="${DEPEND}
+	app-admin/hp-health
 	dev-libs/openssl:0
 	net-analyzer/net-snmp
 	sys-apps/dmidecode
@@ -32,9 +33,48 @@ QA_PREBUILT="opt/hp/${PN}/*/bin/*
 S="${WORKDIR}"
 
 src_install() {
-	rm -r "${ED}"
-	cp -ra "${S}" "${ED}" \
-		|| die "Fail to copy files"
+	insinto /etc
+	doins etc/*.conf
+
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/*
+
+	doinitd etc/init.d/*
+	doman usr/share/man/man?/*
+
+	into /
+	dosbin sbin/*
+
+	into /usr
+	# lib/ in x86 archive
+	# lib64/ in amd64 archive
+	dolib usr/lib*/*
+
+	cd "opt/hp/${PN}"
+
+	insinto  "/opt/hp/${PN}"
+	doins *.conf
+	doins -r mibs
+
+	local _comp
+	for _comp in nic server storage ; do
+		into "/opt/hp/${PN}/${_comp}"
+		dobin "${_comp}"/bin/*
+
+		insinto "/opt/hp/${PN}/${_comp}/etc"
+		doins "${_comp}"/etc/*
+	done
+
+	into "/opt/hp/${PN}/webagent"
+	dobin webagent/csginkgo
+
+	exeinto "/opt/hp/${PN}/utils"
+	doexe utils/*.sh
+
+	dodoc -r share/doc
+
+	keepdir "/var/log/${PN}"
+	keepdir "/var/spool/compaq"
 
 	local libdir="$(get_libdir)"
 
@@ -61,19 +101,4 @@ src_install() {
 	# nic/bin/cmanicd is linked libnetsnmpmibs.so.20 which is provided by
 	# net-snmp-libs-5.5 on RedHat
 	ln -snf libnetsnmpmibs.so "${ED}usr/${libdir}/libnetsnmpmibs.so.20"
-
-	rm -r "${ED}opt/hp/${PN}/share"
-	dodoc -r "opt/hp/${PN}/share/doc"
-
-	rm "${ED}opt/hp/${PN}/hprpm.xpm"
-	rm "${ED}opt/hp/${PN}/rebuild"
-	rm "${ED}opt/hp/${PN}/${PN}.license"
-	rm "${ED}opt/hp/${PN}/${PN}.manifest"
-	rm "${ED}opt/hp/${PN}/${PN}.rebuild.spec"
-	rm -r "${ED}opt/hp/${PN}/addons"
-
-	doman usr/share/man/man?/*
-
-	keepdir "var/log/${PN}"
-	keepdir "var/spool/compaq"
 }
diff --git a/metadata/md5-cache/app-admin/hp-snmp-agents-9.50 b/metadata/md5-cache/app-admin/hp-snmp-agents-9.50
index 432582e1..78994af7 100644
--- a/metadata/md5-cache/app-admin/hp-snmp-agents-9.50
+++ b/metadata/md5-cache/app-admin/hp-snmp-agents-9.50
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=http://h18000.www1.hp.com/products/servers/linux/documentation.html
 KEYWORDS=~amd64 ~x86
 LICENSE=hp-value
-RDEPEND=dev-libs/openssl:0 net-analyzer/net-snmp sys-apps/dmidecode virtual/modutils
+RDEPEND=app-admin/hp-health dev-libs/openssl:0 net-analyzer/net-snmp sys-apps/dmidecode virtual/modutils
 RESTRICT=mirror
 SLOT=0
 SRC_URI=x86? ( http://downloads.linux.hp.com/downloads/SPP/RedHatEnterpriseServer/6.5/i686/current/hp-snmp-agents-9.50-2564.36.rhel6.i686.rpm ) amd64? ( http://downloads.linux.hp.com/downloads/SPP/RedHatEnterpriseServer/6.5/x86_64/current/hp-snmp-agents-9.50-2564.40.rhel6.x86_64.rpm )
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=82d172683c55c4e4f4c99fd498ac112e
+_md5_=32d5930569ea7b1d4797f4a3ea828d68