summaryrefslogtreecommitdiff
path: root/dev-ruby/nokogiri
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ruby/nokogiri')
-rw-r--r--dev-ruby/nokogiri/Manifest8
-rw-r--r--dev-ruby/nokogiri/nokogiri-1.11.6.ebuild107
-rw-r--r--dev-ruby/nokogiri/nokogiri-1.11.7.ebuild2
-rw-r--r--dev-ruby/nokogiri/nokogiri-1.12.5.ebuild (renamed from dev-ruby/nokogiri/nokogiri-1.11.4.ebuild)21
4 files changed, 9 insertions, 129 deletions
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 0d306d5b2668..90bf3c35c588 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,7 +1,5 @@
-DIST nokogiri-1.11.4-git.tgz 5867481 BLAKE2B d9b0df4d6301a510824f8f31bd51e0f3beaf3cf7d3685a703782ae5fab0667b6276c0ccea20032252efc6c2dd6515577fcb21942f5d27a65815bc48f8af91137 SHA512 ca4bf385b06416f5a5b7f8fd742739181cccf93b42590c7d2d4f666846fd3a25d45c16717ae50bacd85e25644efe8584e195df7174450b8a59f2c6ef47624354
-DIST nokogiri-1.11.6-git.tgz 5869434 BLAKE2B 222b6b9e871c124a14ac5d9ac3901d9edfa057daaba7e1179853746af50d661bd70568b326603663f890b4b0d80fbb68f8cc22637ca340fa49699f475cce1bec SHA512 a9d2977ba5a12cb252ee615cffbbf043227e78d746ecba4bfcd82fa825f5ef9fdb74feae27115b16cd65da6dd189e4ac88f1d605e776dfbc52aaf2e0e3044381
DIST nokogiri-1.11.7-git.tgz 5871407 BLAKE2B c0449b5cb8210d22be31f1f9a43c0c13c7ab21feae2d731bf30475fc21c69a3928395109936b9ff242a89da424a5192c8a8cb0ede9d05d6d9ac16c1d6e5a7f63 SHA512 f355185f490e0ce73fdfb496f49e36b39c89835ebef2cbe3aecbfc5aceb5a9757dc07738a709059c3e22b5808fac11e7b340b7ebbb3b2c1b5ea3df8aff0db131
-EBUILD nokogiri-1.11.4.ebuild 3140 BLAKE2B b53910356936e9e450ecc28220343ca68491ea93eceb070c4adb09d67e9017f0d9b20319ed2d2ba2494dc8cc40df220d49450001cb8f60b881f88564464871e4 SHA512 3fe0a0805e12b52556483f1e0a0daa6ac84a0faddad121d2fa0b3f62976f289fe5fb50881ce493d712f2f39408acce5c9b174f515da64fde3ae33c0b4dcc1899
-EBUILD nokogiri-1.11.6.ebuild 3147 BLAKE2B eae6d6a5380b6168830c9ed3a5e59ba71a567134ea7b9604263c27517b2111346cd2792f4f366ae1c0983d7a0b359f8f4b5343eddcb5dc72656fc861a29f3991 SHA512 0d8a1ba138ef5ae9305c79b7d3faa49e6a54dc312e131a83e2eaea7ac2b281c40ec3a473e11a46ed204cc854c10538b59ebc9d00968101158b5211fba74358a8
-EBUILD nokogiri-1.11.7.ebuild 3154 BLAKE2B 92307c6fb1c305dc9271ebe5833a0f1afae1ad6b2a506ee0665cf98f182282eb755e601a84496b823a0f1393e584cdb1c9400912c8eb5b055cb6b950ced4db46 SHA512 c61d7a401a39f6d471f5882f6ced4b3c18625b33dacfc451d2a416f0fe4b3c7b9b73fee8754b87591e42a4d19de810cc3b12c9f986c40e7f14774684c9937a6d
+DIST nokogiri-1.12.5-git.tgz 6158880 BLAKE2B 994fd89c5163d92110de40e2dc654698b11d5a18524cc4b7b668ec1475e7167014e1c7604932686e6ad888f352b04ac26a7fbe526d814b20e686c5d9da95c5df SHA512 36d233df250213c4614c34d045c4fbea099e81e991a6da49067c165bc95f36b281c58cc79deb3b6a8aaccc50743a79efa27969e067cc2b546bef7615b139d79b
+EBUILD nokogiri-1.11.7.ebuild 3147 BLAKE2B 020c0670608a63e9126d98e30a423aad9937e698fe3b3d55ccbade79d7cce323253a528db4eee0b3bcd86ec746e8be38b71e0316548f948e60f3d9b8ec0b7efc SHA512 017ce68216111061f5056dae14eff11c27a3665bf20e8f104f388a694fe1971d6548650d31d354fb99b0e6b8a5d45d20657e2b2d4bb88241aba059cdf8d50f4c
+EBUILD nokogiri-1.12.5.ebuild 2642 BLAKE2B fe4203accab0093d0c8bb01473ad48400737b7cba1c3f476fc4a6b226f62877fce54d9b0d7435c822c20ee9eaa08391f73057e7ba100134b6b235df802400852 SHA512 6a34e891eb6c74ba396473d5f20fa8753c088bb70d2eef5a959b3b5dfc160f6be403d1165d969a07554546f0cf1a05686da057af0affd371654d503cdd322570
MISC metadata.xml 349 BLAKE2B 824094b81182da6ed2c43f55f8697dbf614662e1e032ed62bcf8ec4ef8fb6e6a1bf346f90863a8cb7d6cfaf2696f0be70fd3027d6d01e583bba0c1334252447d SHA512 9ab17ab504279d8d1ea584f7a6f411fe778b89564016dc0d596ec7f714cf9ad80ed5e30c179ec6aa190bafe8a8b72bfdc5a964d213a8024783da246bbb817629
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.6.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.6.ebuild
deleted file mode 100644
index 0a05340414ac..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.11.6.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="ext"
-
-RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
-
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}
- >=dev-libs/libxml2-2.9.12:=
- >=dev-libs/libxslt-1.1.34
- sys-libs/zlib
- virtual/libiconv"
-DEPEND="${DEPEND}
- >=dev-libs/libxml2-2.9.12
- >=dev-libs/libxslt-1.1.34
- sys-libs/zlib
- 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
- test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
- sed -i \
- -e '/tasks\/cross_compile/s:^:#:' \
- -e '/:test.*prerequisites/s:^:#:' \
- -e '/license/ s:^:#:' \
- Rakefile || die
- # Remove the cross compilation options since they interfere with
- # native building.
- sed -i -e 's/cross_compile = true/cross_compile = false/' Rakefile || die
- sed -i -e '/cross_config_options/d' Rakefile || 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
-
- # Account for fix making it upstream into our libxml2 system version
- sed -i -e '116 s/using_packaged/using_system/ ; 131 s/if/if false and /' test/html/test_comments.rb || die
-}
-
-each_ruby_configure() {
- 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() {
- 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
-}
-
-each_ruby_test() {
- ${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
-}
-
-each_ruby_install() {
- each_fakegem_install
-
- # Clean up "ext" directory before installing it. nokogumbo expects
- # the header files and shared object to be in ext.
- rm -rf ext/java ext/nokogiri/*.o ext/nokogiri/{mkmf.log,Makefile} || die
-}
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.7.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.7.ebuild
index e1c14225b0f0..4dac40ee475b 100644
--- a/dev-ruby/nokogiri/nokogiri-1.11.7.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.11.7.ebuild
@@ -20,7 +20,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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~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.11.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.12.5.ebuild
index 863fd634fec6..35fbe47af261 100644
--- a/dev-ruby/nokogiri/nokogiri-1.11.4.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.12.5.ebuild
@@ -1,14 +1,12 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
-RUBY_FAKEGEM_EXTRAINSTALL="ext"
-
RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
@@ -20,7 +18,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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~riscv"
SLOT="0"
IUSE=""
@@ -38,6 +36,7 @@ DEPEND="${DEPEND}
ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
ruby_add_bdepend "
+ dev-ruby/mini_portile2:2.6
>=dev-ruby/pkg-config-1.1.7
>=dev-ruby/rexical-1.0.7
dev-ruby/rdoc
@@ -58,10 +57,8 @@ all_ruby_prepare() {
-e '/reporters/I s:^:#:' \
-i test/helper.rb || die
+ # There is no need for mini_portile2 to be a runtime dependency on Gentoo
sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-
- # Account for fix making it upstream into our libxml2 system version
- sed -i -e '116 s/using_packaged/using_system/ ; 131 s/if/if false and /' test/html/test_comments.rb || die
}
each_ruby_configure() {
@@ -97,11 +94,3 @@ each_ruby_compile() {
each_ruby_test() {
${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
}
-
-each_ruby_install() {
- each_fakegem_install
-
- # Clean up "ext" directory before installing it. nokogumbo expects
- # the header files and shared object to be in ext.
- rm -rf ext/java ext/nokogiri/*.o ext/nokogiri/{mkmf.log,Makefile} || die
-}