[gentoo-commits] repo/gentoo:master commit in: dev-ruby/duktape-rb/files/, dev-ruby/duktape-rb/

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/duktape-rb/files/, dev-ruby/duktape-rb/

[Marek Szuba]

commit:     b88f37ce277c6d9ea1d55296f723b882addd27ca
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 13 21:51:12 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Nov 13 21:54:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b88f37ce

dev-ruby/duktape-rb: use system dev-lang/duktape

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 ....0.0-r1.ebuild => duktape-rb-2.3.0.0-r2.ebuild} | 22 ++++--
 dev-ruby/duktape-rb/duktape-rb-2.3.0.0.ebuild      | 37 ----------
 .../duktape-rb-2.3.0.0_duktape-2.5.0-tests.patch   | 28 ++++++++
 .../duktape-rb-2.3.0.0_use-system-duktape.patch    | 79 ++++++++++++++++++++++
 4 files changed, 124 insertions(+), 42 deletions(-)

diff --git a/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r1.ebuild b/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r2.ebuild
similarity index 60%
rename from dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r1.ebuild
rename to dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r2.ebuild
index f4d010d24ae..aaa03d4381f 100644
--- a/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r1.ebuild
+++ b/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r2.ebuild
@@ -21,17 +21,29 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-# Upstream uses bundled single-source distributable Duktape.
-#RDEPEND+="dev-lang/duktape"
+RDEPEND+="dev-lang/duktape"
 
 ruby_add_bdepend "
+	dev-ruby/pkg-config
 	dev-ruby/rake-compiler
-	test? (
-		dev-ruby/sdoc
-	)"
+	dev-ruby/sdoc
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.0.0_duktape-2.5.0-tests.patch
+	"${FILESDIR}"/${PN}-2.3.0.0_use-system-duktape.patch
+)
 
 RUBY_S=${MY_P}
 
+all_ruby_prepare() {
+	rm ext/duktape/duktape.{c,h} ext/duktape/duk_config.h || die "Failed to remove bundled duktape"
+}
+
+each_ruby_configure() {
+	${RUBY} -C ext/duktape extconf.rb || die "extconf.rb failed"
+}
+
 each_ruby_compile() {
 	${RUBY} -S rake compile
 }

diff --git a/dev-ruby/duktape-rb/duktape-rb-2.3.0.0.ebuild b/dev-ruby/duktape-rb/duktape-rb-2.3.0.0.ebuild
deleted file mode 100644
index ab08a2bf8a6..00000000000
--- a/dev-ruby/duktape-rb/duktape-rb-2.3.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_GEMSPEC="duktape.gemspec"
-RUBY_FAKEGEM_NAME="duktape"
-
-inherit ruby-fakegem
-
-MY_PN=${PN/-/\.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Ruby bindings to the Duktape JavaScript interpeter"
-HOMEPAGE="https://github.com/judofyr/duktape.rb"
-SRC_URI="https://github.com/judofyr/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# Tests require dev-ruby/sdoc, which is currently ~arch-only and fairly limited
-# in the number of supported keywords.
-RESTRICT="test"
-
-# Upstream uses bundled single-source distributable Duktape.
-#RDEPEND+="dev-lang/duktape"
-
-ruby_add_bdepend "dev-ruby/rake-compiler"
-
-RUBY_S=${MY_P}
-
-each_ruby_compile() {
-	${RUBY} -S rake compile
-}

diff --git a/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_duktape-2.5.0-tests.patch b/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_duktape-2.5.0-tests.patch
new file mode 100644
index 00000000000..20228c480da
--- /dev/null
+++ b/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_duktape-2.5.0-tests.patch
@@ -0,0 +1,28 @@
+The parse-error message asserted by two of the tests has changed since
+duktape-2.3.0, it is now
+
+# encoding: ASCII-8BIT
+parse error (line 1, end of input)
+
+This should hopefully cover both cases.
+
+--- a/test/test_duktape.rb
++++ b/test/test_duktape.rb
+@@ -102,7 +102,7 @@
+         @ctx.eval_string('{')
+       end
+ 
+-      assert_equal "parse error (line 1)", err.message
++      assert_match /parse error [(]line 1/, err.message
+     end
+ 
+     def test_type_error
+@@ -160,7 +160,7 @@
+         @ctx.exec_string('{')
+       end
+ 
+-      assert_equal "parse error (line 1)", err.message
++      assert_match /parse error [(]line 1/, err.message
+     end
+ 
+     def test_type_error

diff --git a/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_use-system-duktape.patch b/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_use-system-duktape.patch
new file mode 100644
index 00000000000..9f35293c9e8
--- /dev/null
+++ b/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_use-system-duktape.patch
@@ -0,0 +1,79 @@
+--- a/MANIFEST.txt
++++ b/MANIFEST.txt
+@@ -1,9 +1,6 @@
+ README.md
+ CHANGELOG.md
+-ext/duktape/duktape.c
+-ext/duktape/duktape.h
+ ext/duktape/duktape_ext.c
+-ext/duktape/duk_config.h
+ ext/duktape/extconf.rb
+ lib/duktape/version.rb
+ lib/duktape.rb
+--- a/ext/duktape/extconf.rb
++++ b/ext/duktape/extconf.rb
+@@ -1,6 +1,64 @@
+ require 'mkmf'
+ require 'zlib'
+ 
++#
++# functions
++#
++
++def package_config pkg, options={}
++  package = pkg_config(pkg)
++  return package if package
++
++  begin
++    require 'rubygems'
++    gem 'pkg-config', (gem_ver='~> 1.1')
++    require 'pkg-config' and message("Using pkg-config gem version #{PKGConfig::VERSION}\n")
++  rescue LoadError
++    message "pkg-config could not be used to find #{pkg}\nPlease install either `pkg-config` or the pkg-config gem per\n\n    gem install pkg-config -v #{gem_ver.inspect}\n\n"
++  else
++    return nil unless PKGConfig.have_package(pkg)
++
++    cflags  = PKGConfig.cflags(pkg)
++    ldflags = PKGConfig.libs_only_L(pkg)
++    libs    = PKGConfig.libs_only_l(pkg)
++
++    Logging::message "PKGConfig package configuration for %s\n", pkg
++    Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n", cflags, ldflags, libs
++
++    [cflags, ldflags, libs]
++  end
++end
++
++def duktape_try_compile
++  try_compile "int main() {return 0;}", "", {werror: true}
++end
++
++def add_cflags(flags)
++  print "checking if the C compiler accepts #{flags}... "
++  with_cflags("#{$CFLAGS} #{flags}") do
++    if duktape_try_compile
++      puts 'yes'
++      true
++    else
++      puts 'no'
++      false
++    end
++  end
++end
++
++#
++# main
++#
++
++if ENV['CC']
++  RbConfig::CONFIG['CC'] = RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC']
++end
++$LIBS << " #{ENV["LIBS"]}"
++$LDFLAGS << " #{ENV["LDFLAGS"]}"
++add_cflags(ENV["CFLAGS"])
++
++package_config('duktape')
++
+ $CFLAGS += ' -std=c99'
+ have_func 'rb_sym2str'
+ create_makefile 'duktape_ext'

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/duktape-rb/files/, dev-ruby/duktape-rb/

[Sam James]

commit:     e76d5f1ebcdcc273d362bf216511df29a26a6e79
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 20 13:15:59 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 03:25:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e76d5f1e

dev-ruby/duktape-rb: drop 2.3.0.0-r3

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-ruby/duktape-rb/Manifest                       |  1 -
 dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r3.ebuild   | 49 ----------------------
 .../duktape-rb-2.3.0.0_duktape-2.5.0-tests.patch   | 28 -------------
 3 files changed, 78 deletions(-)

diff --git a/dev-ruby/duktape-rb/Manifest b/dev-ruby/duktape-rb/Manifest
index 8680160526e3..88d0ce3ee9fb 100644
--- a/dev-ruby/duktape-rb/Manifest
+++ b/dev-ruby/duktape-rb/Manifest
@@ -1,2 +1 @@
-DIST duktape-rb-2.3.0.0.tar.gz 1356464 BLAKE2B be7362ddbe6860bcb12c8f8909f66ae525585e628f7be2317b07eb07960f8f25e503dbc89e713e57144cc8108751ac856aa73a16cbd58502e928acf9e116247c SHA512 af4fd45387c3f40cd24bf3c879ef4e0d7efd43ca24f0cb866bf869db7fa9f4add9b60122c0dcfbce5491cdd7479b1414637fa1054078216b9f57fa426feb0154
 DIST duktape-rb-2.7.0.0.tar.gz 1385934 BLAKE2B 1a3a7ea2c1469ddf9ac482e4329726e0f96823e75153027cf83155cca796cd0380d816a23d617e4bc40e72215acdc524fcb9575711e585952aeb9c6ed85ede70 SHA512 e91f57c2789aeb26aecbd9759c0b8cda457f290fcbe431fee721d01c1987c64f307f0e042b50cf6b4fa468d41c6365adde8395e2a33a8c637f6524af1c7cf028

diff --git a/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r3.ebuild b/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r3.ebuild
deleted file mode 100644
index a9b26614da2f..000000000000
--- a/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_GEMSPEC="duktape.gemspec"
-RUBY_FAKEGEM_NAME="duktape"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/duktape/extconf.rb)
-
-inherit ruby-fakegem
-
-MY_PN=${PN/-/\.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Ruby bindings to the Duktape JavaScript interpeter"
-HOMEPAGE="https://github.com/judofyr/duktape.rb"
-SRC_URI="https://github.com/judofyr/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ppc ~riscv"
-
-COMMON_DEPEND="dev-lang/duktape:="
-DEPEND+="${COMMON_DEPEND}"
-RDEPEND+="${COMMON_DEPEND}"
-
-ruby_add_bdepend "
-	dev-ruby/pkg-config
-	dev-ruby/rake-compiler
-	dev-ruby/sdoc
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.0.0_duktape-2.5.0-tests.patch
-	"${FILESDIR}"/${PN}-2.3.0.0_use-system-duktape.patch
-)
-
-RUBY_S=${MY_P}
-
-all_ruby_prepare() {
-	rm ext/duktape/duktape.{c,h} ext/duktape/duk_config.h || die "Failed to remove bundled duktape"
-}
-
-each_ruby_test() {
-	${RUBY} test/test_duktape.rb || die
-}

diff --git a/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_duktape-2.5.0-tests.patch b/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_duktape-2.5.0-tests.patch
deleted file mode 100644
index 20228c480da8..000000000000
--- a/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_duktape-2.5.0-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-The parse-error message asserted by two of the tests has changed since
-duktape-2.3.0, it is now
-
-# encoding: ASCII-8BIT
-parse error (line 1, end of input)
-
-This should hopefully cover both cases.
-
---- a/test/test_duktape.rb
-+++ b/test/test_duktape.rb
-@@ -102,7 +102,7 @@
-         @ctx.eval_string('{')
-       end
- 
--      assert_equal "parse error (line 1)", err.message
-+      assert_match /parse error [(]line 1/, err.message
-     end
- 
-     def test_type_error
-@@ -160,7 +160,7 @@
-         @ctx.exec_string('{')
-       end
- 
--      assert_equal "parse error (line 1)", err.message
-+      assert_match /parse error [(]line 1/, err.message
-     end
- 
-     def test_type_error