Merge updates from master

26 files changed, 171 insertions, 293 deletions

diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index a36b882670fa..273d509cf19d 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -3,3 +3,4 @@ DIST autoprefixer-rails-7.1.2.6.gem 199168 BLAKE2B 4922a2110262029ca3375de4bb93b
 DIST autoprefixer-rails-7.1.4.gem 188416 BLAKE2B bbf495989890c5f5bfdb2998372d5f32dcb114350f1debff2cdafaa6b3f25a29816a2fad8fa0ddf98eca4c7403be7e2041389b68e9e602c1da5574555eeccc19 SHA512 08068f4b6d1ea41a1a64aaf2b3dc895389b0b9ebebd60e2db4f961e4d02b2dcc75cc98eb5e349672ac840e53d504d78dec00b30c3f24699d86c059efd304622e
 DIST autoprefixer-rails-7.1.6.gem 190976 BLAKE2B 071db0c97fbfa5ab7f62dc4a58064056297b37ceacfe51183b8f8cb8385f10a5a3fedf1599bbd47518dd29c89a8fb8d6e12ae2ccd711f5e255964baf1cdaf5bb SHA512 832626700f6a61d44b0fb3721d29121cda858f80aa8a13d134af874cc3e71eb27360f8d9e6de618fe9400d966d2e0afbd2e8a82772f96f34d6f78171574be536
 DIST autoprefixer-rails-7.2.1.gem 195072 BLAKE2B c96da1d177ef1fa70842dd69fb01776f70d8f10532e2839628e20aedfddcb35fe2103a6d0f35ed2b416244f2250129dd830bc189f004b9b0508573d7dc0d5713 SHA512 2a080644309b1784b34e8a8493beab1c6fc610ad1a67c690845b87ebf8a4cc6689c5b8193e6cae2a2787899cb4ec1c6dc70385920fa8c137618becfc3c6875b6
+DIST autoprefixer-rails-7.2.3.gem 195072 BLAKE2B fa7f215239c2e326019f6fa65d8a6c7fa02c0ba46a24935dde80130035e2b22016b300ef1be0c8b116d1a5f2b8c56fd02d9183ab49e80ca5218b18638d1c5f7b SHA512 adb1fb174a49ac3e26ac6be18339e69d65a6afe132cf4c73f33c3c13a675cd473844f8e8f3e15dc5948530886e6da5cac5aaab6566bed6916ea376d8e812a940
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-7.2.3.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-7.2.3.ebuild
new file mode 100644
index 000000000000..7f614030fe5b
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-7.2.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
+HOMEPAGE="https://github.com/ai/autoprefixer-rails"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="7"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/execjs:*"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rails
+	dev-ruby/rake
+	dev-ruby/rspec-rails
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
+	sed -i -e "/Bundler/,+3d" spec/app/config/application.rb || die
+	rm spec/rails_spec.rb spec/compass_spec.rb || die
+}
diff --git a/dev-ruby/connection_pool/Manifest b/dev-ruby/connection_pool/Manifest
index ebace5d7fc4b..fabc9bec68f3 100644
--- a/dev-ruby/connection_pool/Manifest
+++ b/dev-ruby/connection_pool/Manifest
@@ -1,2 +1 @@
-DIST connection_pool-2.2.0.gem 13312 BLAKE2B 265e8f35ccea4ccf8963b23bd0ee8d340dbded53fb00b2e5c8765023f4355ffe4ae8997e9941177b59715fed84a4f60c408150f3b7fc275d2c7127b29377546e SHA512 46170281ddcd29f4b1954ee2a307fd8f45507b24abffe36732b8dbb5e00f9c53274f36234fc26f54d66267ceddf4948d52eb2500bb14276b2fdd5a631e6ec6c9
 DIST connection_pool-2.2.1.gem 13824 BLAKE2B 2328a86f9d625d245f3e74d41fd615d95ea68a6fb8b1d17a9a0f9dc4ff8b772eb2942fd9103b12875a4ea2f3b6d922227a4da79fc61bd348d4bae5aa50b442a2 SHA512 74167b200fcc02d3a60fdc0e71b44c80f1c72db75b5f604a442bd5fb55138fe1750a2db095e0283104fda35fd9024cb71c7ddb614c3d472f814d686b686b6ef0
