summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-admin/chef/ChangeLog8
-rw-r--r--app-admin/chef/Manifest10
-rw-r--r--app-admin/chef/chef-0.10.2.ebuild64
-rw-r--r--app-admin/chef/chef-0.10.8.ebuild62
-rw-r--r--app-admin/chef/chef-10.12.0.ebuild (renamed from app-admin/chef/chef-0.10.10_beta1.ebuild)30
5 files changed, 32 insertions, 142 deletions
diff --git a/app-admin/chef/ChangeLog b/app-admin/chef/ChangeLog
index 934c1c46c52f..195dc471219a 100644
--- a/app-admin/chef/ChangeLog
+++ b/app-admin/chef/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-admin/chef
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/ChangeLog,v 1.12 2012/06/17 15:36:21 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/ChangeLog,v 1.13 2012/08/11 12:16:13 hollow Exp $
+
+*chef-10.12.0 (11 Aug 2012)
+
+ 11 Aug 2012; Benedikt Böhm <hollow@gentoo.org> -chef-0.10.2.ebuild,
+ -chef-0.10.8.ebuild, -chef-0.10.10_beta1.ebuild, +chef-10.12.0.ebuild:
+ version bump + ruby 19 support + remove old versions
*chef-0.10.10 (17 Jun 2012)
diff --git a/app-admin/chef/Manifest b/app-admin/chef/Manifest
index 65ea7db883af..41a422d06b12 100644
--- a/app-admin/chef/Manifest
+++ b/app-admin/chef/Manifest
@@ -2,13 +2,9 @@ AUX client.rb 2491 SHA256 12fd8d9f944da3cc902acb0b8aee5a13202b8f7edd107d72db219b
AUX confd/chef-client 477 SHA256 87ae3fc931df89fc890d1b976c9596a078780ecf95c1fac4f08cad08f8e89a90 SHA512 74a0ca55eea1ac9d6a519d9c4088f24d02bdff365165b9f740f24ae5468d8ce6de8412072ec4d62db4e3d297cd85d1bca125e994471475bf1adff622c59184d0 WHIRLPOOL f5998ad339fe76d61f41d560c3512c320a2649b090497f8d439ce55e734bd074248f8d6b02cd03abe0b7eb308fd495d3363e4db2948f76adb8cda30975dcfaff
AUX initd/chef-client 722 SHA256 acce79068c678dbf95156ff0a49042124d228c6b4564aecf26741e10397286d7 SHA512 3165eaeeedcabfd8fb7dce691eff7534f873023e1184441ec326bddc04daff5a5a8a6bf9e979c81883e82749ad3ccea62bbde5455b45cba18942cd7bc4f59dc8 WHIRLPOOL d71808436547f8ae1e26c6342a329f1b8d2816ef15d41fc1c839a3e71ca4c7db9d5a1eb4603da7e9afd2def2e4ffee51ad3087cf274301641d1a84641738fe47
AUX solo.rb 2023 SHA256 48e1863e4cbcdbf935ea4c9e29514c825c04ff35d68cb6bf8b8f246cd4b6a815 SHA512 bf37ffc2107233b80c467d2c4de6fbeda75a3518e713fb19af623c4594859c23d48ac9b8aba797f6a84f92c96c5cb668071c3d9f199e62aad99192765d9eaa2f WHIRLPOOL a8ba9a84691850e8b843febc049e98edff0b872131efd12d730d6991ab10cc7eab076cb1d037dbf52295c1a3f7d37c29b3b04b62d646f217919cf5cd73136f6d
-DIST chef-0.10.10.beta.1.gem 423424 SHA256 b6c10bb6e503f5dd4f7d897b72e1e93d053a9c9018ea77329c78ee82822e0da0 SHA512 ae3d706a6f37b53f171fa6a59401193fdfb04e0a0fb86c12711e6aafb6b20bf397b2903e9ddf28095b635e93e12fd5d9044b7a650112af6f0d553543e546b739 WHIRLPOOL 4773d228b439d137d28bdc1b7a7b4c7745441e26f0e49401256d1f89f8dd6f3804ff1f585f762c408da42ff1cf7860ee9ed4ec0980fce33d9033a70abb94d3ea
DIST chef-0.10.10.gem 424960 SHA256 144409014cced8d8a69a45a3e14145d2ea8e0845193629fd1ac36181bbd1dc92 SHA512 c250defea56b61e868da4ee28d268a925f09f583a6e0a49ed55f378ef318e55c17a7b7060e69dad4eaa8fc07d3a5076a14f3e54a2a8a3ee97626b010e7bf2ace WHIRLPOOL 3e004df819353306c15a3926ff2faa30caba5d16ed213d5e32a88684f10ab79b886aef109d8c01476b04294d07aadd21204fb5b16af4f91238cd269998c245f9
-DIST chef-0.10.2.gem 347648 SHA256 350bad2d596d0a3ebe555909480a7e9f50900497413b558c0a74ad2a7da5f2a0 SHA512 31e627e8ce5e9c7202782387708e197e9a6791a4e75e2bfdbabb1b793f97b9f6803b94ef0ff153c3eb5593900fedbeb5ac043c0c10916bd532a0db2624193f5f WHIRLPOOL 8753034aa06282f66a12ee1824782e4acfc83567fe0f73dbd29bd51ff9798b2545a1c7b24d12eaac70829d7c7b6de60fa6a72dfe58682568491c05371b18d81d
-DIST chef-0.10.8.gem 381952 SHA256 0a1ea2ee4b22a2933d2ab60164fec21b41425abb6bb4d36e558ae91c857e1a0c SHA512 2b7cf643b027c9d58f4f6e435c4cf9b6b2bbed1ae5dae78126ef8ef4e1afc39e1b8d20497eeff5d1f5a3e80e94ab284eedb4a1bb20aad96e1244908c5c4dfb03 WHIRLPOOL 7a27a6eb8d8ef691b84e6bba99672373943409fe6189f741f066599324ba2a70505d1cf29f000485910565b83d45390fa434d208069238f0f4c2df9d705d0f30
+DIST chef-10.12.0.gem 429056 SHA256 dac132f5b91f90f37b95b964ee213bb936ee07aaceb23cb24b9c7a9fcb20377b SHA512 fd227a325874013ce764d79a3eb250626c0370b50447caa445c2a7e502121c3cbf29832c96ad266b1730fe0cdcac86767d7b55e2594ccbb57c09fee4f395ee0c WHIRLPOOL bfd03dcc4a15e3cc4f141d31af441123a0653e7cb0fa26cc46ccfbe7bda0633c2ecf503b99ad2b7608dab90e9dbe2d7e3e44b00ce9b42d57225359dd7422c091
EBUILD chef-0.10.10.ebuild 1486 SHA256 bd28852201103ddc8948bb16d98af86a8892d004ef73b44ce6b92ed5e2bac34d SHA512 c7607d1d893812e8b0e8693e490da62b52ca7aaed6bb04fdf7393424397d54741e58aedf6f72fe639309809d90f17842914f7f5bc550c416cd9dc42920c6a513 WHIRLPOOL 4086a4128940e3087f88dc10796c4c83b5a06cd1e8dc1ce09003abc336c8b248f834a3bd1d874cb4ae1d87b9b07334c2f298606baf45ce108a786ba06cde4cb5
-EBUILD chef-0.10.10_beta1.ebuild 1508 SHA256 fd162aaaf9d0c7ef750fcf40db905da9a69d5764670a7deb5d39dbf4e20145de SHA512 0aeb84b75ec8c6a89c2060fa447aef49b83c5deee278114a2e4353735cb8f5f54ffb0c05bc05fbe8aad4e2380daadbbb2477da503f9fc8ca8a5781912ce42576 WHIRLPOOL e09d4f5fb3619eb8158707e6ce6c0934dc16d1a5109bffaec8f0d2afbbf56c786c31889a9879db30fc732d6e80264ee031af9b9cbbb022ce6fab19ed087d8502
-EBUILD chef-0.10.2.ebuild 1475 SHA256 bbac3844ab0328673d8ff6bf58a1fdc8866eda51b35af0174c2338075761762f SHA512 f0317fe2b73567362b6efcd6aef978a22f6607aa6fb5516ab33d5706c5ac7b3c047903ef78a844e4f8747367489d8c7734d58b4d5dfd76bb23c0e2fc6f4360e2 WHIRLPOOL 4d97fc463db5212240b95a5cd960564da16a817ea406dc2db2bb0ed5bd914e244e7eed81e25a45b810002d643cceb57ac59aa5d2ac66529f2def3a1763ad0d61
-EBUILD chef-0.10.8.ebuild 1427 SHA256 af91ae4b0fdecde0c689aa0a41fe281472bd84b1e78951df829dd3da9b369518 SHA512 2af7d2b09a139911ffe32d0abe9e529e55e2f0a4c0a97c7eda03423ca3f69b5092bfe04373c7299904ec0086142ac1aa5e7ee8b89fd244376a522183c984da06 WHIRLPOOL b07285e88818893ecfce3603be93bba74677ae164268ffdb84218d4f576f1a3dc5f75d1806ee8b3ff099b151c5d6a90132a6d7920ac16e318ed96107f6f1f542
-MISC ChangeLog 1115 SHA256 5a4eeac85b913bbef1906a2cea0af608b5117738e481a1c4a79da330b7e991be SHA512 cd905b6d75cc87f4ed342c4e4303e9fca1cc8e7ac34df5df219456c4c149c6f7cb63a974e4bc4fd303de623cdd02a4150483fc5546b25803d10b9d4b50822df7 WHIRLPOOL c455399451eaa96270e854df22d580702b8fef1eb93716e1f3a9c112adbe3af708aa729d0e2a48fe647b85ee03de8d2e3cdcb851c71fcf331b218e1dfe79eafa
+EBUILD chef-10.12.0.ebuild 1905 SHA256 9e378562c9945e5ac986a7b5d31efe1aaf5988a69949e22e71ac83fd5e83f5b0 SHA512 a31c7215c43c631c06aea85ad5b04ff68d4f92cd4b7c1000be54aa8fcfd4c307c4bb9bb3f36ccfd3b4dc3ac955eb638ab5bbc6006c7b5e4774ff0fb08e3ff3a2 WHIRLPOOL eab825a96a9c3de4dd9de5e5879b6494206ded0186c2620a6bf77a7370d7418fdf2a9a9726b6ad60926817a07dcf56baef82dff3e80bb8d4793ee49cd1e65e3b
+MISC ChangeLog 1344 SHA256 93855efb012b8827087bd59c4634ce376c3ea49f584d2a693724714bb06d2094 SHA512 006759f6347e5ed6353b8b31cc071da54a3adede3ba8683e6c866e39ea1e5b7c596d9434dcece28116731d3ee95c15317b3bf1f4bd5b3429a2849fe070297646 WHIRLPOOL 5133fb25e76c8d62c9572d05695e9c03e6e9dc0e173ab0da4c1e6d5ce255f3e92dc87ed8494e098ffe0f6ae0d30a991489fe9d33a31b7d157c23c1734a03723c
MISC metadata.xml 233 SHA256 beb476ec6e21df29167e9daf82fb8dfbfc63be8daa1f841288694882bbc27a98 SHA512 ca635918109682b650c0fea6ef239a15f53ef61a4b5c9c13be2395c09d7f53676d8e85b99db0368936527ba0e2eec1b97cfce3b1fb11cb7be1d465cbb9a50e6b WHIRLPOOL 06f397f0cddc6ab2cad0a780ae53f0c1e7f2893eaa80459f122384ce31a9ebcfb2e130f4f725edc6e56a9780681d0d18d0c8553f063eb661769478a5c7a72ab2
diff --git a/app-admin/chef/chef-0.10.2.ebuild b/app-admin/chef/chef-0.10.2.ebuild
deleted file mode 100644
index 6888c79e6963..000000000000
--- a/app-admin/chef/chef-0.10.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/chef-0.10.2.ebuild,v 1.2 2012/05/31 02:23:21 zmedico Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem user
-
-DESCRIPTION="Chef is a systems integration framework"
-HOMEPAGE="http://wiki.opscode.com/display/chef"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/bunny-0.6.0
- dev-ruby/erubis
- dev-ruby/extlib
- dev-ruby/highline
- >=dev-ruby/json-1.4.4
- <=dev-ruby/json-1.5.2
- >=dev-ruby/mixlib-authentication-1.1.0
- >=dev-ruby/mixlib-cli-1.1.0
- >=dev-ruby/mixlib-config-1.1.2
- >=dev-ruby/mixlib-log-1.3.0
- dev-ruby/moneta
- >=dev-ruby/net-ssh-2.1.3
- >=dev-ruby/net-ssh-multi-1.0.1
- >=dev-ruby/ohai-0.6.0
- >=dev-ruby/rest-client-1.0.4
- <dev-ruby/rest-client-1.7.0
- dev-ruby/ruby-shadow
- >=dev-ruby/treetop-1.4.9
- dev-ruby/uuidtools"
-
-all_ruby_install() {
- all_fakegem_install
-
- keepdir /etc/chef /var/lib/chef /var/log/chef /var/run/chef
-
- doinitd "${FILESDIR}/initd/chef-client"
- doconfd "${FILESDIR}/confd/chef-client"
-
- insinto /etc/chef
- doins "${FILESDIR}/client.rb"
- doins "${FILESDIR}/solo.rb"
-}
-
-pkg_setup() {
- enewgroup chef
- enewuser chef -1 -1 /var/lib/chef chef
-}
-
-pkg_postinst() {
- elog
- elog "You should edit /etc/chef/client.rb before starting the service with"
- elog "/etc/init.d/chef-client start"
- elog
-}
diff --git a/app-admin/chef/chef-0.10.8.ebuild b/app-admin/chef/chef-0.10.8.ebuild
deleted file mode 100644
index c9254d41f17e..000000000000
--- a/app-admin/chef/chef-0.10.8.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/chef-0.10.8.ebuild,v 1.3 2012/05/31 02:23:21 zmedico Exp $
-
-EAPI="4"
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem user
-
-DESCRIPTION="Chef is a systems integration framework"
-HOMEPAGE="http://wiki.opscode.com/display/chef"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/bunny-0.6.0
- dev-ruby/erubis
- dev-ruby/highline
- >=dev-ruby/json-1.4.4
- <=dev-ruby/json-1.6.1
- >=dev-ruby/mixlib-authentication-1.1.0
- >=dev-ruby/mixlib-cli-1.1.0
- >=dev-ruby/mixlib-config-1.1.2
- >=dev-ruby/mixlib-log-1.3.0
- dev-ruby/moneta
- >=dev-ruby/net-ssh-2.1.3
- >=dev-ruby/net-ssh-multi-1.1
- >=dev-ruby/ohai-0.6.0
- >=dev-ruby/rest-client-1.0.4
- dev-ruby/ruby-shadow
- >=dev-ruby/treetop-1.4.9
- dev-ruby/uuidtools"
-
-all_ruby_install() {
- all_fakegem_install
-
- keepdir /etc/chef /var/lib/chef /var/log/chef /var/run/chef
-
- doinitd "${FILESDIR}/initd/chef-client"
- doconfd "${FILESDIR}/confd/chef-client"
-
- insinto /etc/chef
- doins "${FILESDIR}/client.rb"
- doins "${FILESDIR}/solo.rb"
-}
-
-pkg_setup() {
- enewgroup chef
- enewuser chef -1 -1 /var/lib/chef chef
-}
-
-pkg_postinst() {
- elog
- elog "You should edit /etc/chef/client.rb before starting the service with"
- elog "/etc/init.d/chef-client start"
- elog
-}
diff --git a/app-admin/chef/chef-0.10.10_beta1.ebuild b/app-admin/chef/chef-10.12.0.ebuild
index 7ef4f850142b..a7e610c24135 100644
--- a/app-admin/chef/chef-0.10.10_beta1.ebuild
+++ b/app-admin/chef/chef-10.12.0.ebuild
@@ -1,13 +1,14 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/chef-0.10.10_beta1.ebuild,v 1.2 2012/05/31 02:23:21 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/chef-10.12.0.ebuild,v 1.1 2012/08/11 12:16:13 hollow Exp $
-EAPI="4"
-USE_RUBY="ruby18"
+EAPI=4
+USE_RUBY="ruby18 ruby19"
RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_VERSION=${PV/_beta/.beta.}
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
inherit ruby-fakegem user
@@ -19,24 +20,34 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
+# specs have various indempotency issues which result in the global Chef::Config
+# object to be replaced and subsequently fails other specs. Revisit this later.
+RESTRICT="test"
+
ruby_add_rdepend ">=dev-ruby/bunny-0.6.0
dev-ruby/erubis
- dev-ruby/highline
+ >=dev-ruby/highline-1.6.9
>=dev-ruby/json-1.4.4
<=dev-ruby/json-1.6.1
>=dev-ruby/mixlib-authentication-1.1.0
>=dev-ruby/mixlib-cli-1.1.0
>=dev-ruby/mixlib-config-1.1.2
>=dev-ruby/mixlib-log-1.3.0
- >=dev-ruby/mixlib-shellout-1.0.0
+ dev-ruby/mixlib-shellout
dev-ruby/moneta
>=dev-ruby/net-ssh-2.2.2
+ <dev-ruby/net-ssh-2.3
>=dev-ruby/net-ssh-multi-1.1
+ <dev-ruby/net-ssh-multi-1.2
>=dev-ruby/ohai-0.6.0
>=dev-ruby/rest-client-1.0.4
+ <dev-ruby/rest-client-1.7
dev-ruby/ruby-shadow
>=dev-ruby/treetop-1.4.9
- dev-ruby/uuidtools"
+ <dev-ruby/treetop-1.5
+ dev-ruby/uuidtools
+ >=dev-ruby/yajl-ruby-1.1
+ <dev-ruby/yajl-ruby-2"
all_ruby_install() {
all_fakegem_install
@@ -49,6 +60,9 @@ all_ruby_install() {
insinto /etc/chef
doins "${FILESDIR}/client.rb"
doins "${FILESDIR}/solo.rb"
+
+ doman distro/common/man/man1/*.1
+ doman distro/common/man/man8/*.8
}
pkg_setup() {