gentoo resync : 02.04.2018

4 files changed, 2 insertions, 192 deletions

diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index c0fe8bf6c663..d5a907b4bfa3 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,9 +1,5 @@
-DIST nokogiri-1.6.8.1-git.tgz 5708322 BLAKE2B 54a97ac8a4bc964f9ad2a1c2eabf23864d1930e45148fb9f2bfa6edddc19670acf1066f12d01cba5654489dcd84b3021c66f942bb1fd51aa9164a2cf9053f5cd SHA512 a4546917e5979810ad4fe0f693f11f00fc719379fecefa68e36e512b128db1de083add4e80dfe3fa0546294ec68aa0f3f890575812b851e884bcbf2165f944d7
-DIST nokogiri-1.7.1-git.tgz 5712371 BLAKE2B cd90c8a48a25a81f65a485ddd6a1df6667f49b2d4242c71750c76ae3d41f439f549a82ae72d87dd3f8022fca9fa917efc91ad3f097f07783666a3712c72ee241 SHA512 82a10eff835d562a215f8a38e660f43f5d05f54fae6c6ec21cb5e4797b747be6a8eeb2e42f3c2b5710294073be8d1a987d881f7845526f0ea3ca52a0feb508d8
 DIST nokogiri-1.8.1-git.tgz 5747155 BLAKE2B 40eaa7506f646e47caced25e87c125f2650d69e7194491061f734de9d4b58ee3efcab202e528c8d416683bf1642b0f1e7cbeb7268e1fa32549ae2a427d55227d SHA512 fbd5e9c3edb0f7099ed7923ccb8922e778859ee1fb226c756f515f69c5f16cc4103644d4a569e16aa05374c6e94c691572255ea82af0002f95879ed396ccdc4a
 DIST nokogiri-1.8.2-git.tgz 5749541 BLAKE2B bb3baa299fd27caf43890a752f93cfc1aafd5897f19783cbc6732ce2924bf9c86639ccabad9f26506cf228f5c179afae4cde57150769780c30d9dfc3403359b0 SHA512 5f34f8a055844cd034682b11e4408fb12b60640e52ea64886a13cb5504d94904eace2a85d5047b21f946f1a296ee562ab3677791d53093123ac136062167294d
-EBUILD nokogiri-1.6.8.1.ebuild 2695 BLAKE2B 7d1d7a6b1e024257d55f67cf278e75809df464b1cbe9510cf2de31142cc72049d544bab71ade13cf5517db83308a13dacc2b7e1951611f9fdfdd85c9217614ef SHA512 a850c065ac183ad06b7c1cf49c0b71df29d328f48351ea28eb30027b383ce49ed873919b9c204e8514f09773dbfb93807d602aa64e239c6c626162a7b375ded1
-EBUILD nokogiri-1.7.1.ebuild 2706 BLAKE2B cb2f1e7b104b260fbba298eb6d5318add9ad12fce32a0c3dbd843e41dc25324d6097f5289fc34da0fd9bf223e3752eb2fceef63a353fc47d208258ca44ea44b0 SHA512 1bf1eaed9afac4d8b8b32441a3b4ab5f7db20577b4045a08e194fd78ff30e1574dc7a12bed36425f05c8eb23628d1310ca9847c8e6fba16beeccee577139b9ce
-EBUILD nokogiri-1.8.1.ebuild 2724 BLAKE2B 4fd3d20f7e7603c2c426704c23b2242bc7ccdec593fcf0f880eb64e029bfeaac2c5dec53ff9c31d06033413af6ec20dd9d5672d153372d30539cbb19c020f1e8 SHA512 dd6e2d1e732e52a3a2ec7dd70aff4e055d1b3aa375f670da17fdfa33e709066188eea8a0d48d36867ab3c0fab01529937b6ce857b283910986fe917e536ed936
+EBUILD nokogiri-1.8.1.ebuild 2723 BLAKE2B fcbf50d99b8f9d291f06a54c81769f204ae40c0ddc12ffbd2fae56492ccbbc6e9d418cab04d397b37192f981bd3668ba72cc5a99e62ad486b1db7916c3db7794 SHA512 0b9afd7dfc9accefc1d426b14776ba56675d8272e1ece8ca4acb63866672a5a5613630f488e1d87a9ef04e73fa418ea30865202a5f27c1e124f83baa3a98191a
 EBUILD nokogiri-1.8.2.ebuild 2732 BLAKE2B c9daa660aca193ad32773a78dfe58bf43c40d04f64fb79909d58e81515eb50e2f2a8cb85040204512e6a5f85f6f101cb8cf9e3a30d3041c1354e30a1bdbb81ba SHA512 c95f2468c3ebf8d07dcc8daf485a070b8179312926bee6ed6a6b47494b1125228f96a9359b5707d979752a3f463cf713d63f119f0716209717279da5e971d843
 MISC metadata.xml 348 BLAKE2B 343ce4d884b8ae636991396c8d2eb1c59bec6db00204eec79bc070ce4b61505b1290ee393e2311e2fd3976e66993c9ba51878767c0d28ff8767786039b97fd7c SHA512 94d5836e5bca783420a76f15d70e3fd29515bc7b9152410d11ba0a01d778530e0d87c4954d118313f8afc340260a12157748db94342b4f12fc5e2756c1f2ff34
diff --git a/dev-ruby/nokogiri/nokogiri-1.6.8.1.ebuild b/dev-ruby/nokogiri/nokogiri-1.6.8.1.ebuild
deleted file mode 100644
index 5bf14bcacf00..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.6.8.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc 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 ~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.2:=
-	dev-libs/libxslt
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.2
-	dev-libs/libxslt
-	virtual/libiconv"
-
-ruby_add_bdepend "
-	dev-ruby/hoe
-	>=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
-}
diff --git a/dev-ruby/nokogiri/nokogiri-1.7.1.ebuild b/dev-ruby/nokogiri/nokogiri-1.7.1.ebuild
deleted file mode 100644
index 3c1d7383e1b1..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.7.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-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 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.2:=
-	dev-libs/libxslt
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.2
-	dev-libs/libxslt
-	virtual/libiconv"
-
-ruby_add_bdepend "
-	dev-ruby/hoe
-	>=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
-}
diff --git a/dev-ruby/nokogiri/nokogiri-1.8.1.ebuild b/dev-ruby/nokogiri/nokogiri-1.8.1.ebuild
index 6b34da46910a..9b8b65cf490b 100644
--- a/dev-ruby/nokogiri/nokogiri-1.8.1.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.8.1.ebuild
@@ -17,7 +17,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 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"
+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=""