From: Manuel Rüger Date: Tue, 18 Nov 2014 13:53:36 +0000 (+0000) Subject: Cleanup unused patches. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0a4f53972f4244090eea0dfbdf40466dc4104d4c;p=gentoo.git Cleanup unused patches. Package-Manager: portage-2.2.14/cvs/Linux x86_64 --- diff --git a/dev-ruby/actionmailer/ChangeLog b/dev-ruby/actionmailer/ChangeLog index 7e35f201f40c..702cd9785643 100644 --- a/dev-ruby/actionmailer/ChangeLog +++ b/dev-ruby/actionmailer/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-ruby/actionmailer # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.276 2014/11/17 20:19:39 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionmailer/ChangeLog,v 1.277 2014/11/18 13:46:38 mrueg Exp $ + + 18 Nov 2014; Manuel Rüger + -files/actionmailer-2.3.10-rails3.patch, + -files/actionmailer-2.3.9-require-uri.patch: + Cleanup unused patches. *actionmailer-4.1.8 (17 Nov 2014) *actionmailer-4.0.12 (17 Nov 2014) diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest index 75500554bd63..2094bf98926c 100644 --- a/dev-ruby/actionmailer/Manifest +++ b/dev-ruby/actionmailer/Manifest @@ -1,8 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX actionmailer-2.3.10-rails3.patch 431 SHA256 4eec1446601ffef54a0e8e210ed53b1d72676ab035cf0ab1d8844f11b5611cde SHA512 2421cb97ec78f6a4fe8a191e90cac51f05a4f0389aae574c3f89542feacf7d0d7c589165ec0fac2072704df00117a783d5e9e51cc706f50d5cb1809039a7288c WHIRLPOOL 016e524c2602413b013efda5288274a3b3cf53c101772af27fd03d368941b06b6dfee01ca73b12a0fea71b5ea2eb035f10a63138823483621eb26fda547f7577 -AUX actionmailer-2.3.9-require-uri.patch 507 SHA256 8aa2121eecea068632f38cc03cedf694e22896f1e57dd9bca912585c5fb14efe SHA512 c6236d36edbf711f6511d002d53b11aefc88efa5d72e8d44799286279f3af9ad7fee72d872df7d15c02d2a333230279cdebaa546c1d0d0860e2377243cb35bb9 WHIRLPOOL f43892b7a4bf9ea84c03e81dc902a29414777f951d4e0f8aec62c8886dcd76950ae64aff7b8239f1263e3b0e9dcbb55440cc059d9db0978dc79a4d8cba2e32e1 DIST rails-3.2.20.tgz 3567367 SHA256 373e66ad1ea7af66504e676b0925806a20532673e2d9da7fa0131aa0559dad5c SHA512 2f39d14c1543e203a6e182528967bfa00d08a29872fd233022e2c3bd6e1a1d4cac754016258c1d7f5f821942e83d5c0f4df39a8c4fa4d5d7ba135f79bcda26a3 WHIRLPOOL e011cccc18a74ed924368077a90e43b14824e460f0d05fbe4c1a4a3092df2fb63808c148190b0f4920bf60ea94fd1be5f56f0d628e8afaf431fb9ba702fa6f71 DIST rails-3.2.21.tgz 3568729 SHA256 95dcf2a848a7fd09acbb12c47e6901baeea08645c32c37e2ae04e2650cf01deb SHA512 952c799736dd2a48532a4340d97ffbbbdc2451fc509e7f86ca47c09f5c6a3f4e5cb9b87c3e803692bc8a810bc178513bbe74f3037fdf8f786c30f0c85dd26948 WHIRLPOOL a2c79df0091ea0ca6f3969a91b4d73c14f79cab9d31ec30591a640321487aedafd0318326080ad4d9be0523002eab2c3c5e9e49b2c6b0b5ef6f5dac8da0bfab5 DIST rails-4.0.11.tgz 3759423 SHA256 cb44b605bc0e6477c9cf389f9c6a8274de10de6a98f979a53ef8505b7eed9e33 SHA512 a38eee261aa76070417ea248ac8f79536f19a75e5ee4bf16ae59f1eff5a9c751b033257a5cdbd1cfdcd80796142ef2ea1f8b2be5cc73604e96759fe2979f9b41 WHIRLPOOL e4b52b5f3d3ddae13ce4aefa1f5890813370de7874e8c5edce1e4f1df32704782babe52013dfa96cf4e60327429602f7b9534af2c19a9ef269d179186a8e1b62 @@ -15,12 +10,5 @@ EBUILD actionmailer-4.0.11.ebuild 1424 SHA256 eec545e7294bc68f6ab0dd20c67e9c2315 EBUILD actionmailer-4.0.12.ebuild 1424 SHA256 48bc11b8f98fb01a5851d2da6d564c31d2b65b2ab840551c81d5e3f376e55121 SHA512 a9da6c3d13367988976d55a0eb7fc6c5a7f0d96b198393be08c8dfdb9ffe453dbf116136d8ec71a8a588c27e73ad44dab632e55419ff2d4670a9b93312933773 WHIRLPOOL 06b29e90d4b049dde22ee8c2d19728376be5d478498c0d23263270da5c05da5fdee9e5c1462bf6ad5b745a45fa92bb8da82ef848685c50494bf44ca7c7573c15 EBUILD actionmailer-4.1.7.ebuild 1252 SHA256 a84f535ccc8929c6f6210b8f224fa2c99299a02cc6f2aeab98948b3e38f0b51d SHA512 daae68c0358a175cb952c61d7ad635d4db20ca4e0db45266102576658e4e467278a24619a5fc5dd09f47baa0bf589b5525de075e3e6f9d90c4423dfbf25c0949 WHIRLPOOL 55323bf72ec314db4319f1bc96e4e3027b927d908393eba783251f5b2c9e4e39f383dd0faeb802706c5b5fc3cb19118c12ba4e8a33fc2798e13ca87ce9456c77 EBUILD actionmailer-4.1.8.ebuild 1469 SHA256 6679289105b18e8906d96ba048f5144b5a9a89d8755543300b7598bab36e320e SHA512 059d93cb3cf1bf4b40f0933b6d53d919868510b8949e8cc7c046b0f622069e73eace8b6642553d6335312212531c17a361692ec9cfe911a76bb9b137ace61507 WHIRLPOOL 3ca4b30eedf202c6f16306c957b2f35bd0b4f28757243fc3c3b3ce68fabac685c84a8c56ae6b002873db3e1c70d393f93b848828393ac81cf4693566ff7393a8 -MISC ChangeLog 38437 SHA256 99afd4fc7ebd2e8c56cb5fd5c68b11ff4e275fe4e2fbeeadd02a713b2c661554 SHA512 9042bb4d87631621ce03a78b405a77ae3b4e91aac110b99c5b1928e39ef3bef820257a377d425697b37649c446a8bff835795517797fb5a063b8a8ed92d48f13 WHIRLPOOL 7291f390d4a33ac36aedd0d239f14f97bda82b54d4c701bad88f5453e5eda556cac15c121fe5f83272fb763a4ad777ce0fda85396f5df52e006383b24444d24d +MISC ChangeLog 38601 SHA256 95bce2191a72424310f9514a6f7013bd66b2d464eeb030a0f4f5bb3eeb66b89a SHA512 1e12eee72e15d7568ba8caa88db5002a3106b3593dd82e684ae53a893fdd4cc5a885f8a448a124d69412696e2fe3c175efb25bba40aa04e4d7839eb56515ce79 WHIRLPOOL affcdfef071d5b6d68fd1e5bbb54b897a9e86c1d1815c7cfd510a00f8ff232f3ee6c535e417b05a554cd0e28a1204aa189832b0825155fbbb245770d36216a10 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iF4EAREIAAYFAlRqWFwACgkQiIP6VqMIqNdgzgEAlSCTuQ62oj8oX+4ujNQnCoBH -lud2GRV9lJQUHnco7dAA/0EAq6zBpU4tIyGc+x+5ghUHHb2YP/LEuubm16j5QwIr -=xqPa ------END PGP SIGNATURE----- diff --git a/dev-ruby/actionmailer/files/actionmailer-2.3.10-rails3.patch b/dev-ruby/actionmailer/files/actionmailer-2.3.10-rails3.patch deleted file mode 100644 index 8e0bf276f5b3..000000000000 --- a/dev-ruby/actionmailer/files/actionmailer-2.3.10-rails3.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- test/abstract_unit.rb.~1~ 2011-02-21 20:35:21.775255045 +0100 -+++ test/abstract_unit.rb 2011-02-21 20:39:26.051025768 +0100 -@@ -1,6 +1,8 @@ - require 'rubygems' - require 'test/unit' - -+gem 'activesupport', '~>2.3' -+gem 'actionpack', '~>2.3' - $:.unshift File.expand_path('../../lib', __FILE__) - $:.unshift File.expand_path('../../../activesupport/lib', __FILE__) - $:.unshift File.expand_path('../../../actionpack/lib', __FILE__) diff --git a/dev-ruby/actionmailer/files/actionmailer-2.3.9-require-uri.patch b/dev-ruby/actionmailer/files/actionmailer-2.3.9-require-uri.patch deleted file mode 100644 index ddf9cd537522..000000000000 --- a/dev-ruby/actionmailer/files/actionmailer-2.3.9-require-uri.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/5555-actionmailer-239-should-now-require-uri - ---- lib/action_mailer/base.rb.orig 2010-09-05 10:56:52.424972729 +0200 -+++ lib/action_mailer/base.rb 2010-09-05 10:56:59.760472595 +0200 -@@ -247,6 +247,7 @@ - class Base - include AdvAttrAccessor, PartContainer, Quoting, Utils - if Object.const_defined?(:ActionController) -+ require 'uri' - include ActionController::UrlWriter - include ActionController::Layout - end diff --git a/dev-ruby/actionpack/ChangeLog b/dev-ruby/actionpack/ChangeLog index 1cb63e0458aa..5a95e1021750 100644 --- a/dev-ruby/actionpack/ChangeLog +++ b/dev-ruby/actionpack/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-ruby/actionpack # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.295 2014/11/17 20:19:20 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/ChangeLog,v 1.296 2014/11/18 13:45:33 mrueg Exp $ + + 18 Nov 2014; Manuel Rüger + -files/actionpack-2.3.10-i18n-0.4.2.patch, + -files/actionpack-2.3.11-rails3.patch, + -files/actionpack-2.3.8-custom-cookie-fix.patch: + Cleanup unused patches. *actionpack-4.1.8 (17 Nov 2014) *actionpack-4.0.12 (17 Nov 2014) diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest index 0cea9ce9de99..bcfb4c648352 100644 --- a/dev-ruby/actionpack/Manifest +++ b/dev-ruby/actionpack/Manifest @@ -1,9 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX actionpack-2.3.10-i18n-0.4.2.patch 2671 SHA256 7060319a5037c3623e8c5beb36133dde6d3e358746fecfc0ee072edbec5b33e5 SHA512 d9e258d26b60166987649b52e7edccc22c37f8e915688a2ceee7088b853a1ca262cf34630b5712c7a02f027984b4eb37296d1274475a16317cbb5778777cd173 WHIRLPOOL cfaa63240a403b09b23893f76205aacc317e010936cca8cd46b7603eab4aacf7c2b09974ff3d5533524f40eb4318db30c0bab3403a688588da194ee2c6df17c7 -AUX actionpack-2.3.11-rails3.patch 416 SHA256 8b2dc793f9e8b996c57dc77b3898a54757f330b8c95ee94c9bdf3b0013350093 SHA512 3e9540bb1777b29736285561ce1d7466f0497150927d40169fd5ce222f803df595105c9f222ff223e923b8b5411d90a92d265b727104f1f494693a7bb100b3d2 WHIRLPOOL 3000e6b584ff572e246d2b281cda1075449af85f905dff6bf591f75de60145868e81af7753882b29af48d45e69f79db3898610646ac5af7862e13f0e24dfbdfe -AUX actionpack-2.3.8-custom-cookie-fix.patch 3009 SHA256 9368cd7b35fbc0b5d4161e121aa9ced113ea831b738a47b6c59828bb17f24c04 SHA512 4e8a1ed63446c946722922b2cd5901b27df4ddcd7125b0c1777148e675117537e9394ba998093667f79e1349ec79a61b7e2e9c6d704327a3e000992f7ae3deb9 WHIRLPOOL e7a716f7b45b8f20eeb0be4faacdb973b172a7f44168862a228ce242afd88db512c73b64cf9bb8faab1e5ca698e65dad8746ca1fbf7cbdf9273819d722c3d32e DIST rails-3.2.20.tgz 3567367 SHA256 373e66ad1ea7af66504e676b0925806a20532673e2d9da7fa0131aa0559dad5c SHA512 2f39d14c1543e203a6e182528967bfa00d08a29872fd233022e2c3bd6e1a1d4cac754016258c1d7f5f821942e83d5c0f4df39a8c4fa4d5d7ba135f79bcda26a3 WHIRLPOOL e011cccc18a74ed924368077a90e43b14824e460f0d05fbe4c1a4a3092df2fb63808c148190b0f4920bf60ea94fd1be5f56f0d628e8afaf431fb9ba702fa6f71 DIST rails-3.2.21.tgz 3568729 SHA256 95dcf2a848a7fd09acbb12c47e6901baeea08645c32c37e2ae04e2650cf01deb SHA512 952c799736dd2a48532a4340d97ffbbbdc2451fc509e7f86ca47c09f5c6a3f4e5cb9b87c3e803692bc8a810bc178513bbe74f3037fdf8f786c30f0c85dd26948 WHIRLPOOL a2c79df0091ea0ca6f3969a91b4d73c14f79cab9d31ec30591a640321487aedafd0318326080ad4d9be0523002eab2c3c5e9e49b2c6b0b5ef6f5dac8da0bfab5 DIST rails-4.0.11.tgz 3759423 SHA256 cb44b605bc0e6477c9cf389f9c6a8274de10de6a98f979a53ef8505b7eed9e33 SHA512 a38eee261aa76070417ea248ac8f79536f19a75e5ee4bf16ae59f1eff5a9c751b033257a5cdbd1cfdcd80796142ef2ea1f8b2be5cc73604e96759fe2979f9b41 WHIRLPOOL e4b52b5f3d3ddae13ce4aefa1f5890813370de7874e8c5edce1e4f1df32704782babe52013dfa96cf4e60327429602f7b9534af2c19a9ef269d179186a8e1b62 @@ -16,12 +10,5 @@ EBUILD actionpack-4.0.11.ebuild 2210 SHA256 425777da07fff133ed6382036c1635ff5b72 EBUILD actionpack-4.0.12.ebuild 2210 SHA256 55074c62a45469628116ba010355126ca111499f15728537d0ec5e6d04389d17 SHA512 35965c418d1aba00120485d68dc6e83aab3373b82a7455f7359c408823298d20c8c445505171775397928d6389877462ade866f7618c0775eef84c46a5d5cf5e WHIRLPOOL 8dc6816df571f4c4e534a7050c6ff8d0e6bcb6871527928fbaf5a58c7b578cdfa302323fc825757eeb6d6d91255e5256d4cfc5a7d582ba0ac29bf34418b854a8 EBUILD actionpack-4.1.7.ebuild 1437 SHA256 11ac1dfe2fc4a0aef2dc6d7f84891e72da0e1f1e4dc71a78ebc8977fe643a977 SHA512 aefcde717b2bdc09ff6d9ec10255a10b2ea897ba82900888c29f6346530d225c0f9832d07647d1fc2b6c18506a9c93621748298c331c8920371a44c08f81565d WHIRLPOOL f276732499d3888015be3f53705e47ad9f8e9c505e57a7bfc10814a191a0b677c20a6ac4c15b8ba76871eca466cfc36965765571f0506115bcddb2c60291971b EBUILD actionpack-4.1.8.ebuild 1437 SHA256 6a680e1ecc3398dd86353de1e38f88cef20a457b6e62d2e44e452631130c4533 SHA512 62a0537b5dc484f8a07f256b43b303e92583a30eddd52cd6be7ec3c9894303fdf50429a3dbc9b0884aed12ba9d15cb060b560003cc7d909306b3200943a98cd2 WHIRLPOOL 0a30e22ca37a0af15570dd3c0c94028677a912d48f8fcc44affbaa8ab51f0f859feb5e9afacf829580568be70baa1ddb672a2a1c584f903c2b8a3fc0940a7459 -MISC ChangeLog 40500 SHA256 8ac44e90beef8b1097bee8afdc08cd7378438cd06de5e2e34aaf9c89dd64eb06 SHA512 094db649805ff8ba7b663e5529e4a0440763d43ceaab3a978a36c2eda3646235a027fe2d8f5772d6d80e4e15793f4b867bd5a043e1a07be2e0ef453ceeb14956 WHIRLPOOL 594bbcdd3c48fe8b8a3d26b68ffab450d9862f37cd4b41a3a1d88942ab82197589164e7445131fea4f6ede3c865b0aafba32e61bb0a20bbfd29ba32d4f5c0744 +MISC ChangeLog 40711 SHA256 8dea53b9d3b46e7e656e8bdce2f91c01a3e490f9e3ee3df3edafb4a998973f74 SHA512 d127d54bf1283136c8ceff2dd1568a3fcc4fb3d6bf0e1e6cf144a31356deb9f0076bb186b52ab31a34c1ee7cde6df5310ea99de489789ded9a1c821d1fab4434 WHIRLPOOL a316196dd3102abc281d536e8df92e0574a469f5aee235628e5a2050a1719a5b9aa65e46337814477cd13baa62dad2782e038bc5341a79e0797a080139fe198d MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iF4EAREIAAYFAlRqWEkACgkQiIP6VqMIqNe/BgD9EhrcHvUBK6XXq8mXxtNh/Py3 -Q8cHqjzq5O4+unTHctwA/3kv9pS7ZJ93CYd58h2Y5Qx/bH0ZWX7M3eMNp1AiuGHr -=3rsg ------END PGP SIGNATURE----- diff --git a/dev-ruby/actionpack/files/actionpack-2.3.10-i18n-0.4.2.patch b/dev-ruby/actionpack/files/actionpack-2.3.10-i18n-0.4.2.patch deleted file mode 100644 index 95efd54f5f42..000000000000 --- a/dev-ruby/actionpack/files/actionpack-2.3.10-i18n-0.4.2.patch +++ /dev/null @@ -1,45 +0,0 @@ -Add additional shoulda expectations to cover apparently changed -semantics from i18n 0.4.1 > 0.4.2. It's not clear what changed -exactly, and it could well be a bug in actionpack which doesn't seem -to pass the locale along to all calls in some of these methods. Not -investigated further yet since all Rails development is aimed at Rails -3. - - ---- test/template/number_helper_i18n_test.rb.~1~ 2011-02-20 15:51:40.792064192 +0100 -+++ test/template/number_helper_i18n_test.rb 2011-02-20 16:42:56.067596179 +0100 -@@ -20,6 +20,8 @@ - end - - def test_number_to_currency_translates_currency_formats -+ I18n.expects(:translate).twice.with(:'number.format', {:locale => nil, :raise => true}).returns({}) -+ I18n.expects(:translate).with(:'number.precision.format', {:locale => nil, :raise => true}).returns({}) - I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults) - I18n.expects(:translate).with(:'number.currency.format', :locale => 'en', - :raise => true).returns(@currency_defaults) -@@ -27,6 +29,7 @@ - end - - def test_number_with_precision_translates_number_formats -+ I18n.expects(:translate).with(:'number.format', {:locale => nil, :raise => true}).returns({}) - I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults) - I18n.expects(:translate).with(:'number.precision.format', :locale => 'en', - :raise => true).returns(@precision_defaults) -@@ -39,6 +42,8 @@ - end - - def test_number_to_percentage_translates_number_formats -+ I18n.expects(:translate).twice.with(:'number.format', {:locale => nil, :raise => true}).returns({}) -+ I18n.expects(:translate).with(:'number.precision.format', {:locale => nil, :raise => true}).returns({}) - I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults) - I18n.expects(:translate).with(:'number.percentage.format', :locale => 'en', - :raise => true).returns(@percentage_defaults) -@@ -46,6 +51,8 @@ - end - - def test_number_to_human_size_translates_human_formats -+ I18n.expects(:translate).twice.with(:'number.format', {:locale => nil, :raise => true}).returns({}) -+ I18n.expects(:translate).with(:'number.precision.format', {:locale => nil, :raise => true}).returns({}) - I18n.expects(:translate).with(:'number.format', :locale => 'en', :raise => true).returns(@number_defaults) - I18n.expects(:translate).with(:'number.human.format', :locale => 'en', - :raise => true).returns(@human_defaults) diff --git a/dev-ruby/actionpack/files/actionpack-2.3.11-rails3.patch b/dev-ruby/actionpack/files/actionpack-2.3.11-rails3.patch deleted file mode 100644 index b958d463fc4c..000000000000 --- a/dev-ruby/actionpack/files/actionpack-2.3.11-rails3.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- test/abstract_unit.rb.~1~ 2011-02-10 08:12:37.551582393 +0100 -+++ test/abstract_unit.rb 2011-02-10 08:13:37.845418027 +0100 -@@ -19,6 +19,10 @@ - # Debugging disabled. `gem install ruby-debug` to enable. - end - -+gem 'activesupport', '~> 2.3' -+gem 'actionmailer', '~> 2.3' -+gem 'activerecord', '~> 2.3' -+ - require 'action_controller' - require 'action_controller/cgi_ext' - require 'action_controller/test_process' diff --git a/dev-ruby/actionpack/files/actionpack-2.3.8-custom-cookie-fix.patch b/dev-ruby/actionpack/files/actionpack-2.3.8-custom-cookie-fix.patch deleted file mode 100644 index ecfe4d68546c..000000000000 --- a/dev-ruby/actionpack/files/actionpack-2.3.8-custom-cookie-fix.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 09e81c7069341ab219ddbd74817feea4a09b8172 Mon Sep 17 00:00:00 2001 -From: Jesse Storimer -Date: Tue, 1 Jun 2010 08:35:25 -0400 -Subject: [PATCH] CookieStore should preserve the Set-Cookie header Array [#4743 state:resolved] - ---- - .../lib/action_controller/session/cookie_store.rb | 7 ++----- - .../test/controller/session/cookie_store_test.rb | 18 ++++++++++++++++-- - 2 files changed, 18 insertions(+), 7 deletions(-) - -diff --git a/actionpack/lib/action_controller/session/cookie_store.rb b/actionpack/lib/action_controller/session/cookie_store.rb -index 3d21e81..2fcee56 100644 ---- a/actionpack/lib/action_controller/session/cookie_store.rb -+++ b/actionpack/lib/action_controller/session/cookie_store.rb -@@ -114,11 +114,8 @@ module ActionController - end - - cookie = build_cookie(@key, cookie.merge(options)) -- unless headers[HTTP_SET_COOKIE].blank? -- headers[HTTP_SET_COOKIE] << "\n#{cookie}" -- else -- headers[HTTP_SET_COOKIE] = cookie -- end -+ headers[HTTP_SET_COOKIE] = [] if headers[HTTP_SET_COOKIE].blank? -+ headers[HTTP_SET_COOKIE] << cookie - end - - [status, headers, body] -diff --git a/actionpack/test/controller/session/cookie_store_test.rb b/actionpack/test/controller/session/cookie_store_test.rb -index 5ef8eec..02e9ed2 100644 ---- a/actionpack/test/controller/session/cookie_store_test.rb -+++ b/actionpack/test/controller/session/cookie_store_test.rb -@@ -44,6 +44,12 @@ class CookieStoreTest < ActionController::IntegrationTest - head :ok - end - -+ def set_session_value_and_cookie -+ cookies["foo"] = "bar" -+ session[:foo] = "bar" -+ render :text => Rack::Utils.escape(Verifier.generate(session.to_hash)) -+ end -+ - def rescue_action(e) raise end - end - -@@ -96,7 +102,7 @@ class CookieStoreTest < ActionController::IntegrationTest - with_test_route_set do - get '/set_session_value' - assert_response :success -- assert_equal "_myapp_session=#{response.body}; path=/; HttpOnly", -+ assert_equal ["_myapp_session=#{response.body}; path=/; HttpOnly"], - headers['Set-Cookie'] - end - end -@@ -164,7 +170,7 @@ class CookieStoreTest < ActionController::IntegrationTest - get '/set_session_value' - assert_response :success - session_payload = response.body -- assert_equal "_myapp_session=#{response.body}; path=/; HttpOnly", -+ assert_equal ["_myapp_session=#{response.body}; path=/; HttpOnly"], - headers['Set-Cookie'] - - get '/call_reset_session' -@@ -193,6 +199,14 @@ class CookieStoreTest < ActionController::IntegrationTest - end - end - -+ def test_setting_session_value_and_cookie -+ with_test_route_set do -+ get '/set_session_value_and_cookie' -+ assert_response :success -+ assert_equal({"_myapp_session" => response.body, "foo" => "bar"}, cookies) -+ end -+ end -+ - private - def with_test_route_set - with_routing do |set| --- -1.7.1 - diff --git a/dev-ruby/activerecord/ChangeLog b/dev-ruby/activerecord/ChangeLog index bd84701e8d79..ad34faf24d32 100644 --- a/dev-ruby/activerecord/ChangeLog +++ b/dev-ruby/activerecord/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-ruby/activerecord # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.282 2014/11/17 20:20:00 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.283 2014/11/18 13:51:56 mrueg Exp $ + + 18 Nov 2014; Manuel Rüger + -files/activerecord-2.3.10-rails3.patch, + -files/activerecord-2.3.14-dynamic-finder-injection.patch, + -files/activerecord-2.3.15-null-array-param.patch, + -files/activerecord-2.3.8-add-index-with-symbol.patch: + Cleanup unused patches. *activerecord-4.1.8 (17 Nov 2014) *activerecord-4.0.12 (17 Nov 2014) diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest index fba2aefc5984..e1fe23c2e243 100644 --- a/dev-ruby/activerecord/Manifest +++ b/dev-ruby/activerecord/Manifest @@ -1,10 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX activerecord-2.3.10-rails3.patch 295 SHA256 96422289122ca769d24f488bc9ab9af9cdda4162ad83a3fe27894b04106d8567 SHA512 0aea58d477b1be3b664e12895316fb8b39c4e6770107a96cef1331cc483f19126709b99d2b4c257c4b10c03ad4d355e57af8ea82df25740851ab6037e745826c WHIRLPOOL 278f8d6457834fb449f725445bb399321e3040913b74594b990929383cbe51d28bdfd127154e089aa5ae18ec144f5561a18f1635c443b0965c326c64916eddbe -AUX activerecord-2.3.14-dynamic-finder-injection.patch 2138 SHA256 d24dcb57517b5dc5056a91bea1dd7ac63a587dd6a7fba7bc9e621fbe18fbe26e SHA512 23d12fbd4ff6ba51f3f17bd35c79e71b5304926780626898fcfb0709a12d8403421d939fff615673963f40afc663b62935701eec4a2c0184c943c6345c17bc61 WHIRLPOOL 753facd9e94cb474f09803b8ee19b1afccf4661e7a1eb7a3c20ff66c2355fdf37a772124f2b8b355ea123f2effd615b1eb16d38a74d99f3f855686aeb0291753 -AUX activerecord-2.3.15-null-array-param.patch 907 SHA256 eaac6a89147c2f4ff0cf75301ac199adcdb18bec3b856af005805aac41677651 SHA512 d18ef97cd98b25055a3865789452f32e15e08718c2288f741e6f33c9a5441ca47f4030ef4e4a6d305b59bf68030686cfa637458f75abd6cf84120a6cefae6de0 WHIRLPOOL 155df14956562306f55f5512c3da0fd19f5010c3c908db953d13b446491b8297a02ca3c743c5476c8d53d5505b077908620f72eea28f879709737ec9877db264 -AUX activerecord-2.3.8-add-index-with-symbol.patch 2588 SHA256 792750e8a065d78235d72d6549694bef3f2b3ffb537c699cd598d19d436a70cd SHA512 c03c3123a2ad65a121f682436f831b249f478a691f66baf2360588f7f9141d6cba992c107440d5095cc44311ea28268a5dd7a3bc3727c3f9d98fb0a771142bfc WHIRLPOOL 16e1f4357fd07446ffa1863c95512f9a371f8f96226f9c77a905971fe16d3213ba602665078f3e12c5b66ab765a6e5cee1d90fedd610691408ec0988024dbe25 DIST rails-3.2.20.tgz 3567367 SHA256 373e66ad1ea7af66504e676b0925806a20532673e2d9da7fa0131aa0559dad5c SHA512 2f39d14c1543e203a6e182528967bfa00d08a29872fd233022e2c3bd6e1a1d4cac754016258c1d7f5f821942e83d5c0f4df39a8c4fa4d5d7ba135f79bcda26a3 WHIRLPOOL e011cccc18a74ed924368077a90e43b14824e460f0d05fbe4c1a4a3092df2fb63808c148190b0f4920bf60ea94fd1be5f56f0d628e8afaf431fb9ba702fa6f71 DIST rails-3.2.21.tgz 3568729 SHA256 95dcf2a848a7fd09acbb12c47e6901baeea08645c32c37e2ae04e2650cf01deb SHA512 952c799736dd2a48532a4340d97ffbbbdc2451fc509e7f86ca47c09f5c6a3f4e5cb9b87c3e803692bc8a810bc178513bbe74f3037fdf8f786c30f0c85dd26948 WHIRLPOOL a2c79df0091ea0ca6f3969a91b4d73c14f79cab9d31ec30591a640321487aedafd0318326080ad4d9be0523002eab2c3c5e9e49b2c6b0b5ef6f5dac8da0bfab5 DIST rails-4.0.11.tgz 3759423 SHA256 cb44b605bc0e6477c9cf389f9c6a8274de10de6a98f979a53ef8505b7eed9e33 SHA512 a38eee261aa76070417ea248ac8f79536f19a75e5ee4bf16ae59f1eff5a9c751b033257a5cdbd1cfdcd80796142ef2ea1f8b2be5cc73604e96759fe2979f9b41 WHIRLPOOL e4b52b5f3d3ddae13ce4aefa1f5890813370de7874e8c5edce1e4f1df32704782babe52013dfa96cf4e60327429602f7b9534af2c19a9ef269d179186a8e1b62 @@ -17,12 +10,5 @@ EBUILD activerecord-4.0.11.ebuild 2670 SHA256 fa542384611431155f439089c94059f49e EBUILD activerecord-4.0.12.ebuild 2670 SHA256 1abd521fa48a1ddbf22603d0037bb6a68f204b3f79bb46b7d03bd58335d699f8 SHA512 579290f143cba2f4dede080281272562a10cf70f7918aeb31a7c34826212edfa5193d3008bdba1db7105c65a28ee1ed7d0b104e58c118c7494277ba4f01dd54f WHIRLPOOL 3f02601a84e2ba92f9d1d08a0c68444516225630503e6e663d9b75f1eca4bc263f0caef8cc9a248a29c118cee49ffaeebd481475b74f99015b67e1fa36847bd9 EBUILD activerecord-4.1.7.ebuild 2433 SHA256 d146ea46a9148d08c5019c1ac897267caa65b6e31311bcf80c866bd0b897a590 SHA512 6a59d930edc6886a9ad4cb9c2d9ef9680db57ec431c118f53fb7058a76a1049f7b071d2b0e2487ed975db561ca84e836c51a5bcc45359f6599915bdf1ed82fb4 WHIRLPOOL 4490f9e6eec9907aecaf47542e5a8b365c41a89e078454a3eebd8357d02a759757f63f2e3311317c5868d38d869e8350e6e92fb92b800a061cf01c88ea6f3099 EBUILD activerecord-4.1.8.ebuild 2433 SHA256 499ce48da5add1b80f0a1b6453c61851a0c060f3ff508ca175c9c30236c1cd3e SHA512 1e4779eb427bd88f1d81e94d3aad09abeec32a1464a45705ad8a2b9bcafc97c64758c214a840cd80a6a68091aa063e197aef7ce9893f3b763ece616075953a6c WHIRLPOOL b255358fd0d9f81b9441f57d7bde443ae5bbff224c35469f27cd108ae33f26439056b70e03c352f141bf49c8e5237001bb642951d859a33288388aabfb121cec -MISC ChangeLog 40037 SHA256 d9dc06c320fdaee83285761ebe7a6b49d3ab82562d85b7cf5e340f488610f177 SHA512 d7a53d9ea08f971d3146addcf39c203d4a7256e8def451109a1b57bac298af4ef262dac97cd7576a401dda455e09c5b65d7b2a34ae8d30614e1941e8340dd8a9 WHIRLPOOL cba106a5b58ab7ad86f67eb2a32bf81198884db5d57c1dfb181e10f3d83383446260ab224a50c5cb987c9c6fe50b19fe63669e6cbd27d70595270e625d3f0df7 +MISC ChangeLog 40325 SHA256 671c11444a60a90de4abc06be327d99e8eb52239a51cac107b4e27e179a8b239 SHA512 0b85952fa63d0a3eb121a32531d3bcf363018d0b89b16f23859aa95c870944a0c3d98b27793ae9d520d6d9c1272d9ba0c956928c25591afbfa78622a90115735 WHIRLPOOL 588ac06b81132041f7f075e2b3616cfb7fd51c65aeb2a48792f15b44624958ff2b0897d2d97d3962008af0783d9ef56d0e77147ed119fcc04df80f4bde6dd5f2 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iF4EAREIAAYFAlRqWHIACgkQiIP6VqMIqNcaFAD/eShCJrpmXseLZqDIjlkR3obZ -A3TM0csBMbZabQlzENcA/RlNhBAteq9v9g27CDUvoJgm4VH9FpGPx4Ip8P/WvP5C -=6Vp6 ------END PGP SIGNATURE----- diff --git a/dev-ruby/activerecord/files/activerecord-2.3.10-rails3.patch b/dev-ruby/activerecord/files/activerecord-2.3.10-rails3.patch deleted file mode 100644 index cf98f192a2ef..000000000000 --- a/dev-ruby/activerecord/files/activerecord-2.3.10-rails3.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- test/cases/helper.rb.~1~ 2011-02-21 20:49:54.892128120 +0100 -+++ test/cases/helper.rb 2011-02-21 20:50:49.833465960 +0100 -@@ -1,3 +1,5 @@ -+gem 'activesupport', '~>2.3' -+ - $:.unshift(File.dirname(__FILE__) + '/../../lib') - $:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib') - diff --git a/dev-ruby/activerecord/files/activerecord-2.3.14-dynamic-finder-injection.patch b/dev-ruby/activerecord/files/activerecord-2.3.14-dynamic-finder-injection.patch deleted file mode 100644 index 0da4470f5df7..000000000000 --- a/dev-ruby/activerecord/files/activerecord-2.3.14-dynamic-finder-injection.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 9de9b359d0d24f70f0f6c5c58a7ad8750684d456 Mon Sep 17 00:00:00 2001 -From: Aaron Patterson -Date: Sun, 23 Dec 2012 11:07:07 -0800 -Subject: [PATCH] CVE-2012-5664 options hashes should only be extracted if - there are extra parameters - ---- - activerecord/lib/active_record/base.rb | 6 +++++- - activerecord/test/cases/finder_test.rb | 12 ++++++++++++ - 2 files changed, 17 insertions(+), 1 deletion(-) - -diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb -index 461007f..809a38c 100755 ---- a/activerecord/lib/active_record/base.rb -+++ b/activerecord/lib/active_record/base.rb -@@ -1897,7 +1897,11 @@ module ActiveRecord #:nodoc: - # end - self.class_eval <<-EOS, __FILE__, __LINE__ + 1 - def self.#{method_id}(*args) -- options = args.extract_options! -+ options = if args.length > #{attribute_names.size} -+ args.extract_options! -+ else -+ {} -+ end - attributes = construct_attributes_from_arguments( - [:#{attribute_names.join(',:')}], - args -diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb -index c779a69..9e3ab92 100644 ---- a/activerecord/test/cases/finder_test.rb -+++ b/activerecord/test/cases/finder_test.rb -@@ -66,6 +66,18 @@ end - class FinderTest < ActiveRecord::TestCase - fixtures :companies, :topics, :entrants, :developers, :developers_projects, :posts, :comments, :accounts, :authors, :customers - -+ def test_find_by_id_with_hash -+ assert_raises(ActiveRecord::StatementInvalid) do -+ Post.find_by_id(:limit => 1) -+ end -+ end -+ -+ def test_find_by_title_and_id_with_hash -+ assert_raises(ActiveRecord::StatementInvalid) do -+ Post.find_by_title_and_id('foo', :limit => 1) -+ end -+ end -+ - def test_find - assert_equal(topics(:first).title, Topic.find(1).title) - end --- -1.7.10.2 (Apple Git-33) - diff --git a/dev-ruby/activerecord/files/activerecord-2.3.15-null-array-param.patch b/dev-ruby/activerecord/files/activerecord-2.3.15-null-array-param.patch deleted file mode 100644 index 609c108269c7..000000000000 --- a/dev-ruby/activerecord/files/activerecord-2.3.15-null-array-param.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0fdf0aa845eead13ee04022f2384b1fd108fc435 Mon Sep 17 00:00:00 2001 -From: Ernie Miller -Date: Tue, 8 Jan 2013 18:41:59 -0500 -Subject: [PATCH] Fix for CVE-2013-0155 - ---- - activerecord/lib/active_record/base.rb | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb -index 0179b00..cfc6e86 100755 ---- a/activerecord/lib/active_record/base.rb -+++ b/activerecord/lib/active_record/base.rb -@@ -2340,6 +2340,8 @@ module ActiveRecord #:nodoc: - def sanitize_sql_hash_for_conditions(attrs, default_table_name = quoted_table_name, top_level = true) - attrs = expand_hash_conditions_for_aggregates(attrs) - -+ return '1 = 2' if !top_level && attrs.is_a?(Hash) && attrs.empty? -+ - conditions = attrs.map do |attr, value| - table_name = default_table_name - --- -1.8.0.1 - diff --git a/dev-ruby/activerecord/files/activerecord-2.3.8-add-index-with-symbol.patch b/dev-ruby/activerecord/files/activerecord-2.3.8-add-index-with-symbol.patch deleted file mode 100644 index a35f09fdf4ae..000000000000 --- a/dev-ruby/activerecord/files/activerecord-2.3.8-add-index-with-symbol.patch +++ /dev/null @@ -1,55 +0,0 @@ -Fix for gentoo bug 329435 as reported in -https://rails.lighthouseapp.com/projects/8994/tickets/4891-rails-238-dbmigrate-gives-undefined-method-length-for-any_indexsymbol - -From 1ceabd624b8bc8c68ac98d951160aaff299d18a6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=89tienne=20Barri=C3=A9?= -Date: Fri, 18 Jun 2010 16:07:17 +0200 -Subject: [PATCH] Fix add_index with a symbol #4891 - ---- - .../abstract/schema_statements.rb | 3 ++- - activerecord/test/cases/migration_test.rb | 7 +++++++ - 2 files changed, 9 insertions(+), 1 deletions(-) - -diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb -index 4fa5881..ddac1f7 100644 ---- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb -+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb -@@ -273,7 +273,7 @@ module ActiveRecord - - if Hash === options # legacy support, since this param was a string - index_type = options[:unique] ? "UNIQUE" : "" -- index_name = options[:name] || index_name -+ index_name = options[:name].to_s if options[:name] - else - index_type = options - end -@@ -346,6 +346,7 @@ module ActiveRecord - # as there's no way to determine the correct answer in that case. - def index_exists?(table_name, index_name, default) - return default unless respond_to?(:indexes) -+ index_name = index_name.to_s - indexes(table_name).detect { |i| i.name == index_name } - end - -diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb -index 8517fe2..4b10062 100644 ---- a/activerecord/test/cases/migration_test.rb -+++ b/activerecord/test/cases/migration_test.rb -@@ -119,6 +119,13 @@ if ActiveRecord::Base.connection.supports_migrations? - end - end - -+ def test_index_symbol_names -+ assert_nothing_raised { Person.connection.add_index :people, :primary_contact_id, :name => :symbol_index_name } -+ assert Person.connection.index_exists?(:people, :symbol_index_name, true) -+ assert_nothing_raised { Person.connection.remove_index :people, :name => :symbol_index_name } -+ assert_equal true, !Person.connection.index_exists?(:people, :symbol_index_name, false) -+ end -+ - def test_add_index_length_limit - good_index_name = 'x' * Person.connection.index_name_length - too_long_index_name = good_index_name + 'x' --- -1.7.1 - diff --git a/dev-ruby/activesupport/ChangeLog b/dev-ruby/activesupport/ChangeLog index d4788b1ef8a1..d9a27ea54287 100644 --- a/dev-ruby/activesupport/ChangeLog +++ b/dev-ruby/activesupport/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-ruby/activesupport # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.273 2014/11/17 20:12:24 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.274 2014/11/18 13:44:54 mrueg Exp $ + + 18 Nov 2014; Manuel Rüger + -files/activesupport-2.3.14-unvendorize.patch, + -files/activesupport-2.3.15-unvendorize.patch, + -files/activesupport-2.3.16-unvendorize.patch, + -files/activesupport-2.3.5-mocha-0.9.5.patch, + -files/activesupport-3.0.3-mocha-0.9.5.patch: + Cleanup unused patches. *activesupport-4.1.8 (17 Nov 2014) *activesupport-4.0.12 (17 Nov 2014) diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest index 5a95fa11f6d6..b0033b54d701 100644 --- a/dev-ruby/activesupport/Manifest +++ b/dev-ruby/activesupport/Manifest @@ -1,11 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX activesupport-2.3.14-unvendorize.patch 2382 SHA256 e9c8c27437a24ec765df9dce35caaa353661bfe51dd50c71007e5be12b092ad1 SHA512 270a110323ad44f52488b17e0fe0a1a98f1367b313532fadddcc72e1e3967f7d0abb16b9f47306c6d7bdadf41cc92f768d945b3bc4f43e0c95d7fb050c75c530 WHIRLPOOL 0ef42aa0427914d01bd4ca1469b59879d1cc21d2997944456ed347702f8bca3897bdbd0886698328ac70044c34c56d548c7e74f37b30b76f97af77bb9b199742 -AUX activesupport-2.3.15-unvendorize.patch 2403 SHA256 67b1e963a7a824733b99c98aaa9479b1117490392393a781c13efbbfd7478ff8 SHA512 f481f103e870f56dba1422eaf6fff95cc4ffa271ab1f2b37530ba665d030f18865d2a3d1daf0a1a36d5e7560a63cc69f94f3eaa5b20c74a872d0a1c5f8a36b82 WHIRLPOOL a3d70a3fc9007dadd97b0ac90aa1dcb62939c63cf56455ec9e818f247c597e3213b3b844fccb0f60a47352b9c7dccd15119a425eb9451ddbd9243bc685f3ebe2 -AUX activesupport-2.3.16-unvendorize.patch 2382 SHA256 fda4f0aecd104d7516b8c6b0d3860b8ac257bc5898eebbb9e3761c1f8ab56c25 SHA512 6d53b4b33c04d8fe337687afd4285b72cf68b98a940f2d314cd03cb015d0b13c9fc01904b5a0036ce8a4cf627379a149655d40d0ffbc022dda8226c0504f60e3 WHIRLPOOL a3bcc1e10cd3f70deb353df130b382d43916f1d0a7d16202bd4b9012e3901d574a3476bf6b62a82d08bffd22c0795d3d07b1307ae0eff3da294dab9f1725032d -AUX activesupport-2.3.5-mocha-0.9.5.patch 1031 SHA256 238be71abfb03ca232d5c80c480da4e8f1ed8f8da6cfd89f7a64513b82cfd811 SHA512 3f98d2c18b7b2cf4cc03c425191201d6e59d83537bf01fbc09c35bfadaf45f05a24f694033edc3a30dab9b02eb865c3ba26f7e376e80d6ed1cbe14fc3c73f8a0 WHIRLPOOL 97e2622840b264bdda41c4ccc50315ff4dafafdaa422acf86e77f02bf5589155b2a7bd55a0a9886b0a8671932fa230d6bb76da07709e02509ce37b3c108964fa -AUX activesupport-3.0.3-mocha-0.9.5.patch 666 SHA256 61e62f5794f9291f3ad8315d5ce0379c25d491311fd30fb06d35f618ece61a5f SHA512 a2d986bdfd7f4376264af1995626d46abf4331fcd64d081bc6c9480e9dae8f4700a2ca6a995a922846c20bf64660fed2e39a7df537240701d0324be4faeaec32 WHIRLPOOL 5ed28791b7dec003a53e6a5a6454d86196b2201b7b3caa32b9971bf05dca59d8ab36b48cf0be604801d1bbc29f204e90b5d77f026aef9c412ad980ce257867db DIST rails-3.2.20.tgz 3567367 SHA256 373e66ad1ea7af66504e676b0925806a20532673e2d9da7fa0131aa0559dad5c SHA512 2f39d14c1543e203a6e182528967bfa00d08a29872fd233022e2c3bd6e1a1d4cac754016258c1d7f5f821942e83d5c0f4df39a8c4fa4d5d7ba135f79bcda26a3 WHIRLPOOL e011cccc18a74ed924368077a90e43b14824e460f0d05fbe4c1a4a3092df2fb63808c148190b0f4920bf60ea94fd1be5f56f0d628e8afaf431fb9ba702fa6f71 DIST rails-3.2.21.tgz 3568729 SHA256 95dcf2a848a7fd09acbb12c47e6901baeea08645c32c37e2ae04e2650cf01deb SHA512 952c799736dd2a48532a4340d97ffbbbdc2451fc509e7f86ca47c09f5c6a3f4e5cb9b87c3e803692bc8a810bc178513bbe74f3037fdf8f786c30f0c85dd26948 WHIRLPOOL a2c79df0091ea0ca6f3969a91b4d73c14f79cab9d31ec30591a640321487aedafd0318326080ad4d9be0523002eab2c3c5e9e49b2c6b0b5ef6f5dac8da0bfab5 DIST rails-4.0.11.tgz 3759423 SHA256 cb44b605bc0e6477c9cf389f9c6a8274de10de6a98f979a53ef8505b7eed9e33 SHA512 a38eee261aa76070417ea248ac8f79536f19a75e5ee4bf16ae59f1eff5a9c751b033257a5cdbd1cfdcd80796142ef2ea1f8b2be5cc73604e96759fe2979f9b41 WHIRLPOOL e4b52b5f3d3ddae13ce4aefa1f5890813370de7874e8c5edce1e4f1df32704782babe52013dfa96cf4e60327429602f7b9534af2c19a9ef269d179186a8e1b62 @@ -18,12 +10,5 @@ EBUILD activesupport-4.0.11.ebuild 1896 SHA256 ffa1738b298f2f7202ef9b0226b9e0f2f EBUILD activesupport-4.0.12.ebuild 1896 SHA256 789b04478e044bdf53b2ab74077c19b98cef94952809360db52258ef0eac47f8 SHA512 846b0c0c76480f33e71a41397971921dc8ef9fc08781771a96ed9ceb9e3aa3f17ee527a18562d384296ffe337b15f9239d313e8935cd31453872a76214071f35 WHIRLPOOL ddf98d80fe47587d6384bcfa8808b025fea6b311bd4c07d77a14f8efe242c3379c4e5b7a0f09a738c72554b608f4c660255d2d1bb75a095492fe57bbea236500 EBUILD activesupport-4.1.7.ebuild 1891 SHA256 a41526cf946d09a03de2502087b79eda20b33b0fea130318b799d0f5c9987ff8 SHA512 097ea3be9754cbae4f978da78da02eabe6357e40286db89af5fbbb68a77bfe4d3f4d0a184872d0af2eeac04cc33490b21e69a10ee5e8d5e4484b9e02debe4d45 WHIRLPOOL 4221ca028f5ce9965fe52d2140237b213e155509407ef4ea812a3d961cb47abe291bfbb48c8a04e2cee5a7fa62105f0234a83ddbe94027016553a9223f92ea32 EBUILD activesupport-4.1.8.ebuild 1891 SHA256 08001539045f99f1c2606789bead9c4fe39f04cb9e3483951ea2c828806ebcbc SHA512 abf41b929e6db76d3f6046c72fdc3fae930abb7915a8fab7df8c4ab0b82034e8a5ab0ef3be96725dd9ab4537a228612bc3507518bba5739bfb58024b7e0f39ba WHIRLPOOL 2f06a84eaa7fb735491db6f607946549abdf5e13b97ae3e5f37cd4ad30902dd9122d26e50302db09d70b8fd27b95efa664a73b492275c148b3e45d3a021f0b43 -MISC ChangeLog 39629 SHA256 68b9897331df4e4ac5c03abf983758bb37f5d69c81d2e1b7a859ab0c530ff5e1 SHA512 e52f43eaf16d848dc019c2c05413ad9c11d6444c6cc46be6396149365c3fe95f90df98b26e1896c82f6ed1438e189b563cb8ae8681f6781bf72ba16db758a2e4 WHIRLPOOL 0391b86c6d39510841a5e9991435711d7b6bd7d233aeaa96f3b5f537ca7f7b206c43ba9fd849e887b993a92844239cbfc952cf903f62a0ebcbe872d537ea2cea +MISC ChangeLog 39946 SHA256 00cc0d3b35d9994adee15ec613920f9b2dd7bf79d77c144618e98cfa0fc24922 SHA512 cf7c80af6c8ad29b0be6be28873da7173cb59134b71e6d6894b9147c3ff6938c012eed5edd1b5dca98dec9cf87c30c5e3172521da97d7f2b6f5c8853d8d7845f WHIRLPOOL 982738408a79aa35d36884410a7a7122a84d2062d4ce7f85365fc691913ea9417afcd9ccee72de438d95d569c2949c937bf20704ae7c343b9664b5a78f06a4dd MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iF4EAREIAAYFAlRqVqsACgkQiIP6VqMIqNdyyQD8ChEvHrKxEcPdT5UrGATXJCX1 -Rz8OAFH2ZwVKOaocyUwA/RCwjnaft8eekQPQzc+bjuhhtzk94xMdMYBmo2bOsX2g -=aJYc ------END PGP SIGNATURE----- diff --git a/dev-ruby/activesupport/files/activesupport-2.3.14-unvendorize.patch b/dev-ruby/activesupport/files/activesupport-2.3.14-unvendorize.patch deleted file mode 100644 index d84f286261c1..000000000000 --- a/dev-ruby/activesupport/files/activesupport-2.3.14-unvendorize.patch +++ /dev/null @@ -1,96 +0,0 @@ -Index: activesupport-2.3.5/lib/active_support/vendor.rb -=================================================================== ---- activesupport-2.3.5.orig/lib/active_support/vendor.rb -+++ activesupport-2.3.5/lib/active_support/vendor.rb -@@ -1,11 +1,7 @@ - # Prefer gems to the bundled libs. - require 'rubygems' - --begin -- gem 'builder', '~> 2.1.2' --rescue Gem::LoadError -- $:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2" --end -+gem 'builder', '~> 2.1.2' - require 'builder' - - begin -@@ -14,15 +10,7 @@ rescue Gem::LoadError - $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.7.4" - end - --begin -- gem 'tzinfo', '~> 0.3.12' --rescue Gem::LoadError -- $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.12" --end -+gem 'tzinfo', '~> 0.3.12' - --begin -- gem 'i18n', '>= 0.4.1' --rescue Gem::LoadError -- $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.4.1" --end -+gem 'i18n', '~> 0.4.1' - require 'i18n' -Index: metadata -=================================================================== ---- a/../metadata -+++ b/../metadata -@@ -16,7 +16,55 @@ bindir: bin - cert_chain: [] - - date: 2011-08-16 00:00:00 Z --dependencies: [] -+dependencies: -+- !ruby/object:Gem::Dependency -+ name: builder -+ prerelease: false -+ requirement: &id001 !ruby/object:Gem::Requirement -+ none: false -+ requirements: -+ - - "~>" -+ - !ruby/object:Gem::Version -+ hash: 57 -+ segments: -+ - 2 -+ - 1 -+ - 2 -+ version: 2.1.2 -+ type: :runtime -+ version_requirements: *id003 -+- !ruby/object:Gem::Dependency -+ name: tzinfo -+ prerelease: false -+ requirement: &id002 !ruby/object:Gem::Requirement -+ none: false -+ requirements: -+ - - ">=" -+ - !ruby/object:Gem::Version -+ hash: 57 -+ segments: -+ - 0 -+ - 3 -+ - 16 -+ version: 0.3.16 -+ type: :runtime -+ version_requirements: *id003 -+- !ruby/object:Gem::Dependency -+ name: i18n -+ prerelease: false -+ requirement: &id003 !ruby/object:Gem::Requirement -+ none: false -+ requirements: -+ - - "~>" -+ - !ruby/object:Gem::Version -+ hash: 57 -+ segments: -+ - 0 -+ - 4 -+ - 1 -+ version: 0.4.1 -+ type: :runtime -+ version_requirements: *id003 - - description: Utility library which carries commonly used classes and goodies from the Rails framework - email: david@loudthinking.com diff --git a/dev-ruby/activesupport/files/activesupport-2.3.15-unvendorize.patch b/dev-ruby/activesupport/files/activesupport-2.3.15-unvendorize.patch deleted file mode 100644 index cc7547513a33..000000000000 --- a/dev-ruby/activesupport/files/activesupport-2.3.15-unvendorize.patch +++ /dev/null @@ -1,97 +0,0 @@ -Index: activesupport-2.3.5/lib/active_support/vendor.rb -=================================================================== ---- activesupport-2.3.5.orig/lib/active_support/vendor.rb -+++ activesupport-2.3.5/lib/active_support/vendor.rb -@@ -1,11 +1,7 @@ - # Prefer gems to the bundled libs. - require 'rubygems' - --begin -- gem 'builder', '~> 2.1.2' --rescue Gem::LoadError -- $:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2" --end -+gem 'builder', '~> 2.1.2' - require 'builder' - - begin -@@ -14,15 +10,7 @@ rescue Gem::LoadError - $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.7.4" - end - --begin -- gem 'tzinfo', '~> 0.3.12' --rescue Gem::LoadError -- $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.12" --end -+gem 'tzinfo', '~> 0.3.12' - --begin -- gem 'i18n', '>= 0.4.1' --rescue Gem::LoadError -- $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.4.1" --end -+gem 'i18n', '~> 0.4.1' - require 'i18n' -Index: metadata -=================================================================== ---- a/metadata -+++ b/metadata -@@ -16,8 +16,56 @@ bindir: bin - cert_chain: [] - - date: 2013-01-08 00:00:00 -08:00 - default_executable: --dependencies: [] -+dependencies: -+- !ruby/object:Gem::Dependency -+ name: builder -+ prerelease: false -+ requirement: &id001 !ruby/object:Gem::Requirement -+ none: false -+ requirements: -+ - - "~>" -+ - !ruby/object:Gem::Version -+ hash: 57 -+ segments: -+ - 2 -+ - 1 -+ - 2 -+ version: 2.1.2 -+ type: :runtime -+ version_requirements: *id003 -+- !ruby/object:Gem::Dependency -+ name: tzinfo -+ prerelease: false -+ requirement: &id002 !ruby/object:Gem::Requirement -+ none: false -+ requirements: -+ - - ">=" -+ - !ruby/object:Gem::Version -+ hash: 57 -+ segments: -+ - 0 -+ - 3 -+ - 16 -+ version: 0.3.16 -+ type: :runtime -+ version_requirements: *id003 -+- !ruby/object:Gem::Dependency -+ name: i18n -+ prerelease: false -+ requirement: &id003 !ruby/object:Gem::Requirement -+ none: false -+ requirements: -+ - - "~>" -+ - !ruby/object:Gem::Version -+ hash: 57 -+ segments: -+ - 0 -+ - 4 -+ - 1 -+ version: 0.4.1 -+ type: :runtime -+ version_requirements: *id003 - - description: Utility library which carries commonly used classes and goodies from the Rails framework - email: david@loudthinking.com diff --git a/dev-ruby/activesupport/files/activesupport-2.3.16-unvendorize.patch b/dev-ruby/activesupport/files/activesupport-2.3.16-unvendorize.patch deleted file mode 100644 index 08994bd11645..000000000000 --- a/dev-ruby/activesupport/files/activesupport-2.3.16-unvendorize.patch +++ /dev/null @@ -1,94 +0,0 @@ -Index: activesupport-2.3.5/lib/active_support/vendor.rb -=================================================================== ---- activesupport-2.3.5.orig/lib/active_support/vendor.rb -+++ activesupport-2.3.5/lib/active_support/vendor.rb -@@ -1,11 +1,7 @@ - # Prefer gems to the bundled libs. - require 'rubygems' - --begin -- gem 'builder', '~> 2.1.2' --rescue Gem::LoadError -- $:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2" --end -+gem 'builder', '~> 2.1.2' - require 'builder' - - begin -@@ -14,15 +10,7 @@ rescue Gem::LoadError - $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.7.4" - end - --begin -- gem 'tzinfo', '~> 0.3.12' --rescue Gem::LoadError -- $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.12" --end -+gem 'tzinfo', '~> 0.3.12' - --begin -- gem 'i18n', '>= 0.4.1' --rescue Gem::LoadError -- $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.4.1" --end -+gem 'i18n', '~> 0.4.1' - require 'i18n' -Index: metadata -=================================================================== ---- a/metadata -+++ b/metadata -@@ -16,5 +16,53 @@ bindir: bin - cert_chain: [] - date: 2013-01-28 00:00:00.000000000 Z --dependencies: [] -+dependencies: -+- !ruby/object:Gem::Dependency -+ name: builder -+ prerelease: false -+ requirement: &id001 !ruby/object:Gem::Requirement -+ none: false -+ requirements: -+ - - "~>" -+ - !ruby/object:Gem::Version -+ hash: 57 -+ segments: -+ - 2 -+ - 1 -+ - 2 -+ version: 2.1.2 -+ type: :runtime -+ version_requirements: *id003 -+- !ruby/object:Gem::Dependency -+ name: tzinfo -+ prerelease: false -+ requirement: &id002 !ruby/object:Gem::Requirement -+ none: false -+ requirements: -+ - - ">=" -+ - !ruby/object:Gem::Version -+ hash: 57 -+ segments: -+ - 0 -+ - 3 -+ - 16 -+ version: 0.3.16 -+ type: :runtime -+ version_requirements: *id003 -+- !ruby/object:Gem::Dependency -+ name: i18n -+ prerelease: false -+ requirement: &id003 !ruby/object:Gem::Requirement -+ none: false -+ requirements: -+ - - "~>" -+ - !ruby/object:Gem::Version -+ hash: 57 -+ segments: -+ - 0 -+ - 4 -+ - 1 -+ version: 0.4.1 -+ type: :runtime -+ version_requirements: *id003 - description: Utility library which carries commonly used classes and goodies from the Rails framework - email: david@loudthinking.com diff --git a/dev-ruby/activesupport/files/activesupport-2.3.5-mocha-0.9.5.patch b/dev-ruby/activesupport/files/activesupport-2.3.5-mocha-0.9.5.patch deleted file mode 100644 index 4b6381e337fd..000000000000 --- a/dev-ruby/activesupport/files/activesupport-2.3.5-mocha-0.9.5.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: activesupport-2.3.5/lib/active_support/testing/setup_and_teardown.rb -=================================================================== ---- activesupport-2.3.5.orig/lib/active_support/testing/setup_and_teardown.rb -+++ activesupport-2.3.5/lib/active_support/testing/setup_and_teardown.rb -@@ -45,12 +45,7 @@ module ActiveSupport - return if @method_name.to_s == "default_test" - - if using_mocha = respond_to?(:mocha_verify) -- assertion_counter_klass = if defined?(Mocha::TestCaseAdapter::AssertionCounter) -- Mocha::TestCaseAdapter::AssertionCounter -- else -- Mocha::Integration::TestUnit::AssertionCounter -- end -- assertion_counter = assertion_counter_klass.new(result) -+ assertion_counter = Mocha::Integration::TestUnit::AssertionCounter.new(result) - end - - yield(Test::Unit::TestCase::STARTED, name) diff --git a/dev-ruby/activesupport/files/activesupport-3.0.3-mocha-0.9.5.patch b/dev-ruby/activesupport/files/activesupport-3.0.3-mocha-0.9.5.patch deleted file mode 100644 index 3292b8d21d25..000000000000 --- a/dev-ruby/activesupport/files/activesupport-3.0.3-mocha-0.9.5.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- lib/active_support/testing/setup_and_teardown.rb.~1~ 2010-09-10 09:22:52.828721874 +0200 -+++ lib/active_support/testing/setup_and_teardown.rb 2010-09-10 09:29:01.825098824 +0200 -@@ -97,11 +97,7 @@ - - def retrieve_mocha_counter(result) #:nodoc: - if respond_to?(:mocha_verify) # using mocha -- if defined?(Mocha::TestCaseAdapter::AssertionCounter) -- Mocha::TestCaseAdapter::AssertionCounter.new(result) -- else -- Mocha::Integration::TestUnit::AssertionCounter.new(result) -- end -+ Mocha::Integration::TestUnit::AssertionCounter.new(result) - end - end - end diff --git a/dev-ruby/builder/ChangeLog b/dev-ruby/builder/ChangeLog index ddac3b3d898e..1abe15064c8f 100644 --- a/dev-ruby/builder/ChangeLog +++ b/dev-ruby/builder/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-ruby/builder # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/ChangeLog,v 1.104 2014/11/03 15:41:21 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/ChangeLog,v 1.105 2014/11/18 13:51:23 mrueg Exp $ + + 18 Nov 2014; Manuel Rüger + -files/builder-2.1.2-activesupport.patch, + -files/builder-2.1.2-fix-tests.patch, -files/builder-3.0.0+ruby-1.9.2.patch, + -files/builder-3.0.0-tests.patch: + Cleanup unused patches. 03 Nov 2014; Manuel Rüger builder-3.0.4-r1.ebuild, builder-3.0.4.ebuild, builder-3.1.4.ebuild, builder-3.2.2.ebuild: diff --git a/dev-ruby/builder/Manifest b/dev-ruby/builder/Manifest index 952e169b92b2..215de3773493 100644 --- a/dev-ruby/builder/Manifest +++ b/dev-ruby/builder/Manifest @@ -1,7 +1,3 @@ -AUX builder-2.1.2-activesupport.patch 650 SHA256 67e25efcd27f213ef511d86a985f0e445b646c24a36a661fc778961b1929c2f0 SHA512 98b6caf21de89ce627d4b723e3ec95a5d60ca4f9a838f4bdd801a77537616c8a5fb3caf1cfdba79cb425c586b5bb2e02f98ce043236a0ee39ba99215cab6d0bd WHIRLPOOL 7faea7d78c63e9d1e707ed3665d7fdd397724b843eefdfaac7342bde7f73e3dd1865cbf3b071b10791bc7a9c466d72b9215e82ec055dfc2d113063e62312a5b4 -AUX builder-2.1.2-fix-tests.patch 346 SHA256 a195ed4c42ce0f9ae21df26c4e803d58b40f82aaa6692c8672d7285234ca7a77 SHA512 d7c98646a54d7604ffb66215197ca11f37aca3815e5b3fbca57cdf3f4458ec01eae16d0bcbc0a971f839021a459f20f3351c0e672f9de4b9c82145ca6ee20453 WHIRLPOOL 98283d78e154acd391ed062db56ccf7a003107a2059a513b2e96ed867e6a269a9b1ed9b3f0d9edf397cdb6f48e2c04ecf340b153ea5db1c7e719de1fbd2c37ed -AUX builder-3.0.0+ruby-1.9.2.patch 924 SHA256 254ac558e3c6319a2b200775fa62a3f1cb4b6f8a3724ff8d31e3a52592eac168 SHA512 6704e2a5097bf16041397dd7ea6a04b6640a2a231d068122d4079971b5c09ec63c40cc5356ffd62fe33e443f8f0b3a584c7c20452f0b9771f82186ad5577f5ec WHIRLPOOL f01e45c7288c0fb4cd83923f2bb61a54b058df8acf40e0bfb6d42a52574a08fb24d1ee041adabf259e0bab29003587fd63ff5f933b14bbcd97b4238454e886be -AUX builder-3.0.0-tests.patch 2109 SHA256 9f7240c3b17916c1efa70b8467f2e5e873892c0903c1df92625552d8598a3b5a SHA512 ac4b220448fe3ad9449eb77ab5f90094efb973b7b445af2856387e366934c899b3c46088bf6f58cd9fc2e4e3834259a229f198b0f3fd95a0f30afa35613123f0 WHIRLPOOL 2c334aa523240b604f8596777c454353621f6940c9fbc2f7dd96b62ed9990018f562ba4e43ed88e3af0de346634f2324e49c189fc3e039bc34464f5860576355 DIST builder-3.0.4.gem 26112 SHA256 a1a31cc496700003b6809f09fc2fda5d22532a1551eed48ee402ed44040cc442 SHA512 5709d4ede932d3eb136ba42e162a5d4a6c033a68c4bafdb68eefb6912499dc8b98716301f341e2a9471f1e9a206e4f3cdd2843bf90068ca729daafd02cccd03b WHIRLPOOL eb02982825ae7c331ee1bf19dbc11e4554bb4ebf2fc4b0df3e91c45ad00d661a150f3dca84b44d435aec30b889006f0dec17b4a4b978bef895cb035511ec0341 DIST builder-3.1.4.gem 26112 SHA256 b700924902c2680a4f6568aa8dee2879010754c305ea651ad7eb83b583970bdc SHA512 d9da48735ef719927e71b2bbd392424fbef1aa0b728ac0bff8b6924d752f1f4f3a615153b392803528dfcbf48add3793d411abed23437f64c828b457dd0f24e7 WHIRLPOOL f459d54e04fbbd3b53e52e31a6d52507f4cc401f52bb06048d8fdfe5d1b82d5df0c009a6dec97134573ef5433cc8a19bd483ed4cbeb148b63763bd580fc8c987 DIST builder-3.2.2.gem 31744 SHA256 62fb9ad70ea42219a0c8d209a30281803712c717df7cb8f5ce5f63b4d489d191 SHA512 785c0b5ea6682b590d3b92544910cac2d26d1b4906f0b0b502913c6c95365e173178ac1ec74d1dd0afe9b9fe6aac4d7f2ed712bf444682a029b86cdcd1787afa WHIRLPOOL e0d87352b39922bc1f92b0a0f7e8841698cccd841a747503f624c7960e0bef80c594897d45680f38ed0e4eda6d899896c5de2562c4e30fa478cbe1fbb4191e47 @@ -9,5 +5,5 @@ EBUILD builder-3.0.4-r1.ebuild 999 SHA256 91098bee542d447a404168f6c9ebd598940c48 EBUILD builder-3.0.4.ebuild 860 SHA256 a6e6d1e91ec911d1bb2cfdcecf148556e7cf4d64cb6e5334167be39d9b52ad6f SHA512 7a5a43c902738254e54eef4ac6ca2799a6783897278f2a816991eb08451824c22ac8a367165fdd547e68084e25838d2e9125bab56540214d4daf7e351bda7225 WHIRLPOOL 1d79cecdd7b30955af6d0c07e52506f90e05483714d8c75651488d7a5d7d791cbf59852fbc61a8b0a130a7b5beb8b5df100ac4e462654814084662dfcfaf4958 EBUILD builder-3.1.4.ebuild 1010 SHA256 77669a381615de875e961f423190b14684b25eb1951f2eaef3cc080d36afe34c SHA512 57c1e105619262720995552191abe173a3e12875013f4a235d201e1bf81bb457ed3738e019346c7e384616f5b43827c34fd6df54b044d69c36cf38e03a5f048f WHIRLPOOL f9e4bae527e798048fb86fb3656f32e48c9a729a486589463edf6eb5e566a5c3a41a29c8a56ed8875baf5856185fd6e3b9f83b699602ece0c7539791c8ba31e5 EBUILD builder-3.2.2.ebuild 959 SHA256 7679e6cb48dc2c2d52c0e4aa4b3ec5dfb5c216566cc7aaa084003959c9de6ea4 SHA512 8546e68a3c8f4f8beb80d11b3f0ad5bbb59cd8c213894389504bfe92c550de1f3a9ffb5ca993f5a845bb918892fd307e437a56328beca3f975eab24ef6d41c81 WHIRLPOOL 26e4ba42f16e99304b3bdb6616e74b91bdcf5002f0a22a69d17249b2808bf7c48b5b827aa1b87f9375c7aa0a678ade87ea11f5b43b1b1c8e744bea36b7dfa2c4 -MISC ChangeLog 12742 SHA256 cbca439993d31aa40f123657f23431d442f710ddea6f26a22cdf8a4edca7e1a0 SHA512 854fccf9ebcfecfc6a3e78c685ac314f53b805e7a56135ad9ba29d961c278a58b80d36a676e4cd48478b093fb353da1c841dacf015bfd3e4086bd20558dd543b WHIRLPOOL 9c04ff48531508ad9b43e29b161fa3856f79c144e68a21b4dfabc5bd6c1f67837970454ce660383c7ab800615cabdc6ab12d1797249623fc96b734505cc3920a +MISC ChangeLog 12976 SHA256 fd8af8a111edea31c1b84578ae06c1abe8c012f36c14f37ed6fd3493c5092b1d SHA512 a603a4a40ccc4682a9c167e4b790e79c6304529b16f7f4d2091b1eabb047450a88aea67fbdb4e5f46bc5316e91d31033122c2c11fbbd5222c27805c7f7a58946 WHIRLPOOL bfd8f06e02653aec4003317890279d1d8d13e1b166fee7a40f9306a4336b02c1cbe3eca7142ee8d5035b77c5d2a639cba1323ecfcf8f34e2b8db56a2dff98d1c MISC metadata.xml 233 SHA256 32c38bb0d5d7273ede2d421cbec817fadee5ba890e600656a6fe15980406025b SHA512 560f825602f6347ee6572e01abb0fa073c54121b1f38dc2a9e79f3268ca703c814a2967d0ee15ec43bbb27f8cf600d3c8887bf9e76b56fea744142b46de962f5 WHIRLPOOL 7db8bc8ed98a030190adb672d3872655b4876255f3898c6832532faa41d8653c0944fed8b2fcd84b4200c427a5f31a0807836056cd68733f61b61d5d92a82e08 diff --git a/dev-ruby/builder/files/builder-2.1.2-activesupport.patch b/dev-ruby/builder/files/builder-2.1.2-activesupport.patch deleted file mode 100644 index c0b0b5bdcefa..000000000000 --- a/dev-ruby/builder/files/builder-2.1.2-activesupport.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urb builder-2.1.2/lib/builder/xchar.rb activesupport-2.3.2/lib/active_support/vendor/builder-2.1.2/builder/xchar.rb ---- builder-2.1.2/lib/builder/xchar.rb 2006-12-24 20:29:01.000000000 +0100 -+++ activesupport-2.3.2/lib/active_support/vendor/builder-2.1.2/builder/xchar.rb 2008-10-19 20:32:21.000000000 +0200 -@@ -10,7 +10,7 @@ - - module Builder - def self.check_for_name_collision(klass, method_name, defined_constant=nil) -- if klass.instance_methods.include?(method_name) -+ if klass.instance_methods.include?(method_name.to_s) - fail RuntimeError, - "Name Collision: Method '#{method_name}' is already defined in #{klass}" - end diff --git a/dev-ruby/builder/files/builder-2.1.2-fix-tests.patch b/dev-ruby/builder/files/builder-2.1.2-fix-tests.patch deleted file mode 100644 index c58b1a6774d0..000000000000 --- a/dev-ruby/builder/files/builder-2.1.2-fix-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -Require the needed files explicitly. Otherwise tests might break if this -test is found first. - ---- test/testeventbuilder.rb.~1~ 2006-12-24 20:29:01.000000000 +0100 -+++ test/testeventbuilder.rb 2010-06-26 15:43:50.853708583 +0200 -@@ -1,3 +1,6 @@ -+require 'test/unit' -+require 'builder' -+ - class TestEvents < Test::Unit::TestCase - - class Target diff --git a/dev-ruby/builder/files/builder-3.0.0+ruby-1.9.2.patch b/dev-ruby/builder/files/builder-3.0.0+ruby-1.9.2.patch deleted file mode 100644 index 5d627d75f436..000000000000 --- a/dev-ruby/builder/files/builder-3.0.0+ruby-1.9.2.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 770b5acf1736297669d000d1f673ba287ef1d95e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= -Date: Wed, 2 Feb 2011 14:20:00 +0100 -Subject: [PATCH] Skip blankslate tests even when using minitest. - -At least with Ruby 1.9.2's minitest, simply defining the suite method is -not going to be enough to skip over these tests; instead use the skip -method if it's available. ---- - test/test_blankslate.rb | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/test/test_blankslate.rb b/test/test_blankslate.rb -index a46eeb6..222b9bc 100644 ---- a/test/test_blankslate.rb -+++ b/test/test_blankslate.rb -@@ -89,6 +89,10 @@ class TestBlankSlate < Test::Unit::TestCase - end - - def setup -+ if Object::const_defined?(:BasicObject) and respond_to?(:skip) -+ skip "BlankSlate is not used in this environment" -+ end -+ - @bs = BlankSlate.new - end - --- -1.7.4 - diff --git a/dev-ruby/builder/files/builder-3.0.0-tests.patch b/dev-ruby/builder/files/builder-3.0.0-tests.patch deleted file mode 100644 index 04eb16228db9..000000000000 --- a/dev-ruby/builder/files/builder-3.0.0-tests.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/lib/builder/xmlbase.rb b/lib/builder/xmlbase.rb -index 1a1e5f9..06f8807 100644 ---- a/lib/builder/xmlbase.rb -+++ b/lib/builder/xmlbase.rb -@@ -122,7 +122,9 @@ module Builder - def _escape(text) - result = XChar.encode(text) - begin -- result.encode(@encoding) -+ encoding = ::Encoding::find(@encoding) -+ raise Exception if encoding.dummy? -+ result.encode(encoding) - rescue - # if the encoding can't be supported, use numeric character references - result. -@@ -132,7 +134,12 @@ module Builder - end - else - def _escape(text) -- text.to_xs((@encoding != 'utf-8' or $KCODE != 'UTF8')) -+ # original_xs is defined by activesupport when fast_xs is -+ # loaded; since fast_xs (as of version 0.8.0) does not accept -+ # the encode parameter, use the original function if present. -+ toxs_method = ::String.method_defined?(:original_xs) ? :original_xs : :to_xs -+ -+ text.send(toxs_method, (@encoding != 'utf-8' or $KCODE != 'UTF8')) - end - end - -diff --git a/test/test_markupbuilder.rb b/test/test_markupbuilder.rb -index 63864ad..2d9b853 100644 ---- a/test/test_markupbuilder.rb -+++ b/test/test_markupbuilder.rb -@@ -446,13 +446,20 @@ class TestIndentedXmlMarkup < Test::Unit::TestCase - end - end - -- def test_use_entities_if_kcode_is_utf_but_encoding_is_something_else -+ def test_use_entities_if_kcode_is_utf_but_encoding_is_dummy_encoding - xml = Builder::XmlMarkup.new - xml.instruct!(:xml, :encoding => 'UTF-16') - xml.p(encode("\xE2\x80\x99", 'UTF8')) - assert_match(%r(

