Version bump. Make sure only the latest testing version installs rackup.

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

diff --git a/dev-ruby/rack/ChangeLog b/dev-ruby/rack/ChangeLog
index 3739838ed0aec8da77237ba4da69dc46619adc2f..6e169ea8bb6b206695b9573f7f352eff6b62c457 100644 (file)
--- a/dev-ruby/rack/ChangeLog
+++ b/dev-ruby/rack/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/rack
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/ChangeLog,v 1.63 2011/12/17 14:53:47 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/ChangeLog,v 1.64 2011/12/24 08:03:02 graaff Exp $
+
+*rack-1.3.5 (24 Dec 2011)
+*rack-1.2.4-r2 (24 Dec 2011)
+
+  24 Dec 2011; Hans de Graaff <graaff@gentoo.org> +rack-1.2.4-r2.ebuild,
+  +rack-1.3.5.ebuild:
+  Version bump. Make sure only the latest testing version installs rackup.
 
   17 Dec 2011; Hans de Graaff <graaff@gentoo.org> rack-1.2.4-r1.ebuild:
   Avoid broken specs for ruby19. These appear to be related to changes in newer

diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index c59cd9cc6bdfce7e991b0085a9a79384fff41715..2e707e189337af2dd76b0299b0bebebc5d8144e6 100644 (file)
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -9,19 +9,22 @@ DIST rack-1.1.0.tar.gz 335553 RMD160 b160ae2f6f410111df5987ec562e6bbcef61c177 SH
 DIST rack-1.1.2.tar.gz 279282 RMD160 42f262b0b82f94bc13650bbbd3ef4e718afa5142 SHA1 ec107026d3923d86d9a6e8eeaef73c897a27e110 SHA256 03539f0211fb28c7f0c8c31f701fc040c8561ce4b6ae67210ea132baab5c0fb6
 DIST rack-1.2.3.tar.gz 338774 RMD160 ad86580fc2487c8c8e06e04d53375e835ee5c2f5 SHA1 f34ca5ccc0c02105702b0263783478aee4b8526e SHA256 1b0be91dbec33eac866f198de0aa9ebd18950b73ec270cb24f35a2fa6028d162
 DIST rack-1.2.4.tar.gz 341444 RMD160 f4920fde1c792140ddae0966eb1a2cd66a76daee SHA1 1847ebb8f0b8fc50f4068de67bec4a5a07e9f184 SHA256 bca88697e4bb616a694df0e1cbb95ad7a79b1503dce1d774ea9e104703fc3d81
+DIST rack-1.3.5.tar.gz 407136 RMD160 91c1c7e7e69c03d048cfc9e3c8968e0c733edb43 SHA1 9768a2140711c3a92e194ddeb2f5671f6aa89bf3 SHA256 58ab68fda76fa882b04e4471496f0116c74270b07b1c7a6bb1c992a52ece1454
 EBUILD rack-1.0.1-r2.ebuild 1746 RMD160 d02c5a64032a5199cd255b11833a57189c5fd085 SHA1 a70bce57e7827bdcf36c5bf5057f0c5771513acb SHA256 e28c40c577d6e101d9286bca71621be55f5c7b6b5bea56744014c6ff3dd146a7
 EBUILD rack-1.1.0-r1.ebuild 1343 RMD160 ce8015fec934f9df85f25c25b9584b291db5cafc SHA1 7e35b8a7ccc5b29f48e372fa884118a91561b9ac SHA256 ad8906dffbf268af1bbc998eb362df9613e2635e5215315fb0b3965b9fdbd3f5
 EBUILD rack-1.1.0.ebuild 1282 RMD160 2507782d9e4b2e5c22da84bbdb7d521edcff62c2 SHA1 43a5861afa0903d111be7d493cfe31f5ce915092 SHA256 172f2a9d15660e4cc8b1ebbddb9a38abfc3d7d20a306fe3a3d00a944b234af05
 EBUILD rack-1.1.2.ebuild 1356 RMD160 cf3e1890672a776cec3ac66ef2eb2fd09fb865f0 SHA1 4af7aab8c68e9d92e05a092d254d8f11aa7e0cad SHA256 0e0672e3a351f0c11326fecc06ed54546af4ae8db996aa40ef1ffe16cccfebd2
 EBUILD rack-1.2.3.ebuild 1690 RMD160 751f206621da2567bd544b9179d158401d90d68a SHA1 1190349f20f6c29d3fc6a37c1dbfba220bf5bd5e SHA256 84d6c4334ad99929e4e6ec04eeee162a5af6a6e5cb87c78921c6386ac2c57151
 EBUILD rack-1.2.4-r1.ebuild 2439 RMD160 d714e74f1310f47f5bd9d24d73f6ed724140d9ac SHA1 02e9b52a3c6894457884f92792d599cf890ad602 SHA256 3f62b11636c4f360c2f24a2917a1201ad1e2031491f322e5f56699740a03b2b5
