Version bump; cleanup old versions; use new syntax.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-ruby/amazon-ec2/ChangeLog b/dev-ruby/amazon-ec2/ChangeLog
index 18fd7db5c93776da963d977b2c3dd46761febdd5..fc1909aa2b20a0c7f05be2dd62447024dc9d5581 100644 (file)
--- a/dev-ruby/amazon-ec2/ChangeLog
+++ b/dev-ruby/amazon-ec2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/amazon-ec2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amazon-ec2/ChangeLog,v 1.6 2010/04/26 18:59:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amazon-ec2/ChangeLog,v 1.7 2010/05/23 22:50:59 flameeyes Exp $
+
+*amazon-ec2-0.9.14 (23 May 2010)
+
+  23 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -amazon-ec2-0.9.4.ebuild, -amazon-ec2-0.9.10.ebuild,
+  -amazon-ec2-0.9.12.ebuild, +amazon-ec2-0.9.14.ebuild:
+  Version bump; cleanup old versions; use new syntax.
 
   26 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   amazon-ec2-0.9.12.ebuild:

diff --git a/dev-ruby/amazon-ec2/Manifest b/dev-ruby/amazon-ec2/Manifest
index 80364c28c9284177d4197f52934d2c3fcb85f5f8..2b5b9055bd1c7ff3a5e82a99f05761a80021f650 100644 (file)
--- a/dev-ruby/amazon-ec2/Manifest
+++ b/dev-ruby/amazon-ec2/Manifest
@@ -1,18 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST amazon-ec2-0.9.10.gem 128000 RMD160 e661e8eaeaad8abbe398bb655722bf9adbe8c262 SHA1 b495df3f2449410dc9bc8cb8810b87b6601ddfa7 SHA256 20bc8dd2a7a250c6b9661e5c289f12d7a0879fd09d967a1e4ff1bdd4964bddcb
-DIST amazon-ec2-0.9.12.gem 128512 RMD160 b6c4ab76d191d0c16286302ed0f67660755e0e49 SHA1 45e995b83b6a3bf61d189501f2362278ba25c8a0 SHA256 a0a813682e655565ded9fcfc113bcc41d54e806ecbd0e006c267dc8b7232da9f
-DIST amazon-ec2-0.9.4.gem 125952 RMD160 0907508381c5152464c5bee7ecdc430c07cd091e SHA1 ed496d1ff31f2bf8e1a449511ccf3d89a876ad61 SHA256 ddbfa8d0425f5bf6ca9069ebd381b6e5f546fa2098285bfb9d708f959e2c05f6
-EBUILD amazon-ec2-0.9.10.ebuild 1114 RMD160 5d09a124d4fb85f1fa97370396a056c3ab272324 SHA1 fc76d1525403ffc6ca8ae16684ed223e3d6472f0 SHA256 d47c2efced5005112174735657431c056ba807454660fd82657746bd0962d29c
-EBUILD amazon-ec2-0.9.12.ebuild 1121 RMD160 71627bc8e8d52cd51f9fd81b90fae42478fdff47 SHA1 3879c56ea6af9c837ad3935b08605b90c2d73354 SHA256 53305a3c6b8ddffc82b3be00b91fa4f3209be4e4973d92dd22287a74fa6794a9
-EBUILD amazon-ec2-0.9.4.ebuild 1096 RMD160 df9ba8072f8b27265cf7f4a0261d60c518c33634 SHA1 89d7c318ff8e7b076f8f34845d458c73b00c2020 SHA256 a52aad7cb9fad4b0bec6dcb18f1f1ab4fbf306e4f58c2237e6285f269f3748c0
-MISC ChangeLog 1320 RMD160 d8690ef0c4f26527a471f6318e53ba7efa101a3b SHA1 a39978768002377fd81714e67d5059abef9b7423 SHA256 ffec4d37abd8742b7af4432e119252f2f58241252d19bad624fd620559b89e9c
+DIST amazon-ec2-0.9.14.gem 128512 RMD160 46b32e0c7570275e40547b69e06a2e328721b494 SHA1 855721cebf81f01c526f870c5c46385274f6144f SHA256 50e5d5d37b78816a0b33ce3ef7c3a4740e9a6d856051cf765dbf63cf4d599dbe
+EBUILD amazon-ec2-0.9.14.ebuild 1140 RMD160 63161a2ae0f10e06bb8c7a5e091aa830b6d59359 SHA1 30683b9f62df1a2353a6526eccce87359b501bd8 SHA256 6f4139ffb4d2421502029ec80d523bdbe0a568dbd45b11f4caf26adc6c70e5b0
+MISC ChangeLog 1576 RMD160 cd0bebae96f84afcd2b96e1bd2e59c9e34b3098f SHA1 26d8eb9a5368061f89aaeddfc051eacc43281462 SHA256 25153d3cf5134c44f3b0ec9871b74c19096baec8bc4e3e3b7cf8686d286a5f8c
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvV4ogACgkQAiZjviIA2XjCtwCggMmANgtsOCxgOzlcTFy26ctJ
-loMAn0DgvkNSvto0wL+nTTNU1i6alNiC
-=ZQrw
+iEYEARECAAYFAkv5sRYACgkQAiZjviIA2XgRdgCeON2tICBiWaq2s/T1mntu3uPx
+ZWIAn29NgPQcfm3WcP2F5nsAW9xTgY5W
+=8uGO
 -----END PGP SIGNATURE-----

diff --git a/dev-ruby/amazon-ec2/amazon-ec2-0.9.10.ebuild b/dev-ruby/amazon-ec2/amazon-ec2-0.9.10.ebuild
deleted file mode 100644 (file)
index 02b9622..0000000
--- a/dev-ruby/amazon-ec2/amazon-ec2-0.9.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amazon-ec2/amazon-ec2-0.9.10.ebuild,v 1.1 2010/04/04 18:24:59 flameeyes Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 jruby"
-
-RUBY_FAKEGEM_TASK_DOC="yard"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc README_dev.rdoc ChangeLog"
-
-RUBY_FAKEGEM_BINWRAP="ec2sh"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for accessing the Amazon Web Services EC2 and related"
-HOMEPAGE="http://github.com/grempe/amazon-ec2"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# We only need yard for Ruby 1.8, as we use it for documentation
-# generation.
-USE_RUBY=ruby18 \
-       ruby_add_bdepend doc "dev-ruby/yard"
-
-ruby_add_bdepend test "virtual/ruby-test-unit >=dev-ruby/test-spec-0.10.0 >=dev-ruby/mocha-0.9.8"
-ruby_add_rdepend '>=dev-ruby/xml-simple-1.0.12'
-
-each_ruby_prepare() {
-       case ${RUBY} in
-               *ruby19)
-                       ;;
-               *)
-                       # Remove the reference to test-unit gem, since it's only
-                       # available on Ruby 1.9.
-                       sed -i -e '/^gem/s:^:#:' test/test_helper.rb || die
-                       ;;
-       esac
-}

diff --git a/dev-ruby/amazon-ec2/amazon-ec2-0.9.12.ebuild b/dev-ruby/amazon-ec2/amazon-ec2-0.9.14.ebuild
similarity index 81%
rename from dev-ruby/amazon-ec2/amazon-ec2-0.9.12.ebuild
rename to dev-ruby/amazon-ec2/amazon-ec2-0.9.14.ebuild
index 8b7e89d43cee38d7cbf3f1accd58fe89f565b6e5..2f392e34026baef9852c1b6517c709e3aa708540 100644 (file)
--- a/dev-ruby/amazon-ec2/amazon-ec2-0.9.12.ebuild
+++ b/dev-ruby/amazon-ec2/amazon-ec2-0.9.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amazon-ec2/amazon-ec2-0.9.12.ebuild,v 1.2 2010/04/26 18:59:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amazon-ec2/amazon-ec2-0.9.14.ebuild,v 1.1 2010/05/23 22:50:59 flameeyes Exp $
 
 EAPI=2
 
@@ -25,9 +25,14 @@ IUSE=""
 # We only need yard for Ruby 1.8, as we use it for documentation
 # generation.
 USE_RUBY=ruby18 \
-       ruby_add_bdepend doc "dev-ruby/yard"
-
-ruby_add_bdepend test "virtual/ruby-test-unit >=dev-ruby/test-spec-0.10.0 >=dev-ruby/mocha-0.9.8"
+       ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+ruby_add_bdepend "
+       test? (
+               virtual/ruby-test-unit
+               >=dev-ruby/test-spec-0.10.0
+               >=dev-ruby/mocha-0.9.8
+       )"
 ruby_add_rdepend '>=dev-ruby/xml-simple-1.0.12'
 
 each_ruby_prepare() {

diff --git a/dev-ruby/amazon-ec2/amazon-ec2-0.9.4.ebuild b/dev-ruby/amazon-ec2/amazon-ec2-0.9.4.ebuild
deleted file mode 100644 (file)
index 67e2977..0000000
--- a/dev-ruby/amazon-ec2/amazon-ec2-0.9.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amazon-ec2/amazon-ec2-0.9.4.ebuild,v 1.2 2010/02/13 19:15:52 flameeyes Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 jruby"
-
-RUBY_FAKEGEM_TASK_DOC="yard"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc README_dev.rdoc ChangeLog"
-
-RUBY_FAKEGEM_BINWRAP="ec2sh"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for accessing the Amazon Web Services EC2 and related"
-HOMEPAGE="http://github.com/grempe/amazon-ec2"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# We only need yard for Ruby 1.8, as we use it for documentation
-# generation.
-USE_RUBY=ruby18 \
-       ruby_add_bdepend doc "dev-ruby/yard"
-
-ruby_add_bdepend test "virtual/ruby-test-unit dev-ruby/test-spec dev-ruby/mocha"
-ruby_add_rdepend '>=dev-ruby/xml-simple-1.0.12'
-
-each_ruby_prepare() {
-       case ${RUBY} in
-               *ruby19)
-                       ;;
-               *)
-                       # Remove the reference to test-unit gem, since it's only
-                       # available on Ruby 1.9.
-                       sed -i -e '/^gem/s:^:#:' test/test_helper.rb || die
-                       ;;
-       esac
-}