Fix license change in stable. Version bump.

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

4 files changed, 53 insertions, 6 deletions

diff --git a/dev-ruby/coderay/ChangeLog b/dev-ruby/coderay/ChangeLog
index b630ce510b1b..af03b9a8ad01 100644
--- a/dev-ruby/coderay/ChangeLog
+++ b/dev-ruby/coderay/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/coderay
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coderay/ChangeLog,v 1.74 2013/08/14 07:15:13 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coderay/ChangeLog,v 1.75 2013/09/02 06:01:17 mrueg Exp $
+
+*coderay-1.1.0 (02 Sep 2013)
+
+  02 Sep 2013; Manuel Rüger <mrueg@gentoo.org> +coderay-1.1.0.ebuild,
+  coderay-1.0.9.ebuild:
+  Fix license change in stable. Version bump.
 
   14 Aug 2013; Manuel Rüger <mrueg@gentoo.org> -coderay-1.0.6.ebuild,
   -coderay-1.0.8.ebuild:
diff --git a/dev-ruby/coderay/Manifest b/dev-ruby/coderay/Manifest
index 8ef86aa77867..8b557e7382f1 100644
--- a/dev-ruby/coderay/Manifest
+++ b/dev-ruby/coderay/Manifest
@@ -1,6 +1,8 @@
 DIST coderay-0.9.8.gem 97792 SHA256 1522e8b2d73dfead95d7f195dce63411c59b4b7cb120c6589d6474ccf207d38c SHA512 32443a817cb7bc37560e5826b9d9f8e0a7846a9687e39df22823f5f53671e42c3239102336aeb1126f848b62af4028c70d85279705cfb1ee465f9ff380a8f8ef WHIRLPOOL 871f02f0e6958a7825ce32e2ede0b00e6b2800aeecac3f7938e8b4233eecfd87433c052c7b732fcc29d6f3a497b9bff6fefe688de51ae1f7aa12711396586960
 DIST coderay-1.0.9.tgz 249169 SHA256 4dc6f49cfa3428149e6fd80aa14b5a1efc5210e35dd85c07fd20958d031653a3 SHA512 629a27316cecb8a5e09f9d939b671a0d6b4bb187c16b85704ed781d5004c6bfd15fb10d00508d7c659a66e6095a428a0201f0ab5a64dd36df7d696d17e232d97 WHIRLPOOL 3b5bcca16ec6b226b793ce25b3ff637348112a6e44141f1093d4c99cc7963be49b5a9a245109020cdbdf2e3779d060f37caed00c3b1d4d42db8c834ee9159201
+DIST coderay-1.1.0.tgz 242639 SHA256 2e9fc7ac7ef9b14fc87f8467994bf436d3bc1e7fb6f768cc2c1049ea5c6cd96f SHA512 8bf57162f59a35a2c0df9e4925ce2313c77a8613849df6e18052c3d15c5a1a39f73ff0a090675711e274e269f271dc6f7c5a9ade25cdaa34080ee3e245e9d19a WHIRLPOOL 31bd461ce9fec3d402bed43103b43136dca4388cd27f226c16fb33b957117b14701dac147c0b0c61204fe806e4c7b2175f4c3908e673791a1f1f412f7879fd26
 EBUILD coderay-0.9.8.ebuild 933 SHA256 ee230c4f1377b6ff56783e6c08a052192fb5f3c5f9081b07707cf32ad7271b32 SHA512 d49ac1ca724393b371efcef0c1d7457d2f20f6f4b3c3a9b9e1785c773d6ebda21e3cb3b1e5bd00badfa73ba2ac04ef901fee2d188843ca5969797e0adae68ba9 WHIRLPOOL b2f2e4602f8be96276c081ed30b236dcda8b5a3a5baa81a916f577fc2d1acd54865057a68a1ea7b4303495c81ec82783db0ffa9e19231972c6659817cb384aee
