summaryrefslogtreecommitdiff
path: root/dev-ruby/nokogiri
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ruby/nokogiri')
-rw-r--r--dev-ruby/nokogiri/Manifest2
-rw-r--r--dev-ruby/nokogiri/nokogiri-1.10.10.ebuild4
-rw-r--r--dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild (renamed from dev-ruby/nokogiri/nokogiri-1.10.4.ebuild)29
3 files changed, 21 insertions, 14 deletions
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index ab1c3a6acc6a..ff1a39bf3abc 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,2 +1,2 @@
DIST nokogiri-1.10.10-git.tgz 5793723 BLAKE2B 13829f6cc31c2b81462fdf306222ff27830d80aeea922ce4c3adceee4ce7486c0571ab76b3f07b14f1767af7b433af9e0eb83d02f8bcea989fa7e96c9cc743f3 SHA512 2d0bf09af417f0f5e7b07b9f2c555ce04e22d69ce73b484906d8a35745f90d6467824d0d56d8dadc53f020c56a7806e7152cd6347e47596e79ddaaadea1ff65a
-DIST nokogiri-1.10.4-git.tgz 5792963 BLAKE2B 80223c7bda39c56ced8e98d1d9f6858907f2814eb2d9f28d13c9f26fe29ae7f057e5a19765a3b304ffc4f9edd3dd0f77b99d5a673923ce95a8f02135aa9882ca SHA512 c27877297d432b9a9baf3e0639600d6ca5b382a87ff0dc1efb5d9bb3c79aaa31a589a4491f938283e4f9d35e8d29b6f88a60e27a5d4c81e7b491e100f8d06a9d
+DIST nokogiri-1.11.1-git.tgz 5835648 BLAKE2B e8c84fe72063ac3d764ea71fe469a8f7d0499487e523563e0ab737e69e06279b112c666aa254e0075740b27690ba96162a5c6e39f125b58360fbb5720104935d SHA512 47974f05b6788f2e04ef9ed7d0fc33790cdadbd258408e0242a14521cc996b6d42878b5bba3334b4bde2970dbadda0cde93a00e30fcddd100401186a90617502
diff --git a/dev-ruby/nokogiri/nokogiri-1.10.10.ebuild b/dev-ruby/nokogiri/nokogiri-1.10.10.ebuild
index 0941351c90c4..259d53fadc8d 100644
--- a/dev-ruby/nokogiri/nokogiri-1.10.10.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.10.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.nokogiri.org/"
LICENSE="MIT"
SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
index 3fb1a2238289..25405d872c2f 100644
--- a/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
@@ -1,39 +1,42 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md STANDARD_RESPONSES.md"
RUBY_FAKEGEM_EXTRAINSTALL="ext"
-inherit ruby-fakegem eutils multilib
+RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
+
+inherit ruby-fakegem multilib
DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
HOMEPAGE="https://www.nokogiri.org/"
LICENSE="MIT"
SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
RDEPEND="${RDEPEND}
- >=dev-libs/libxml2-2.9.9:=
- >=dev-libs/libxslt-1.1.33
+ >=dev-libs/libxml2-2.9.10:=
+ >=dev-libs/libxslt-1.1.34
virtual/libiconv"
DEPEND="${DEPEND}
- >=dev-libs/libxml2-2.9.9
- >=dev-libs/libxslt-1.1.33
+ >=dev-libs/libxml2-2.9.10
+ >=dev-libs/libxslt-1.1.34
virtual/libiconv"
+ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
+
ruby_add_bdepend "
>=dev-ruby/pkg-config-1.1.7
>=dev-ruby/rexical-1.0.7
dev-ruby/rdoc
- dev-ruby/racc
test? ( dev-ruby/minitest )"
all_ruby_prepare() {
@@ -47,7 +50,11 @@ all_ruby_prepare() {
sed -i -e 's/cross_compile = true/cross_compile = false/' Rakefile || die
sed -i -e '/cross_config_options/d' Rakefile || die
- sed -i -e '/simplecov/,/^end/ s:^:#:' test/helper.rb || die
+ sed -e '/simplecov/,/^end/ s:^:#:' \
+ -e '/reporters/I s:^:#:' \
+ -i test/helper.rb || die
+
+ sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
}
each_ruby_configure() {
@@ -76,7 +83,7 @@ each_ruby_compile() {
emake -Cext/${PN} \
V=1 \
CFLAGS="${CFLAGS} -fPIC" \
- archflag="${LDFLAGS}"
+ archflag="${LDFLAGS}" || die "make extension failed"
cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
}