dev-ruby/ruby-glib2: патч для сборки с glib-2.26.0

dev-ruby/ruby-glib2/ruby-glib2-3.3.2-r1.ebuild

@@ -0,0 +1,33 @@
+# 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_PATCHES=( support-glib-2.26.0.patch )
+
+ruby_add_bdepend "dev-ruby/pkg-config
+	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:^:#:' lib/mkmf-gnome2.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}

dev-ruby/ruby-gtk2/ruby-gtk2-3.3.2-r1.ebuild

@@ -1,40 +0,0 @@
-# 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 virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby Gtk2 bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/gtk+:2
-	x11-themes/hicolor-icon-theme"
-RDEPEND+=" x11-libs/gtk+:2"
-
-ruby_add_rdepend "
-	>=dev-ruby/ruby-gdkpixbuf2-${PV}
-	>=dev-ruby/ruby-atk-${PV}
-	>=dev-ruby/ruby-pango-${PV}"
-
-RUBY_PATCHES=( support-glib-2.26.0.patch )
-
-all_ruby_prepare() {
-	# Avoid native installer
-	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew_libffi/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
-
-	# Avoid compilation of dependencies during test.
-	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
-
-	# Use standard icon
-	sed -i -e 's/"find"/"call-start"/' test/test_gtk_icon_theme.rb || die
-
-	# Fix search path for gtk-2.0 on Gentoo
-	sed -i -e "/include_paths =/ s:]$:,'/usr/include/gtk-2.0']:" ext/gtk2/extconf.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} test/run-test.rb
-}