Add live ebuild

Package-Manager: portage-2.2.14-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

diff --git a/app-admin/diamond/ChangeLog b/app-admin/diamond/ChangeLog
index 2fe03fab2d2c847d6b29970417cb0b1bf8074a77..bebe155ebaac4895ea3e9b0a45a610b7f15e96f3 100644 (file)
--- a/app-admin/diamond/ChangeLog
+++ b/app-admin/diamond/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/diamond
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/ChangeLog,v 1.1 2015/03/01 23:09:12 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/ChangeLog,v 1.2 2015/03/02 10:35:34 grobian Exp $
+
+*diamond-9999 (02 Mar 2015)
+
+  02 Mar 2015; Fabian Groffen <grobian@gentoo.org> +diamond-9999.ebuild,
+  diamond-4.0.ebuild:
+  Add live ebuild
 
 *diamond-4.0 (01 Mar 2015)
 

diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest
index 7cbd286c3cd2c55f873f79ff8ae6940094572030..2c3f0e96eeb4a53b754a32801b246f2b3a8cd5a3 100644 (file)
--- a/app-admin/diamond/Manifest
+++ b/app-admin/diamond/Manifest
@@ -4,13 +4,14 @@ Hash: SHA256
 AUX diamond.confd 57 SHA256 41941d406f48b5eca55d9146928eee185820fe27a3708d3fcaa71c3f78bf4adc SHA512 51b037902394b22f957a15ad1479ebdae5ac29384f2b7a5053ea8200bad05dc9c9060cc5c6c1a931e341e99b95327e55b06aaa9a828950533265f9c96a8dff55 WHIRLPOOL 80165d5cf5347dd3abeeec53f4df64d51f7f78445363574b2bc1b8f2fec9f1a0798c4986319dabe6d6a4b6b499c577fc8679b2fc65554107e48e3e13dac4e68b
 AUX diamond.initd 568 SHA256 99184d76c9967c1edfe12b555e7759ca8b6106d7890359e5c1e0a1c3e7016777 SHA512 e7edb84928460bcfe4ab26218b1e367c05fac08f7c0dd13ef1ff33fc627b3684b0a1d0768601968c20fd43edbea8df8917a6aede76902bd3e6e71d23f8980ca1 WHIRLPOOL 7cc69ae79165dd91943a50c1bd56ebd0e07bb71212a35488e71e91041c577991e60c9c65d145894e49914897ab6e10ee9684d418d089f73bd42ae284b45f5dfc
 DIST python-diamond-4.0.tar.gz 491433 SHA256 e84dd3c87b230d524306a07c3fc7c1db1d9796e3748025e8345a4fa18b162256 SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b WHIRLPOOL 2b1f6124001183058cf282d6e9c51bba0878f26308731266f2c31c549bb42db945c579b49b5a34666e0c05ccbda0163135662a11e59a482f8ef031c49c6005ba
