Move tilt 2.x in a separate slot since many packages depend explicitly on tilt 1.x.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

diff --git a/dev-ruby/tilt/ChangeLog b/dev-ruby/tilt/ChangeLog
index e99e17e2cb7d5d1f83b9b1cfb4d50688429bf5d2..526ce40ecf5a07cf09798c26b66f34b937a6635d 100644 (file)
--- a/dev-ruby/tilt/ChangeLog
+++ b/dev-ruby/tilt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/tilt
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/ChangeLog,v 1.36 2014/11/18 13:35:58 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/ChangeLog,v 1.37 2015/01/19 07:16:53 graaff Exp $
+
+*tilt-2.0.1-r1 (19 Jan 2015)
+*tilt-1.4.1-r2 (19 Jan 2015)
+
+  19 Jan 2015; Hans de Graaff <graaff@gentoo.org> +tilt-1.4.1-r2.ebuild,
+  -tilt-2.0.1.ebuild, +tilt-2.0.1-r1.ebuild:
+  Move tilt 2.x in a separate slot since many packages depend explicitly on
+  tilt 1.x.
 
   18 Nov 2014; Manuel Rüger <mrueg@gentoo.org>
   -files/tilt-1.3.2-thread_id.patch:

diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index 2ccfea954ae99172d2b20d73f30e2cc0a2c329b6..9af5e66596ae66e8522adacfc1da8e5eea306332 100644 (file)
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX tilt-1.3.3-yajl-test.patch 1271 SHA256 0d6b137c9333c092436bde716b3779a8ea1ba0494aa280b54ebacf95e6b4447a SHA512 93b99903d8974d01362abe8c0fc00f5dc64341a70c7608a5ba2f5e3ed31c9c6f1171a507a90abf5fc0ee7a7187ab3dd9cbe553bbc94545e2ea70f6f14ead2526 WHIRLPOOL 6a656e71bf145a224f4982f08ee889a59986e557f15bf81336cc3debbbbb23d89281913a0e72fa531f7deb6efbbef2d0ea83f0d561ee69f37e7b4e64f062cf70
 DIST tilt-1.3.3.gem 36352 SHA256 48af9536c7699dc0f8f50ba2432b627a3f47f9702d2d25d48dfc2d4a2da20da3 SHA512 6f1b23694d1a459869d581baf9f1f8bcc60218f5cd99fea3ae57d3104b1ab0857dcbf801ad636afb42985c4574427fed7039dc92da094c8761a9861a0ac65e74 WHIRLPOOL 7a5a9afcacc56b4d1dd9617e29a243cc54d607c15e34f319ee469a1bac1d90f949608dc8b4ae6d9b17858460f8cf0b06f23c037afd1e49e506ca838ebe36750c
 DIST tilt-1.4.1.gem 42496 SHA256 39820562c4f5db45fe18de87ccc30a0e77a998bf5334b1d8c10a2f7dbc1f5903 SHA512 10fec263596d0e18a7a1440a7edfa08a161526cc46cc70427bc251951c447c40b4a4e8675e9162a9ed288879682b4aceeeb35b48cf3f4925921025194543363f WHIRLPOOL 5d70949358b97e867cdec160bd3c3726dabfec94bfeadc3a12f17463d378779d8502dda6458c7deb92bd3d9def91e306077ef806a7f75bd6c892554739ce46e9
 DIST tilt-2.0.1.gem 44544 SHA256 73dc6e2cd2fe4251cb7d15c92d0e66c884f17d0be580500d00cb426eb29881e1 SHA512 9451b2387c7c2535c9c78ae07dc0893f675e921d845f8eb5bc24c13a1e726888baba0d813195a81014370b640b290fab2e1b47871b6b2ab1e3eddb10c71217df WHIRLPOOL 92773f66291c193e912f810b8ad3da827782e744b19e2ef0ece7db262ff8a66324e9e08362f3b37ce14d125a196e743f1e264ef739bfeeaecd37c1a29c15c7e6
 EBUILD tilt-1.3.3.ebuild 1487 SHA256 42cd73c0fa2de07eb702413bb9d184278c77e94961dd6fb45fa10e61e148094f SHA512 f16e6c5c0b4e585c557abbeebd64a04ab4a63d6c4ea3fd806d406963c0bf36540f3f5cbc9893c4170fea4e8ae4d5fa6469458a57f8616954e71777a3fb47c610 WHIRLPOOL 60be2d42c81b7107912006cee412bbaafb4760f48d4d5fe74987d10aeb5eb7260c1040086a6aa8c74e0f21d29be091b9a05666f1ab701a41be5983feb3586e5a
 EBUILD tilt-1.4.1-r1.ebuild 1159 SHA256 159145b4429cb2d4e1f241e4c4030fb98a40e5570f68573b905d5ad2ffcc6169 SHA512 77746196247f1ad041544ab208edc35bf42683d5445377bee0cb3b323da048598c941dabf9a1356a5b89a1da5b1304682ae58a4547e0aad2538a8851e8feb62f WHIRLPOOL ee5614f2d35a0dac63e75a01bf5cad7863f55d9d686984ab7d776bd3a105e919132ef148755ab98b988f1b232a1e84dc24ec7f7b6f30b24bb5075675275e435d
