gentoo resync : 31.10.2017

3 files changed, 3 insertions, 45 deletions

diff --git a/media-sound/gmorgan/Manifest b/media-sound/gmorgan/Manifest
index c85d8c3e568c..63cc32975dd2 100644
--- a/media-sound/gmorgan/Manifest
+++ b/media-sound/gmorgan/Manifest
@@ -5,9 +5,7 @@ AUX gmorgan-0.79-remove-gettext-version-check.patch 855 SHA256 c1689dc5724d5087b
 AUX gmorgan-0.79-remove-old-docs.patch 736 SHA256 4905cc3c53017823ac6eeac864480fb68516d6f20dae0d76e37d82e90b443b1b SHA512 55ba54cd3410fe70ad5e2d1f2d60c56e30b335bc90e730e0a9a6265c7e0cc688e5aa15f0e9109af7c61db217e39fbf245ab08a54ae46cbc52f6deda5be769108 WHIRLPOOL 725e899352560744b6b463f3e2f3031e9b4ac491073ac3381308d873ed243b8e2301fc692345ea6ec48d4e1144385577152bb9ec25471694d372a7a82e76e017
 AUX gmorgan-cflags.patch 597 SHA256 cb1e7b196bd252ab7dc8117b09603250ccbcaafaac80a5ae2e7fdc62d3ecf8b5 SHA512 d33092eb45f1716d78902045a5ce1609e6264dd95ed079c05b02c19935f4686598352aeb6007b3d4a3a77215a7663b06865771419ad319c2f583dddb57d9c1b0 WHIRLPOOL 3f6910a4165e52c088f1b9646ea88a9bf000cf9b8c3a12cfa7f885761477c289b1c28fbf313ca7bb01736b287baf84b9bcaae8053cb3223b41045d5f6fee78c8
 DIST gmorgan-0.79.tar.gz 8055701 SHA256 eccdff6d0de745f469e45220de2b41764c0e591eb894695c24ce07cc2a65b1cf SHA512 17fadbe2c8b2b4c7e18816a6f866e4406c005fda1ca3ded628c9497aa46abacd06417d68296c500a2d108e9364eae3702f990f5c1b1b1d83328ed553aa453be0 WHIRLPOOL 96a20bc79ee9a8b62ad1061995fda5542450b5e0faee9677f548d05884e13791af79617bf1ad0546028db2a1f38b7e3882b9dd4778e7a912b6ebcb02efefa7f1
