Skip to content
Browse files

FL-487: continued zenoss integration work

  • Loading branch information...
1 parent ce4c376 commit 937031deb37444f42d6b12cb7a3cc2aaf5a3f30d @danielrobbins danielrobbins committed Apr 11, 2013
Showing with 13 additions and 5 deletions.
  1. +2 −1 sys-monitor/zenoss/Manifest
  2. +11 −4 sys-monitor/zenoss/zenoss-4.2.3.20130125.ebuild
View
3 sys-monitor/zenoss/Manifest
@@ -1,2 +1,3 @@
-DIST zenoss-build-1.0.9.tar.gz 12589 SHA256 3cd3d04c2c914284343610f00c1120f68882449d5d97e2709bbe5c242ae55997 SHA512 5313c7d07ccf123851ca141ba5292d5babb51f7e6742c377d6df8067aba3348366c176598087362760c31a024b848b78c0821cf0c719c08e0f30cd46dc69071a WHIRLPOOL 0c1dd20c9db0d44563be077d70e630eac6d6e2c3e71ecab2346820427b2fda767bc207ca13fcc733d3653a31c9bdc12bfa34957cecc1d112548e7e1cf4e6e25a
+DIST zenoss-build-1.2.tar.gz 13088 SHA256 984ebbd722de65bfbde858cfc86de061d36dadb3c1c02881b6ddf4cc01b1e022 SHA512 f12f43ababfd89de3c36ec455fee8e67fe59233d2fceac3fb46f912613f318fa577738e684ecb5eb054fe46525d46b870b72aef6f608b313128edbb822b80197 WHIRLPOOL d92371809006e75a52d349b2619612232541278262b08a51d3d78a7ad58c2b526cd3054015d541df75ddb4f0fbadf7a9b694706d2917f4c05493e0e12ad4c2b7
DIST zenoss-dev-20130125.tar.xz 235236424 SHA256 ff7714d3effa85667892477cbc1cbc9bd37866ec792544ad35c860694cabeb4d SHA512 7d014d26f3a24fce21d1616a468da0c1cd7714d7c1261555a29934d3378ae4e54859272acd86dc679e3c25bab4087f16a995fb3d02ebce88f0325a857264b1af WHIRLPOOL c50506033350bab5b83489a6ba357cad9fd9087782963bf85d62a1340160a421f98125223b87ce08cbc49c303836bc6ce487a7f6f104217469d32276f0d4f14a
+DIST zenoss-pip-distfiles-20130125.tar 109076480 SHA256 5ab3318fb0527cb787d98fcadaafc6b790db36b8743c35affbcf3255613272d2 SHA512 0c9d15cec88944573daa4057ad68c3696c3ebe2bfc752ea5b0bd6daff32755557c19a8d857c7efea136527592209e732535bace757fb158d55c42f014efb763a WHIRLPOOL 99aae49a3dbccbc3d034a4022cc2f37444d988ee253077d22fac0583443c08da7ff2178f6dab6a35c2e54fe890d614706b6c57ad3abdeaae6c292cb09ff0818b
View
15 sys-monitor/zenoss/zenoss-4.2.3.20130125.ebuild
@@ -10,9 +10,10 @@ HOMEPAGE="http://wiki.zenoss.org"
RESTRICT="mirror"
GITHUB_REPO="VirtualEnvBuild"
GITHUB_USER="zenoss"
-GITHUB_TAG="1.0.9"
+GITHUB_TAG="1.2"
ZENOSS_A="zenoss-dev-20130125.tar.xz"
-SRC_URI="http://www.github.com/${GITHUB_USER}/${GITHUB_REPO}/tarball/${GITHUB_TAG} -> zenoss-build-${GITHUB_TAG}.tar.gz http://www.funtoo.org/distfiles/zenoss/$ZENOSS_A"
+ZENOSS_PIP_A="zenoss-pip-distfiles-20130125.tar"
+SRC_URI="http://www.github.com/${GITHUB_USER}/${GITHUB_REPO}/tarball/${GITHUB_TAG} -> zenoss-build-${GITHUB_TAG}.tar.gz http://www.funtoo.org/distfiles/zenoss/$ZENOSS_A http://www.funtoo.org/distfiles/zenoss/$ZENOSS_PIP_A"
LICENSE="GPL-2"
SLOT="0"
@@ -42,10 +43,16 @@ pkg_setup() {
src_unpack() {
unpack zenoss-build-${GITHUB_TAG}.tar.gz
- mv "${WORKDIR}/${GITHUB_REPO}-${GITHUB_TAG}" "${S}" || die
+ mv "${WORKDIR}/$( cd $WORKDIR; ls )" "${S}" || die
+ install -d ${S}/downloads
+ cd ${S}/downloads; tar xvf ${DISTDIR}/${ZENOSS_PIP_A} || die "pip archive extract fail"
}
src_compile() {
install -d ${S}/maven
- ./build_zenoss.sh ${DISTDIR}/${ZENOSS_A} ./requirements.txt || die "build fail"
+ ./build_zenoss.sh ${DISTDIR}/${ZENOSS_A} ${DISTDIR}/${ZENOSS_A} || die "build fail"
+}
+
+src_install() {
+ mv ${S}/image/opt ${D}/opt || die "opt move fail"
}

0 comments on commit 937031d

Please sign in to comment.
Something went wrong with that request. Please try again.