Move ruby21 target to new revision.

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

4 files changed, 55 insertions, 15 deletions

diff --git a/dev-ruby/builder/ChangeLog b/dev-ruby/builder/ChangeLog
index 3bf47aa0ce49..e8c0d4d0162c 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.100 2014/07/02 09:12:01 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/ChangeLog,v 1.101 2014/07/02 13:28:21 mrueg Exp $
+
+*builder-2.1.2-r5 (02 Jul 2014)
+
+  02 Jul 2014; Manuel Rüger <mrueg@gentoo.org> +builder-2.1.2-r5.ebuild,
+  builder-2.1.2-r4.ebuild:
+  Move ruby21 target to new revision.
 
   02 Jul 2014; Tobias Klausmann <klausman@gentoo.org> builder-3.0.4.ebuild:
   Stable on alpha, bug #490912
diff --git a/dev-ruby/builder/Manifest b/dev-ruby/builder/Manifest
index 81cde5fac3bf..0c696db62829 100644
--- a/dev-ruby/builder/Manifest
+++ b/dev-ruby/builder/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 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
@@ -10,17 +7,11 @@ DIST builder-3.0.4.gem 26112 SHA256 a1a31cc496700003b6809f09fc2fda5d22532a1551ee
 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
 EBUILD builder-2.1.2-r3.ebuild 1176 SHA256 f9bf760d1b57637db581e352f79d214d440c8080a834c208ffb5f61ea1254d3d SHA512 e530eb1ff01079c5edbe6d04fdf5aae10e8a2c1d2c877ed8dd28cad530efc0c678aaad6da71b7c9389b9838c74459db2750c5cda0bcb10dbb5d75ddf5bb495b1 WHIRLPOOL d254e29c49cebe2f07d320385fc3091b4be75f1e42ae7c5f11979461c6394b7f37aed5fb66ebcc42cd8ece42c9e6fa7be45d3faed3b8c250bdf4644d3e776c52
-EBUILD builder-2.1.2-r4.ebuild 1162 SHA256 c77ab17a0efbcbcfd7c43268f803ccec5555046f2be86bfe56167b0368aaa1d8 SHA512 334f5555a2b422a2d5e7691981beb5e99e9f2ec61d81b5188e10206aa27073eb05526622c26a31c54de17732b2b8f93fddba26bea707a116706c984bd9de393e WHIRLPOOL 75e11c089309b41870fc9d1f0252518faa21c2f5e4ff27c8f88e7a181c040d9e48b711fdb37d63ec5c9ff175f5053b73bbd1e720c9bdff664c8bb7886dab02ad
+EBUILD builder-2.1.2-r4.ebuild 1155 SHA256 a36fe1eefe94e25a7427079aab42b4efadec76a34397957dd5b11f75645f0b8c SHA512 ac517cb1c76d3b7b6c20edbe1f31edfc73e6f04541d68450e918c9ca23736ad8d5cff9519de458eb18ff893ba1a25a3481bd16120dd68d036b1b11a0e842bb53 WHIRLPOOL a86d7557af65d42d2ab25f6c1ceec98afc2da6358d894436a9024154914ce16b02c6b99ddfc6162e166da8ffd5211f5cda090afd1e07ecf2fb1e44bb103925ca
+EBUILD builder-2.1.2-r5.ebuild 1162 SHA256 ea21e140e07bf00ebff204056ea21e8a354f6bd9ed9a8784b87a5d919d15897f SHA512 236815afe6b547e17b92c794a8cbb9d36cb85e1f8fe58b10f9a75280c51367ac8c6ac5e3d5d266fab23e92fa7185540813fe50dfedf9ede9cc523d6227558c3d WHIRLPOOL d0fa2fc00d9ed1f8b8c6d030236f52a65fadf866c4e84d4873339a6c8bc5b460b917f12dc763c78258c7417e9f585a6046a5d0ea2155ce9b0bcc195453b8775f
 EBUILD builder-3.0.4-r1.ebuild 1005 SHA256 517ab846bd77752ffed89c68e9557fadb672f6393d93055df3d8737289665d2f SHA512 3521b01ec439e081af5000c5bc657e210c983303edf03b08a017c5e6752cb113e60b257987048f9cfcf3718064963408a5a88d890ec725c87683e6be5eca5b2f WHIRLPOOL 41e9cadd87bc8845e02317dd49d89442026e40ab3376e00b08dc94201f470a1693aaf7a423f79819ed524a245d7ff626af058291ba895c8fa739e118a62576ac
 EBUILD builder-3.0.4.ebuild 869 SHA256 565bb4387f16ce34cd348984c878b5e19f7ed5aaf675f2162ef788045268e4ad SHA512 eb295abc9363257799b92a6471b05894d3ba3e3513d757ad99a3f344aadb6451fa2975a62f046306cf0b331e4707ed206d0604b08c7812d3298e4d133cb32644 WHIRLPOOL 21ab3dabce38e25c05a471a640bd117ce64c7398e9c8ae68debb6b06c6930e44a469969fe27d15b16db13d608fa365b5dce289d46ef37ebfa18e45691ad0fae1
 EBUILD builder-3.1.4.ebuild 1017 SHA256 03925b936733367aa5b3bde692e9eaa8dbf02b72470d1befd95c58fca121a10f SHA512 5e78a6b2dfb0f2ce36c202d854f79a0b6499b672845cc6a30ded2f2acb0495b1c4f743bc2e0d148195c55a189ef8db26a63d090213e5bd475f6ec9a1e732ddd2 WHIRLPOOL c5bed4d9c90f5acf41a1e41d6f1dc14b200a35934560c3c9c1507899f82f045515da248392cc1691d12789bde188d945da050480414266c481bce99ca7a14886
 EBUILD builder-3.2.2.ebuild 965 SHA256 232206429ebefd22a0a0b56b891e90565e25e4c324c4850c8d01e81531231af5 SHA512 27815f03a109f1e937c2590cd4d80b4ae99cfb112e8c1f3897c7595bbd8ab42ca16e2613d4feb18635d753d6d61c6ab549d5c821b55237b5160dd2ae1002c377 WHIRLPOOL 087bb25116bb67803ebdf2e5a1490fbafc64acb659d75bad6d7398f1aa53ed6c303dffe6dfac8b4e418dc69c98783ed9b8f14f34febe04dce9edc4c3a1956721
