version bump + ruby 19 support + remove old versions

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

5 files changed, 21 insertions, 106 deletions

diff --git a/app-admin/chef-expander/ChangeLog b/app-admin/chef-expander/ChangeLog
index 9810e9f37166..e5c7a1d0461b 100644
--- a/app-admin/chef-expander/ChangeLog
+++ b/app-admin/chef-expander/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/chef-expander
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-expander/ChangeLog,v 1.5 2012/06/17 15:39:58 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-expander/ChangeLog,v 1.6 2012/08/11 12:25:35 hollow Exp $
+
+*chef-expander-10.12.0 (11 Aug 2012)
+
+  11 Aug 2012; Benedikt Böhm <hollow@gentoo.org> -chef-expander-0.10.2.ebuild,
+  -chef-expander-0.10.8.ebuild, -chef-expander-0.10.10_beta1.ebuild,
+  +chef-expander-10.12.0.ebuild:
+  version bump + ruby 19 support + remove old versions
 
 *chef-expander-0.10.10 (17 Jun 2012)
 
diff --git a/app-admin/chef-expander/Manifest b/app-admin/chef-expander/Manifest
index 862ac95e2122..51b0c0971a35 100644
--- a/app-admin/chef-expander/Manifest
+++ b/app-admin/chef-expander/Manifest
@@ -1,12 +1,8 @@
 AUX confd/chef-expander 546 SHA256 c1f0cb37ab03bfe15d2348dd83e93585cb09bdbdfcce5cef2a616543fb967b8e SHA512 3f1c886d9c629d2e97d0be44b2fb6967360e057a781dd58061f7747891d01198b57f01b083def11731f8241a3689ac084403ae9765cc74fc9a1cc809f3b7776e WHIRLPOOL e853654c4b9fc8ed2319293196731ba4aeaaf3904b89ae8651f706e29c9c977b89ef49c8b567e6bd1eb7104a962f9f91b9035ca8d64cff046e5ed9177ab6433e
 AUX initd/chef-expander 1127 SHA256 072fbc8d0217f23b7dbc0d4379bcd3ce1492f22cad727418733befaba3da521d SHA512 20e10f766baf4dd084cf65a84a7f83df4a1e810ddc4abf62d7b18aa77cd6fb6a0ec6b6a91d05fe92fcf3b1dc8ba0525734e15027071b5badc51e256222332393 WHIRLPOOL c30a6d48525ab5c31d33e53d9ea19505e94a6ed870d7f676e21da1ff171a77811cd76eeb8b8d0a877d7160981d6ab879dbc528f9c44e62096c447b551878c7da
-DIST chef-expander-0.10.10.beta.1.gem 24576 SHA256 4220261a9b53488ac164975e81c647e654f53b6433cd8dd27f06daa6a2dcf74e SHA512 4d31b2687522db866bc11bdda22395860e394b99e7b3d820b346b983890190ce0d0da572a64cedf5d77fa87ca31603243dbc1f1ed9d0bcb1b0c8ed238d6d1a06 WHIRLPOOL 86cd5fbe0ab0420a4d641c0cc57b94e3373bc7d9df77eb93127d5c6331c332cf7e01d3d7b9dbbf884169f211e36332171d63433fc9145bc70ecdbd9e19b39f85
 DIST chef-expander-0.10.10.gem 24064 SHA256 214da1ab5a947f7dfacc46433c7bf03ef7b242e2a33dc7adf021cc97f2a97b2f SHA512 afc6331c41750341d0a50901fd5a9b17854ccbe7b62f199eded52a489a9194019a690fe757f86c9348b1b09915be3faa838e3fc0a34849ae42c93b0791fe3997 WHIRLPOOL 3ca8f0be1a9044c40dfa222c9e6ed8a9e99a27e03d10950396280ca03bfdfcbfb6bb380ff7a191049e564407cf05e2657e29985d48850d53ed7c48facb536971
-DIST chef-expander-0.10.2.gem 24064 SHA256 8a6cb36fb04a18806fd76d439cd409aaa455c79f9f50fdf254123ea0febce247 SHA512 f6821c0ed4c01ff093bc49ba40c1e5445b8688d45fd1a4973d41b16dde319c6a9fc1488ce9db99a919d1e2fb7eb07a7ab0cae6443647415281da29ad9555d753 WHIRLPOOL 1a7a8c1e469fd078f2c11c110276cc3a72ace21779266d5fc36a80631d371a1c12dabf81c1480795fa11ef2e7a961545f2a654e338736c443711be96eecb2537
-DIST chef-expander-0.10.8.gem 24576 SHA256 42f69adf2c7129adab7a39fde974d68195f9ba6cd89c0c201ee47ea2793f1997 SHA512 da0921bec08ff4a23c1badd68ac9f5c0d41efc3a03bc3acb716d1db8283f28bb5cdbd36302459b8a3b554573be93fe315f303ffb4bb04138ea8666acb8e396af WHIRLPOOL 3e9e437c9b0a03fb9feb08874d824940e0c24356d62903b969e05c1820d2859bf5a6bfd8832c6ee5903b8defee0b88968c9be45bb9497c8392542611870065fb
+DIST chef-expander-10.12.0.gem 24576 SHA256 f6d83fa51394e276e33bbd92d39dd30f0cbe93975409b66faffc56f62c1f8534 SHA512 f8abd430c29fa8488e88a7e9b57726a29420cd5982ea28d6c566a07447a9eb51b95be48469aeb4bbd2b1059c0f77977198b11cc169dbf95cdb46b605c13cc361 WHIRLPOOL fc12051fce34b0a70e77d652a1fb1dcd7994f82975d5aa831e0c5d6c5dfce58cd951bd6a9bf5497026e6146bccc4b4f6bfde692af24250bc13ec1f2151fbcf81
 EBUILD chef-expander-0.10.10.ebuild 1190 SHA256 d855d6a231ac0a631d5fd8c62228fb64a6e117139f5ec71f2a188341fcc00648 SHA512 27eff86530e712a4bb6f27889f680fa7f2e3f1cf0106e9528d39e978e3c3e57ce10652bf16e909f28d18d67018a693a6d63dc7c745b3893f3f76c9cb92691711 WHIRLPOOL 0ef651f3197a2d25c4155098950a561a4f4ae87687e4531ede4e0316fe8987000f5b41701e4e1dc1058cd487acf529134098177c88834734b718a47d12c1d7e8
-EBUILD chef-expander-0.10.10_beta1.ebuild 1236 SHA256 3faa53cf17fd8593cc9c2e5985bb6de78bcfd4b71d81ff6b37c3b422ac6cb13d SHA512 2da6057fca7acd45ca7bea63cac08d48a77d55313f18f1f1ea87822e136e709f2c26dccca6f15ef8838a795bf6ff6ea6b69f6f382d5cbe8c3fe39321ed1161bc WHIRLPOOL 8cd30bed015ddccef8786f6c7be8be86c0fbee025fcaa5d8776818b489431cf369d840040ce8d79aa394d50c50f44f0913239e82620292bfc6d21711dbb2d607
-EBUILD chef-expander-0.10.2.ebuild 1018 SHA256 ed97621c2733649c7311f25f66c8c1630545fcd14fc3484d8467a3a551d66a34 SHA512 55530e20cba57bfaba4aa5848f9096f06f981ae8ec2e2a60ebc9815ce478d426ca104044d39238c9c9584cfb792afb1d46dc0c441dea356549a2e1ff9459ab63 WHIRLPOOL fe938cbbd78a9916f881fce44984590dd2e7414581f5366135ed9cefd98f3cef8deba398bf7e73a8c0fd36329e74a2b93215fffa971abd6ba91490d78d4080db
-EBUILD chef-expander-0.10.8.ebuild 1189 SHA256 1a7f0660f49a95dc323e3f411ccf92570b08c3d7c1b798f4fc89229899d23e72 SHA512 bccf63e6c4aebb300e5e9c4abb9d4333add4d05ed1e749442158a6f7d30cbf6b7903c0b7f0df6fac7383cc493cf7c8e0bd93413ce3874422aa28dfec0ead739c WHIRLPOOL 8d7de50eab68d544146afa2b5229396a8909f5927211ac1de67abd98507a3ef2745b862807abf9794ad7326b12f55dc0f79e3d5db8fcf8dd9a78042de25cd811
-MISC ChangeLog 1130 SHA256 e3af519c7b73ffbc51cf1f1bb08f0d93433268d4ad24f0f50bd844ec60412033 SHA512 5e2eacba822bdace7634532e44a27d6ab303e81535d11db0a55998baed9633f0d7a6a843ffbc090bce85b33a5f1e987220ba466bd6b7cc1fed3dcb8be03a5f3f WHIRLPOOL d23130207873fc4cd7c126ba674bac133d1b0a740ed708d0ee1e29b73f6ce2ea7934eb7a67ed121791dd32e647c3778611d176de6f9cffdf6d5ae9a89a2b3b9b
+EBUILD chef-expander-10.12.0.ebuild 1301 SHA256 ab34f927eee41ea840f25ce41148b287de3f999b8a35c71b72e51596c3b21c00 SHA512 c33188e996082a164b55bd8e5704cefe872c0d810308d7f21b0c7c7c90fa5c034ee819f0095649301d6037f7c7cda4337bf059477670a1086b4f2c8854722a4f WHIRLPOOL 3be29c94aa69d2dfa9f6a4e30c4bffd791be1d76899d62e484d0f55c2d017a7ae806780f9dc4ddfbb4b2b04cdd663a8c985ea191f48c5b6c868ed15c39b8c54e
+MISC ChangeLog 1406 SHA256 a433380589eefdb4818be87b36c9a3b266e06129b37927476517ac8c2806a8cd SHA512 2235df01392ded72b3f92d92fa367f7122fedbc57fe25962647e2c7da50b38c649fb26cdbdd8d8b7ba605fd8ceee591fd7fd0145c1ae19b5dd885be582cb2a3b WHIRLPOOL 34f11a990bb5dd705f95c34132b1f6aff1d3fe0bb67a26868e4262cc609b81090b522c475fef88e3f4d9f9addd5e5546c97abdab50ff8469fc8cbb9ac3a97298
 MISC metadata.xml 233 SHA256 beb476ec6e21df29167e9daf82fb8dfbfc63be8daa1f841288694882bbc27a98 SHA512 ca635918109682b650c0fea6ef239a15f53ef61a4b5c9c13be2395c09d7f53676d8e85b99db0368936527ba0e2eec1b97cfce3b1fb11cb7be1d465cbb9a50e6b WHIRLPOOL 06f397f0cddc6ab2cad0a780ae53f0c1e7f2893eaa80459f122384ce31a9ebcfb2e130f4f725edc6e56a9780681d0d18d0c8553f063eb661769478a5c7a72ab2
