* [gentoo-commits] gentoo-x86 commit in dev-ruby/nokogiri: nokogiri-1.6.3.1.ebuild nokogiri-1.5.10.ebuild nokogiri-1.6.0.ebuild ChangeLog
@ 2014-11-25 13:10 Manuel Rueger (mrueg)
0 siblings, 0 replies; only message in thread
From: Manuel Rueger (mrueg) @ 2014-11-25 13:10 UTC (permalink / raw
To: gentoo-commits
mrueg 14/11/25 13:10:25
Modified: nokogiri-1.6.3.1.ebuild nokogiri-1.5.10.ebuild
nokogiri-1.6.0.ebuild ChangeLog
Log:
Drop jruby target.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key )
Revision Changes Path
1.3 dev-ruby/nokogiri/nokogiri-1.6.3.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.6.3.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.6.3.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.6.3.1.ebuild?r1=1.2&r2=1.3
Index: nokogiri-1.6.3.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.6.3.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nokogiri-1.6.3.1.ebuild 28 Aug 2014 02:53:26 -0000 1.2
+++ nokogiri-1.6.3.1.ebuild 25 Nov 2014 13:10:25 -0000 1.3
@@ -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 @@
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
}
1.16 dev-ruby/nokogiri/nokogiri-1.5.10.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.5.10.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.5.10.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.5.10.ebuild?r1=1.15&r2=1.16
Index: nokogiri-1.5.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.5.10.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nokogiri-1.5.10.ebuild 18 Nov 2014 11:46:49 -0000 1.15
+++ nokogiri-1.5.10.ebuild 25 Nov 2014 13:10:25 -0000 1.16
@@ -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 @@
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
}
1.9 dev-ruby/nokogiri/nokogiri-1.6.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.6.0.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.6.0.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.6.0.ebuild?r1=1.8&r2=1.9
Index: nokogiri-1.6.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.6.0.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nokogiri-1.6.0.ebuild 28 Aug 2014 02:53:26 -0000 1.8
+++ nokogiri-1.6.0.ebuild 25 Nov 2014 13:10:25 -0000 1.9
@@ -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 @@
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
}
1.112 dev-ruby/nokogiri/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/nokogiri/ChangeLog?rev=1.112&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/nokogiri/ChangeLog?rev=1.112&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/nokogiri/ChangeLog?r1=1.111&r2=1.112
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- ChangeLog 18 Nov 2014 11:58:16 -0000 1.111
+++ ChangeLog 25 Nov 2014 13:10:25 -0000 1.112
@@ -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:
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-11-25 13:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-25 13:10 [gentoo-commits] gentoo-x86 commit in dev-ruby/nokogiri: nokogiri-1.6.3.1.ebuild nokogiri-1.5.10.ebuild nokogiri-1.6.0.ebuild ChangeLog Manuel Rueger (mrueg)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox