Remove ruby18 support. Cleanup old.

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

7 files changed, 20 insertions, 162 deletions

diff --git a/dev-ruby/libxml/ChangeLog b/dev-ruby/libxml/ChangeLog
index 2b270df60d3d..6c816794b84e 100644
--- a/dev-ruby/libxml/ChangeLog
+++ b/dev-ruby/libxml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/libxml
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/ChangeLog,v 1.91 2013/12/27 02:41:44 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/ChangeLog,v 1.92 2014/04/24 16:36:47 mrueg Exp $
+
+  24 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -libxml-2.6.0.ebuild,
+  -libxml-2.7.0.ebuild, libxml-2.4.0.ebuild, libxml-2.7.0-r1.ebuild,
+  libxml-2.7.0-r2.ebuild:
+  Remove ruby18 support. Cleanup old.
 
 *libxml-2.7.0-r2 (27 Dec 2013)
 
diff --git a/dev-ruby/libxml/Manifest b/dev-ruby/libxml/Manifest
index dedabc811da6..f7384f345a5a 100644
--- a/dev-ruby/libxml/Manifest
+++ b/dev-ruby/libxml/Manifest
@@ -1,11 +1,8 @@
 AUX libxml-2.6.0-fix-test.patch 647 SHA256 85663cbec055f88ceeb902c3610e5007ade47c93e711101e018700ab9ee26b1a SHA512 557f731e7018053ec3dc21dcc36c2d33685bad3b3c71b5886796e825dbd7624b849295d0c41daf380dcb74e71739a62ae9671105a1dbb3feeb48f52bea6c318c WHIRLPOOL 04666a5f8665389d87bddebaf0204d15f943517860788caaa12c120db4c9213aae4ddf405531f70447efc5287b0086dea4123d4f9e7c4e96305354e2ce84dce3
 DIST libxml-ruby-2.4.0.gem 260608 SHA256 5dabf6d9859ede50a6ffb0230f7031741037c1d6ac38988e816a90b208c2467f SHA512 870d72b978cf6b09ee932dff424ca8735d106b6b237a0b0ab963f8b14829adb48e4303ceaa6e382b28bb7b510648467d33a53cb40aa56f3e350227856ba18b99 WHIRLPOOL e73dd0e8a30824516de02a279068dd4a26f5c991bf2558aaaf2deb64089b9bf0d7b08758fe52276335898440f21c755091877b2ce9654f147d566dd5b96ffba6
-DIST libxml-ruby-2.6.0.gem 268800 SHA256 9be18419b128e1806723a0fafec4895555dd7bf08ceda16fdd23f4b7f542061e SHA512 a94c4b7543f4657f0def452d04904ef6b4773099b2d24f52de63f8cf6dc498a2fa849e4322d3be5eee1c8bb4ec1a3eeb908327ab08f29d9832bf5c29afa29ace WHIRLPOOL 75e7ac24df897c58fed0ebc0971daed2d63c4e5d641585e005d35ea5289cbfb4ba3cabf68a80d9e6c56930aa00ab9b64ecdff891dac51d63749a12681c4f1f17
 DIST libxml-ruby-2.7.0.gem 269824 SHA256 f1f8a3538a064923d8f718748f8771bf088a154c2967f1b7a0cd82d6cd15a9d8 SHA512 e41383cb0e31257361c0da27623de8be478a5ae82a4f59233238a66ce098ce2a6dab4b639490d0753ccd3ae8c6cf0edc5989c071cd5fe4ea7b2b9a25fd271dfa WHIRLPOOL 0de7efe2b0f16d95f69e830bfd08153f0039ecbdc49b4fd5201b205b57e2202c0defb70469031adc838734ddfb6e47561b431e15103bb643aa28ab3031eb246d