-DIST gmorgan_0.39.tar.gz 1370780 SHA256 37f6c3d4b43c415e0edaf5d8acc80d7a60fb9318f684acde0eaa723f3ef58b56 SHA512 b66769382de4b2386779d55158d16167d4aba1a2e3425fc46561cfda621854004029b872810844313d64b8fea50d7cdcaa5247a02ef500f7d932deedc691bdf3 WHIRLPOOL 92453194f241cf75d19221dce97aec8a06e16dc19d7b46ab09ab51d8e4541de22b5f6ca46fc18d68e82a18dcdc5fd529f02fb044ea6e4a45f8586d8030148ea1
-EBUILD gmorgan-0.39.ebuild 951 SHA256 3290b7ebbfbe09c20dcd18b34f95dbd3424ef9fbc60ad7c9af78e26f19082ba7 SHA512 6247b536d0c90174b7b122398c803db6310344b812f254cd41d392a9a7639fb235be62e42f46ad6400c13c130e527315f1ba754a3f5b7ac76c474eb33f59b55b WHIRLPOOL 0bcad7de920ac20df832fd8f1aa0dd932d1b7ec7cd7542b8277fe91529b5d2046537e24ccc5697b4e5ca929a899c7e04b7f85557ce4b28e7094e1a685d78907e
-EBUILD gmorgan-0.79.ebuild 785 SHA256 80924fad1a78750069350fdbeda3b108bd1dcdf04a4caa4df9592a53fb65d2db SHA512 b14863f4c2ce179528096cdd31a88ca82954c657783055508027e384acbf6f08c77e6586973df8367c968f7e006975adb3dddcff6e5adc5f425c2e8a16a96e1e WHIRLPOOL 34c69d71c0e19e3c32d0e31584b9aef4a4b1b7be5bbbe1af9dd6a81322a1ea39db5564b14058586d2d11ccc27ed9421ba4c8ced255ac1535685b699a58450a76
+EBUILD gmorgan-0.79-r1.ebuild 859 SHA256 1f2712f75b9cb84406e63144c72d4100701735dc01f7e6dbe52fbdb691459a78 SHA512 232d5250ac1b88594f116bfdc6a9da1cfc991693dc26c3bf19109cdbaee70a54c67e182defffae58a16e98bb753c8f97d33832053786934066c07d87e7a263db WHIRLPOOL 1fa63c19992747b9dbc47c2157325a94fab9985ba9b25ef8b4afe477bb4cb6027734f790bbc3ccf696455d910a2785e811f850e4a5c6e1ec6820fb3a2792f233
 MISC ChangeLog 2545 SHA256 c6d33ee545b9be9f95eeee6fc60d81b7020a89b41449229a909c8111f75f688c SHA512 5ea8880d1b6c9bb3a9d313b666a09610ad95261104aeb428922fa1273e04abf082cd791c235f5920f8f6b588bc972680302fc60db11c12564c66779a66524c0c WHIRLPOOL 9c6a61f106dfc8917bb132087bd1a1c260094e360b3f7c27a0a224c8f07ffe23bdfa77b6a0dc4cd9f60e6128f36f62f591cfc2ae15065912cc2d5a34d7f67f84
 MISC ChangeLog-2015 4540 SHA256 4b3a4451d0260c37a4a1791d1a9ab263aa6fbb7bf368183acf7d5b4fe351e25b SHA512 512b3c24d74de2e08e3a58cc19b12c449c2e2dd8a2be40103e542e7759632c52a954446a309b8226d94606a7053cf992fd2d830b5c4b4554794736a05d7c698d WHIRLPOOL 3cbcc74b2e918462c16240be452dc0459bb0ec7459fe813695a77e8d87a2eb83b94fd670eb104c3f28b01d4c8fc5fb1391ea887a48899de51a4d846ed1c630b4
 MISC metadata.xml 336 SHA256 90555defe0515f8ec9952c40165d83eb9f10254f9f2cf94e48096a03eb9c2bf7 SHA512 3d5245a06c576d8a4f5fdf07ddb0a6cbc9cf0f64799da9e7e58a67fdd23a5fe082d0bc557575914ec7fba42923d8503587b327ad31f270f46710084fb7cba5f8 WHIRLPOOL f54f1d82e3b322a66e4d9bb33c0b90458b00a0d92876899e29f3d7c4a5d8fd3001930f4c2fb66c8b122b24866619c64aafdbe5b1b3e3494808b2d2d72b5f6174
diff --git a/media-sound/gmorgan/gmorgan-0.39.ebuild b/media-sound/gmorgan/gmorgan-0.39.ebuild
deleted file mode 100644
index 76258d47e22f..000000000000
--- a/media-sound/gmorgan/gmorgan-0.39.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils autotools
-
-MY_P=${PN}_${PV}
-DESCRIPTION="Opensource software rhythm station"
-HOMEPAGE="http://gmorgan.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gmorgan/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/alsa-lib
-	x11-libs/fltk:1"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-cflags.patch"
-
-	# Stolen from enlightenment.eclass
-	cp $(type -p gettextize) "${T}/" || die "Could not copy gettextize"
-	sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize"
-
-	einfo "Running gettextize -f --no-changelog..."
-	( "${T}/gettextize" -f --no-changelog > /dev/null ) || die "gettexize failed"
-
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS NEWS README || die
-}
diff --git a/media-sound/gmorgan/gmorgan-0.79.ebuild b/media-sound/gmorgan/gmorgan-0.79-r1.ebuild
index a602c30e99ce..1aaebf4e3107 100644
--- a/media-sound/gmorgan/gmorgan-0.79.ebuild
+++ b/media-sound/gmorgan/gmorgan-0.79-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gmorgan/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND="media-libs/alsa-lib
@@ -29,6 +29,7 @@ PATCHES=(
 
 src_prepare() {
 	default
+	sed -i -e "s#/usr/local/share/#/usr/share/#" src/gmorgan.chord.cpp || die
 	eautoreconf
 }