’

), xml.target!) # - end - -+ def test_use_entities_if_kcode_is_utf_but_encoding_is_unsupported_encoding -+ xml = Builder::XmlMarkup.new -+ xml.instruct!(:xml, :encoding => 'UCS-2') -+ xml.p(encode("\xE2\x80\x99", 'UTF8')) -+ assert_match(%r(

’

), xml.target!) # -+ end -+ - def test_use_utf8_if_encoding_defaults_and_kcode_is_utf8 - xml = Builder::XmlMarkup.new - xml.p(encode("\xE2\x80\x99",'UTF8')) diff --git a/dev-ruby/bundler/ChangeLog b/dev-ruby/bundler/ChangeLog index 752a5e8e0061..e98bd74bd867 100644 --- a/dev-ruby/bundler/ChangeLog +++ b/dev-ruby/bundler/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ruby/bundler # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/ChangeLog,v 1.68 2014/10/26 07:55:30 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/ChangeLog,v 1.69 2014/11/18 13:52:30 mrueg Exp $ + + 18 Nov 2014; Manuel Rüger + -files/bundler-1.0.3-gentoo.patch, -files/bundler-1.1.5-nouserpriv.patch: + Cleanup unused patches. *bundler-1.7.4 (26 Oct 2014) diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest index 6b6377dcbe73..dd215cd8325e 100644 --- a/dev-ruby/bundler/Manifest +++ b/dev-ruby/bundler/Manifest @@ -1,8 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX bundler-1.0.3-gentoo.patch 604 SHA256 a21e789e1c8268673aaab471567b83e187475fd23a2303756488b75d2f3df9a0 SHA512 008cc11f0e20363b5df2bc154b6c2fe0117070cf93e6ea5a33601d3de2b02c2dd3fbd84c3e2200e9a355a6540e575fd53f805b5ed3015616e331cee4d87c8376 WHIRLPOOL 6f022a85511f6a341f413addf158bdf03e49e989118ab3b54720c7227f0251b633d2053e64e04a559e45788f1acaf359452617abb4b66dbace551734f94733a9 -AUX bundler-1.1.5-nouserpriv.patch 1317 SHA256 8eb59df7b2db4486a7b9e254cd37bff68e4e539b0b6ac8431c0b572d2e70fffd SHA512 456116b5f3f5a8908e4dac83b5bb3fb754a9cbd7e00472cd11a592bb8ff226319c81eda7d3a691e3a1e37422b63d8f0fa15c7b5157f24e842a6cf4e961db8726 WHIRLPOOL 9ac092c1f429b396050a03020546b75c2010572f7014f9772692aa28ea2180356d0838fd1cfc80b120e803fa6cef74ddcc3fb7f4aabf1360ef1a4c16ecd6b1ba DIST bundler-1.3.5.gem 268800 SHA256 08b89047f7b829f3e197a28fb1bde74c3f5cfea1552f99dfba237fee30eaffe4 SHA512 ea3ca89b50692c575e342b695e72aaca536af9e37d2e9740017aa55dcb999759ee5c0cfba71d90ba3baf9da2ba580a3813cdfebe428f20bbb7a86f1158409236 WHIRLPOOL 0b0660919a7f842b830f452242774e33c797e144c55b48af408fc04faa002eb3fe6309675538b0c44020dfc5609b33cc39e2999df6e7363373b48815b5231f61 DIST bundler-1.3.6.gem 269824 SHA256 2ba6a8ce2367b2e382b9691e6fba8089db40bb4bb88054ded1adf2616cba125f SHA512 ffe756344e67fdf5408f9c61b6ffa417a0140a86ad0e7f4567dbb7323c7e70afc0947633f90946bc3b690251d102708340a1715e25a138cd8487afabd646c7a3 WHIRLPOOL 468062791a9d5fcc7dd978d00fc3d024673aeebc4b153d93fefa90f6ee1035c18029d6caed66dcfbabada94d95fd2a20049512bcf4160110522bdb5ea5d3984a DIST bundler-1.7.3.gem 299520 SHA256 d2cfd2cb30a14bbaab0cef7917d220d6285d6eaed024e445680b47c816592303 SHA512 2e037837fa2e9fdb85b7a04aa4cfb79b4be64dab4a4cd45af55b2b2cab69c1c377543fda732db26b32c1c4a8dc8c82e609b908633887a61ca3ad16a00ea22557 WHIRLPOOL a01a46c89a20eda57329fb30e4711392632a68151aeac935fdd8ee51d62bac0b0a08835c69798f31aa655a87284bf1066390c9e38782111cf0d5f3b6fdd6e688 @@ -12,12 +7,5 @@ EBUILD bundler-1.3.5.ebuild 1467 SHA256 09f62f686b1aae2b2cf42749f6661425dd339d81 EBUILD bundler-1.3.6.ebuild 1806 SHA256 b2bdd432ca2f2b2bd1d7b9629b7b3f9cb7933fa00c1dfabf120b7d112c9361d9 SHA512 a291b9c7e5ca68aee6ec2bfc47eb7f242bc538ec8dd1b2380ca418a8c8a86cf4df3efe594c8b616eff5dcffc01a7eb69cc0de02c21e8bfb32ab2f0eb1df3bf13 WHIRLPOOL 1aaeb9c41af5b0768eda85e749ee78dcd140a998632f0354cf5ea413421249ca0e91449d86ed06120027fb1aa7be834b0755d9cd19d8686dc0cd028397c5bb21 EBUILD bundler-1.7.3.ebuild 2021 SHA256 1becda0c0798a41b08bfd8d184e61a8fc99b38d4e42c59052ac710e8385f2f3a SHA512 59177879258e1efa6d0ee323cfe692538226fbf9dd8d8599ae97677afc76e3df2a7619c18f41e2c67988a56a0b029e2b68c77288e44c365132cc9c2873f05331 WHIRLPOOL 32773b05eb3e6a6f666f1002dca8758429a01644e0da3255375b3a42bacf4bc41e8b428869a9c6d8590920d13f0ad1d5405ac0dd830de80b9363e07e7f0e3c48 EBUILD bundler-1.7.4.ebuild 2008 SHA256 c88653ae58275fcdb47587c22f7d042487ec57e0e4aefc18aeb09a7ba1f022cc SHA512 aca47148119a65627f254d75478948c98a881aabff728744465bee5359b548cff8dfdaa52301b05c4463e00b36a2b0556a3bbf48e6440168e3330291ee07dfa6 WHIRLPOOL 3206ff0649bf9a129eba974b31f3ac6feaac0be249296da008cd904898bf6a97073d34c6462bce1c4f05b8cf74e31f9fa7345a3f751b1f530315d4bac7f08330 -MISC ChangeLog 8859 SHA256 7a680cd46c9f6e4d9bc07b52f03a51f0e2a12ea528de5e256c7af4edad211b1c SHA512 5ba7d2ca8875e3ef05bfd49fcec0d6cc7031eec56e790ed2d8069bab095613efeb5ef0c081963621958d4cd7fb8379a8c5f4d96f34fa46d34ae563dc72ca7a99 WHIRLPOOL e0fb897184255ee26e07368cf763af214ecd9e4f3d35ecb607744c2701ebfc763fe45936b449f36abf27a8c7c586563f6aba38734e36a515e843c918942e7da1 +MISC ChangeLog 9009 SHA256 580fe9a99ea71eaa718df55d62e715f74dd86985ee62c30be57e3e99410d9454 SHA512 1e51e608a77b9af7ac1b9104eedf662d18c009c968af676b15498b6fdf8c116ec5dd45e6b065d53bfbd08dccf35aba3013d22cfbbb1ae5840d49bc710b6dfc4b WHIRLPOOL 77c4e20ebd01ef2b1accf5020298679a5599c97be5603c131327b876b98edf873675bc6b7dfc2e193befd87e3aadc7e62d7dd83ea72be4c12c525d261e7d87f9 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iF4EAREIAAYFAlRMqPsACgkQiIP6VqMIqNfUPgD9G5Grc420EM4mr92EdzgL3ubD -06+ALxNduKl8XXslxSQA/1iXFYN7EZPWMTDBip7+c1gdvXobdrCcxzFXPoBrlwHd -=+QpS ------END PGP SIGNATURE----- diff --git a/dev-ruby/bundler/files/bundler-1.0.3-gentoo.patch b/dev-ruby/bundler/files/bundler-1.0.3-gentoo.patch deleted file mode 100644 index 5667e87628ff..000000000000 --- a/dev-ruby/bundler/files/bundler-1.0.3-gentoo.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/bin/bundle b/bin/bundle -index d2e5081..17db3f0 100755 ---- a/bin/bundle -+++ b/bin/bundle -@@ -1,9 +1,14 @@ - #!/usr/bin/env ruby - - # Check if an older version of bundler is installed -+mybasedir = __FILE__.gsub(/\/bin\/bundle/, '') -+ - require 'bundler' - $:.each do |path| -- if path =~ %r'/bundler-0.(\d+)' && $1.to_i < 9 -+ # ignore the directory we're running from, in the tests -+ path = path.gsub(%r"^#{mybasedir}", '') -+ -+ if path =~ %r'/bundler-0\.(\d+)' && $1.to_i < 9 - abort "Please remove older versions of bundler. This can be done by running `gem cleanup bundler`." - end - end diff --git a/dev-ruby/bundler/files/bundler-1.1.5-nouserpriv.patch b/dev-ruby/bundler/files/bundler-1.1.5-nouserpriv.patch deleted file mode 100644 index c5538e1284b8..000000000000 --- a/dev-ruby/bundler/files/bundler-1.1.5-nouserpriv.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 58b5cf9444c0dbe8374557539bbcd6c58341323d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= -Date: Mon, 13 Aug 2012 19:16:09 -0700 -Subject: [PATCH] spec: do not check for /usr/bin not to be writable when - running as root. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This test would fail on default GEntoo installs as the package is -executed as root. - -Signed-off-by: Diego Elio Pettenò ---- - spec/install/gems/simple_case_spec.rb | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/spec/install/gems/simple_case_spec.rb b/spec/install/gems/simple_case_spec.rb -index 0619ba5..1c932f1 100644 ---- a/spec/install/gems/simple_case_spec.rb -+++ b/spec/install/gems/simple_case_spec.rb -@@ -796,7 +796,7 @@ describe "bundle install with gem sources" do - # On OS X, Gem.bindir defaults to /usr/bin, so system_bindir is useful if - # you want to avoid sudo installs for system gems with OS X's default ruby - it "overrides Gem.bindir" do -- Pathname.new("/usr/bin").should_not be_writable -+ Pathname.new("/usr/bin").should_not be_writable unless Process::euid == 0 - gemfile <<-G - require 'rubygems' - def Gem.bindir; "/usr/bin"; end --- -1.7.8.6 - diff --git a/dev-ruby/gherkin/ChangeLog b/dev-ruby/gherkin/ChangeLog index fbe98df4099c..139e9902e859 100644 --- a/dev-ruby/gherkin/ChangeLog +++ b/dev-ruby/gherkin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ruby/gherkin # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/ChangeLog,v 1.74 2014/11/16 18:15:08 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/ChangeLog,v 1.75 2014/11/18 13:52:54 mrueg Exp $ + + 18 Nov 2014; Manuel Rüger + -files/gherkin-2.3.10-no-werror.patch: + Cleanup unused patches. 16 Nov 2014; Agostino Sarubbo gherkin-2.11.6.ebuild: Stable for ppc64, wrt bug #493780 diff --git a/dev-ruby/gherkin/Manifest b/dev-ruby/gherkin/Manifest index a7dbce35b49d..c06d01052059 100644 --- a/dev-ruby/gherkin/Manifest +++ b/dev-ruby/gherkin/Manifest @@ -1,30 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX gherkin-2.12.0-ruby21.patch 1451 SHA256 da20309315bc7c8cc39aaead2191faeb4ccaffb29af560709b0bef04c6b34bff SHA512 57d333b3be301c4e6ad3d14f24ec80bbeea373c5d7199adfa1554c6c221335ae1783e28af325f5757f31884140c278443e045befa15f65a91774e967ca8c3a23 WHIRLPOOL a3cbf2d3e66940a0eb7db5c67c738d99679a0d435406e011195851d5bf6e649734b0ba532e679c0fdf00ea840447294451498967c6e7d9ea913ae8738857b567 -AUX gherkin-2.3.10-no-werror.patch 861 SHA256 f430e369b9e5d2e740c040d7fa5410e7351b135722a8c6f18eaa695ac73017c4 SHA512 da63b941df9de14dede17a5da9951713710cade20341342fedafe11e9d0f571e29d6140d90cdf46851476125f4570e47692ad976c25385b71d9de8a1610d1339 WHIRLPOOL 758b3453db642e72a869ecb673d2d9147efe4a14283c03e62e0f39397e90a8c7fbc0439cc8b8d59673ff4a7abf963e4b8049b2c2454b633a88e6c37faf754ea8 DIST gherkin-2.11.6-git.tgz 603165 SHA256 a52b0f1909aea52ea5644e0bf91008538d20d46e41a5a940b56b7e8066824a1e SHA512 92409f948d39fe4038016706fb5b8580ed9aeffac2b4b03dceb2759923010c33f4bc51b3dbb31a5108e2892c52276ceb0c3e14b3e6826193d4624c8b72c0845f WHIRLPOOL d1c7d13e4601fe345e13a04dc10eb2b7679f65eb99ed022cbeaa2479d9cbd8b91e1344f15c9c34ada3dcd4777870435663e433906175ef9654ea26d08522e0b1 DIST gherkin-2.12.0-git.tgz 605964 SHA256 09206d66e437bfa2cb917a251899e3e95479c47d713a2b8de3e7dcbdd9982bfa SHA512 e86c2299bb3b41845bf8a3119b65ff855023510173b04c1e08e1105c03523e0e89ec45db4c7034e85fc20b7a9e1ce5a791aaf3f4793d44c0aa782ffd9fcee83a WHIRLPOOL dcfc5b5a0dcad7e401c2e0afb41e53593d095a44e97df8eadffa634b155ccb5a979f3e719e57c32d18afac0be49d31021276abc20010a6a9259ca041c155a390 EBUILD gherkin-2.11.6.ebuild 2364 SHA256 eec0a32819bc4f88b4a4ef555d298e9af0905bb891b28c7734c245e952994b2c SHA512 c823a6ec6d0403ba9db918aa7db643bb0c2956b79612673a55f05dfa2cabdacb060219148d49129daa172445ed3ba07a01c2b887bc1f95e35cd704882bdc73e3 WHIRLPOOL 6bd49e7e4519ba1b958d4555191d68cee317b7ff413187af7fbaa283fff31835700dc89346ed017de3196f7dfbea2d76e11428ca91073d6048cef08af4608a05 EBUILD gherkin-2.12.0-r1.ebuild 2668 SHA256 61db4a465c5a309f8e8ca2368e794a1189f1d9e0a8787c17ede05e0d0bb110ec SHA512 9302afbed9815e05542f97067d980260b64c9b72f0d40c5435c32536409de77cb805461730ab55be22913b517b67659a9ce9d2bef92f1b3f65b7185c9b2c92dd WHIRLPOOL fe73eae17e39a0d34612a9f93d3bbadc78450dde684806a3d99fd865bd68eb1fb3f0ce6382d83e922a442be86d15aaa030631801338b645f746960bf304c77f2 EBUILD gherkin-2.12.0-r2.ebuild 2672 SHA256 029624d3f7679bacda149431baae4ac7f850783be519717a8a9d519d5090506b SHA512 4e8791f1a4a7531e65506b14240e62f514be90a4e8249e4434a89ac07d416359923215b59315d2d3ae65d91f33136b75c847bb2fc270149f0d0100a6d73bd88d WHIRLPOOL 10f1e56b9205de9ac8ba2ed34325b280aff8ea0d832fbbef0aab26627bf6385a67a0a0ba09906747a6eb2d81bba61d4b03ff4365f49eb34a47f3e38b34918e93 EBUILD gherkin-2.12.0-r3.ebuild 2714 SHA256 f735433e3ea60c7ea4cc538f23853de1e31460b4333e2eb6631b1ae128b5aff3 SHA512 de16829c9d9a8dc4de95d5661582535d7349ef143376584621e002d7a20135afb82425909cffe7f0f76e37b3e5818d5a487204134d3ca3b095ac848738d81dd6 WHIRLPOOL cf440e2020e4287218f638c92eec1839076d6efc0557b7b5aea1d2bfcd65fdff4d95e0ee2b5e758ae7fa7b0306d1c8f8117784cfb3c82dd907b1b94b96b9716f -MISC ChangeLog 9963 SHA256 4eb2d07eca92874a2b2a9801d1230d7c2bb0378be3720f9630990ff0053c8594 SHA512 1afff14a33a2bb4fd56ebfb7c37ba36d739569227fdd3f5dde9863edaafaa157df39a1e8c38c582016ac3f95928b6852ab376f8461e72eaaf7c14a4c25242fe8 WHIRLPOOL 7fb645246cf7bbd7b71693cf5f5e6720bb8c534534d819f4d854323f8f6019eef890aca7974a00d19cd3bb57f72dc553f04237f3e06d6d82babbf00113ee9690 +MISC ChangeLog 10081 SHA256 e39efa6b7300c233192cf18f069415236aa663f24d7f5682927d931952621e00 SHA512 b99ef371b8390d93cca5dffa020cad3548b866ccc2a2a5ce4857574240cccaca2732740624c3bf02098308aa273761933bb11c66f5ec7f860ec440c65783c71e WHIRLPOOL 46786336889c2c71a35109999d1bb797efee869b17768af0f0c51438acbd4b1eb70edf754322465982168094bb3c173f748234f418a723c5964cd5d17b9db645 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJUaOmtAAoJELp701BxlEWfPY0P/2DFhkvNAK0QV3T+B7aFukiq -TB2rCRCIRApRmFn0LKovt7PvXlcdGfTd6huefkIm+mVVAYV61phlEMgveTKpNKkN -CGCci9f3vJbVuvALOQhtKpK0O6wJ3PIYHXHo+OODXzh9LT5mL481pXehMB5bqlN6 -VKHm1pIgNcjueimIxWQLLTdGSTVH28rv261v/Fw2APhIKYfRoBoOC6d0qkmOa9V5 -uhGpWW+iSvCPY01ATHgYWjbAFvSJSLnQrXt3v6gBLzRhmb7Aibnn+IoYGoSMByfR -3pmowURNmkjw97MPIcuOALdTX9h+xZyYTT2qRJ8VEl5SOwPYAsTU+wJ5oyMwNcHt -bjeKmFwDq/eM/QlV4wjBRmHfQ/a8e8IXUdQXSx87xdf0yDWHXSjP63oeC9Zg9kyF -4FdhXkplXUzWQdRrxhGKJwSStJOG2sXkS4MBnl8N2/u1377NwRTe2+cUUn+jBLQW -ylDNEffpMMxAGrx+ZU1zeInpk+apIfOVa2WJAe0X0tuA+5t2FhUG286WfgxnWx+s -elqGUXd/NdfZRXHa/6WPVOXMNepceHO7Ecl4T/U+2/QZWmRmgtmDlp7l5RUBTSQm -Ozq956EQ612I7QGN1unhdTsaWtQmuhc7sw5URM6DRDBje/8qI51Hj9MARjO/wmoE -jG9gpeIOhkwt5t8xDnCh -=Ri4U ------END PGP SIGNATURE----- diff --git a/dev-ruby/gherkin/files/gherkin-2.3.10-no-werror.patch b/dev-ruby/gherkin/files/gherkin-2.3.10-no-werror.patch deleted file mode 100644 index 644a46a388d7..000000000000 --- a/dev-ruby/gherkin/files/gherkin-2.3.10-no-werror.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 1a46a428b4c92982124a8081623db9d56f6a28d7 -Author: Hans de Graaff -Date: Thu Jun 2 11:46:22 2011 +0200 - - Don't use -Werror in production code. - - Using -Werror will break compilation when new versions of gcc are - introduced since new warnings are added for every new version. - -diff --git a/tasks/compile.rake b/tasks/compile.rake -index 57cd90f..01e9b55 100755 ---- a/tasks/compile.rake -+++ b/tasks/compile.rake -@@ -72,7 +72,7 @@ langs.each do |i18n| - io.write(<<-EOF) - require 'mkmf' - CONFIG['warnflags'].gsub!(/-Wshorten-64-to-32/, '') if CONFIG['warnflags'] --$CFLAGS << ' -O0 -Wall -Werror' if CONFIG['CC'] =~ /gcc/ -+$CFLAGS << ' -O0 -Wall' if CONFIG['CC'] =~ /gcc/ - dir_config("gherkin_lexer_#{i18n.underscored_iso_code}") - have_library("c", "main") - create_makefile("gherkin_lexer_#{i18n.underscored_iso_code}") diff --git a/dev-ruby/gruff/ChangeLog b/dev-ruby/gruff/ChangeLog index 0555065df402..469c891aef73 100644 --- a/dev-ruby/gruff/ChangeLog +++ b/dev-ruby/gruff/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-ruby/gruff # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gruff/ChangeLog,v 1.51 2014/10/11 00:35:55 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gruff/ChangeLog,v 1.52 2014/11/18 13:53:33 mrueg Exp $ + + 18 Nov 2014; Manuel Rüger + -files/gruff-0.3.6-fix-tests.patch, -files/gruff-0.3.6-sort-filenames.patch, + -files/gruff-0.3.6-zero-division.patch: + Cleanup unused patches. *gruff-0.5.1-r1 (11 Oct 2014) diff --git a/dev-ruby/gruff/Manifest b/dev-ruby/gruff/Manifest index 6035bfc437a7..f1adaa7061fc 100644 --- a/dev-ruby/gruff/Manifest +++ b/dev-ruby/gruff/Manifest @@ -1,11 +1,8 @@ -AUX gruff-0.3.6-fix-tests.patch 739 SHA256 c44c3a5c9a82b42ae0f4fa2ff490ff3ddde53deb9ba4153861ecca83ba036e08 SHA512 1901455716738f15c9a6cfa06ef45c672675b88f362a096a3bc996665aa5b1056c1158fe25f4fb1fc5faaebc3a772efff7853d271c21e921408c636bce5d5332 WHIRLPOOL e4fd019b3b4fb95cc92caf5126794b06d15ddcea1f5a6293dd24df7b711edd4f778a719a188f6766610ace7667d5d1a32bf1b17b65fe7d6276e1ace36a84a150 -AUX gruff-0.3.6-sort-filenames.patch 1335 SHA256 095382ac4ca3e86165834655d6e4bc8635367f8aedc164a0dd366607a40d2f06 SHA512 1c7ad97309fd65e9c81c6a92d669e31ee2cea5417019c0e1039493a2a4c2b3e5a55b6a977ee1b7e5710cadc085ac1005fc9178e440baffbb03b977f491c8cc6e WHIRLPOOL 587534ec010c043636ee11c6c6ada92e8a1b8ca13797a56394bf7c59a14b2f6005d44cdc401f41eb6c2d20b4e5824d63cdc8a9210148f350cd53d1d5626b2912 AUX gruff-0.3.6-spider.patch 521 SHA256 30d4474118df254429fabb1a25f5612301d9aa16c518f35e8bc6446d3c4afde9 SHA512 5424d12f7801a572ee90eb0122db3fceca84ce481153f77eba60ee783655776cdc0531ccf1a25fc4794c094facdb2815e09841886179cce7ffbb5328a467e386 WHIRLPOOL c6693be668b88559d87b2f4da64a3dc9f50b1a7482fa1ffd65ed707af5c8c9673874b85e78425aaba81d8231a65f30433ed57a97487ee33eeaa43a90444f1b53 -AUX gruff-0.3.6-zero-division.patch 734 SHA256 bcbfb5998f5e807b9b71b82f54b09d304110c6801b2d390573b0d636ea90e46d SHA512 5c76374c7b4253fe906ff512fe6cb1f61eb6755265015db288fad079565941eeecc7a36dc0a08e196b25bd78741ba33d9fdceb3a9a20cef56e5020bf2cd2a840 WHIRLPOOL b14f171dafa0832a5a1b3124c7fcd2902326ccb27d72023000f7f1a444da0dd255726a47596fdff091afbee81be4481b94667f80d6d846ca1994a3a2a7ffabef DIST gruff-0.3.7.gem 306688 SHA256 05f65bee546c41fe3570be4730a0b2940d3b748149cc5a7cb41b5d32fd02819b SHA512 fbafc0f8021dbf7ba5b446da3980e94bd9012b131ecd9889320ead95b1e57931c3b8ab16bf11cb06479caff6e74b391a33f9a5f14cf2d187f9f415832b62ebab WHIRLPOOL 14e6b1e210c5d97983e5ce8583219c89ed7c192942284f1df64ee12b496e16ed9bad535224e0912f0cd3920aa36186b51b9446cb7f7b01b609287c8ffea51452 DIST gruff-0.5.1.gem 315904 SHA256 34a3cea74d8f87182dcd8ae0a7981e58a49870cd8bb9aedb4b11e5cf56bccb2d SHA512 30453b6af286548be4727c124662df1b05ef93acb25a443cdb7b02c7076dddcbd71769fa249402456e5f54e27d40e4bb6cd8ba012c1746b3190c7a27c505b8f3 WHIRLPOOL bdd8f72c78780fd2b070edfe21a5f7e0d84c86baf6026bd53e40cf934d279c2cc36f139042fbe1e32fe4dc9e0016771b781ffcff304b1043258f7f9cfb7dc441 EBUILD gruff-0.3.7.ebuild 1251 SHA256 35c92b477976fed2bdc85ed86443a07bb9cb8139907e67fe4131c7ab56f24d14 SHA512 08871b0caeb442dc862cd87c96de4f085782a8add5cf54d2648d958b2b02feebb0ba2957fff955912c7b21ef03bfe68a8fc3766249fa57ccc42cddfbb2b54cc6 WHIRLPOOL 24b5c9cd0f3eec89a269403b5ab22defb32605c5870e6cab7d27c73f99cc723908b00567e5a2dcfe3a2181235c558e1023eeff94427908ba14e0553b7036b796 EBUILD gruff-0.5.1-r1.ebuild 1235 SHA256 2f7937a05ace8c5d1baace3a5e2c2727bd307d781d1319f59558f5f2d886f54e SHA512 ffb914ce5b6764876c5da1e6d21c508fff76378ff609e11e461c666b27e2110282ffec88ee78800d51638fa17ac20cac1c108f5dd23d890622650cb179ca686e WHIRLPOOL 0d4a309a9b1256c2cadea282c9b9d2ebb4de2e962d63ef2550c144560e9389f05a899b189208154f35140c0494cf1d432ea748600d441c761a4e0f34747c6d1c EBUILD gruff-0.5.1.ebuild 1224 SHA256 cb75b048c49c4a26a04fc6344b578ee2371c85b7f3ce825a697d755db70e96fe SHA512 8befac9a45aca0c44556624fbcabce59acc676f4d171e5ce61d0c2db469195e7c3c60de6d7cf97d1faccb5384a85f3d29e790377c8e398d6346403a6bdca94b5 WHIRLPOOL 0012c4cd5af78e6fe4e42134b9db10e1027a896b0ba18830e442bacafa27b598449bd24309a885f11dc58d0db704cac70276747cf2b04a9d99b4504364908d63 -MISC ChangeLog 6417 SHA256 442e8bddbd6d1945d2bcbf0ebd2ee5aa8baee45846901bc741be097a8ac1bf2b SHA512 0f565f9e283aaafd57039582a76df7b8bfdfa4fd91472ab37ffbef9bc74fdfb5a4cafc93f2e6c5f93ff3c2a4ffe5758c3eb22d21e89cc3623061248622d84340 WHIRLPOOL f9a922a29d82aa0dd5e02cdd1e73a2d29983c6b0a2fa21fa4132236ec3c1940b6250f448342fe0a2cea3c1aff94beee5d9377a32b322f116443ddd8dc54a18cf +MISC ChangeLog 6613 SHA256 e32f9db1a3a6d8eb43e8b7ae21b498c1d838ba4a33ef3f7087a1784a6956da56 SHA512 ba167ff55936cae7e8e4b40ace9d4115c3f55f84fd98c1787d9eec253fc66daeb2ac0a066f91ddd0ad5ca34af9a0fae45271190e0257b92ff32aa72dfb7c7d7a WHIRLPOOL 863fd62a3420acc700ca5c67663a5fa4607665dac424429d84ef642dc088e3c15e1455a74f93c08b53c3cb918f40d8a3f8294b3aef8bc4b23ee41b42f90a4eb0 MISC metadata.xml 231 SHA256 867c08589996ba5bc00a71c4dbc1e28832e8f81bbb4f7e22b108015b6c9e8a8d SHA512 4511611ad705ae2650d9ebdfc3477c7fe8a99b0343f813f0ea018c4bf9a54b8d84c1e2f088b0299e5d5aa08a516e4c5ba8e050d1236a183d3f290ad333a8482a WHIRLPOOL c832a14f9f9726f438e57368d67026573186a3cd13936c3d2ec89abb7df72633c5278ac5917fc0c0201861cd0f256016696412eab35905a038ea57ff82e5987d diff --git a/dev-ruby/gruff/files/gruff-0.3.6-fix-tests.patch b/dev-ruby/gruff/files/gruff-0.3.6-fix-tests.patch deleted file mode 100644 index 9e90c2e9ba5a..000000000000 --- a/dev-ruby/gruff/files/gruff-0.3.6-fix-tests.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 83c3ce9b01311dd18da0eff717d46734d5e96b83 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= -Date: Sat, 5 Sep 2009 21:54:24 +0200 -Subject: [PATCH 2/2] Remove a call to set label_max_decimals on Gruff::Line that doesn't exist. - ---- - test/test_line.rb | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/test/test_line.rb b/test/test_line.rb -index 4135b1e..1531931 100644 ---- a/test/test_line.rb -+++ b/test/test_line.rb -@@ -462,7 +462,6 @@ class TestGruffLine < GruffTestCase - g.legend_font_size = 12 - g.marker_font_size = 16 - g.hide_dots = false -- g.label_max_decimals = 1 - - g.write('test/output/line_jruby_error.png') - end --- -1.6.4.2 - diff --git a/dev-ruby/gruff/files/gruff-0.3.6-sort-filenames.patch b/dev-ruby/gruff/files/gruff-0.3.6-sort-filenames.patch deleted file mode 100644 index 3ec23f16d576..000000000000 --- a/dev-ruby/gruff/files/gruff-0.3.6-sort-filenames.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 60d0bcc1de340d29c5bad3c707b49be7195e119b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= -Date: Sat, 5 Sep 2009 21:52:18 +0200 -Subject: [PATCH 1/2] Make sure the Gruff::Layer::filenames array is sorted when creating. - -If the array is not sorted, the rest of the class fails to work as intended -and the tests fail: - - 2) Failure: -test_layer(TestGruffScene) [./test/test_scene.rb:54]: -<["cloudy.png", "partly_cloudy.png", "stormy.png"]> expected but was -<["stormy.png", "partly_cloudy.png", "cloudy.png"]>. - -and - - 2) Failure: -test_layer(TestGruffScene) [./test/test_scene.rb:61]: -<"1200.png"> expected but was -<"0600.png">. ---- - lib/gruff/scene.rb | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/lib/gruff/scene.rb b/lib/gruff/scene.rb -index 47943db..ef93656 100644 ---- a/lib/gruff/scene.rb -+++ b/lib/gruff/scene.rb -@@ -133,7 +133,7 @@ class Gruff::Layer - def initialize(base_dir, folder_name) - @base_dir = base_dir.to_s - @name = folder_name.to_s -- @filenames = Dir.open(File.join(base_dir, folder_name)).entries.select { |file| file =~ /^[^.]+\.png$/ } -+ @filenames = Dir.open(File.join(base_dir, folder_name)).entries.select { |file| file =~ /^[^.]+\.png$/ }.sort - @selected_filename = select_default - end - --- -1.6.4.2 - diff --git a/dev-ruby/gruff/files/gruff-0.3.6-zero-division.patch b/dev-ruby/gruff/files/gruff-0.3.6-zero-division.patch deleted file mode 100644 index b201a604f921..000000000000 --- a/dev-ruby/gruff/files/gruff-0.3.6-zero-division.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit f5098443aba86fc59b02eace6ecad7530d72694b -Author: Serge Prikha -Date: Wed Jun 6 16:22:41 2012 +0400 - - small fix on zero division - -diff --git a/lib/gruff/base.rb b/lib/gruff/base.rb -index 590ef99..898afe0 100644 ---- a/lib/gruff/base.rb -+++ b/lib/gruff/base.rb -@@ -1066,7 +1066,7 @@ module Gruff - # Return a formatted string representing a number value that should be - # printed as a label. - def label(value) -- label = if (@spread.to_f % @marker_count.to_f == 0) || !@y_axis_increment.nil? -+ label = if (@spread.to_f % (@marker_count.to_f==0 ? 1 : @marker_count.to_f) == 0) || !@y_axis_increment.nil? - value.to_i.to_s - elsif @spread > 10.0 - sprintf("%0i", value) diff --git a/dev-ruby/rails_autolink/ChangeLog b/dev-ruby/rails_autolink/ChangeLog index 6de69aa05b09..fc3ea8cc19f0 100644 --- a/dev-ruby/rails_autolink/ChangeLog +++ b/dev-ruby/rails_autolink/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ruby/rails_autolink # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails_autolink/ChangeLog,v 1.6 2014/08/05 16:00:32 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails_autolink/ChangeLog,v 1.7 2014/11/18 13:44:11 mrueg Exp $ + + 18 Nov 2014; Manuel Rüger + -files/rails_autolink-1.0.9-fixes.patch: + Cleanup unused patches. 05 Aug 2014; Manuel Rüger rails_autolink-1.1.5.ebuild, rails_autolink-1.1.6.ebuild: diff --git a/dev-ruby/rails_autolink/Manifest b/dev-ruby/rails_autolink/Manifest index 406c3cfc6eb7..2f4e9c6eed80 100644 --- a/dev-ruby/rails_autolink/Manifest +++ b/dev-ruby/rails_autolink/Manifest @@ -1,7 +1,6 @@ -AUX rails_autolink-1.0.9-fixes.patch 1231 SHA256 aae537d66b9c7e2d3a445513917630cd2dfc50b047395f440d80a2fe306f824b SHA512 bf7c6040f38957bc313de54307bfc4502078ce9ec7fb8b1f9622dcdb7759526582475dcd04dc27d803b0f6fa9caf707776a9c0d8c4559fd7a32aaefb2c74fcbe WHIRLPOOL ed97cbd93ad715c79fbce78f9fd640843e466dcbeb9432dac1587424d56d9dcf8275958db976721181f58b3489a7aca09cbb7fee32788d29edc1eca7debfea00 DIST rails_autolink-1.1.5.gem 12800 SHA256 240b2a25bcc2b1da360b570c4209022f7878dfea0f6ff68ddd8fb0a4d324ae52 SHA512 691f400d525f7d834f16887013a2dad6b64528eb853a8e2fa243d683d84a6de8c6c5c9f95b688c79b8365653cfcc42144158849d6ce52fa350355048ed4523d2 WHIRLPOOL a9458f7ab998e008f525c4ba0c89a6d674a5de002b12610fc2135611ca3c9712ea7a749690a510ad46e574e0005428acc863f02055720254a5a93f3be47fa954 DIST rails_autolink-1.1.6.gem 13312 SHA256 384c17bee71ca5dc44f49401762f91abb6bc356dd564f380713fc974d2c25671 SHA512 5a9b5c2449a0a69488dbf1de3a87b987b450cfd34b420489a38801d5fcca91a2ac1c6b6b43f2f5699534a9f583a3367452d7e99da3f18619ecc23172949a8b4e WHIRLPOOL 82f51c91595f912908c53a5716a49efc7a686e024a926d29d5427182b6386b96f9294157aa0ca9722ba9f7710bc247cc8dbb9fe23794135db5a955ee705725da EBUILD rails_autolink-1.1.5.ebuild 923 SHA256 4bb7328a2237ad358f261723bba30d668153fb990b60b4b093d934d28dc1e06f SHA512 bbe3bd7f1b340ac98b7d7245d023ee7973839d388bad91a3c2bcee1906c90357d1c3bcd68b2293d9f3920770b812dd72d4e7d7f78ac225303cfaccdca441682c WHIRLPOOL f16426dd987aed27dabf918ccf3244e8fc57395babf502b45746405d7626753e858ab85e960ad241966e6e76fedb670b8667865f01c0c082d4404c2eb72dad75 EBUILD rails_autolink-1.1.6.ebuild 656 SHA256 cc1ce7ac1e677b4e703bc3771ba3dd6d1ab073f10068d810abe0fb8fbbeb95c2 SHA512 326002ad157ac25794653a7d1cf680e34c908c866e2ccea33089c1086d96fa6b1804a89739ca52a1433ea01c8f2fe90a4cb4a62b9d10d8cac66bac1510070b58 WHIRLPOOL 3f3fb16ce41723e86b9ce338b8998cbbe52b1dafa6c05ccb66f9a4045bc4c5a569fff5720ea44212bb90d094faa4e172fd60085b7ded1da9edbaec5608dfe00e -MISC ChangeLog 1293 SHA256 a8d307a2d14d297643c80d42b110e005bb7b40e8fbb85b98e1ce1258477397f4 SHA512 171b5141ebefa2b200f89c181d873885a2641e86b8c5b99261330837ac784a06668f79d4fbebd86d39e19af0b0fbc267f98108c10de695dd3ebba0496175d824 WHIRLPOOL a189ceb6d572185ed3d511c1a695bd13f2d781572e88a614a70b2526232ed7f8296799d35bbfa1320f36cce4690554a2e6edbc223c77822bf55a65483fc71c65 +MISC ChangeLog 1411 SHA256 32b9d0c7a3b4e887f5ad2ed894c193064e8b7bda3c45f693bb602a5eb38f45b0 SHA512 945620256d6193920aedc2fb8a04350b97793ab3fa3d9542c6187968714a914d9b9bc432b43432aff00a4716d8a32a36afa6fe19f3fa4a444d77b6c22026937a WHIRLPOOL 02835c655da46eb986141621ebdbe53ee21bd22cc92546fec395a26662695069ec327ddbfa5ad5d6e0fd129bdf26ea46a18aeda095e157603cb106fab95fac85 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b diff --git a/dev-ruby/rails_autolink/files/rails_autolink-1.0.9-fixes.patch b/dev-ruby/rails_autolink/files/rails_autolink-1.0.9-fixes.patch deleted file mode 100644 index a1a0a8a11dac..000000000000 --- a/dev-ruby/rails_autolink/files/rails_autolink-1.0.9-fixes.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9bc8ce3c5bd1919df87ac7039b41de18e70bc64d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= -Date: Fri, 25 Jan 2013 12:29:21 -0800 -Subject: [PATCH] lib: add to the whitelist the protocol schemes that are - tested for. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Without this commit, the testsuite will simply fail. - -Signed-off-by: Diego Elio Pettenò ---- - lib/rails_autolink/helpers.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/rails_autolink/helpers.rb b/lib/rails_autolink/helpers.rb -index 4f6cd8d..bec82c6 100644 ---- a/lib/rails_autolink/helpers.rb -+++ b/lib/rails_autolink/helpers.rb -@@ -71,7 +71,7 @@ module RailsAutolink - private - - AUTO_LINK_RE = %r{ -- (?: ((?:ed2k|ftp|http|https|irc|mailto|news|gopher|nntp|telnet|webcal|xmpp|callto|feed|svn|urn|aim|rsync|tag|ssh|sftp|rtsp|afs):)// | www\. ) -+ (?: ((?:ed2k|ftp|http|https|irc|mailto|news|gopher|nntp|telnet|webcal|xmpp|callto|feed|svn|urn|aim|rsync|tag|ssh|sftp|rtsp|afs|file|z39.50r|chrome|view-source:http):)// | www\. ) - [^\s<]+ - }x - --- -1.8.1.1 - diff --git a/dev-ruby/ruby-net-ldap/ChangeLog b/dev-ruby/ruby-net-ldap/ChangeLog index c442b9940c95..dddea945a7eb 100644 --- a/dev-ruby/ruby-net-ldap/ChangeLog +++ b/dev-ruby/ruby-net-ldap/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ruby/ruby-net-ldap # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-net-ldap/ChangeLog,v 1.19 2014/11/05 07:00:16 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-net-ldap/ChangeLog,v 1.20 2014/11/18 13:50:28 mrueg Exp $ + + 18 Nov 2014; Manuel Rüger + -files/ruby-net-ldap-0.6.1-fix-test.patch: + Cleanup unused patches. 05 Nov 2014; Hans de Graaff -ruby-net-ldap-0.6.1.ebuild, -ruby-net-ldap-0.6.1-r1.ebuild: diff --git a/dev-ruby/ruby-net-ldap/Manifest b/dev-ruby/ruby-net-ldap/Manifest index 4ba68619cc4d..f7f8bb03745a 100644 --- a/dev-ruby/ruby-net-ldap/Manifest +++ b/dev-ruby/ruby-net-ldap/Manifest @@ -1,17 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX ruby-net-ldap-0.6.1-fix-test.patch 7099 SHA256 8ab3e538d107ac88ae6d1f47fdb0161e032b12c39052220baa8f5466021348bc SHA512 13bcc0b6b172d70e58647a2bfd3bc08d883ae69e3fb53e0a8cdc2e300190cafb6337456b6ed93db45c6d8eda7462adfea9e61d13699d1152ca3a571517944b4a WHIRLPOOL 9db6c7e6d77d6561b860fd8e60d4be6ebbe30b7380b34398982614113e648baaf5c16918645ead9ac647919209473d5e62b31c03e28bc7bf3f824d45370908bb DIST net-ldap-0.7.0.gem 70656 SHA256 d39d341c992abb7273d8b83cbe32a38e69fdeb4eab684dbd2db1232e4065a4b4 SHA512 71000b05bcf7db8a3c40f6311e16385f2569df12c5b193c454dc2ebd043af0183d650626d8805c0e58e59aa842091da1fba37e35cdb58789279ef5b93ad13e7f WHIRLPOOL 6fbbe9a6ffe1832db61d2eb5cacba4675be9cf9bb7dc9d7102e3c04f244dc7572e2a19d96c62b5e6c77b64467d6efe0e76ad9fcc74837b2404387f2ea8c5ea94 DIST net-ldap-0.8.0.gem 72704 SHA256 e1b7f21b58a4c2ff6f2c3361f584342017f46d4a965f377f192b4cd8855b0242 SHA512 3083a9bb61a048213d524d9795ac61b38d07abd4788b5504b9d642062f9fcf947120c98e10a76d8e3be0dc91b680bae50b056bd9fcd75cdb4a1af2e907953cf9 WHIRLPOOL e6767bc2985faa6262743d9a6273abe2d693c4d12b21fb5dcc256a49634b059fc2bf831a21ce37128158ff18045e8630790eea2bbda8106dca262b392533ddfa EBUILD ruby-net-ldap-0.7.0.ebuild 1002 SHA256 d1abd978f714ba8920fd9cc205af84310ae84ce7fb8e8d9eddc43a3fcc9075fa SHA512 05e5a06477340b662a9101dfcbebc893b0b64f1d7fe16b1835e45b96ef6bd119cd6f34f059baf951801f2fb56ede421bb78d2e9981c9af1d9e694ef6a0f5db5a WHIRLPOOL 575e140311b4d84fc5796967557008e426241a7f8c48c2caf4f411f2be3d9e13490fcedf2288f2e067323c9eaf8b763fc179fea24a5d5467698f2121879043bf EBUILD ruby-net-ldap-0.8.0.ebuild 1098 SHA256 e842d4c5202d491930f8b6e5111313e2a75274b0b19250885cd802884f0ef8e1 SHA512 40817ac8d85cc15331b6da07364615aa24ce86f71e4766fbbcb4a459760c6718338483f5ac1443ffa8faf391c451cbe268b9bd933dcc91b2cce78e2847475471 WHIRLPOOL 35d75a3a3a59060c0f01554bd7b6c3c50630c2a291125cad57bb0256837de6ec839366f0d2f38330df6a00f56f86a50d0bc7080c9107eeb55ca9ee688cb9a42a -MISC ChangeLog 2964 SHA256 407142c2217103a3a57f02712c78797f4ec466128fdbac56868521f34b28b576 SHA512 6be1b8380f53e67b31b3f41a648e5759dfd44a1d13362d6a14a8f2c9556bf442979050f968821940c6abf34172e3968f7a1a4148cea512cc3657b0a8ed943ab5 WHIRLPOOL 8ee1955e8b80383d3e5186849a157acbeaa60d7d75f88c1e61618fc6346e97b289c4c74b8e4b8484a03bc13f4f8a92a71407103687e0ba78e1614170a8b13ece +MISC ChangeLog 3083 SHA256 8bc03068f77df19897114b7bbd713ad11f7f66d2f7ce68a6b70eb6f36dd946a3 SHA512 a6bfa8a4f1d94f1d066a6c5acc3c0c81716487e990a2a97f59971dac8ead8f34d98819fb5e87a5c0cf2af835e79c73ea5639cdb78524db1f358772e8169660b3 WHIRLPOOL f8126f602b7be76d58330181effd5cf1a12cea098a9ce65bada7bcc33186e3f177474cd6625cc18b1784466551dfdc92993ed6ee9abcee6b4b303229a353088b MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iF4EAREIAAYFAlRZywgACgkQiIP6VqMIqNegcwD/eGcmspC+CqqhEqus2mf6460P -Ni8EQx8zkZAGuTjTbD0A/jRgyNL9ItoxmMeRkn80uI3LdpTw/ljs3H4hPqNXyGrt -=ehRe ------END PGP SIGNATURE----- diff --git a/dev-ruby/ruby-net-ldap/files/ruby-net-ldap-0.6.1-fix-test.patch b/dev-ruby/ruby-net-ldap/files/ruby-net-ldap-0.6.1-fix-test.patch deleted file mode 100644 index e44ee4c721c1..000000000000 --- a/dev-ruby/ruby-net-ldap/files/ruby-net-ldap-0.6.1-fix-test.patch +++ /dev/null @@ -1,167 +0,0 @@ -From 0c439a94a2e67136f43a16fba34695120997b49e Mon Sep 17 00:00:00 2001 -From: Shaun Mangelsdorf -Date: Fri, 4 Apr 2014 16:56:40 +1000 -Subject: [PATCH] Add raw_string helper in tests, to repair encoding issues - -Strings with raw byte sequences misbehave in Ruby 2.0+ because the -default encoding for string literals is now UTF-8. The String#b method -resolves this, and was not previously available. ---- - spec/spec_helper.rb | 5 +++++ - spec/unit/ber/ber_spec.rb | 42 +++++++++++++++++------------------ - spec/unit/ber/core_ext/string_spec.rb | 4 ++-- - spec/unit/ldap/filter_spec.rb | 4 ++-- - test/test_snmp.rb | 11 ++++++--- - 5 files changed, 38 insertions(+), 28 deletions(-) - -diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb -index 5079537..a585398 100644 ---- a/spec/spec_helper.rb -+++ b/spec/spec_helper.rb -@@ -2,4 +2,9 @@ - - RSpec.configure do |config| - config.mock_with :flexmock -+ -+ def raw_string(s) -+ # Conveniently, String#b only needs to be called when it exists -+ s.respond_to?(:b) ? s.b : s -+ end - end -diff --git a/spec/unit/ber/ber_spec.rb b/spec/unit/ber/ber_spec.rb -index 48e161a..9806cc8 100644 ---- a/spec/unit/ber/ber_spec.rb -+++ b/spec/unit/ber/ber_spec.rb -@@ -33,28 +33,28 @@ - context "numbers" do - # Sample based - { -- 0 => "\x02\x01\x00", -- 1 => "\x02\x01\x01", -- 127 => "\x02\x01\x7F", -- 128 => "\x02\x01\x80", -- 255 => "\x02\x01\xFF", -- 256 => "\x02\x02\x01\x00", -- 65535 => "\x02\x02\xFF\xFF", -- 65536 => "\x02\x03\x01\x00\x00", -- 16_777_215 => "\x02\x03\xFF\xFF\xFF", -- 0x01000000 => "\x02\x04\x01\x00\x00\x00", -- 0x3FFFFFFF => "\x02\x04\x3F\xFF\xFF\xFF", -- 0x4FFFFFFF => "\x02\x04\x4F\xFF\xFF\xFF", -- -+ 0 => raw_string("\x02\x01\x00"), -+ 1 => raw_string("\x02\x01\x01"), -+ 127 => raw_string("\x02\x01\x7F"), -+ 128 => raw_string("\x02\x01\x80"), -+ 255 => raw_string("\x02\x01\xFF"), -+ 256 => raw_string("\x02\x02\x01\x00"), -+ 65535 => raw_string("\x02\x02\xFF\xFF"), -+ 65536 => raw_string("\x02\x03\x01\x00\x00"), -+ 16_777_215 => raw_string("\x02\x03\xFF\xFF\xFF"), -+ 0x01000000 => raw_string("\x02\x04\x01\x00\x00\x00"), -+ 0x3FFFFFFF => raw_string("\x02\x04\x3F\xFF\xFF\xFF"), -+ 0x4FFFFFFF => raw_string("\x02\x04\x4F\xFF\xFF\xFF"), -+ - # Some odd samples... -- 5 => "\002\001\005", -- 500 => "\002\002\001\364", -- 50_000 => "\x02\x02\xC3P", -- 5_000_000_000 => "\002\005\001*\005\362\000" -- }.each do |number, expected_encoding| -+ 5 => raw_string("\002\001\005"), -+ 500 => raw_string("\002\002\001\364"), -+ 50_000 => raw_string("\x02\x02\xC3P"), -+ 5_000_000_000 => raw_string("\002\005\001*\005\362\000") -+ }.each do |number, expected_encoding| - it "should encode #{number} as #{expected_encoding.inspect}" do - number.to_ber.should == expected_encoding -- end -+ end - end - - # Round-trip encoding: This is mostly to be sure to cover Bignums well. -@@ -79,7 +79,7 @@ - context "strings" do - it "should properly encode UTF-8 strings" do - "\u00e5".force_encoding("UTF-8").to_ber.should == -- "\x04\x02\xC3\xA5" -+ raw_string("\x04\x02\xC3\xA5") - end - it "should properly encode strings encodable as UTF-8" do - "teststring".encode("US-ASCII").to_ber.should == "\x04\nteststring" -@@ -87,7 +87,7 @@ - it "should properly encode binary data strings using to_ber_bin" do - # This is used for searching for GUIDs in Active Directory - ["6a31b4a12aa27a41aca9603f27dd5116"].pack("H*").to_ber_bin.should == -- "\x04\x10" + "j1\xB4\xA1*\xA2zA\xAC\xA9`?'\xDDQ\x16" -+ raw_string("\x04\x10" + "j1\xB4\xA1*\xA2zA\xAC\xA9`?'\xDDQ\x16") - end - it "should not fail on strings that can not be converted to UTF-8" do - error = Encoding::UndefinedConversionError -diff --git a/spec/unit/ber/core_ext/string_spec.rb b/spec/unit/ber/core_ext/string_spec.rb -index 6eebe05..ef2c498 100644 ---- a/spec/unit/ber/core_ext/string_spec.rb -+++ b/spec/unit/ber/core_ext/string_spec.rb -@@ -6,7 +6,7 @@ - context "when passed an ldap bind request and some extra data" do - attr_reader :str, :result - before(:each) do -- @str = "0$\002\001\001`\037\002\001\003\004\rAdministrator\200\vad_is_bogus UNCONSUMED" -+ @str = raw_string("0$\002\001\001`\037\002\001\003\004\rAdministrator\200\vad_is_bogus UNCONSUMED") - @result = str.read_ber!(Net::LDAP::AsnSyntax) - end - -@@ -22,7 +22,7 @@ - before(:each) do - stub_exception_class = Class.new(StandardError) - -- @initial_value = "0$\002\001\001`\037\002\001\003\004\rAdministrator\200\vad_is_bogus" -+ @initial_value = raw_string("0$\002\001\001`\037\002\001\003\004\rAdministrator\200\vad_is_bogus") - @str = initial_value.dup - - # Defines a string -diff --git a/spec/unit/ldap/filter_spec.rb b/spec/unit/ldap/filter_spec.rb -index 5e4cb8a..06fd3b8 100644 ---- a/spec/unit/ldap/filter_spec.rb -+++ b/spec/unit/ldap/filter_spec.rb -@@ -83,12 +83,12 @@ def eq(attribute, value) - end - - context 'with a well-known BER string' do -- ber = "\xa4\x2d" \ -+ ber = raw_string("\xa4\x2d" \ - "\x04\x0b" "objectclass" \ - "\x30\x1e" \ - "\x80\x08" "foo" "*\\" "bar" \ - "\x81\x08" "foo" "*\\" "bar" \ -- "\x82\x08" "foo" "*\\" "bar" -+ "\x82\x08" "foo" "*\\" "bar") - - describe "<- .to_ber" do - [ -diff --git a/test/test_snmp.rb b/test/test_snmp.rb -index 88a619d..065025e 100644 ---- a/test/test_snmp.rb -+++ b/test/test_snmp.rb -@@ -4,10 +4,15 @@ - require 'net/snmp' - - class TestSnmp < Test::Unit::TestCase -- SnmpGetRequest = "0'\002\001\000\004\006public\240\032\002\002?*\002\001\000\002\001\0000\0160\f\006\b+\006\001\002\001\001\001\000\005\000" -- SnmpGetResponse = "0+\002\001\000\004\006public\242\036\002\002'\017\002\001\000\002\001\0000\0220\020\006\b+\006\001\002\001\001\001\000\004\004test" -+ def self.raw_string(s) -+ # Conveniently, String#b only needs to be called when it exists -+ s.respond_to?(:b) ? s.b : s -+ end -+ -+ SnmpGetRequest = raw_string("0'\002\001\000\004\006public\240\032\002\002?*\002\001\000\002\001\0000\0160\f\006\b+\006\001\002\001\001\001\000\005\000") -+ SnmpGetResponse = raw_string("0+\002\001\000\004\006public\242\036\002\002'\017\002\001\000\002\001\0000\0220\020\006\b+\006\001\002\001\001\001\000\004\004test") - -- SnmpGetRequestXXX = "0'\002\001\000\004\006xxxxxx\240\032\002\002?*\002\001\000\002\001\0000\0160\f\006\b+\006\001\002\001\001\001\000\005\000" -+ SnmpGetRequestXXX = raw_string("0'\002\001\000\004\006xxxxxx\240\032\002\002?*\002\001\000\002\001\0000\0160\f\006\b+\006\001\002\001\001\001\000\005\000") - - def test_invalid_packet - data = "xxxx" --- -1.9.3 -