-EBUILD libxml-2.4.0.ebuild 2167 SHA256 89d7ce1a52041695c1857ee4abc34f0d4e3072402006d7ff65fb8dbd7fc9bbd4 SHA512 8fc62eb687dd12ccdf41c85a9c436dbe96f312c3cb50d90ff3544df7ea88b8c7760a88870080cc32357cc9178d6bb8ae86a6a5718554bbb36778a5976606cdb9 WHIRLPOOL b0bde10bd37ae101b9baf5a8cae449372726a31a9edb0a6e18449f2b30cd30e3c590097fed834ebd55ea744c7b3ce2ea031b8e85e9b71503deb75c3f2557df91
-EBUILD libxml-2.6.0.ebuild 2374 SHA256 83dbcfbe8c37d5d01cf208aa250b6dc254d143431de95b4aeae7d380ce7c7d84 SHA512 b27269281de97dbef8f9cec76285867f6fec426f9acd91fb5af292288d41ee1b894f2446a81586097b97a4ab96e00a6a25ac3bdffc2920c3d8a2009b8e09d449 WHIRLPOOL 17b40d54c4ffe63d79e161ee7a698ba7dbc430a37f6b28c9cd247f277095bd71ab53c3ef0be174b865dd81d232cdbc2c2beb0f0b37d85aa7462c132a1f6506d3
-EBUILD libxml-2.7.0-r1.ebuild 2343 SHA256 caf039f1f23599b6e5cbec13729fa99f8232ff0c71253135b36139d5fb76a74a SHA512 e740b4ff92eb20e763e1c95e054dac491fa6bac9d8c422e724d80fb591e9e4a3f8640646c004003485c0d6c42fc0b1da4869e9fc9c7604c104986b828a98f7de WHIRLPOOL 9354f519f24479a15d049bffec7cab94f3a05be5ace37953a547d2cbc232313600b1ca559ad0f4fa8cf9a8dd06faa39df806bce68db5267224c4b45dac9863a2
-EBUILD libxml-2.7.0-r2.ebuild 2356 SHA256 ca08b75de22b232cee7f7848a2389ebbfd833b56832e3da6d42567a5065cbb21 SHA512 130f646dfce369fdce9b22ccf8da7ba508b0126005e9b8ba8fb05de3fab633c5c6a5e94018447250ee96ac9609143a7843987c6a69a57bc8d995729f852df16c WHIRLPOOL 9a0d0a989922c98b4ed04add8f0932f0c65756e3e9d78c881622bc49ed7f5abaa95790dd849438cc3b78361d16d02ebdb967669cf7772b2b2ec38a327b3bba1d
-EBUILD libxml-2.7.0.ebuild 2335 SHA256 eb552ba8254a81f0bbc27d3b5f36b5482a174df6c7406160fa335a146ef2cb24 SHA512 01923011259ad9d6aceb481e692a6a74c34128a78c844d3efe2f3780b5e68f8df17cc687a3baa8d4d34d2d03194a0877e529f4f433f337e303ddffded13664e4 WHIRLPOOL 90813436b70bcb611c67f8f5e946d9b6fb52d3e3cbb5afa3aaddd499d4376d07e542df47a6f7d14d41e51014747c3baad7b30b3393dfa89a6b80b194fe2d5732
-MISC ChangeLog 11926 SHA256 2e4a4c6b69ab22b4326bea9fb29aa8a173dd1cc192bc3088a76b2f38a0732e7f SHA512 35f7030acf384920606df3de7c972332c2032cbec5a582f0c1b7ffbd11d9738c97a37fdd1c3e7b9b085a6c6a4a74329e36005f5bf5b397c92f654d194453734d WHIRLPOOL c37c9b1ce05fb729bdfa798a67cb3a2b9b7304a8856488a372cab591da0a4ea878774e20dcb008f705ac1a2845ec04b7e1d28c40dab42e2e540069d64243ac7f
+EBUILD libxml-2.4.0.ebuild 2162 SHA256 fa66dfaa2e101e83e44849075754854c585e3848a73898598b7ff45c90b05722 SHA512 c8a028014bc26c0abddbeccc72f902badde99f4f83b337c51cfca794965a35081d37586d7b3bbe0b4362328cc899e25ac6221168e7075567781474066c28c168 WHIRLPOOL 13ef1d7dd291322779d177d4e2cfa3c3622f609913ef43bb5ef2360737cd5e6b67ee0db03b1da9348633ffabe4c2dde2b4b559c777c02f4b5e0d5bd287a7645b
+EBUILD libxml-2.7.0-r1.ebuild 2338 SHA256 061185cb3dfd63515ddbe71c730a34ed38df30a1f40e2d91d7a82fda8baee3c3 SHA512 cc2880d7bea3a5d89cf885af92ce8f55d2d07f418dd6622eac0568a12be82a8dd0fc747edff687e95a572199b4c48f31a31e3448a0e8cda7a5b99cc15cdecfe4 WHIRLPOOL 5e45d4ea5c905d58e5fb448d0f89d6d805c9311589b195cffebb0cea2eab130eade4068c9d2b9c1e6f470975c4955ae9560f90415837f8b632ac09710e52039d
+EBUILD libxml-2.7.0-r2.ebuild 2349 SHA256 42e56b68b1c4f6b6ba8f90def289ee6897a150a0e7b3e9ea30de1a45c848f1b0 SHA512 0056ad88a4b2921486d29da6508a5f8bb93faed09393caca3fe19f68842bd1edc85a787fc55d7a104e24527e3c4edeacd30ffdafd817978060284ee13f5bcf06 WHIRLPOOL 2a9abab610de28ae78db8f99c45a7e1b61854fcebd57c6e83282736a6004a36d08e4c9e99c18486ea5430ad7f9e375787bb34e025398106e0184285e74f26588
+MISC ChangeLog 12130 SHA256 ab27b613421309bcbd6b340734a964122564021d513f407364315bc58bb97ea1 SHA512 ae61da1e2c287f9589acadd1fb61b0d87f40793383632314272dd6cbbe94d109a5fa8988932751ce3795df96eba4bec82d49f8e5b404b5bf088e0a48b3214834 WHIRLPOOL 8450876ceb8039df59836361b64276eff9264b9e3c9210c473f8bbe38d81add0017cba72983692b9c8a0249603ac220620c08ad0484d280650bc890362170fb5
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/libxml/libxml-2.4.0.ebuild b/dev-ruby/libxml/libxml-2.4.0.ebuild
index 33eb95ec3e59..7fdb94b81c30 100644
--- a/dev-ruby/libxml/libxml-2.4.0.ebuild
+++ b/dev-ruby/libxml/libxml-2.4.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.4.0.ebuild,v 1.7 2013/04/23 15:05:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.4.0.ebuild,v 1.8 2014/04/24 16:36:47 mrueg Exp $
 
 EAPI=2
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_NAME="libxml-ruby"
 
diff --git a/dev-ruby/libxml/libxml-2.6.0.ebuild b/dev-ruby/libxml/libxml-2.6.0.ebuild
deleted file mode 100644
index 6285bd52da1a..000000000000
--- a/dev-ruby/libxml/libxml-2.6.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.6.0.ebuild,v 1.1 2013/05/09 07:18:00 graaff Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_NAME="libxml-ruby"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc HISTORY"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby libxml with a user friendly API, akin to REXML, but feature complete and significantly faster."
-HOMEPAGE="https://github.com/xml4r/libxml-ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="${RDEPEND} dev-libs/libxml2"
-DEPEND="${DEPEND} dev-libs/libxml2"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
-
-RUBY_PATCHES=( ${P}-fix-test.patch )
-
-all_ruby_prepare() {
-	# Remove grancher tasks only needed for publishing the website
-	sed -i -e '/grancher/d' -e '/Grancher/,$d' Rakefile || die
-
-	# We don't have the hanna template available.
-	sed -i -e 's/hanna/rake/' Rakefile || die
-
-	# Remove rake-compiler bits since we don't use it
-	sed -i -e '/extensiontask/d' -e '/ExtensionTask/,/end/d' -e '/GemPackageTask/,/end/d' Rakefile || die
-
-	# replace ulimit -n output as it does not work with Ruby 1.9
-	sed -i -e 's:`ulimit -n`:"'`ulimit -n`'":' test/tc_parser.rb || die
-
-	# Avoid test failing due to different semantics in libxml 2.8.
-	# https://github.com/xml4r/libxml-ruby/issues/43
-	sed -i -e '/test_invalid_encoding/,/^  end/ s:^:#:' test/tc_reader.rb || die
-
-	# Ignore two test failures on ruby18 for now given that older
-	# versions no longer compile.
-	sed -i -e '/test_schema_type/,/end/ s:^:#:' \
-		-e '/test_schema_element/,/end/ s:^:#:' test/tc_schema.rb || die
-
-	# Remove the pregenerated extconf.h. It should not be included, but
-	# it also confuses our hardlink-based duplication scheme.
-	rm ext/libxml/extconf.h || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext/libxml extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -C ext/libxml
-	cp ext/libxml/libxml_ruby.so lib/ || die
-}
-
-each_ruby_test() {
-	# The test suite needs to load its files in alphabetical order but
-	# this is not guaranteed. See bug 370501.
-	${RUBY} -Ilib -r ./test/test_helper.rb test/test_suite.rb || die
-}
diff --git a/dev-ruby/libxml/libxml-2.7.0-r1.ebuild b/dev-ruby/libxml/libxml-2.7.0-r1.ebuild
index 8a096728ce67..441b68c4c3ee 100644
--- a/dev-ruby/libxml/libxml-2.7.0-r1.ebuild
+++ b/dev-ruby/libxml/libxml-2.7.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.7.0-r1.ebuild,v 1.5 2013/12/24 16:57:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.7.0-r1.ebuild,v 1.6 2014/04/24 16:36:47 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_NAME="libxml-ruby"
 