-EBUILD coderay-1.0.9.ebuild 1409 SHA256 86d7736c276f75cf205f7b505e379ce4f8b912cd05c4635a113a5ff1e36a6881 SHA512 642050756343af145d403720f3106c00860863d1b889fc5b6eea0b05c46f154a9ca72fde76a262f32667361e3e11f31a5f2c921a8366360ba8eaac29611422d0 WHIRLPOOL 82bf7ab93de4c43b4ff131a9ba35ec85a6799d271bbddccd8c7393e32bad96d3d744a563a3aeb146a5d5e724301eb5dae099c0f033d20e0de6b5a874ff1d6f50
-MISC ChangeLog 9475 SHA256 082f77053c3095cea6c2cd17d01bc7450c0ddf5204b30d8e690c0203438ac63a SHA512 20b4b249ba175783062cda7b2b4d41f30013c9d29a36ce952288cba2281f5b5610c3faf588a447cef740b58c650cdc912b21c572dc81847c87e0272101c38ecf WHIRLPOOL 5b6f48bebd2a26b636cf4169d2bf4b94b11432ef7ed823b0eb349a301dcfe6d2eefaf27259d41003fa10e9a9479bb35b05f87f88720236a6f995df2683bbd674
+EBUILD coderay-1.0.9.ebuild 1397 SHA256 7e6a8b323385603786fb3de38555876bc7ffc0fc38b679568d161e36348004b7 SHA512 78f9039fea34c06ed72c0c71c6be5e6b365b0e5e2a3da41cb7c46f7320804c02acc93aa26d1084de4d38a443870487878c0d8382fcf2e21e0b10f1e093b79fa8 WHIRLPOOL 1ec91fa583eda5402c07950a112894bc780a6eef2b3cddb45bc813ca063871023139755db7dd6da33a7c41e28cb8f5608cd9ef09bea5eee703f999cf4b617501
+EBUILD coderay-1.1.0.ebuild 1405 SHA256 8dc44e4c920b6eeca9326c7b91513b9662c1ae0f47cb21343663df67275ecbb5 SHA512 0bb96942eb6a5e50fa1d055f0912cdd6cd8075bdc8aef97da054beaab3f26c188eb0fd8b639d473be8017e00ef6195ff8cc39a88d67b2f4c9d1bc9204dcbd247 WHIRLPOOL 13fa7cb1d8bc80922c4177ddff5ad661df75c2e6e9a0b3c4366fc97bdce94fc23d0cbbfee5992ce7ee8b6e35091800c651616f986b7586b248e7a5f6c4f9e765
+MISC ChangeLog 9647 SHA256 f8afd1ed5605f9f3aedaedfaa87ecd331f7e85e13f6530b5032d33537b8be18d SHA512 c2d3f660ee614c06f13f5fdac27ccbda1259bee907e3e992c42f85c94da62217d568e414d4a4cde9db611efcf041f0bfc69aafd6eb0b287e8efcfd6181b48221 WHIRLPOOL a1cfd2a2e997cc185d1f2cb6248a251927e721c80ea8710ade8a381f0f85e0af6a145a7089b06312a009deedf81c232d94987bd5faa5a79405d34ea164c7c781
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/coderay/coderay-1.0.9.ebuild b/dev-ruby/coderay/coderay-1.0.9.ebuild
index 9ffd22652d8e..f7da41f50fc8 100644
--- a/dev-ruby/coderay/coderay-1.0.9.ebuild
+++ b/dev-ruby/coderay/coderay-1.0.9.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coderay/coderay-1.0.9.ebuild,v 1.10 2013/08/08 19:28:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coderay/coderay-1.0.9.ebuild,v 1.11 2013/09/02 06:01:17 mrueg Exp $
 
 EAPI=4
 
-USE_RUBY="ruby18 ree18 ruby19 jruby"
+USE_RUBY="ruby18 ruby19 jruby"
 
 # The test target also contains test:exe but that requires
 # shoulda-context which we do not have packaged yet.
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rubychan/coderay/tarball/v${PV} -> ${P}.tgz"
 
 RUBY_S="rubychan-coderay-*"
 
-LICENSE="LGPL-2.1"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-ruby/coderay/coderay-1.1.0.ebuild b/dev-ruby/coderay/coderay-1.1.0.ebuild
new file mode 100644
index 000000000000..c31bf77dc14b
--- /dev/null
+++ b/dev-ruby/coderay/coderay-1.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coderay/coderay-1.1.0.ebuild,v 1.1 2013/09/02 06:01:17 mrueg Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19 jruby"
+
+# The test target also contains test:exe but that requires
+# shoulda-context which we do not have packaged yet.
+RUBY_FAKEGEM_TASK_TEST="test:functional test:units"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="Changes-pre-1.0.textile Changes.textile FOLDERS README_INDEX.rdoc README.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby library for syntax highlighting."
+HOMEPAGE="http://coderay.rubychan.de/"
+SRC_URI="https://github.com/rubychan/coderay/tarball/v${PV} -> ${P}.tgz"
+
+RUBY_S="rubychan-coderay-*"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Redcloth is optional but automagically tested, so we add this
+# dependency to ensure that we get at least a version that works: bug
+# 330621. We use this convoluted way because redcloth isn't available
+# yet for jruby.
+USE_RUBY="${USE_RUBY/jruby/}" ruby_add_bdepend "test? ( >=dev-ruby/redcloth-4.2.2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/ s:^:#:' coderay.gemspec || die
+}