wpscan: revert the prevous break, pushing the proper fix

dev-ruby/cms_scanner/cms_scanner-0.0.41.3-r1.ebuild

@@ -16,9 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-ruby_add_rdepend "dev-ruby/activesupport:*
-	>=dev-ruby/addressable-2.5.0
-	>=dev-ruby/nokogiri-1.8.0
+ruby_add_rdepend "
+	>=dev-ruby/nokogiri-1.10.0
 	>=dev-ruby/opt_parse_validator-0.0.16.6
 	>=dev-ruby/public_suffix-3.0.0
 	>=dev-ruby/ruby-progressbar-1.10.0
@@ -26,7 +25,7 @@ ruby_add_rdepend "dev-ruby/activesupport:*
 	=dev-ruby/xmlrpc-0.3*
 	>=dev-ruby/yajl-ruby-1.4.1"
 
-each_ruby_prepare() {
-	#relax 5.1 to any
-	sed -i -e '/activesupport/,/^-/ s:^:#:' ../metadata || die
-}
+#each_ruby_prepare() {
+#	#relax 5.1 to any
+#	sed -i -e '/activesupport/,/^-/ s:^:#:' ../metadata || die
+#}

dev-ruby/nokogiri/Manifest

@@ -0,0 +1 @@
+DIST nokogiri-1.10.1-git.tgz 5785169 BLAKE2B 69f0a7d17d42b97f3f130bd611bb8426202693dded6afe47255a05909463b018e4f96698815756a2745dd8de71b3ba7d04391ffb1285c32b39a2480650900f6e SHA512 abef5899e4bcef273f8d607c5368cc5d3e7215f21f9a6c174ae6e755ad0fcc41999fc0deef5abddc438745c0327b5cab7649ada393a46b6a161b1184107a9c80

dev-ruby/nokogiri/nokogiri-1.10.1.ebuild

@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md STANDARD_RESPONSES.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="ext"
+
+inherit ruby-fakegem eutils 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	>=dev-libs/libxml2-2.9.8:=
+	>=dev-libs/libxslt-1.1.30
+	virtual/libiconv"
+DEPEND="${DEPEND}
+	>=dev-libs/libxml2-2.9.8
+	>=dev-libs/libxslt-1.1.30
+	virtual/libiconv"
+
+ruby_add_bdepend "
+	>=dev-ruby/pkg-config-1.1.7
+	dev-ruby/rexical
+	dev-ruby/rdoc
+	dev-ruby/racc
+	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
+}
+
+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
+}

net-analyzer/wpscan/wpscan-3.4.3-r1.ebuild

@@ -18,19 +18,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 ruby_add_bdepend "dev-ruby/bundler"
+ruby_add_rdepend ">=dev-ruby/cms_scanner-0.0.41.2"
 
-ruby_add_rdepend ">=dev-ruby/cms_scanner-0.0.41.3
-	>=dev-ruby/addressable-2.5.0
-	dev-ruby/activesupport:*
-	>=dev-ruby/yajl-ruby-1.3.0
-	=dev-ruby/nokogiri-1.10*
-"
-
-each_ruby_prepare() {
+#each_ruby_prepare() {
 #https://github.com/wpscanteam/wpscan/issues/1266
-	sed -i "s|'activesupport', '~> 5.1'|'activesupport'|g" wpscan.gemspec
-	sed -i -e '/s.add_development_dependency/d' wpscan.gemspec
+#	sed -i "s|'activesupport', '~> 5.1'|'activesupport'|g" wpscan.gemspec
+#	sed -i -e '/s.add_development_dependency/d' wpscan.gemspec
 
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-}
+#	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+#	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+#}

profiles/pentoo/base/package.accept_keywords/dev-ruby

@@ -363,3 +363,5 @@ dev-ruby/listen:1
 =dev-ruby/asciidoctor-1.5*
 
 dev-ruby/sablon
+
+=dev-ruby/nokogiri-1.10*