From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D6887158086 for ; Fri, 8 Oct 2021 10:49:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CDC6BE0867; Fri, 8 Oct 2021 10:49:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 99DBEE0848 for ; Fri, 8 Oct 2021 10:49:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 383FB343306 for ; Fri, 8 Oct 2021 10:49:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 85C99105 for ; Fri, 8 Oct 2021 10:49:53 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1633690185.c11cab237c6d6ed7061952852e6e966d910d5b57.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/nokogiri/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/nokogiri/Manifest dev-ruby/nokogiri/nokogiri-1.11.4.ebuild dev-ruby/nokogiri/nokogiri-1.11.6.ebuild X-VCS-Directories: dev-ruby/nokogiri/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: c11cab237c6d6ed7061952852e6e966d910d5b57 X-VCS-Branch: master Date: Fri, 8 Oct 2021 10:49:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d9a3294e-b084-4dbc-9691-ecde8e43135c X-Archives-Hash: c81ed436cb949a2c2fbc00ae2ea862e2 commit: c11cab237c6d6ed7061952852e6e966d910d5b57 Author: Hans de Graaff gentoo org> AuthorDate: Fri Oct 8 06:38:10 2021 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Fri Oct 8 10:49:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c11cab23 dev-ruby/nokogiri: cleanup Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Hans de Graaff gentoo.org> dev-ruby/nokogiri/Manifest | 2 - dev-ruby/nokogiri/nokogiri-1.11.4.ebuild | 107 ------------------------------- dev-ruby/nokogiri/nokogiri-1.11.6.ebuild | 107 ------------------------------- 3 files changed, 216 deletions(-) diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest index 047746c6abc..2fc077e083f 100644 --- a/dev-ruby/nokogiri/Manifest +++ b/dev-ruby/nokogiri/Manifest @@ -1,4 +1,2 @@ -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 DIST nokogiri-1.12.5-git.tgz 6158880 BLAKE2B 994fd89c5163d92110de40e2dc654698b11d5a18524cc4b7b668ec1475e7167014e1c7604932686e6ad888f352b04ac26a7fbe526d814b20e686c5d9da95c5df SHA512 36d233df250213c4614c34d045c4fbea099e81e991a6da49067c165bc95f36b281c58cc79deb3b6a8aaccc50743a79efa27969e067cc2b546bef7615b139d79b diff --git a/dev-ruby/nokogiri/nokogiri-1.11.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.4.ebuild deleted file mode 100644 index 863fd634fec..00000000000 --- a/dev-ruby/nokogiri/nokogiri-1.11.4.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.6.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.6.ebuild deleted file mode 100644 index 0a05340414a..00000000000 --- 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 -}