diff --git a/dev-ruby/connection_pool/connection_pool-2.2.0.ebuild b/dev-ruby/connection_pool/connection_pool-2.2.0.ebuild
deleted file mode 100644
index 90496bb12d72..000000000000
--- a/dev-ruby/connection_pool/connection_pool-2.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rake"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changes.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Generic connection pooling for Ruby"
-HOMEPAGE="https://github.com/mperham/connection_pool"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5 )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' connection_pool.gemspec || die
-	sed -i -e '/bundler/d' Rakefile || die
-	sed -i -e "s/gem 'minitest'/gem 'minitest', '~> 5.0'/" test/helper.rb || die
-}
diff --git a/dev-ruby/connection_pool/connection_pool-2.2.1.ebuild b/dev-ruby/connection_pool/connection_pool-2.2.1.ebuild
index eaf2366fa376..030165fd8fae 100644
--- a/dev-ruby/connection_pool/connection_pool-2.2.1.ebuild
+++ b/dev-ruby/connection_pool/connection_pool-2.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rake"
 RUBY_FAKEGEM_RECIPE_DOC="none"
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/mperham/connection_pool"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5 )"
diff --git a/dev-ruby/execjs/execjs-2.7.0.ebuild b/dev-ruby/execjs/execjs-2.7.0.ebuild
index 738e318a26df..a0a54c734ebf 100644
--- a/dev-ruby/execjs/execjs-2.7.0.ebuild
+++ b/dev-ruby/execjs/execjs-2.7.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/rcairo/Manifest b/dev-ruby/rcairo/Manifest
index 06c41974c1b5..431f58a00771 100644
--- a/dev-ruby/rcairo/Manifest
+++ b/dev-ruby/rcairo/Manifest
@@ -1,2 +1,2 @@
 DIST cairo-1.15.10.gem 102912 BLAKE2B 55459487e9148f5b8fbdb00901cf0af9f2fd878ec0a73563e868f98aa76c517520d63702c19f10773c51545f638b7c9ccf69c1190aa324045cb82f5f93fed701 SHA512 af3cec5bf03022a5049922aaa0366b7330ec0e2003734ee855d1d9632d2027be6e08efd8b67c02bf3d006d11d8a7e28ac3d23ce9591940dc92442c7552858907
-DIST cairo-1.15.9.gem 102400 BLAKE2B 9b2c2f04b09ab858667edb74d5ac59c8b957edd49e989403f965cda1b06f4534bae6408cc119bd54c6842372524850a8a417583b95d6b70e6f4bca2c288f9fd8 SHA512 f934a0ad283145bb4710374ccb1b149c6f6bcdc69978cbcd45de8a9da319a4611249262b6ca4f8bd5ef3955739c54b24bb278e36c421cd0af91ed14a43eb7e98
+DIST cairo-1.15.11.gem 103424 BLAKE2B da4598d64d57ebe9245d892c25cfed0198d4a2c6adc440e7547314bb01adfde20118f17c6a07b0342a78c5e86b18e5c4b51782f99a61b34deeab0bdff12649ce SHA512 3c21468511eac323b27a86e1c5188b5444d3bf2de244f4dc35d0ae297cb3f1756ec8333555bb7c4178e9f4ebcfd1600e6fd77fa7fe76055bf633bb2f8c69271c
diff --git a/dev-ruby/rcairo/rcairo-1.15.9-r1.ebuild b/dev-ruby/rcairo/rcairo-1.15.11.ebuild
index a2ad6e573009..cbe486328eec 100644
--- a/dev-ruby/rcairo/rcairo-1.15.9-r1.ebuild
+++ b/dev-ruby/rcairo/rcairo-1.15.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_NAME="cairo"
 
@@ -24,7 +24,7 @@ IUSE=""
 
 SLOT="0"
 LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="${RDEPEND}
 	>=x11-libs/cairo-1.2.0[svg]"
@@ -32,7 +32,7 @@ DEPEND="${DEPEND}
 	>=x11-libs/cairo-1.2.0[svg]"
 
 ruby_add_bdepend "
