Version bump.

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

4 files changed, 68 insertions, 32 deletions

diff --git a/dev-ruby/highline/ChangeLog b/dev-ruby/highline/ChangeLog
index 844834760748..5e6ff6de1282 100644
--- a/dev-ruby/highline/ChangeLog
+++ b/dev-ruby/highline/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/highline
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/highline/ChangeLog,v 1.74 2012/12/30 20:46:07 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/highline/ChangeLog,v 1.75 2013/05/04 09:08:45 graaff Exp $
+
+*highline-1.6.18 (04 May 2013)
+
+  04 May 2013; Hans de Graaff <graaff@gentoo.org> -highline-1.6.8.ebuild,
+  +highline-1.6.18.ebuild:
+  Version bump.
 
   30 Dec 2012; Agostino Sarubbo <ago@gentoo.org> highline-1.6.13.ebuild:
   Stable for alpha, wrt bug #447594
diff --git a/dev-ruby/highline/Manifest b/dev-ruby/highline/Manifest
index c3d8fd3f336f..8160a9b4373c 100644
--- a/dev-ruby/highline/Manifest
+++ b/dev-ruby/highline/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST highline-1.6.13.gem 219136 SHA256 7dcb2a3c99001fba6f7597682aef935db0ebf69f293d7604954763b135195c96 SHA512 390df34d5810fd640212706366a33dadeffbc2b689db20d8584827f93ce30395d32f382c8ccfc8947b8cf6bbfa693b3691d4e21d36d3850fc6aa72b3ca63fb45 WHIRLPOOL c9125bb170152842137a6fc75b18e867f90f5a22e3b5c9e8eff6ac6900498d22b5e283fef57da4b6cbef3dc1e43210fabc4a7c3a11fbf8bbd89e5df4fb25af98
 DIST highline-1.6.15.gem 218624 SHA256 a1925472c2395c897354e66334891b9347887886181a6e5b6a55a44dfda39cc6 SHA512 b8ce321f198a67806b09049f8ef9a9ae888ecff8e226d427c9e4fc68bf0c17c916003e5ee47bacf1799435a480d1cc79e35fa7cd71c67c8ea7f427b16c981861 WHIRLPOOL 694b2dc539a7aa8e9d9c8ed29790eb54ebc6683bba7261e22b5915cceb705310130d16ea73500bd7af31091fdf172a33578fe38e24a957b057d1404f49f4fd9d
-DIST highline-1.6.8.gem 66560 SHA256 5dd4f1219ec60683e262716f21fe9c2f113ed8119dfa820c7294ebbf5c7cd38c SHA512 17f663ce09e09bd0d36ea64b9d6e57c040887eed1d73ec04116596a2c7c2d0cfef1cca927f1833895535636d39ebbb18fae9f57c81161bedd4600d35c2f4026f WHIRLPOOL c769aa17f7ca5af5fbc748fd4924b4a458f5a4b4b55861995de620a9e5ff06e1be5b31ce84de221a25c8f825b004a9ab00b3bff0792291ce7e40485acfd1013f
+DIST highline-1.6.18.gem 220672 SHA256 02b953647dc3b159b7215a468b45f606e07de54035bfce3d7d35479656e33d77 SHA512 3163562272fe62f056ad563227ec5ea8a0f73dba285732a8b858968ddd80afefa75ad041e55573b88ea5def77e2621e387bb60a6875d3fc2c23713906d8c7f19 WHIRLPOOL 4835052bc363d5fc4e2c9e7bb280de6af68a0b8695c00a9b3266d740c797f411bd4030d225a68cc06a596f6f0e665000601200ad15887861f26b41e9910b01a2
 EBUILD highline-1.6.13.ebuild 944 SHA256 449d879ee39e216f6c24bd2e1239731724a13b2350c348a249d3d494414cded2 SHA512 1dea0bfe5ab86e8449cf1779429b58aa7828762dd0c87bdf844e3a97ea44f0b1c4488490767dc0b5d61c2bf82a4ee86191fefab12aebbf10044397caf63cf23a WHIRLPOOL 1ccc1cbbe4065cd61edd7ffc6052d6860b57b7f2ca64e989d55129989cb759293dd40a73bbf58bf4c0b92bf6fc12b8b1e571c8b9938177d188c5e5bbd509bc45
 EBUILD highline-1.6.15.ebuild 1247 SHA256 3ed9f347e3bb449353798df77f58a89125167078e949b64e983a921496785e74 SHA512 9698e97359d995d515c75167bd90a95b022c619aa8b1475cf532f6b06596049328931e69c09275c0e4c2e52b7d83afcb690ad8e5e04e7054ebfe448a06379e01 WHIRLPOOL 0873346c9b911ee26323ae33aea0f1126ed1571bf23cc7b5aec25e2aab750a8d0dae0c170e965bb93856a0ba398e9fe7ece22c200589d520586b5d0e5fce29b9
