Fix dep. Remove old. Fixes bug #540838.

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

diff --git a/dev-ruby/pygments_rb/ChangeLog b/dev-ruby/pygments_rb/ChangeLog
index 33e634d6db00a9aba56487875df25710d622d0e7..ecc7511a2d2bd8c532171e0de2d1115bfaadf297 100644 (file)
--- a/dev-ruby/pygments_rb/ChangeLog
+++ b/dev-ruby/pygments_rb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/pygments_rb
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pygments_rb/ChangeLog,v 1.8 2015/01/29 21:04:49 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pygments_rb/ChangeLog,v 1.9 2015/03/29 04:45:17 mrueg Exp $
+
+  29 Mar 2015; Manuel Rüger <mrueg@gentoo.org> -pygments_rb-0.6.0-r2.ebuild,
+  pygments_rb-0.6.2.ebuild:
+  Fix dep. Remove old. Fixes bug #540838.
 
 *pygments_rb-0.6.2 (29 Jan 2015)
 

diff --git a/dev-ruby/pygments_rb/Manifest b/dev-ruby/pygments_rb/Manifest
index edfa0ec09f6e5753d4ec5435edb486972849dc65..762330c921fa5096eb5e593f074a3c1879c531d4 100644 (file)
--- a/dev-ruby/pygments_rb/Manifest
+++ b/dev-ruby/pygments_rb/Manifest
@@ -1,6 +1,4 @@
-DIST pygments.rb-0.6.0.gem 1879552 SHA256 5a78b84e44fe819077a32e23f036ec626c144ebaf62d4ab1ea73e5c852925f4b SHA512 08e2abc76791790c28d9a20619a24c3d4057835d0d59e82c067b812809fc377aeb50e8bcb8f4d2ff0880d9b89dde6ee0789554b8140d07bf96f69034391554f0 WHIRLPOOL edf355f8dd3ee3238a141db03e09bfd1663bb906cc002bcc37f6e39c3c82303c90ca9752858ec22c1c3a4bafb8f245e063be3d2a601d040665aff279d0c6b8a2
 DIST pygments.rb-0.6.2.gem 1892352 SHA256 f4a1743be41a14f1f7ce63e03acefb9c6fabf7261c296b001191e0800f56e032 SHA512 8fd2da56d669882fa6b73073f02371ed7f9523ae115dd66bd77f2ed1d2e0abe5336e52d94fd92e85a55d813d163b0a6615233c2b27d16b5d089e0f97a2647d9c WHIRLPOOL 4caecb6182dcc712f2cdeded83bb734db7c5f988b70c0e87dd63c09ab0e75877cd780f4c5d1d64f751ca0fe3f0d8794e6f27d16a72fdfe4f1724312a705f6f12
-EBUILD pygments_rb-0.6.0-r2.ebuild 1674 SHA256 3193f6904ce7888c7c16bc2c5be8bc0224e151ef8a82715263a3c3b8be4c44ba SHA512 75f427a66ff2ee81588b89ced8eaaaf01d836aafa952e51ecd4093e1d8cdcce7fd1b9d4459e6e8cfea04ff49f164aecc9459dcda389141a1265a8d332e136c89 WHIRLPOOL afe65ffed57e52d6c73163c895ae7a6ad784106f9ebeb679aa9813c9fedc61cc2519c0d4d6914c9d7c2bb4960c8bc16c3198de89e4c612c69c99ad1807621448
-EBUILD pygments_rb-0.6.2.ebuild 1670 SHA256 624dc3961f19c05746e3de300d04e019016130db803d00368c5eb07917363f3c SHA512 f274290005c9131f5cfcafea0493f3a66e1992d87a2381fb329d74af20bea7e0ec25486268ef69e9b34cf597a9c1f9b89c44c386d36651e3216ba7c05dfb0376 WHIRLPOOL b579eddba8ea26750e83386d4755bb38d2d06c6a476c2b392dffb1f1a29cc755ed44fd19f442f8cee7102ed4d2afae45d3988d15b808d9f70f0cf804dd641c92
-MISC ChangeLog 1409 SHA256 1754a860085268b53f2f0b2b01c6108ed50b0c4a98ddda3741122542a19c241d SHA512 4a0e23404efd00716a8e92c518a3d0393a66a7353351e7e6342b8dc82d6e21221771773c13b6479d4ababadf80a95eb1a1a3715cdbc7b0f941b1a791a414bc93 WHIRLPOOL d5ce35fecb90a75101450dde19346eb3f0a16199348585ba971a08f675cdff91dd4de1e4895a33f9b2db5e3ec6a6cff266784065192fb58b14ce5648cf29499b
+EBUILD pygments_rb-0.6.2.ebuild 1670 SHA256 263f7133c201d91b5a100971f5a5ddbf053a9fa41f1c35b3fef92c22ae3e5827 SHA512 7dbd002f7dc07eee0926b3fcd74fd6e2e22092f15fae8e13d7691ce7227725f700a60ebba625eec62d38eb6b803bccc174b8e5a584e4301a5118cdbb61c9eba7 WHIRLPOOL 473729a30a037216799f3b7cfa624f35f5b3872e8d842fafc0eafa71c359b645596869a34dcaceb0d9df6331bbcd6e5d5b865a5cd51553546f9aef4ea37d792c
+MISC ChangeLog 1558 SHA256 f4b6bda2e0f9a2e88a4f45d5d2c6ebc3e7513d6ecb22106296024c8fcb877736 SHA512 f1e131856943f3acc042a138766ed8b27416d67fcea9db49d9418becbf7d12c6c1f594b4d7bc1966a4ce2590ab74dac00dc02d7eae449065e92fdcd764ec7974 WHIRLPOOL 55ca5cd803678b59161818c1f78dbee2cb8d41c212747635fc40bd84f94a034b2a4869c8cb8b0e24560a1ab235d28e930e531b6a5934af0c1e91b5792e05b13b
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b