+EBUILD tilt-1.4.1-r2.ebuild 1182 SHA256 7b95c0ca0a16784e2181223678e8bfae5442cd966b083c4f89a3c8cd48a29c45 SHA512 4d292cdf741cc826f35e8168cf18b3500815adf2ecaa4a3214207fbc4182bbcb096cfb6d0bbb5824b169b28140a1bb78616934bdab761df47f00c4efed4c3de9 WHIRLPOOL 218c9df26a5ed029e72ae1cf2d4a7385f65b266eb36abc21fb86683edaf4565bb0aaa86d00cce8e5fd3c71488e9810acda0c63877e977da5644ecc29b51b5e2a
 EBUILD tilt-1.4.1.ebuild 1149 SHA256 4891ea0cfd43bbcd11e7f95d630baf4210bf60c32fe21f8242888d77ebfc4a0b SHA512 fa0cec99d1b3e65b89d4c59b38d89d51deffec1491551a9133612e0a30dcec34654abc97459ad2c55e75da12d434c6d8f8d2448009566eea30ca19cf82e6754e WHIRLPOOL 372abf27724f603478d23f7229cf1a21af741302e78d5f69272245befb4af2c0ba048072d5d095feaa32c48f208f6f0f15dadfd86836fe942d526864ffd3ef81
-EBUILD tilt-2.0.1.ebuild 1698 SHA256 2d25ccde4a059a1c89d2e229522ce13ed983e3a2dd4fc493c9b00dd472783587 SHA512 80fca5469a43f626f78e4b0cb446524aeaf5450f49a833f92191e4ef2ce5f01bdd4ce6bbb0049f17f076508569281d122ce90d0700acb07d37a1f514b7cc7c87 WHIRLPOOL 451181fb6c1effc56e63179229d78c0cd1067eae2b569238bfb7d6153a914cf5f93ecb58b0a7f651c68cefe999afe0c4d602323d73231e2187e1a20f8a832302
-MISC ChangeLog 4603 SHA256 88de8a7b798b9528e611aec83c4a07bdb9ae1b20237e0d0449c253825646fd01 SHA512 88859f96eee6fed150e0c7dce2897adb885b4649d4e4b53bc76a0cf7d90a537cf8d233bed3f1b7b22aa1c7756a72724d9fc2fb409cf2c340af7e292065129e97 WHIRLPOOL 01b8704ecb3238a04411458cf472d0cc25bf48f1bdcd95a7ef4f3a1b15693cde730584214ca28193acae854850ee0e8dd16cbdc90d9f21111ed65af115b31de0
+EBUILD tilt-2.0.1-r1.ebuild 1711 SHA256 7d115a1672aeb596f609a7fbb924e02b448a974c7ff4e7d23c1ee9e1470f540d SHA512 fe508461281c50eebb7318e51bbcf357c75a8a0c92090cdd819b7e8ba5551f02bf3c1f3a874e5c97242d0129264accb9c70af9b67516e3d22c49d7f4b6417b4d WHIRLPOOL d8b1092d7a2a9c2157a05350326209c021d2057a6e010dc9b6926633004002f6764671de66c04a081e14ea3d4e916b07995d2a6c49036e4da3bbb6d8b3d40750
+MISC ChangeLog 4870 SHA256 c95207d57c17852ffd443436f687abc6f95bc327a79c2adac8a7be1021834b35 SHA512 212bd78c995d34e297ce91978abaf20d29ac5b01f57f8bda78e3a38ae12597ea5d600c21dadc1df77dff22dda563d384980c93ddbad43738b13e9a42113f1588 WHIRLPOOL e8d2c18ce913b80e76819f5d335369ecf9de9c65176e083eeee0829577dd511f87892c3b726fbf2104b16794facf4e899161bec75658d832e3c2cefccf52cff7
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlS8r2cACgkQiIP6VqMIqNcdwwD/eNrCEjJBo8rxfSy4T71DaT4a
+bAxRZMVew/1Pk8kQLYwA/iLcj07pvBiggZe/waJUvlZcqsX3AjBow02GsjPIJxZd
+=2Hfx
+-----END PGP SIGNATURE-----

