Updating liguros repov21.1.3

7 files changed, 88 insertions, 37 deletions

diff --git a/dev-ruby/ruby-glib2/Manifest b/dev-ruby/ruby-glib2/Manifest
index 1b65a51f45db..06bc2a232fec 100644
--- a/dev-ruby/ruby-glib2/Manifest
+++ b/dev-ruby/ruby-glib2/Manifest
@@ -1 +1,4 @@
+DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
+DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
diff --git a/dev-ruby/ruby-glib2/files/support-glib-2.26.0.patch b/dev-ruby/ruby-glib2/files/support-glib-2.26.0.patch
deleted file mode 100644
index acb9ea657011..000000000000
--- a/dev-ruby/ruby-glib2/files/support-glib-2.26.0.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From f34f99f0c6a752084f90e52c382e329d02ad22fd Mon Sep 17 00:00:00 2001
-From: Mamoru TASAKA <mtasaka@fedoraproject.org>
-Date: Fri, 6 Sep 2019 12:19:21 +0900
-Subject: [PATCH] glib2: fix parser in MkEnums for resent GLib
-
-GLib 2.62.0 introduced some deprecation warnings for macros in gtestutils.h with the commit https://gitlab.gnome.org/GNOME/glib/commit/40ff4759774516b7dff3b07303a98fc1626b2d0e .
-This patch makes GLib::MkEnums correctly parse header files in GLib 2.62.0 again.
-From c6fba15e10d379127441902b6d80f923797eb98b Mon Sep 17 00:00:00 2001
-From: Kouhei Sutou <kou@clear-code.com>
-Date: Sun, 8 Sep 2019 11:11:40 +0900
-Subject: [PATCH] Don't capture enum typedef attribute
-
----
- glib2/lib/glib-mkenums.rb | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/glib2/lib/glib-mkenums.rb b/glib2/lib/glib-mkenums.rb
-index 37545ece8..fc9f2e93e 100644
---- a/lib/glib-mkenums.rb
-+++ b/lib/glib-mkenums.rb
-@@ -112,7 +112,10 @@ def self.parse(data, g_type_prefix, options={})
-       data.force_encoding("utf-8") if data.respond_to?(:force_encoding)
-       data.scan(/^\s*typedef\s+enum\s*(\/\*<\s*flags\s*>\*\/)?\s*
-                 \{?\s*(.*?)
--                \}\s*(\w+);/mx) do |force_flags, constants, name|
-+                \}\s*(\w+)
-+                # GLIB_DEPRECATED_TYPE_IN_2_38_FOR(GTestSubprocessFlags)
-+                (?:\s+[\w()\s]+)?
-+                ;/mx) do |force_flags, constants, name|
-         enum_options = {}
-         enum_options[:force_flags] = !force_flags.nil?
-         force_flags_patterns = [(options[:force_flags] || [])].flatten
diff --git a/dev-ruby/ruby-glib2/metadata.xml b/dev-ruby/ruby-glib2/metadata.xml
index 79224fb562f5..9aa50bb871a8 100644
--- a/dev-ruby/ruby-glib2/metadata.xml
+++ b/dev-ruby/ruby-glib2/metadata.xml
@@ -6,8 +6,7 @@
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
-		<remote-id type="sourceforge">ruby-gnome2</remote-id>
+		<remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
 	</upstream>
-	<origin>calculatelinux-overlay</origin>
+	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.3.2-r1.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.3.2.ebuild
index ab3e829060e7..28812d439ef8 100644
--- a/dev-ruby/ruby-glib2/ruby-glib2-3.3.2-r1.ebuild
+++ b/dev-ruby/ruby-glib2/ruby-glib2-3.3.2.ebuild
@@ -12,8 +12,6 @@ IUSE=""
 RDEPEND+=" >=dev-libs/glib-2"
 DEPEND+=" >=dev-libs/glib-2"
 
-PATCHES=( ${FILESDIR}/support-glib-2.26.0.patch )
-
 ruby_add_bdepend "dev-ruby/pkg-config
 	test? ( >=dev-ruby/test-unit-2 )"
 
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.3.6.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.3.6.ebuild
new file mode 100644
index 000000000000..b5ef2c1f6643
--- /dev/null
+++ b/dev-ruby/ruby-glib2/ruby-glib2-3.3.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Glib2 bindings"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+RDEPEND+=" >=dev-libs/glib-2"
+DEPEND+=" >=dev-libs/glib-2"
+
+ruby_add_bdepend ">=dev-ruby/pkg-config-1.3.5
+	test? ( >=dev-ruby/test-unit-2 )"
+
+all_ruby_prepare() {
+	# Skip spawn tests since our sandbox also provides items in the environment and this makes the test fragile.
+	rm -f test/test-spawn.rb || die
+
+	# Remove pregenerated Makefile since it will otherwise be shared by all targets.
+	rm -f Makefile Makefile.lib ext/glib2/Makefile || die
+
+	# Avoid native installer
+	sed -i -e '/native-package-installer/ s:^:#:' -e '/^setup_homebrew/ s:^:#:' lib/mkmf-gnome2.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild
new file mode 100644
index 000000000000..d8f7adf0af33
--- /dev/null
+++ b/dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Glib2 bindings"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+RDEPEND+=" >=dev-libs/glib-2"
+DEPEND+=" >=dev-libs/glib-2"
+
+ruby_add_bdepend ">=dev-ruby/pkg-config-1.3.5
+	test? ( >=dev-ruby/test-unit-2 )"
+
+all_ruby_prepare() {
+	# Skip spawn tests since our sandbox also provides items in the environment and this makes the test fragile.
+	rm -f test/test-spawn.rb || die
+
+	# Remove pregenerated Makefile since it will otherwise be shared by all targets.
+	rm -f Makefile Makefile.lib ext/glib2/Makefile || die
+
+	# Avoid native installer
+	sed -i -e '/native-package-installer/ s:^:#:' -e '/^setup_homebrew/ s:^:#:' lib/mkmf-gnome2.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.4.3.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.4.3.ebuild
new file mode 100644
index 000000000000..297c9e60b4da
--- /dev/null
+++ b/dev-ruby/ruby-glib2/ruby-glib2-3.4.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Glib2 bindings"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+RDEPEND+=" >=dev-libs/glib-2"
+DEPEND+=" >=dev-libs/glib-2"
+
+all_ruby_prepare() {
+	ruby-ng-gnome2_all_ruby_prepare
+
+	# Skip spawn tests since our sandbox also provides items in the
+	# environment and this makes the test fragile.
+	rm -v test/test-spawn.rb || die
+}