diff --git a/app-admin/chef-expander/chef-expander-0.10.2.ebuild b/app-admin/chef-expander/chef-expander-0.10.2.ebuild
deleted file mode 100644
index 208a8dea33b7..000000000000
--- a/app-admin/chef-expander/chef-expander-0.10.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-expander/chef-expander-0.10.2.ebuild,v 1.2 2011/08/06 14:23:51 graaff Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Configuration management tool"
-HOMEPAGE="http://wiki.opscode.com/display/chef"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-
-ruby_add_rdepend "~app-admin/chef-${PV}
-	>=dev-ruby/amqp-0.6.7:0
-	>=dev-ruby/bunny-0.6.0
-	>=dev-ruby/em-http-request-0.2.11
-	>=dev-ruby/eventmachine-0.12.10
-	>=dev-ruby/fast_xs-0.7.3
-	>=dev-ruby/highline-1.6.1
-	>=dev-ruby/mixlib-log-1.2.0
-	>=dev-ruby/uuidtools-2.1.1
-	>=dev-ruby/yajl-ruby-0.7.7"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doinitd "${FILESDIR}/initd/chef-expander"
-	doconfd "${FILESDIR}/confd/chef-expander"
-
-	keepdir /etc/chef /var/{lib,log,run}/chef
-	fowners chef:chef /var/{lib,log,run}/chef
-}
diff --git a/app-admin/chef-expander/chef-expander-0.10.8.ebuild b/app-admin/chef-expander/chef-expander-0.10.8.ebuild
deleted file mode 100644
index c28a317cd83d..000000000000
--- a/app-admin/chef-expander/chef-expander-0.10.8.ebuild
+++ /dev/null
@@ -1,49 +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-expander/chef-expander-0.10.8.ebuild,v 1.1 2012/01/29 12:17:25 hollow Exp $
-
-EAPI="4"
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Configuration management tool"
-HOMEPAGE="http://wiki.opscode.com/display/chef"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-
-ruby_add_rdepend "~app-admin/chef-${PV}
-	>=dev-ruby/amqp-0.6.7
-	<dev-ruby/amqp-0.7
-	>=dev-ruby/bunny-0.6.0
-	<dev-ruby/bunny-0.7
-	>=dev-ruby/em-http-request-0.2.11
-	<dev-ruby/em-http-request-0.3
-	>=dev-ruby/eventmachine-0.12.10
-	<dev-ruby/eventmachine-0.13
-	>=dev-ruby/fast_xs-0.7.3
-	<dev-ruby/fast_xs-0.8
-	>=dev-ruby/highline-1.6.1
-	<dev-ruby/highline-1.7
-	>=dev-ruby/mixlib-log-1.2.0
-	>=dev-ruby/uuidtools-2.1.1
-	<dev-ruby/uuidtools-2.2
-	>=dev-ruby/yajl-ruby-0.7.7"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doinitd "${FILESDIR}/initd/chef-expander"
-	doconfd "${FILESDIR}/confd/chef-expander"
-
-	keepdir /etc/chef /var/{lib,log,run}/chef
-	fowners chef:chef /var/{lib,log,run}/chef
-}
diff --git a/app-admin/chef-expander/chef-expander-0.10.10_beta1.ebuild b/app-admin/chef-expander/chef-expander-10.12.0.ebuild
index ff67c72da26c..7d1006f7994b 100644
--- a/app-admin/chef-expander/chef-expander-0.10.10_beta1.ebuild
+++ b/app-admin/chef-expander/chef-expander-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-expander/chef-expander-0.10.10_beta1.ebuild,v 1.1 2012/04/29 13:21:15 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-expander/chef-expander-10.12.0.ebuild,v 1.1 2012/08/11 12:25:35 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
 
@@ -19,7 +20,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=""
+# specs require a live rabbitmq server
+RESTRICT="test"
 
 ruby_add_rdepend "~app-admin/chef-${PV}
 	>=dev-ruby/amqp-0.6.7
@@ -37,7 +39,8 @@ ruby_add_rdepend "~app-admin/chef-${PV}
 	>=dev-ruby/mixlib-log-1.2.0
 	>=dev-ruby/uuidtools-2.1.1
 	<dev-ruby/uuidtools-2.2
-	>=dev-ruby/yajl-ruby-0.7.7"
+	>=dev-ruby/yajl-ruby-1.0
+	<dev-ruby/yajl-ruby-2"
 
 all_ruby_install() {
 	all_fakegem_install