+EBUILD rack-1.2.4-r2.ebuild 2464 RMD160 a217c76ecfb127fd2aaf7eaa8f162afc2957427d SHA1 c8645467f9f67c7978bdc96d2565fb9db0eb46e0 SHA256 7672781efef24c6d172eecfab9493b0d3adbf5d310de0c84742d227aedcbbf20
 EBUILD rack-1.2.4.ebuild 1683 RMD160 3daff284889b0aade46b7a560cdf348bf96b3b58 SHA1 43290d2990f329e01382a61afd561d3a1551d631 SHA256 337f4222b895826d28ace7bc511916a8015e06593a3b9303ec55fa55b2e4c173
-MISC ChangeLog 8204 RMD160 8865174b51e37716424220adfcdc90d241d9698e SHA1 d12248e158008ce8973997e44d8f7d15ac157547 SHA256 2565d4e030393779e3646b57447e535e672cd2bd493b1eb18a2404bac864b36e
+EBUILD rack-1.3.5.ebuild 1852 RMD160 84f54f5969575e116a5257517102274e12d30b95 SHA1 e640b9ce2b0d5a98625c9f3c9e34047885c6c0c2 SHA256 d730cd014101e64def8a239a557d0732f9426cd88f380dcb2061edb9f82a638b
+MISC ChangeLog 8431 RMD160 b559c390a0bb85774b758797982803453807655e SHA1 decd8bc432b844bf0e37aa8c29d7c888a6c3f30f SHA256 f886e3faf36cfd1d56a43baea4e4f6b770adfc5d584dce9cc32ddcba66c06c15
 MISC metadata.xml 298 RMD160 346a19f2ad30420333de0e18f6885d39c45199f9 SHA1 aa0efe5a5420481faf50930f7e9934fdce3f15f3 SHA256 4433420c9bacb25a180e376175271d9fa41ab158ac71638fb8cccc460370899b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk7srSEACgkQiIP6VqMIqNfJ3wD/Q/4Mu4Lgt3HSAdqEJd1c3zfA
-wQfJn7QhO5FldkXkhsYA/0TyG8vC6pgf6daoDbnysBIlJE1GYTKV3JrZieC8vRn8
-=T7+Z
+iF4EAREIAAYFAk71hzwACgkQiIP6VqMIqNeeFQD/XRDxta3yewsFV2mbz6xIdCuI
+6gcikPKY4wF3oCaMLekA/0UugDPqUitDbLWO7dyd9QYJ6v21NuRyHfIYJTeH/NkE
+=HsL/
 -----END PGP SIGNATURE-----