-	>=dev-ruby/pkg-config-1.1.5
+	>=dev-ruby/pkg-config-1.2.2
 	dev-ruby/ruby-glib2
 	test? ( >=dev-ruby/test-unit-2.1.0-r1:2 )"
 
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.1.1.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.1.1.ebuild
index 37494e985ced..4a984903557a 100644
--- a/dev-ruby/ruby-glib2/ruby-glib2-3.1.1.ebuild
+++ b/dev-ruby/ruby-glib2/ruby-glib2-3.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 inherit ruby-ng-gnome2
 
diff --git a/dev-ruby/test_declarative/Manifest b/dev-ruby/test_declarative/Manifest
index 767b650d28d4..e8b052400d8e 100644
--- a/dev-ruby/test_declarative/Manifest
+++ b/dev-ruby/test_declarative/Manifest
@@ -1 +1,2 @@
 DIST test_declarative-0.0.5.tgz 2114 BLAKE2B 6856e3bb734354f75298107e243bc461143176797e98d69f5c67a6d121a6556310d46d4676d32bbc5317d39e0c48fa4f4cff1cbeb3e31ec5834ed406d7cba33b SHA512 69641a56c38403a86a8562910aa5ab433476351cc0e5a1f2a640030bfb4f82b96bf724d911ce46ff75dfe934de50d6549304088ee85d5689990e0ce5d263c160
+DIST test_declarative-0.0.6.tgz 3586 BLAKE2B de8e4b011de9ce0773e2c76887d6cf7d888c2f799a07e6dda024b301594edc37ccf2c386c366c0a13d81a1f0697fe7be92932db7d66e5ed482d529fac4b9ce78 SHA512 f147fef7f3ac912c7b1cb2826cfc7cb5abf4cba92ea4f7accc2b1ba3a4f0775bff5ae06e80370144b7b1e7d03e2f3129e268c5d7056ee2aca9d77047a1b5a1c3
diff --git a/dev-ruby/test_declarative/test_declarative-0.0.5-r2.ebuild b/dev-ruby/test_declarative/test_declarative-0.0.5-r2.ebuild
index b20fcfc1e462..338f473cbc6a 100644
--- a/dev-ruby/test_declarative/test_declarative-0.0.5-r2.ebuild
+++ b/dev-ruby/test_declarative/test_declarative-0.0.5-r2.ebuild
@@ -20,7 +20,7 @@ RUBY_S="svenfuchs-test_declarative-*"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 each_ruby_test() {
diff --git a/dev-ruby/test_declarative/test_declarative-0.0.6.ebuild b/dev-ruby/test_declarative/test_declarative-0.0.6.ebuild
new file mode 100644
index 000000000000..970e137404c4
--- /dev/null
+++ b/dev-ruby/test_declarative/test_declarative-0.0.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ruby22, ruby23: fails due to minitest incompatabilities.
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simply adds a declarative test method syntax to test/unit"
+HOMEPAGE="https://github.com/svenfuchs/test_declarative"
+SRC_URI="https://github.com/svenfuchs/test_declarative/tarball/v${PV} -> ${P}.tgz"
+RUBY_S="svenfuchs-test_declarative-*"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+	sed -i -e '/rake/ s/12.0.0/12/' Gemfile || die
+}
+
+each_ruby_test() {
+	# There are other gemfiles but their setup seems broken atm.
+	for gemfile in Gemfile ; do
+		einfo "Running tests with ${gemfile}"
+		BUNDLE_GEMFILE=${gemfile} ${RUBY} -S bundle exec rake test || die
+	done
+}
diff --git a/eclass/ruby-utils.eclass b/eclass/ruby-utils.eclass
index e4a072a0972e..4be437672d08 100644
--- a/eclass/ruby-utils.eclass
+++ b/eclass/ruby-utils.eclass
@@ -31,7 +31,7 @@ if [[ ! ${_RUBY_UTILS} ]]; then
 RUBY_TARGETS_PREFERENCE="ruby22 "
 
 # All other active ruby targets