diff --git a/dev-ruby/pygments_rb/pygments_rb-0.6.0-r2.ebuild b/dev-ruby/pygments_rb/pygments_rb-0.6.0-r2.ebuild
deleted file mode 100644 (file)
index 68b91d4..0000000
--- a/dev-ruby/pygments_rb/pygments_rb-0.6.0-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pygments_rb/pygments_rb-0.6.0-r2.ebuild,v 1.2 2014/11/15 07:42:45 graaff Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-PYTHON_COMPAT=( python2_7 )
-
-RUBY_FAKEGEM_NAME="pygments.rb"
-MY_P="${RUBY_FAKEGEM_NAME}-${PV}"
-
-RUBY_FAKEGEM_RECIPE_TEST="rake"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${RUBY_FAKEGEM_NAME}.gemspec"
-
-inherit ruby-fakegem python-single-r1
-
-DESCRIPTION="pygments syntax highlighting in ruby"
-HOMEPAGE="https://github.com/tmm1/pygments.rb"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE+=" ${PYTHON_REQUIRED_USE}"
-
-RUBY_S="${MY_P}"
-
-RDEPEND+=" dev-python/pygments[${PYTHON_USEDEP}]
-       dev-python/simplejson[${PYTHON_USEDEP}]"
-DEPEND+=" test? ( ${RDEPEND} )"
-
-ruby_add_rdepend ">=dev-ruby/yajl-ruby-1.1
-       dev-ruby/posix-spawn"
-ruby_add_bdepend "dev-ruby/rake-compiler"
-
-pkg_setup() {
-       ruby-ng_pkg_setup
-       python-single-r1_pkg_setup
-}
-
-all_ruby_prepare() {
-       sed -i -e '/[Bb]undler/d' Rakefile || die
-       sed -i -e 's/~> 1.1.0/~> 1.1/' -e '/s.files/d' pygments.rb.gemspec || die
-       python_fix_shebang lib/pygments/mentos.py
-       # we are loosing a "custom github lexer here", no idea what it is,
-       # but if we need it, it should go into dev-python/pygments
-       rm -r vendor lexers || die "removing bundled libs failed"
-}
-
-each_ruby_compile() {
-       # regenerate the lexer cache, based on the system pygments pkg
-       ${RUBY} cache-lexers.rb || die "regenerating lexer cache failed"
-}
-
-each_ruby_install() {
-       each_fakegem_install
-       ruby_fakegem_doins lexers
-}

diff --git a/dev-ruby/pygments_rb/pygments_rb-0.6.2.ebuild b/dev-ruby/pygments_rb/pygments_rb-0.6.2.ebuild
index c7f47da0063fc56a6bdaca8e956bd9305ce94936..cfddd7cbb784d1959f7ff09cbfd0caf2ca267868 100644 (file)
--- a/dev-ruby/pygments_rb/pygments_rb-0.6.2.ebuild
+++ b/dev-ruby/pygments_rb/pygments_rb-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pygments_rb/pygments_rb-0.6.2.ebuild,v 1.1 2015/01/29 21:04:49 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pygments_rb/pygments_rb-0.6.2.ebuild,v 1.2 2015/03/29 04:45:17 mrueg Exp $
 
 EAPI=5
 
@@ -33,7 +33,7 @@ RDEPEND+=" dev-python/pygments[${PYTHON_USEDEP}]
        dev-python/simplejson[${PYTHON_USEDEP}]"
 DEPEND+=" test? ( ${RDEPEND} )"
 
-ruby_add_rdepend ">=dev-ruby/yajl-ruby-1.1
+ruby_add_rdepend ">=dev-ruby/yajl-ruby-1.2
        dev-ruby/posix-spawn"
 ruby_add_bdepend "dev-ruby/rake-compiler"