summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2015-03-02 13:10:07 +0000
committerFabian Groffen <grobian@gentoo.org>2015-03-02 13:10:07 +0000
commite4c13856bf068da92a0e4ac1edfa8c84297312e7 (patch)
tree4d8a7a6ba3c796527a0595dba74718c9e07b177c /app-admin/diamond
parentRemove old. (diff)
downloadhistorical-e4c13856bf068da92a0e4ac1edfa8c84297312e7.tar.gz
historical-e4c13856bf068da92a0e4ac1edfa8c84297312e7.tar.bz2
historical-e4c13856bf068da92a0e4ac1edfa8c84297312e7.zip
Remove windows config, fix pid-file location
Package-Manager: portage-2.2.14-prefix/cvs/SunOS i386 Manifest-Sign-Key: 0x5F75F607C5C74E89
Diffstat (limited to 'app-admin/diamond')
-rw-r--r--app-admin/diamond/ChangeLog6
-rw-r--r--app-admin/diamond/Manifest12
-rw-r--r--app-admin/diamond/diamond-4.0.ebuild6
-rw-r--r--app-admin/diamond/diamond-9999.ebuild6
4 files changed, 21 insertions, 9 deletions
diff --git a/app-admin/diamond/ChangeLog b/app-admin/diamond/ChangeLog
index bebe155ebaac..1eb4993b79d0 100644
--- a/app-admin/diamond/ChangeLog
+++ b/app-admin/diamond/ChangeLog
@@ -1,6 +1,10 @@
# 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.2 2015/03/02 10:35:34 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/ChangeLog,v 1.3 2015/03/02 13:10:03 grobian Exp $
+
+ 02 Mar 2015; Fabian Groffen <grobian@gentoo.org> diamond-4.0.ebuild,
+ diamond-9999.ebuild:
+ Remove windows config, fix pid-file location
*diamond-9999 (02 Mar 2015)
diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest
index 2c3f0e96eeb4..9c78f767578b 100644
--- a/app-admin/diamond/Manifest
+++ b/app-admin/diamond/Manifest
@@ -4,14 +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 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
+EBUILD diamond-4.0.ebuild 1645 SHA256 eb1680f0d02cadfcee71c98f8312010cd8f489d8e31aa2e52ab1dc649f7d839b SHA512 108671e063f80333b81687776e9251e62046a3ddad6b954728af874384cbb44f27a2ecb4b92b8ce346f3c12cbad63f192e7f7eaa763427c731434f271204aee2 WHIRLPOOL aa867853c34a8b127d649bf3d3166f49e6ff64f448feade98ad358b2a938b7cda930b28f582f13aa71e8a1fa8a8067935199a57bbc2a0de636387638601fdb65
+EBUILD diamond-9999.ebuild 1646 SHA256 35da91292850942bac21dd8fc14f4078efb39a34f54cf064fd5c0c9328bd7c36 SHA512 1f7797b31567f1fe4ecce082f514e5e4fe626745ffb1c2bd6758308ba2bf28015bbdb8ba2429dda32c4a75d6fe5866559926ad4a5bf39f099c875cb3f4b21706 WHIRLPOOL 5a528682acb682683aba7c598765a40089baa21ba1bb9d4595286456727f85d910d8a4f6802e2782f5b9d53db93a08874e0c6a7a1309e8277dd1113d0bd8ba86
+MISC ChangeLog 701 SHA256 9e5651c0eb0edd1296717eb016efd8878bf90b2b23822f240e6108bc78d0ea16 SHA512 e42ac6a90624622a4d7c02fa3895c47487aae03f2cbba409a133dccb827dc4e63accdaaf99b2d72c97345f61570140ce9a498e5a7d16b57b353746c9539b16ef WHIRLPOOL da6549e4301096f15581beabdaa9aec0d78e8142e965141d9650f41a04d5533dbcb279aa7e18bda6048dd03757da6c3308cea20a3110cc277807a55fd444ef2d
MISC metadata.xml 586 SHA256 d167f488ef5b8f3b813586538e8e355dc4a0a92bd8cf1ff21ffacbc04a292de7 SHA512 97a0367b6b759a8d79427763d2fe1c37c9038406653821a83d7669a39d059170ff6d122e9f7baa31c2c8ce6d7b7c3478dcebfae55a6a6a7403816b2a6fc451a8 WHIRLPOOL 410db9ae30c5a7516b252e92abbc8a9dbb62c885034c8ee3fabe4e005e373c721927bd7d8f1723a559f9d8b29d57927074011dc449442e8fb7f40e1d4ff32629
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlT0PPgACgkQX3X2B8XHTomDpQCeO25AYq1/3IFDlQdNZMS/gNAf
-WdkAoJZw9lVCwy9wcFlhNmE6ZsjlCGza
-=+JPt
+iEYEAREIAAYFAlT0YS0ACgkQX3X2B8XHTokPKQCfVn9F63kCLzbARquRMqGfRuzU
+5nkAoJ4Hs5FAz8TMUT23lkUUoVMCljSJ
+=baj7
-----END PGP SIGNATURE-----
diff --git a/app-admin/diamond/diamond-4.0.ebuild b/app-admin/diamond/diamond-4.0.ebuild
index 90963a9abcf2..de138cd18313 100644
--- a/app-admin/diamond/diamond-4.0.ebuild
+++ b/app-admin/diamond/diamond-4.0.ebuild
@@ -1,6 +1,6 @@
# 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.2 2015/03/02 10:35:34 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/diamond-4.0.ebuild,v 1.3 2015/03/02 13:10:03 grobian Exp $
EAPI=5
@@ -52,6 +52,10 @@ python_install() {
export VIRTUAL_ENV=1
distutils-r1_python_install
mv "${ED}"/usr/etc "${ED}"/ || die
+ rm "${ED}"/etc/diamond/*.windows # won't need these
+ sed -i \
+ -e '/pid_file =/s:/var/run:/run:' \
+ "${ED}"/etc/diamond/diamond.conf.example || die
}
src_install() {
diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-9999.ebuild
index bf4d782a44d7..a28ec6bed2ea 100644
--- a/app-admin/diamond/diamond-9999.ebuild
+++ b/app-admin/diamond/diamond-9999.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/diamond-9999.ebuild,v 1.2 2015/03/02 13:10:03 grobian Exp $
EAPI=5
@@ -52,6 +52,10 @@ python_install() {
export VIRTUAL_ENV=1
distutils-r1_python_install
mv "${ED}"/usr/etc "${ED}"/ || die
+ rm "${ED}"/etc/diamond/*.windows # won't need these
+ sed -i \
+ -e '/pid_file =/s:/var/run:/run:' \
+ "${ED}"/etc/diamond/diamond.conf.example || die
}
src_install() {