gentoo resync : 22.01.2021

3 files changed, 3 insertions, 101 deletions

diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index e3570fc087c1..9e13aea6d4a1 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,7 +1,5 @@
 DIST nokogiri-1.10.10-git.tgz 5793723 BLAKE2B 13829f6cc31c2b81462fdf306222ff27830d80aeea922ce4c3adceee4ce7486c0571ab76b3f07b14f1767af7b433af9e0eb83d02f8bcea989fa7e96c9cc743f3 SHA512 2d0bf09af417f0f5e7b07b9f2c555ce04e22d69ce73b484906d8a35745f90d6467824d0d56d8dadc53f020c56a7806e7152cd6347e47596e79ddaaadea1ff65a
-DIST nokogiri-1.11.0-git.tgz 5834946 BLAKE2B 3d54b8a998d56c66d97b7376031aebb0951df7f99c684e67537107a5e7fd0cb76b40c5351b8c46831eaf1427724e302d29a0a9b24bf806f64c541f2c30d54f66 SHA512 2cc5642d28e5a83023d0d3e031875dfbcde176995ed458be13bbe560f01552fee0424093bd7bd881c08a698f545874389d92581e987466bbf57f13deefe1e8a4
 DIST nokogiri-1.11.1-git.tgz 5835648 BLAKE2B e8c84fe72063ac3d764ea71fe469a8f7d0499487e523563e0ab737e69e06279b112c666aa254e0075740b27690ba96162a5c6e39f125b58360fbb5720104935d SHA512 47974f05b6788f2e04ef9ed7d0fc33790cdadbd258408e0242a14521cc996b6d42878b5bba3334b4bde2970dbadda0cde93a00e30fcddd100401186a90617502
 EBUILD nokogiri-1.10.10.ebuild 2713 BLAKE2B 57dedd5488570432b5202d72ea9427ce220fa3303f4899ec04802969cef5e2b151fd0f97f6fdb912f5fb1ad876ebc5c4a66f0b84e7cc2eee573d4ce24da217a6 SHA512 fa8c7d4e2dc79676837763c9b114fa9d4fc53b387dc94293fde7902b3506d99fca95ea7c8699caa284a8eb8b49bb46bc7a8e6e8d6b7eef32caeeac1ced927b2f
-EBUILD nokogiri-1.11.0.ebuild 2822 BLAKE2B a458e3fb58fdf6140e5eb9840209027679df6d46ba6cb88d369c2602674d187cf8b1a77060439625bebdaee1250058b44033a7f985e66cafee265aa12e294096 SHA512 384d3a0a78754158683795631e1a86edb4f43379c9e346d8b059de48deffa7338fe3107b76d787caea79a8fd3db7a65e62c808b706327669ad58b539e994baa4
-EBUILD nokogiri-1.11.1.ebuild 2822 BLAKE2B a458e3fb58fdf6140e5eb9840209027679df6d46ba6cb88d369c2602674d187cf8b1a77060439625bebdaee1250058b44033a7f985e66cafee265aa12e294096 SHA512 384d3a0a78754158683795631e1a86edb4f43379c9e346d8b059de48deffa7338fe3107b76d787caea79a8fd3db7a65e62c808b706327669ad58b539e994baa4
+EBUILD nokogiri-1.11.1-r1.ebuild 2890 BLAKE2B 743f0897e421a45ea046446afd81da14c5c4c939eabefeafab89c9c4eb6f6f1c2407c22cd023237701eafaf31f5198db1c4cb5ab202dc0ba4a3b98fd49c209b2 SHA512 76b0679e7c0a856f47891128e4473a0f0c3d1f3253db88900cdcd2eb03385479530bec1476f072c6173ab6ad531566500867f3c662b7b9acc03d4903116ab7ab
 MISC metadata.xml 348 BLAKE2B 343ce4d884b8ae636991396c8d2eb1c59bec6db00204eec79bc070ce4b61505b1290ee393e2311e2fd3976e66993c9ba51878767c0d28ff8767786039b97fd7c SHA512 94d5836e5bca783420a76f15d70e3fd29515bc7b9152410d11ba0a01d778530e0d87c4954d118313f8afc340260a12157748db94342b4f12fc5e2756c1f2ff34
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.0.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
index f0d3e1a26ed3..25405d872c2f 100644
--- a/dev-ruby/nokogiri/nokogiri-1.11.0.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
@@ -53,6 +53,8 @@ all_ruby_prepare() {
 	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() {
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.1.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.1.ebuild
deleted file mode 100644
index f0d3e1a26ed3..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.11.1.ebuild
+++ /dev/null
@@ -1,98 +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"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md STANDARD_RESPONSES.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="ext"
-
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.10:=
-	>=dev-libs/libxslt-1.1.34
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=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
-	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
-}
-
-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() {
-	# 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
-
-	each_fakegem_install
-}