diff --git a/dev-ruby/libxml/libxml-2.7.0-r2.ebuild b/dev-ruby/libxml/libxml-2.7.0-r2.ebuild
index c87093367a57..985db07c0240 100644
--- a/dev-ruby/libxml/libxml-2.7.0-r2.ebuild
+++ b/dev-ruby/libxml/libxml-2.7.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.7.0-r2.ebuild,v 1.1 2013/12/27 02:41:44 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.7.0-r2.ebuild,v 1.2 2014/04/24 16:36:47 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_NAME="libxml-ruby"
 
diff --git a/dev-ruby/libxml/libxml-2.7.0.ebuild b/dev-ruby/libxml/libxml-2.7.0.ebuild
deleted file mode 100644
index f8f4ca5e8160..000000000000
--- a/dev-ruby/libxml/libxml-2.7.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/libxml/libxml-2.7.0.ebuild,v 1.1 2013/08/08 15:43:48 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_NAME="libxml-ruby"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc HISTORY"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby libxml with a user friendly API, akin to REXML, but feature complete and significantly faster."
-HOMEPAGE="https://github.com/xml4r/libxml-ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="${RDEPEND} dev-libs/libxml2"
-DEPEND="${DEPEND} dev-libs/libxml2"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	# Remove grancher tasks only needed for publishing the website
-	sed -i -e '/grancher/d' -e '/Grancher/,$d' Rakefile || die
-
-	# We don't have the hanna template available.
-	sed -i -e 's/hanna/rake/' Rakefile || die
-
-	# Remove rake-compiler bits since we don't use it
-	sed -i -e '/extensiontask/d' -e '/ExtensionTask/,/end/d' -e '/GemPackageTask/,/end/d' Rakefile || die
-
-	# replace ulimit -n output as it does not work with Ruby 1.9
-	sed -i -e 's:`ulimit -n`:"'`ulimit -n`'":' test/tc_parser.rb || die
-
-	# Avoid test failing due to different semantics in libxml 2.8.
-	# https://github.com/xml4r/libxml-ruby/issues/43
-	sed -i -e '/test_invalid_encoding/,/^  end/ s:^:#:' test/tc_reader.rb || die
-
-	# Ignore two test failures on ruby18 for now given that older
-	# versions no longer compile.
-	sed -i -e '/test_schema_type/,/end/ s:^:#:' \
-		-e '/test_schema_element/,/end/ s:^:#:' test/tc_schema.rb || die
-
-	# Remove the pregenerated extconf.h. It should not be included, but
-	# it also confuses our hardlink-based duplication scheme.
-	rm ext/libxml/extconf.h || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext/libxml extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -C ext/libxml
-	cp ext/libxml/libxml_ruby.so lib/ || die
-}
-
-each_ruby_test() {
-	# The test suite needs to load its files in alphabetical order but
-	# this is not guaranteed. See bug 370501.
-	${RUBY} -Ilib -r ./test/test_helper.rb test/test_suite.rb || die
-}