diff --git a/dev-ruby/rack/rack-1.2.4-r2.ebuild b/dev-ruby/rack/rack-1.2.4-r2.ebuild
new file mode 100644 (file)
index 0000000..81a42b4
--- /dev/null
+++ b/dev-ruby/rack/rack-1.2.4-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.2.4-r2.ebuild,v 1.1 2011/12/24 08:03:02 graaff Exp $
+
+EAPI="2"
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog KNOWN-ISSUES README SPEC"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eutils versionator
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="http://rubyforge.org/projects/rack"
+SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+# The gem has automagic dependencies over mongrel, ruby-openid,
+# memcache-client, thin, mongrel and camping; not sure if we should
+# make them dependencies at all. We do add the fcgi dependency because
+# that spec isn't optional.
+ruby_add_bdepend "test? ( dev-ruby/bacon dev-ruby/ruby-fcgi )"
+
+# Block against versions in older slots that also try to install a binary.
+RDEPEND="${RDEPEND} !<dev-ruby/rack-1.1.0-r1:0"
+
+#USE_RUBY=ruby19 \
+#      ruby_add_bdepend "ruby_targets_ruby19 test" '=dev-ruby/test-unit-1*'
+
+all_ruby_prepare() {
+       epatch "${FILESDIR}"/${PN}-1.2.1-gentoo.patch
+
+       # Add missing require for Mutex use. This may show up in the tests
+       # depending on load order.
+       sed -i -e '1 irequire "thread"' lib/rack/lock.rb || die
+}
+
+each_ruby_prepare() {
+       case ${RUBY} in
+               *ruby19)
+                       # Avoid failing encoding-related specs, most likely due to
+                       # changes in handling of encodings in newer ruby 19
+                       # versions.
+                       sed -i -e '/escape non-UTF8 strings/,/end/ s:^:#:' test/spec_utils.rb || die
+                       sed -i -e '/escape html entities in unicode strings/,/end/ s:^:#:' test/spec_utils.rb || die
+                       sed -i -e '/escape html entities even on MRI/,/^  end/ s:^:#:' test/spec_utils.rb || die
+                       sed -i -e '/accept params and build multipart encoded params/,/^  end/ s:^:#:' test/spec_mock.rb || die
+                       ;;
+               *)
+                       ;;
+       esac
+}
+
+each_ruby_test() {
+       # Since the Rakefile calls specrb directly rather than loading it, we
+       # cannot use it to launch the tests or only the currently-selected
+       # RUBY interpreter will be tested.
+       ${RUBY} -S bacon -Ilib -w -a \
+               -q -t '^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|rackup)' \
+               || die "test failed for ${RUBY}"
+}

diff --git a/dev-ruby/rack/rack-1.3.5.ebuild b/dev-ruby/rack/rack-1.3.5.ebuild
new file mode 100644 (file)
index 0000000..9c16bcf
--- /dev/null
+++ b/dev-ruby/rack/rack-1.3.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.3.5.ebuild,v 1.1 2011/12/24 08:03:02 graaff Exp $
+
+EAPI="2"
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog KNOWN-ISSUES README.rdoc SPEC"
+
+inherit ruby-fakegem eutils versionator
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="http://rubyforge.org/projects/rack"
+SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+# The gem has automagic dependencies over mongrel, ruby-openid,
+# memcache-client, thin, mongrel and camping; not sure if we should
+# make them dependencies at all. We do add the fcgi dependency because
+# that spec isn't optional.
+ruby_add_bdepend "test? ( dev-ruby/bacon dev-ruby/ruby-fcgi )"
+
+# Block against versions in older slots that also try to install a binary.
+RDEPEND="${RDEPEND} !<dev-ruby/rack-1.1.0-r1:0 !<dev-ruby/rack-1.2.4-r2:1.2"
+
+all_ruby_prepare() {
+       epatch "${FILESDIR}"/${PN}-1.2.1-gentoo.patch
+}
+
+each_ruby_prepare() {
+       case ${RUBY} in
+               *jruby)
+                       # Avoid two failing tests due to bugs in jruby that should
+                       # be solved in 1.6.5 or 1.7.
+                       rm test/spec_deflater.rb || die
+                       ;;
+               *)
+                       ;;
+       esac
+}
+
+each_ruby_test() {
+       # Since the Rakefile calls specrb directly rather than loading it, we
+       # cannot use it to launch the tests or only the currently-selected
+       # RUBY interpreter will be tested.
+       ${RUBY} -S bacon -Ilib -w -a \
+               -q -t '^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|Rack::Server)' \
+               || die "test failed for ${RUBY}"
+}