-RUBY_TARGETS_PREFERENCE+="ruby23 ruby24"
+RUBY_TARGETS_PREFERENCE+="ruby23 ruby24 ruby25"
 
 
 _ruby_implementation_depend() {
diff --git a/media-gfx/pqiv/Manifest b/media-gfx/pqiv/Manifest
index 4ff0aa2879f6..fa8d1af73dec 100644
--- a/media-gfx/pqiv/Manifest
+++ b/media-gfx/pqiv/Manifest
@@ -1,2 +1,3 @@
 DIST pqiv-2.10.1.tar.gz 138129 BLAKE2B 46503e6012854562d1ff1bbf43d218dbdc6f9e7000c8625de73a708061a6c1678622b48270c73b3a16fff2fdac60bf5097376dfd0a6f5c7c2e36611aed8bd3cc SHA512 9850f6693e7fd2942d105736a7d6a274388875770e194ac6bd8a5a8291db8fec1ee3a0262f911f2b8e5d115aa11d520c44d80cc8218e2c87d6935dea4dfcb97e
+DIST pqiv-2.10.2.tar.gz 138506 BLAKE2B 255104acec9d42eac52d8aaf05207fc8071ecbef14a04c5952e70347d0cd83b54b00725b9bb949184bcd9437982701814b6a09c4c2397336f26ce9f50896d2e6 SHA512 99cb3a187fa2cc0df7b7f768b2f801fbec78aa8d76aacd12085f3b8ccbfaf931a2379e7b05a92f83dacf511489518a75f9e5bf528e4152158d8bb75cffb0d6f7
 DIST pqiv-2.9.tar.gz 133823 BLAKE2B a43c5323c47c10a94f83e8ed065e26212bf023f483cbc0e2160fe7789a55a043bb5912ed62306a15193edeb7ffca0450619799843101c41246ce867da3ffe6e3 SHA512 0a509d5d4b41682f86f4b813d63f3f7f8f3977ede0b8b1649a2adc188ed83923147b8bb741ba7f85b4c1dd7a9612fca3fec44169364042be4db44ef53d813ab7
diff --git a/media-gfx/pqiv/pqiv-2.10.2.ebuild b/media-gfx/pqiv/pqiv-2.10.2.ebuild
new file mode 100644
index 000000000000..68f387141219
--- /dev/null
+++ b/media-gfx/pqiv/pqiv-2.10.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit linux-info toolchain-funcs xdg-utils
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/phillipberndt/pqiv.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/phillipberndt/pqiv/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="powerful GTK 3 based command-line image viewer with a minimal UI"
+HOMEPAGE="https://github.com/phillipberndt/pqiv http://www.pberndt.com/Programme/Linux/pqiv/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="archive ffmpeg imagemagick kernel_linux libav pdf postscript webp"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/cairo-1.6
+	x11-libs/gtk+:3
+	archive? ( app-arch/libarchive:0= )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= )
+	)
+	imagemagick? ( media-gfx/imagemagick:0= )
+	pdf? ( app-text/poppler:0= )
+	postscript? ( app-text/libspectre:0= )
+	webp? ( media-libs/libwebp:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+doecho() {
+	echo "$@"
+	"$@" || die
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		linux-info_pkg_setup
+	fi
+}
+
+src_configure() {
+	local backends="gdkpixbuf"
+	use archive && backends+=",archive,archive_cbx"
+	use ffmpeg || use libav && backends+=",libav"
+	use imagemagick && backends+=",wand"
+	use pdf && backends+=",poppler"
+	use postscript && backends+=",spectre"
+	use webp && backends+=",webp"
+
+	doecho ./configure \
+		--backends-build=shared \
+		--backends=${backends} \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--destdir="${ED}"
+}
+
+src_compile() {
+	tc-export CC
+	emake VERBOSE=1 CFLAGS="${CFLAGS}"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 4480d36b476e..d1624b04050f 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,4 +1,2 @@
-DIST abcMIDI-2017.11.08.zip 556065 BLAKE2B 80025c0a3eb0d6ffac28e02b708c33b195abaf0e6774216471920b9bd907a932075f2e2264e81888bd801271d0316df8438adc246ab3e3fb8a4d0b02a3ce499e SHA512 c89a49c9a3b3f6d462acd09cc26b2720cbd9cc9525e38b1c9cce41052c01167a66f284854e3cc468737eefdaee321db294edca3a4b3b8c6d93d249330913d630
-DIST abcMIDI-2017.11.10.zip 556044 BLAKE2B 67e2a8ce5ccfd922aee1a79582428aa7cb378319e0eaaf5f0e2e35602ac3e527fbdc02e7fae956ca0f74935760d71033146c7e812a69f57ec21de54db59a8e2a SHA512 6a80109849370994a74f71e358bf3225ca750736648e45d16fc5c039106c3f3da9444f509c87c3c55faabbc60db6e468a83d1fcffab788cfbd74b6255ea0cfc4
-DIST abcMIDI-2017.11.19.zip 556185 BLAKE2B 01ec71e17357b3d6050d26c909e06556f5209f1aaddbb0f85031199070dbe93a7980b7b2e238dd7ad8a7a5f4f07683ccbeff1b44942e691286fb75fe1a075e34 SHA512 8e76a55bf699e69425ef51cc4c77f17b952798cd83e620d88781d209bb4f00a9c80b47ad0a40df2a64c2595d94174a2cba44f3e436d7cf066f9126f4fc548dec
 DIST abcMIDI-2017.11.27.zip 557045 BLAKE2B 8f341f7217c1a98732bdfe5e4383c6718476714a4f37f629852f46a40c5e50711194d281dafde16293d45bd0c70c9b7506f5d426db03249ba2358b0c76142941 SHA512 006313ef9fcae652996339a682d308a6e931da9692b4662e3272c8bee73a3803dd9aeb54189cb464c68593473339201b20af6b291524ea2f096567053131e7b6
+DIST abcMIDI-2017.12.20.zip 558729 BLAKE2B 8f4ea8e1f162318f4d0abacab2f4f793e9acc6bbe4c1dc549c80a5d30ece9a5938fe0c3477ce5760cf87dff87dd70110ddea3e96a4ec2a3221bbcda1032cedd4 SHA512 3aa198e285e29d716953ab87b9a68a492b13dfba9121664c5457bd4ac1d0f210b4d4780a7c543b65c8b318ec99b547e54f4a30ec600f5608699e1eb7e4d57998
diff --git a/media-sound/abcmidi/abcmidi-2017.11.10.ebuild b/media-sound/abcmidi/abcmidi-2017.11.10.ebuild
deleted file mode 100644
index adf33138050d..000000000000
--- a/media-sound/abcmidi/abcmidi-2017.11.10.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_P="abcMIDI-${PV}"
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="http://ifdo.ca/~seymour/runabc/top.html"
-SRC_URI="http://ifdo.ca/~seymour/runabc/${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch )
-	default
-
-	rm configure makefile || die
-	sed -i "s:-O2::" configure.ac || die
-
-	eautoreconf
-}
-
-src_install() {
-	default
-	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
-
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.abc
-	fi
-}
diff --git a/media-sound/abcmidi/abcmidi-2017.11.19.ebuild b/media-sound/abcmidi/abcmidi-2017.11.19.ebuild
deleted file mode 100644
index adf33138050d..000000000000
--- a/media-sound/abcmidi/abcmidi-2017.11.19.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_P="abcMIDI-${PV}"
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="http://ifdo.ca/~seymour/runabc/top.html"
-SRC_URI="http://ifdo.ca/~seymour/runabc/${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch )
-	default
-
-	rm configure makefile || die
-	sed -i "s:-O2::" configure.ac || die
-
-	eautoreconf
-}
-
-src_install() {
-	default
-	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
-
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.abc
-	fi
-}
diff --git a/media-sound/abcmidi/abcmidi-2017.11.08.ebuild b/media-sound/abcmidi/abcmidi-2017.12.20.ebuild
index adf33138050d..adf33138050d 100644
--- a/media-sound/abcmidi/abcmidi-2017.11.08.ebuild
+++ b/media-sound/abcmidi/abcmidi-2017.12.20.ebuild
diff --git a/x11-libs/c++-gtk-utils/Manifest b/x11-libs/c++-gtk-utils/Manifest
index 116d5248f652..894b8ea450df 100644
--- a/x11-libs/c++-gtk-utils/Manifest
+++ b/x11-libs/c++-gtk-utils/Manifest
@@ -1,10 +1,6 @@
 DIST c++-gtk-utils-2.0.27.tar.gz 2608722 BLAKE2B 06f5663435a75d7a5560b982574f06c124842f2cb77fa1e4e171428944916da7b4f493294e0373243a062794739336719f548c4cd3b3e6789fffa3eebf0115ba SHA512 8d6c12797d54d9b379302bfd572ded8b9e6e64ea5911ba4b13a0dd6d588711ec6d10bc3a83af8cab23165feeaae8873de5c3945cec94954590806f60490038bc
-DIST c++-gtk-utils-2.0.29.tar.gz 2704000 BLAKE2B 68a20ad9334aee1fcfd795071185de60d133519a2dbf5c06a01b1d96031c9e69734e316b3bceeabacdaeda1f71341df80b5b244ba6698954c038a563b25e1fce SHA512 500002a74609eee41c53b91de119533c67627f68900509763717c7c8738bcdab0747a0f0f62b4b25110a311ad0951bdb5670bf13898787a576438663face967d
-DIST c++-gtk-utils-2.0.30.tar.gz 2707580 BLAKE2B 6dab84bf67b4a23c50e0c652c0324f96f3438669d74f6d32a908cf7578ccba2276fa6fa80322dc4dc113ec96ac0467cf50c184fc695fdb49cb19e71eeb3a0297 SHA512 220048b2ad1121c0cface6fd8bceaa86f1c228a1156ef5a4b1d13af421583fd6dfefe6309259f4f23125578b80fe945625b089dad272041d9681ac032d18b6a7
 DIST c++-gtk-utils-2.0.31.1.tar.gz 2749035 BLAKE2B b01c7cdc48f3d5d5a54bfcc56fff88fa21cadd099dd764fe0cc15dc167b966bd3448824327dcab34bcbb8e01574b2555a5e14cfc96d79168bfb5f15e5c3aabaf SHA512 592397fcfcb8b2b8f479fac432c5d8974706487a121e5a8cee877472bd764d702035380f52a6f520325d7393afa4971fe6beab56818ab3d23c1ffa42a3f752fc