-MISC ChangeLog 12153 SHA256 ba052023a7abc2cedc4a36ee534a62c23c5fa85eb4b9f2dc095604003d90774d SHA512 d6b84dd134a2a9d0a64e9452586650fc9f683b17285716b6b93933129460161f7a817708c66aa47f0a67c6521d645e9e7bfebabc479707fbb0347eea4921b858 WHIRLPOOL 692373600217d205d717a88fc792fdd81a307b8168f1326211cfaab96ba48f906eaec0bba1539317e464da790eea3e33474c728ec0c3b2658f596f444d7d0431
+MISC ChangeLog 12323 SHA256 569aad7b55c0451f99aa83d450d1c119f432b2170772b76d16ce111a4355f69f SHA512 1a55d40cf1074e77ac6ca93d5c255b3469486c96e5f9f43c10bf19232a43908765832872dfdc64701d6007f1e66abc3404e513795b210853708935604bf8cceb WHIRLPOOL 4555aef8b880ae555afc223afb081a6dc49490b68e646c5e0d1d0807210815bc460a15511751b75e031c604a2977aff939c95b814ee26044e81344cef404688e
 MISC metadata.xml 233 SHA256 32c38bb0d5d7273ede2d421cbec817fadee5ba890e600656a6fe15980406025b SHA512 560f825602f6347ee6572e01abb0fa073c54121b1f38dc2a9e79f3268ca703c814a2967d0ee15ec43bbb27f8cf600d3c8887bf9e76b56fea744142b46de962f5 WHIRLPOOL 7db8bc8ed98a030190adb672d3872655b4876255f3898c6832532faa41d8653c0944fed8b2fcd84b4200c427a5f31a0807836056cd68733f61b61d5d92a82e08
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlOzzQgACgkQA+4Doc5dVOiKTwCfX2u5XNSOaqnKmH6+4ZjKPo6S
-1CgAn0GOJ7kQEP8MLZD4GUPAfGSq2tm5
-=CVqm
------END PGP SIGNATURE-----
diff --git a/dev-ruby/builder/builder-2.1.2-r4.ebuild b/dev-ruby/builder/builder-2.1.2-r4.ebuild
index 7d7a01326b9d..2db98f9d1881 100644
--- a/dev-ruby/builder/builder-2.1.2-r4.ebuild
+++ b/dev-ruby/builder/builder-2.1.2-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-2.1.2-r4.ebuild,v 1.1 2014/05/04 12:35:18 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-2.1.2-r4.ebuild,v 1.2 2014/07/02 13:28:21 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 jruby"
 
 RUBY_FAKEGEM_TASK_TEST="test_all"
 
diff --git a/dev-ruby/builder/builder-2.1.2-r5.ebuild b/dev-ruby/builder/builder-2.1.2-r5.ebuild
new file mode 100644
index 000000000000..24adae1c6ab1
--- /dev/null
+++ b/dev-ruby/builder/builder-2.1.2-r5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-2.1.2-r5.ebuild,v 1.1 2014/07/02 13:28:21 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
+
+RUBY_FAKEGEM_TASK_TEST="test_all"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README CHANGES"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="A builder to facilitate programatic generation of XML markup"
+HOMEPAGE="http://rubyforge.org/projects/builder/"
+SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_PATCHES=( "${FILESDIR}"/${P}-activesupport.patch "${FILESDIR}"/${P}-fix-tests.patch )
+
+all_ruby_prepare() {
+	sed -i -e '/rdoc\.template .*jamis/d' Rakefile || die
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby19|*ruby20|*ruby21)
+			rm test/testblankslate.rb || die
+			;;
+		*)
+			;;
+	esac
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -S testrb test/test*.rb || die
+}