diff --git a/dev-ruby/tilt/tilt-1.4.1-r2.ebuild b/dev-ruby/tilt/tilt-1.4.1-r2.ebuild
new file mode 100644 (file)
index 0000000..01d9f7d
--- /dev/null
+++ b/dev-ruby/tilt/tilt-1.4.1-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/tilt-1.4.1-r2.ebuild,v 1.1 2015/01/19 07:16:54 graaff Exp $
+
+EAPI=5
+
+# jruby fails tests
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md TEMPLATES.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A thin interface over a Ruby template engines to make their usage as generic as possible"
+HOMEPAGE="http://github.com/rtomayko/tilt"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? (
+       dev-ruby/bluecloth
+       dev-ruby/coffee-script
+       dev-ruby/erubis
+       dev-ruby/nokogiri
+       dev-ruby/radius )"
+
+# Most dependencies are optional: skip haml for ruby20 and ruby21
+# because haml depends on rails.
+USE_RUBY="ruby19" ruby_add_bdepend "test? ( dev-ruby/haml )"
+
+ruby_add_rdepend ">=dev-ruby/builder-2.0.0"
+
+all_ruby_prepare() {
+       # Recent kramdown versions handle quoting differently.
+       rm test/tilt_kramdown_test.rb || die
+}

diff --git a/dev-ruby/tilt/tilt-2.0.1.ebuild b/dev-ruby/tilt/tilt-2.0.1-r1.ebuild
similarity index 83%
rename from dev-ruby/tilt/tilt-2.0.1.ebuild
rename to dev-ruby/tilt/tilt-2.0.1-r1.ebuild
index 8ce1c03e4719d67ef2b7ab04bc8225a271b25dc8..1916e9d4e62de6c487cbf945db752993a7cda733 100644 (file)
--- a/dev-ruby/tilt/tilt-2.0.1.ebuild
+++ b/dev-ruby/tilt/tilt-2.0.1-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/tilt-2.0.1.ebuild,v 1.1 2014/08/20 19:37:47 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/tilt-2.0.1-r1.ebuild,v 1.1 2015/01/19 07:16:53 graaff Exp $
 
 EAPI=5
 
-# jruby fails tests
 USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC=""
@@ -13,10 +12,10 @@ RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/TEMPLATES.md"
 inherit ruby-fakegem
 
 DESCRIPTION="A thin interface over a Ruby template engines to make their usage as generic as possible"
-HOMEPAGE="http://github.com/rtomayko/tilt"
+HOMEPAGE="https://github.com/rtomayko/tilt"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="2"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
@@ -35,7 +34,8 @@ ruby_add_bdepend "test? (
 # because haml depends on rails.
 USE_RUBY="ruby19" ruby_add_bdepend "test? ( dev-ruby/haml )"
 
-ruby_add_rdepend ">=dev-ruby/builder-2.0.0"
+ruby_add_rdepend ">=dev-ruby/builder-2.0.0
+       !!<dev-ruby/tilt-1.4.1-r2:0"
 
 all_ruby_prepare() {
        rm Gemfile || die