-EBUILD highline-1.6.8.ebuild 860 SHA256 fcc1fddcf948bbbfdd3b7d888c404a0eb834adc6e3163810b89f5f685b3d92d9 SHA512 6f08f250551d4a2cb0b096b94920f01f31646995497e5b2488b4fb03d38f47e1534602aabcec15869028b7f27aad6c3b2a35d4aafb882a723e58e36ff28fac85 WHIRLPOOL b7dacbcf5b6998f0cfad82a09229f81aa42381d085cafb288442145c17c1c684614d0f19c5384b17fd870d8108a621c7fa4a237879c919e399b8ff2605bd9e7f
-MISC ChangeLog 8898 SHA256 e09e65166af26befbf47932b2d52bedd732410fd6916fa14b1973bb8397f2e58 SHA512 1490bbfdccf979f9b341da29d6acc7dd757ec35047bd9319d80290c9534b92175451806db0083da59f4b1a5fff008b9314675a876d7deee238bcad4bcfda6b53 WHIRLPOOL b5516681ad0116d115bdb2a563bf2fc64b1a22b2b7c447fce3130a1b6b2ff3c8172cd9cfe861c35e89190831832ebd651d89d203d6208b0388707f25adf3d4e5
+EBUILD highline-1.6.18.ebuild 1417 SHA256 17a0b6b1abbbec734fc13af1bc7ddf16ca99af3b953b763ffe91e46c93f5bd7f SHA512 197b3876c673c6867ea2c04447a9f6bab37cc46bb209368f75d91d9d482e38d98efb91a66a482670d7c21744347e8b5a3fbecd2b3f2c8c3490c17b2c2ce0b4dc WHIRLPOOL fc7cce99fbfc5a1558c66752ec7b697cdb82872d7abf95c2548b26daa5f0616a32a54e410022c5bc0f27897b7d02a6da307b1d41bcb32d2fd4b9a324f32fb672
+MISC ChangeLog 9051 SHA256 5d9c5ff78a19c0e673f9607fdb76485651fd146a62464a63e705f4c19d43a91a SHA512 5f5ad2a3a4375917fc8829a25426830d4572422dd5d3aa2bd11da3f2039266ff76e21f79a51230eea6ea4d029b84d84696a58802bb7ff2b26ce31f7ff1b444b0 WHIRLPOOL aa8465868286ab4be706e076171214c2855c32adc5a2ac274d7f64346a817c04de65bb587c59a700f2fdcc9ca906962917dc7e9531ba33a6475b3e4f37a4862f
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlGE0B4ACgkQiIP6VqMIqNe/9wD/Q27GpEQLTTaXLphPa6jTV+AZ
+AgICtXXM1BFMEviCgnQA/RKZeP++K5VN+1Mb2dVKk4pUBlH8Cn8wrDRG4uiFHwrr
+=4kws
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/highline/highline-1.6.18.ebuild b/dev-ruby/highline/highline-1.6.18.ebuild
new file mode 100644
index 000000000000..c2b97c71a8b2
--- /dev/null
+++ b/dev-ruby/highline/highline-1.6.18.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/highline/highline-1.6.18.ebuild,v 1.1 2013/05/04 09:08:45 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19 jruby"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc TODO"
+RUBY_FAKEGEM_DOCDIR="doc/html"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Highline is a high-level command-line IO library for ruby."
+HOMEPAGE="http://highline.rubyforge.org/"
+
+IUSE=""
+LICENSE="|| ( GPL-2 Ruby )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+all_ruby_prepare() {
+	# fix up gemspec file not to call git
+	sed -i -e '/git ls-files/d' highline.gemspec || die
+
+	# Avoid tests that require a real console because we can't provide
+	# that when running tests through portage. These should pass when
+	# run in a console. We should probably narrow this down more to the
+	# specific tests.
+	sed -i -e '/tc_highline/ s:^:#:' test/ts_all.rb || die
+
+	sed -i -e '/test_question_options/,/^  end/ s:^:#:' \
+		-e '/test_paged_print_infinite_loop_bug/,/^  end/ s:^:#:' \
+		-e '/test_cancel_paging/,/^  end/ s:^:#:' \
+		test/tc_menu.rb || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*jruby)
+			ewarn "Skipping tests since they hang indefinitely."
+			;;
+		*)
+			${RUBY} -S rake test || die
+			;;
+	esac
+}
diff --git a/dev-ruby/highline/highline-1.6.8.ebuild b/dev-ruby/highline/highline-1.6.8.ebuild
deleted file mode 100644
index 3272792c0bcb..000000000000
--- a/dev-ruby/highline/highline-1.6.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/highline/highline-1.6.8.ebuild,v 1.7 2012/11/07 04:30:40 jer Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ruby19 jruby ree18"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README TODO"
-RUBY_FAKEGEM_DOCDIR="doc/html"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Highline is a high-level command-line IO library for ruby."
-HOMEPAGE="http://rubyforge.org/projects/highline/"
-
-IUSE=""
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-all_ruby_prepare() {
-	# Provide our own metadata since jruby can't handle the metadata.
-	rm ../metadata || die
-
-	sed -i -e '/AUTHORS/s:^:#:' Rakefile || die "Fixing the Rakefile failed"
-}