gentoo resync : 14.07.2018

3 files changed, 8 insertions, 35 deletions

diff --git a/dev-ruby/ruby-glib2/Manifest b/dev-ruby/ruby-glib2/Manifest
index 33c7fd9fab24..f3dd216d78e7 100644
--- a/dev-ruby/ruby-glib2/Manifest
+++ b/dev-ruby/ruby-glib2/Manifest
@@ -1,7 +1,5 @@
-DIST ruby-gnome2-all-3.0.8.tar.gz 1732574 BLAKE2B c41acfae9b48056047a3cd1f1b4341ad9f3b19bd328f0f408cbf8e555466d1f9b6f726fb69cabe7126dd1f4b537286ab311ed62740fe4b069ebddea2c2e9d9a0 SHA512 e30c2cd95db762eff4f5f6d6f03811338657a849fc94d1af71488bb912cc82b85c0aa6860658f6eba66119ef95382ad142661751471a52de9606c5514ec6a6cf
 DIST ruby-gnome2-all-3.1.1.tar.gz 2233259 BLAKE2B 2758a2b34bbb96a9b2aba73f576d6213c9add2bd37ac85ed083a2bfb050d5327d7332ee1b9a8445e69aab0c4721ba446b4cb66c26273818ba930cce389eda152 SHA512 be264505d254248e0e6190b28c5311d10384c2ade19ac56f249bd17284b153368e6007862c4e19e6d1015ba3e441f9bc502a5dbcc45b7dc8036611ef554a6de9
-DIST ruby-gnome2-all-3.1.3.tar.gz 2202172 BLAKE2B c5da99d3e8901d7307c676f0c17e95418ba50abcd9218785985899757126f12830ddda32ebd57ca0300b55da84ec3895c155644e382ec85ad4153fb2c9b44dbd SHA512 e9f87ed8648742b601758be9c9395a57bed7c0b25602a09432e9da1158a79caac20e46c54d5b5941a4f41f562e202e6837c9ea5f6e19afb4289aa68ceb2e0a40
-EBUILD ruby-glib2-3.0.8.ebuild 741 BLAKE2B bb8e9e7537c4c1c3fde2c23e05887ba66126f9a1c97090695468a3eba8e3f3928ebee403ccdd0b62c890a7049cdc4e7e29853ef935529fb1137d0698c941e16c SHA512 d1a902188747caa187e2f316f54b14913dd06f13447337d70f1a911446513bc244cf5fe6f3d36a24e076f36909ab680cb0fc4a379be6540b5b904344c821a7cd
+DIST ruby-gnome2-all-3.2.7.tar.gz 2290033 BLAKE2B 48abafe9c108f3a42b5da05edb6aa7ea6b508e313f65954481d3ce1f1c4497adfce52d83d491314f352fd057ac31fad63d2c1ec4b13fb0f6de1f6f9ab12d35c6 SHA512 94c273941918e49f140cd5dcc413421406e4b15ad244f6a4c29255030162aaae13dacb701c3df20a64ac6945b7cc4a5de0fa8bed21b4f119183641d298bc2030
 EBUILD ruby-glib2-3.1.1.ebuild 747 BLAKE2B 8df6857b2456e644faeeb3102e8529996d554cebbdd1506fab4f901674ba137fbdfbabc3658e04a8cd9dea0bfe56ecb0ac7a1ad7d74666530a40053e4dd1242c SHA512 1c14758f6325bb04ad8841a5b6eb583ffb92e793559c9d95e02ba191965e1f3c31f8426a2bed7652cb467efa90d8f8d9382d997cffe87f23e55ea3faf459db19
-EBUILD ruby-glib2-3.1.3.ebuild 750 BLAKE2B e4312d180e9b3f62fb6144729f4a567d14b6732f155600687931e82ec0539c859fcb4d2c1f4ce4bddf97a62c4a4ca9cb2f17ec8a0bce02d755b4dc9f2275ceb4 SHA512 33feb81185886d6878dc450cfceae44596bd50a9f14d89d4ab0c5f3d37ddb0615b08c81165ee4eb24549d13a09e99813f76745e2c69be17e8178c2246ca670c3
+EBUILD ruby-glib2-3.2.7.ebuild 842 BLAKE2B 4b200ad28816308c555cbdc409306db49a3446129cd0ecd58b491cb626bbbff764d3c69f1b6ca56991013c809c4198e97fd4f40273126c6305dffa0ac814347d SHA512 afd37c36a827bc41855a7958c7c679887db2e679700261d7aa82155fb69067828f4d6eb57784fae4a308e5919b07cf820da149fd5b82044901c65f84d9db73b3
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.0.8.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.0.8.ebuild
deleted file mode 100644
index ca84319c828f..000000000000
--- a/dev-ruby/ruby-glib2/ruby-glib2-3.0.8.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-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
-	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
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.1.3.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.2.7.ebuild
index f28c14664b63..46580192736c 100644
--- a/dev-ruby/ruby-glib2/ruby-glib2-3.1.3.ebuild
+++ b/dev-ruby/ruby-glib2/ruby-glib2-3.2.7.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby Glib2 bindings"
-#KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 RDEPEND+=" >=dev-libs/glib-2"
 DEPEND+=" >=dev-libs/glib-2"
@@ -17,10 +17,13 @@ ruby_add_bdepend "dev-ruby/pkg-config
 
 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
+	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() {