Drop jruby target.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key )

4 files changed, 81 insertions, 158 deletions

diff --git a/dev-ruby/nokogiri/ChangeLog b/dev-ruby/nokogiri/ChangeLog
index f818535a341c..7b6a2ee492ea 100644
--- a/dev-ruby/nokogiri/ChangeLog
+++ b/dev-ruby/nokogiri/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/nokogiri
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.111 2014/11/18 11:58:16 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.112 2014/11/25 13:10:25 mrueg Exp $
+
+  25 Nov 2014; Manuel Rüger <mrueg@gentoo.org> nokogiri-1.5.10.ebuild,
+  nokogiri-1.6.0.ebuild, nokogiri-1.6.3.1.ebuild:
+  Drop jruby target.
 
   18 Nov 2014; Manuel Rüger <mrueg@gentoo.org>
   -files/nokogiri-1.4.4-libxml-2.7.8.patch:
diff --git a/dev-ruby/nokogiri/nokogiri-1.5.10.ebuild b/dev-ruby/nokogiri/nokogiri-1.5.10.ebuild
index b38c16bd6c98..b319a5ae4caf 100644
--- a/dev-ruby/nokogiri/nokogiri-1.5.10.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.5.10.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.5.10.ebuild,v 1.15 2014/11/18 11:46:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.5.10.ebuild,v 1.16 2014/11/25 13:10:25 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -58,60 +58,33 @@ each_ruby_prepare() {
 		test/test_convert_xpath.rb || die
 	sed -i -e '/entity_reference_without_dtdload/,/^      end/ s:^:#:' \
 		test/xml/test_entity_reference.rb || die
-
-	case ${RUBY} in
-		*jruby)
-			# Avoid failing tests:
-			# https://github.com/sparklemotion/nokogiri/issues/721
-			rm test/xslt/test_exception_handling.rb test/test_xslt_transforms.rb || die
-			;;
-		*)
-			;;
-	esac
 }
 
 each_ruby_configure() {
-	case ${RUBY} in
-		*jruby)
-			;;
-		*)
-			${RUBY} -Cext/${PN} extconf.rb \
-				--with-zlib-include="${EPREFIX}"/usr/include \
-				--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
-				--with-iconv-include="${EPREFIX}"/usr/include \
-				--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
-				--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
-				--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
-				--with-xslt-dir="${EPREFIX}"/usr \
-				--with-iconvlib=iconv \
-				|| die "extconf.rb failed"
-			;;
-	esac
+	${RUBY} -Cext/${PN} extconf.rb \
+		--with-zlib-include="${EPREFIX}"/usr/include \
+		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+		--with-iconv-include="${EPREFIX}"/usr/include \
+		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-xslt-dir="${EPREFIX}"/usr \
+		--with-iconvlib=iconv \
+		|| die "extconf.rb failed"
 }
 
 each_ruby_compile() {
-	case ${RUBY} in
-		*jruby)
-			if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
-				${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
-			fi
-
-			${RUBY} -S rake compile || die
-			;;
-		*)
-			if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
-				${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
-			fi
-
-			if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
-				${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
-			fi
-
-			emake -Cext/${PN} \
-				V=1 \
-				CFLAGS="${CFLAGS} -fPIC" \
-				archflag="${LDFLAGS}" || die "make extension failed"
-			cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
-			;;
-	esac
+	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+	fi
+
+	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+	fi
+
+	emake -Cext/${PN} \
+		V=1 \
+		CFLAGS="${CFLAGS} -fPIC" \
+		archflag="${LDFLAGS}" || die "make extension failed"
+	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
 }
diff --git a/dev-ruby/nokogiri/nokogiri-1.6.0.ebuild b/dev-ruby/nokogiri/nokogiri-1.6.0.ebuild
index 2a7a2e4cc32b..5f12d8cb0d53 100644
--- a/dev-ruby/nokogiri/nokogiri-1.6.0.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.6.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.6.0.ebuild,v 1.8 2014/08/28 02:53:26 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.6.0.ebuild,v 1.9 2014/11/25 13:10:25 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc CHANGELOG.ja.rdoc README.rdoc README.ja.rdoc ROADMAP.md STANDARD_RESPONSES.md"
@@ -57,61 +57,34 @@ each_ruby_prepare() {
 		test/test_convert_xpath.rb || die
 	sed -i -e '/entity_reference_without_dtdload/,/^      end/ s:^:#:' \
 		test/xml/test_entity_reference.rb || die
-
-	case ${RUBY} in
-		*jruby)
-			# Avoid failing tests:
-			# https://github.com/sparklemotion/nokogiri/issues/721
-			rm test/xslt/test_exception_handling.rb test/test_xslt_transforms.rb || die
-			;;
-		*)
-			;;
-	esac
 }
 
 each_ruby_configure() {
-	case ${RUBY} in
-		*jruby)
-			;;
-		*)
-			NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
-				${RUBY} -Cext/${PN} extconf.rb \
-				--with-zlib-include="${EPREFIX}"/usr/include \
-				--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
-				--with-iconv-include="${EPREFIX}"/usr/include \
-				--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
-				--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
-				--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
-				--with-xslt-dir="${EPREFIX}"/usr \
-				--with-iconvlib=iconv \
-				|| die "extconf.rb failed"
-			;;
-	esac
+	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+		${RUBY} -Cext/${PN} extconf.rb \
+		--with-zlib-include="${EPREFIX}"/usr/include \
+		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+		--with-iconv-include="${EPREFIX}"/usr/include \
+		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-xslt-dir="${EPREFIX}"/usr \
+		--with-iconvlib=iconv \
+		|| die "extconf.rb failed"
 }
 
 each_ruby_compile() {
-	case ${RUBY} in
-		*jruby)
-			if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
-				${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
-			fi
-
-			${RUBY} -S rake compile || die
-			;;
-		*)
-			if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
-				${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
-			fi
-
-			if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
-				${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
-			fi
-
-			emake -Cext/${PN} \
-				V=1 \
-				CFLAGS="${CFLAGS} -fPIC" \
-				archflag="${LDFLAGS}" || die "make extension failed"
-			cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
-			;;
-	esac
+	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+	fi
+
+	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+	fi
+
+	emake -Cext/${PN} \
+		V=1 \
+		CFLAGS="${CFLAGS} -fPIC" \
+		archflag="${LDFLAGS}" || die "make extension failed"
+	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
 }
diff --git a/dev-ruby/nokogiri/nokogiri-1.6.3.1.ebuild b/dev-ruby/nokogiri/nokogiri-1.6.3.1.ebuild
index 6d2c0cb4f447..4a6b6e8a3882 100644
--- a/dev-ruby/nokogiri/nokogiri-1.6.3.1.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.6.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.6.3.1.ebuild,v 1.2 2014/08/28 02:53:26 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.6.3.1.ebuild,v 1.3 2014/11/25 13:10:25 mrueg Exp $
 
 EAPI=5
 
@@ -58,61 +58,34 @@ each_ruby_prepare() {
 		test/xml/test_entity_reference.rb || die
 	sed -e '/\(test_last_of_type\|test_nth_of_type\|test_nth_last_of_type\)/,/^      end/ s:^:#:' \
 		-i test/css/test_nthiness.rb || die
-
-	case ${RUBY} in
-		*jruby)
-			# Avoid failing tests:
-			# https://github.com/sparklemotion/nokogiri/issues/721
-			rm test/xslt/test_exception_handling.rb test/test_xslt_transforms.rb || die
-			;;
-		*)
-			;;
-	esac
 }
 
 each_ruby_configure() {
-	case ${RUBY} in
-		*jruby)
-			;;
-		*)
-			NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
-				${RUBY} -Cext/${PN} extconf.rb \
-				--with-zlib-include="${EPREFIX}"/usr/include \
-				--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
-				--with-iconv-include="${EPREFIX}"/usr/include \
-				--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
-				--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
-				--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
-				--with-xslt-dir="${EPREFIX}"/usr \
-				--with-iconvlib=iconv \
-				|| die "extconf.rb failed"
-			;;
-	esac
+	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+		${RUBY} -Cext/${PN} extconf.rb \
+		--with-zlib-include="${EPREFIX}"/usr/include \
+		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+		--with-iconv-include="${EPREFIX}"/usr/include \
+		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-xslt-dir="${EPREFIX}"/usr \
+		--with-iconvlib=iconv \
+		|| die "extconf.rb failed"
 }
 
 each_ruby_compile() {
-	case ${RUBY} in
-		*jruby)
-			if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
-				${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
-			fi
-
-			${RUBY} -S rake compile || die
-			;;
-		*)
-			if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
-				${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
-			fi
-
-			if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
-				${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
-			fi
-
-			emake -Cext/${PN} \
-				V=1 \
-				CFLAGS="${CFLAGS} -fPIC" \
-				archflag="${LDFLAGS}" || die "make extension failed"
-			cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
-			;;
-	esac
+	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+	fi
+
+	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+	fi
+
+	emake -Cext/${PN} \
+		V=1 \
+		CFLAGS="${CFLAGS} -fPIC" \
+		archflag="${LDFLAGS}" || die "make extension failed"
+		cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
 }