-EBUILD diamond-4.0.ebuild 1465 SHA256 e15c0610f4d5c597e6df27d7dd0f3afb35188547e182f35d7412bde978be784d SHA512 1acec7370a925812b884d4300c75b631baacacb4e5e024a2db68ad99db62f45a9a741410390bf01cea456f0c96d16c7ab95a733c8fca6667decc3c587e891f03 WHIRLPOOL 22e29fedd11ee41348b7e7fa76ca4ba4669f1b5e1fced3bf3b662504464243fb91fe724e8d386a5750002349710087b95b9ca7f5ae1fa73e614de604f4ca8468
-MISC ChangeLog 416 SHA256 2f69d424ecb89f33b9ce6748a72459cc1ae098349f84c837e0af9ef1848a0f05 SHA512 942ca8f2075dae3b8afdabd899602c180556f886b682b412895f2876b42b1814d2c98fa47e7ba3e4792ff0483df68f68b09c525b0a91e60d93d172d88e2ea8fb WHIRLPOOL 114de37c8be304ce799c7351eb5b078189b40478da990b3d9564ac74d7ca466e4f8b124b28ba7f048c87b79fe0610a7bdbc88f6f6c04367159efd53c4a5a60dc
+EBUILD diamond-4.0.ebuild 1493 SHA256 e097240a3f273c4c7628f16442cb02c9ed363706513d4cdb0f88489fd8feee78 SHA512 bc60f3a9ebb98e3bb7d6f95bdaa12b2ad5eade8df4fac0268cfa7845f6eed6539cf12d980e05233c7af760b218968e6c20a0f27f89cd940677ec9978c4ead33d WHIRLPOOL 8f6a83ce5c384f255149d59ee0b681de9901208201561a7accd8001e14d99e98a60c0acff6e117da7a8bf26de717666b5737d1e771a193f2832991db942b4349
+EBUILD diamond-9999.ebuild 1494 SHA256 c6c932ab9705b0c052797bf82a02fb15803d95eab35ea076f52a4773ff3dc88e SHA512 98b38b3c60f38e7d24f4a41310046a0b7028342bcca74c6766c7c447d930aea40c152bf7a9bca91ea4c79740dcdee0280616ffa3d9e30b7768dc33c4a4dd698f WHIRLPOOL 700fe8f5f5e008f84bde2a414d77095947e978baca06f471bd144793569a2720a65511d4787a0ca450bf59b08dfe9dd2d78cc47f8128743cd5f5c360487641e0
+MISC ChangeLog 559 SHA256 fbe1de77ab54bd869cbdeb2f27b0a4d77b3a28d04696b088a819d0de4947c95c SHA512 300097c38bcfdb9d71b49282bdefba8b5f16ccda88399bee1051ebb33edea9a7859e207d17e019d74fe8f3d58d591a64f1cc0a6f4a9510b8f81bd6917a306f5d WHIRLPOOL c580e7e3ca4415e25037973619ff9fbaff79266e714de2a0a43012f9461336c6cfe67030c3802909207a178aa4589db4438b001fbd81c0348b344f6252ff29f1
 MISC metadata.xml 586 SHA256 d167f488ef5b8f3b813586538e8e355dc4a0a92bd8cf1ff21ffacbc04a292de7 SHA512 97a0367b6b759a8d79427763d2fe1c37c9038406653821a83d7669a39d059170ff6d122e9f7baa31c2c8ce6d7b7c3478dcebfae55a6a6a7403816b2a6fc451a8 WHIRLPOOL 410db9ae30c5a7516b252e92abbc8a9dbb62c885034c8ee3fabe4e005e373c721927bd7d8f1723a559f9d8b29d57927074011dc449442e8fb7f40e1d4ff32629
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTznBkACgkQX3X2B8XHTond/gCfRBFPYLiGfkE/e9U2KFlPpBdK
-UEAAn2h9ETiYFbQRBNpGQ7XfurYHpFdT
-=Vcxh
+iEYEAREIAAYFAlT0PPgACgkQX3X2B8XHTomDpQCeO25AYq1/3IFDlQdNZMS/gNAf
+WdkAoJZw9lVCwy9wcFlhNmE6ZsjlCGza
+=+JPt
 -----END PGP SIGNATURE-----

diff --git a/app-admin/diamond/diamond-4.0.ebuild b/app-admin/diamond/diamond-4.0.ebuild
index 8b319f562be24e0367dc047f845d539dd5539260..90963a9abcf2e30656d0a23c8b55a6bd03ba4453 100644 (file)
--- a/app-admin/diamond/diamond-4.0.ebuild
+++ b/app-admin/diamond/diamond-4.0.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/diamond-4.0.ebuild,v 1.1 2015/03/01 23:09:12 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/diamond-4.0.ebuild,v 1.2 2015/03/02 10:35:34 grobian Exp $
 
 EAPI=5
 
 if [[ ${PV} = 9999* ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git"
+       S=${WORKDIR}/diamond-${PV}
 else
        SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
        KEYWORDS="~x86 ~amd64"
+       S=${WORKDIR}/Diamond-${PV}
 fi
 
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -32,8 +34,6 @@ RDEPEND="dev-python/configobj
 DEPEND="${RDEPEND}
        test? ( dev-python/mock )"
 
-S=${WORKDIR}/Diamond-${PV}
-
 src_prepare() {
        # adjust for Prefix
        sed -i \

diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-9999.ebuild
new file mode 100644 (file)
index 0000000..bf4d782
--- /dev/null
+++ b/app-admin/diamond/diamond-9999.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/diamond-9999.ebuild,v 1.1 2015/03/02 10:35:34 grobian Exp $
+
+EAPI=5
+
+if [[ ${PV} = 9999* ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git"
+       S=${WORKDIR}/diamond-${PV}
+else
+       SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
+       KEYWORDS="~x86 ~amd64"
+       S=${WORKDIR}/Diamond-${PV}
+fi
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python daemon that collects and publishes system metrics"
+HOMEPAGE="https://github.com/python-diamond/Diamond"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test mongo mysql snmp redis"
+
+RDEPEND="dev-python/configobj
+       dev-python/setproctitle
+       mongo? ( dev-python/pymongo )
+       mysql? ( dev-python/mysql-python )
+       snmp? ( dev-python/pysnmp )
+       redis? ( dev-python/redis-py )"
+DEPEND="${RDEPEND}
+       test? ( dev-python/mock )"
+
+src_prepare() {
+       # adjust for Prefix
+       sed -i \
+               -e '/default="\/etc\/diamond\/diamond.conf"/s:=":="'"${EPREFIX}"':' \
+               bin/diamond* \
+               || die
+
+       distutils-r1_src_prepare
+}
+
+python_test() {
+       "${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}"
+}
+
+python_install() {
+       export VIRTUAL_ENV=1
+       distutils-r1_python_install
+       mv "${ED}"/usr/etc "${ED}"/ || die
+}
+
+src_install() {
+       distutils-r1_src_install
+       newinitd "${FILESDIR}"/${PN}.initd ${PN}
+       newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}