-DIST c++-gtk-utils-2.0.31.tar.gz 2756583 BLAKE2B 086e9a183c9a7673f6e37af56bc712d188f4e9f33ccff2503a161add9d2c98f3cb7fd7a36026eaf27e1e19ba5e18fdf950d411eee101b5c3278d36d78d71783a SHA512 688e738c2433838ea8eaa6f51f34d201f93b186b3689ac7ff93b1467fa178a17fd31884a7fe2f1358cbfc0cc7001c0c95ce8aaadaaf9b84f11e476b94f777311
+DIST c++-gtk-utils-2.0.32.tar.gz 2753596 BLAKE2B 8b3cccca9a5229084df5c929b5ec88f300f57fb985961d56ec41e76f237247d8853e3cbb621590fcd5adb41dc57a3da0c48628310f89cec2160ee23ff19ca615 SHA512 583b6199c3c8cfd3d13157e871e4562000ac8df63bb10dd7cc44faf380cf10ee8e5f04a2d9bd0ed2ffb70b8c11cab70006bc525024790657e52e6d082ec34b38
 DIST c++-gtk-utils-2.2.10.tar.gz 2643918 BLAKE2B 3953b8acb7e8fcb47cfc55ade75baa6dd344e2e6e25187e67346137ef4cc241817c893597d75ae58462aaf0a0b58db5f018fd053e1da0b38716ae41c8ed40af3 SHA512 a0ea673988c95404846da6af6ff7ea51978653df3781be6a8323db5fe96826e94b0de9bbda5d3b821bbba2286dda6e66f4c099de4cd8da7bdefa4caa684d7a31
