media-sound/gmorgan: Version bump to 0.79, fix build with gcc6

Package-Manager: Portage-2.3.4, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4119

7 files changed, 206 insertions, 0 deletions

diff --git a/media-sound/gmorgan/Manifest b/media-sound/gmorgan/Manifest
index a00b5d2d3f64..4293fdc2ae26 100644
--- a/media-sound/gmorgan/Manifest
+++ b/media-sound/gmorgan/Manifest
@@ -1,2 +1,3 @@
 DIST gmorgan-0.70.tar.gz 7010268 SHA256 be9da04dffecb879583eab221217a40ecec3dea22b5538f10cd65191a87abe01 SHA512 d003b8e06707b6e3d707caa368f916a932a3e2f21927c90f3918e28705d2185d56661aa5fd937370b8f5c23ef1873510fd6848d7eba6ee4aa57df1a608cda3b6 WHIRLPOOL 9557eac232201a0a75d26d8d50a04fa96afb17d077d0836d7e7220457d37868c565a3497125453990f18c087d9298319f999075102a62dfef180fa9e9decf915
+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
diff --git a/media-sound/gmorgan/files/gmorgan-0.79-gcc6.patch b/media-sound/gmorgan/files/gmorgan-0.79-gcc6.patch
new file mode 100644
index 000000000000..2941fdf106e3
--- /dev/null
+++ b/media-sound/gmorgan/files/gmorgan-0.79-gcc6.patch
@@ -0,0 +1,43 @@
+From a395c47f97ae2cc7564c2af04913620767c650d3 Mon Sep 17 00:00:00 2001
+From: Peter Levine <plevine457@gmail.com>
+Date: Sat, 4 Mar 2017 14:25:40 +0200
+Subject: [PATCH] Fix build with gcc6
+
+If nls is disabled, the build defines a number of macros such as 'gettext' and 'dgettext' that would otherwise clash with symbols in /usr/include/libintl.h.  Unfortunately, the build eventually includes /usr/include/libintl.h anyway, and the symbols do clash.  Testing on gcc-5.4 and gcc-6.2 shows the macros aren't needed or used.
+---
+ src/gettext.h | 19 -------------------
+ 1 file changed, 19 deletions(-)
+
+diff --git a/src/gettext.h b/src/gettext.h
+index 8b262f4..8aea60c 100644
+--- a/src/gettext.h
++++ b/src/gettext.h
+@@ -36,25 +36,6 @@
+ #if defined(__sun)
+ # include <locale.h>
+ #endif
+-
+-/* Disabled NLS.
+-   The casts to 'const char *' serve the purpose of producing warnings
+-   for invalid uses of the value returned from these functions.
+-   On pre-ANSI systems without 'const', the config.h file is supposed to
+-   contain "#define const".  */
+-# define gettext(Msgid) ((const char *) (Msgid))
+-# define dgettext(Domainname, Msgid) ((const char *) (Msgid))
+-# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
+-# define ngettext(Msgid1, Msgid2, N) \
+-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+-# define dngettext(Domainname, Msgid1, Msgid2, N) \
+-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+-# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
+-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+-# define textdomain(Domainname) ((const char *) (Domainname))
+-# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
+-# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))
+-
+ #endif
+ 
+ /* A pseudo function call that serves as a marker for the automated
+-- 
+2.12.0
+
diff --git a/media-sound/gmorgan/files/gmorgan-0.79-manpages.patch b/media-sound/gmorgan/files/gmorgan-0.79-manpages.patch
new file mode 100644
index 000000000000..5fe8b7b3b4a5
--- /dev/null
+++ b/media-sound/gmorgan/files/gmorgan-0.79-manpages.patch
@@ -0,0 +1,30 @@
+From 838843654b9b8e7394da0cad37ab919817a95248 Mon Sep 17 00:00:00 2001
+From: Harri Nieminen <moikkis@gmail.com>
+Date: Sat, 4 Mar 2017 13:53:00 +0200
+Subject: [PATCH 2/3] Don't try to generate man page, Fixes sandbox issue
+
+Fixes following error:
+  make[1]: Entering directory '/var/tmp/portage/media-sound/gmorgan-0.79/work/gmorgan-0.79/man'
+  name="gmorgan a midi processor" ../src/gmorgan -o gmorgan.1
+   * ACCESS DENIED:  open_wr:      /dev/snd/seq
+   * ACCESS DENIED:  open_wr:      /dev/snd/seq
+  ALSA lib /var/tmp/portage/media-libs/alsa-lib-1.1.3/work/alsa-lib-1.1.3/src/seq/seq_hw.c:466:(snd_seq_hw_open) open /dev/snd/seq failed: Permission denied
+  ALSA lib /var/tmp/portage/media-libs/alsa-lib-1.1.3/work/alsa-lib-1.1.3/src/seq/seq_hw.c:466:(snd_seq_hw_open) open /dev/snd/seq failed: Permission denied
+make[1]: [Makefile:526: gmorgan.1] Segmentation fault (ignored)
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 6fd435d..2e739a3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = m4 src data doc man po
++SUBDIRS = m4 src data doc po
+  
+ # Find gnulib headers.
+ ACLOCAL_AMFLAGS = -I m4
+-- 
+2.12.0
+
diff --git a/media-sound/gmorgan/files/gmorgan-0.79-remove-dirs.patch b/media-sound/gmorgan/files/gmorgan-0.79-remove-dirs.patch
new file mode 100644
index 000000000000..2183688e61aa
--- /dev/null
+++ b/media-sound/gmorgan/files/gmorgan-0.79-remove-dirs.patch
@@ -0,0 +1,33 @@
+From b1ca9596933eb4e9486eebadd1c4ca2254da35e1 Mon Sep 17 00:00:00 2001
+From: Harri Nieminen <moikkis@gmail.com>
+Date: Sat, 4 Mar 2017 13:54:03 +0200
+Subject: [PATCH 3/3] Remove duplicate dirs from data/Makefile.am
+
+They are already defined in SUBDIRS variable
+---
+ data/Makefile.am | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index a73f8d7..fc9ff0c 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -15,7 +15,6 @@ FourAntiR.gmsong \
+ Four.gmsong \
+ fullkeyboard.gmos \
+ GMPresetList.txt \
+-help \
+ hhtm.gmps \
+ HowHignTheBoom.gmsong \
+ HowInsensate.gmsong \
+@@ -33,7 +32,6 @@ QuietNight.gmos \
+ README \
+ Saxaphones.gmos \
+ shearing.gmos \
+-skins \
+ sounds.gmox \
+ StyleLib.lib \
+ template.gmos \
+-- 
+2.12.0
+
diff --git a/media-sound/gmorgan/files/gmorgan-0.79-remove-gettext-version-check.patch b/media-sound/gmorgan/files/gmorgan-0.79-remove-gettext-version-check.patch
new file mode 100644
index 000000000000..5a076a7ba2a8
--- /dev/null
+++ b/media-sound/gmorgan/files/gmorgan-0.79-remove-gettext-version-check.patch
@@ -0,0 +1,26 @@
+From f9e6d4ac86b53cb3b9a8fcd95194798e7ec56e3a Mon Sep 17 00:00:00 2001
+From: Harri Nieminen <moikkis@gmail.com>
+Date: Sat, 4 Mar 2017 13:52:22 +0200
+Subject: [PATCH 1/3] Remove useless gettext version check
+
+Fixes following error:
+autopoint: *** Missing version: please specify in configure.ac through a line 'AM_GNU_GETTEXT_VERSION(x.yy.zz)' the gettext version the package is using
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ed48b6f..f6ba2af 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,7 +16,6 @@ AC_HEADER_STDC
+ AC_FUNC_SELECT_ARGTYPES
+ AC_CHECK_FUNCS([bzero memset select strdup])
+ AM_GNU_GETTEXT([external]) 
+-AM_GNU_GETTEXT_VERSION
+ LIBS="`fltk-config --use-images --ldflags` -lasound"
+ CXXFLAGS="-g `fltk-config --use-images --cxxflags`"
+ AC_CHECK_HEADERS([unistd.h])
+-- 
+2.12.0
+
diff --git a/media-sound/gmorgan/files/gmorgan-0.79-remove-old-docs.patch b/media-sound/gmorgan/files/gmorgan-0.79-remove-old-docs.patch
new file mode 100644
index 000000000000..97dec2c194da
--- /dev/null
+++ b/media-sound/gmorgan/files/gmorgan-0.79-remove-old-docs.patch
@@ -0,0 +1,30 @@
+From 5fb5ec11e284c28edc8ee651900ceaff992921ed Mon Sep 17 00:00:00 2001
+From: Harri Nieminen <moikkis@gmail.com>
+Date: Sat, 4 Mar 2017 14:18:13 +0200
+Subject: [PATCH 1/2] Remove old docs and update datadir
+
+---
+ doc/Makefile.am | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 16187f0..0c3c4a8 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,11 +1,4 @@
+-datadir = $(prefix)/share/${PACKAGE}/doc
+-data_DATA=gmorgan0.75.pdf \
+-gmorgan0.75.odt \
+-gmorgan-old-es.pdf \
+-gmorgan-old-es.sxw \
+-gmorgan-old-fr.pdf \
+-gmorgan-old-fr.sxw \
+-gmorgan-old.pdf \
+-gmorgan-old.sxw 
++datadir = $(docdir)
++data_DATA=gmorgan0.75.pdf
+ 
+ EXTRA_DIST = $(data_DATA)
+-- 
+2.12.0
+
diff --git a/media-sound/gmorgan/gmorgan-0.79.ebuild b/media-sound/gmorgan/gmorgan-0.79.ebuild
new file mode 100644
index 000000000000..77d5c1384977
--- /dev/null
+++ b/media-sound/gmorgan/gmorgan-0.79.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Opensource software rhythm station"
+HOMEPAGE="http://gmorgan.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gmorgan/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="media-libs/alsa-lib
+	x11-libs/fltk:1"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-gettext-version-check.patch
+	"${FILESDIR}"/${P}-manpages.patch
+	"${FILESDIR}"/${P}-remove-dirs.patch
+	"${FILESDIR}"/${P}-remove-old-docs.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+	doman man/${PN}.1
+}