-DIST c++-gtk-utils-2.2.12.tar.gz 2738884 BLAKE2B 3868ebe1cb9632b3189667d052826be792bd61cd11203b569ad8536c46b616698a7e9b08a154f8f024995967165b155d8e849868201e754918969e8c5ac01ddc SHA512 c2edca67104b304a0cdbceb9903f6060594e80024a7e156db9abc0a8a9360361467bf356860197a0d1eb9549e2452c5e5075d0a1a34cedc3e29760783b82f270
-DIST c++-gtk-utils-2.2.13.tar.gz 2742099 BLAKE2B 8bef9d026ba87604cf97533049182eb8b5d1908d3de00903f4385850e8e8113b02fec2d98068b1b26fc4034371647b77bc65a6fdc012d813536ed9f839265e6c SHA512 42b4f92722e3e03546311702ed233e248d39fcb38b51c687e34ce48e57abe31078c31a99d199aeb3c8de68ae0cf280b606a2585c43898d4a003f962bbe132c2f
 DIST c++-gtk-utils-2.2.14.1.tar.gz 2790401 BLAKE2B 14b1a90d054ffcd1fc31db61a0ec4a2aa140f1560ff5332cbf97cf179da0bce087d8602ff820fe10fe448fa14691eb8200d25e467ce0dec2114a0ca426e2a0d7 SHA512 f6ce101bdc4b10f7afe05af5d90924e5ca7999e2c3db22885666e6528ae87b35cb75a40b92af9df823e12c3fd0dbf45cb8385e3637326829b9d0bcab0f691831
-DIST c++-gtk-utils-2.2.14.tar.gz 2797320 BLAKE2B c65ceef056a998c6c1fa1ef30560100ef4008474ec36697c6d16c70007e71ee9280815496df58d3e6c35d40c8c260519c6d92e9bc9a73aa8857cca97251e20f1 SHA512 c32de0023f6e1bf0c32cc9b2ee4a38394f938e8ae631ed702f3a5b941cda024594dc147924239e24d94462393cc49e408a1cbafc06f9a31006b639165600941e
+DIST c++-gtk-utils-2.2.15.tar.gz 2943272 BLAKE2B 3eae2d8d0d724e005b0843fb8124d946fc89c48ef8b4f30a5aced222106693826c0bb23ea45005eb545b09f3a45aa191f04ad2932ec56a0050d6764cc0944329 SHA512 0181fb0400173fb99f89d72b52bc2ef458d25688d5f3be064f7baafbee6586fde386b3400d90e2178bdd3228c9dc184f87a0db0a50a020db5785b50f34785acc
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.29.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.29.ebuild
deleted file mode 100644
index dbd301d79cb7..000000000000
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.29.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++"
-HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+gtk nls static-libs"
-SLOT="3"
-
-RDEPEND="
-	>=dev-libs/glib-2.26
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS=( ChangeLog )
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gtk) \
-		$(use_enable static-libs static) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--without-guile
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.31.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.31.ebuild
deleted file mode 100644
index 39e01a5069b5..000000000000
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.31.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++"
-HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+gtk nls static-libs"
-SLOT="3"
-
-RDEPEND="
-	>=dev-libs/glib-2.26
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS=( ChangeLog )
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gtk) \
-		$(use_enable static-libs static) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--without-guile
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.30.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.32.ebuild
index dbd301d79cb7..54010a2c72e2 100644
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.30.ebuild
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.32.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit eutils
 
 DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++"
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.12.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.12.ebuild
deleted file mode 100644
index 6ce05b0095d5..000000000000
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.12.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++"
-HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+gtk nls static-libs"
-SLOT="0"
-
-RDEPEND="
-	>=dev-libs/glib-2.26
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS=( ChangeLog )
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gtk) \
-		$(use_enable static-libs static) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--without-guile
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.14.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.14.ebuild
deleted file mode 100644
index 667bb7c4d976..000000000000
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.14.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++"
-HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+gtk nls static-libs"
-SLOT="0"
-
-RDEPEND="
-	>=dev-libs/glib-2.26
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS=( ChangeLog )
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gtk) \
-		$(use_enable static-libs static) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--without-guile
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.13.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.15.ebuild
index 6ce05b0095d5..e2e2c0185b1e 100644
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.13.ebuild
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.15.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit eutils
 
 DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++"