Version bump. Removed old

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 981CA6FC)

4 files changed, 51 insertions, 103 deletions

diff --git a/media-sound/gmorgan/ChangeLog b/media-sound/gmorgan/ChangeLog
index a8948eada4b4..b288c0e4f399 100644
--- a/media-sound/gmorgan/ChangeLog
+++ b/media-sound/gmorgan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/gmorgan
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmorgan/ChangeLog,v 1.32 2015/08/02 23:21:08 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmorgan/ChangeLog,v 1.33 2015/08/04 07:58:55 polynomial-c Exp $
+
+*gmorgan-0.70 (04 Aug 2015)
+
+  04 Aug 2015; Lars Wendler <polynomial-c@gentoo.org> +gmorgan-0.70.ebuild,
+  +files/gmorgan-0.70-cxxflags.patch, -files/gmorgan-amd64.patch:
+  Version bump. Removed old.
 
   02 Aug 2015; Manuel Rüger <mrueg@gentoo.org> -gmorgan-0.25-r1.ebuild:
   Remove old.
diff --git a/media-sound/gmorgan/files/gmorgan-0.70-cxxflags.patch b/media-sound/gmorgan/files/gmorgan-0.70-cxxflags.patch
new file mode 100644
index 000000000000..61225fc07c29
--- /dev/null
+++ b/media-sound/gmorgan/files/gmorgan-0.70-cxxflags.patch
@@ -0,0 +1,11 @@
+--- gmorgan-0.70/configure.in
++++ gmorgan-0.70/configure.in
+@@ -15,7 +15,7 @@
+ AC_CHECK_FUNCS([bzero memset select strdup])
+ AM_GNU_GETTEXT([external])
+ LIBS="`fltk-config --use-images --ldflags` -lasound"
+-CXXFLAGS=" `fltk-config --use-images --cxxflags`"
++CXXFLAGS="${CXXFLAGS} `fltk-config --use-images --cxxflags`"
+ AC_CHECK_HEADERS([unistd.h])
+ AC_CHECK_HEADER(alsa/asoundlib.h, true, AC_MSG_ERROR([Alsa is required]))
+ AC_PATH_PROG(FLTK_CONFIG, fltk-config, no)
diff --git a/media-sound/gmorgan/files/gmorgan-amd64.patch b/media-sound/gmorgan/files/gmorgan-amd64.patch
deleted file mode 100644
index 86b80e836c6f..000000000000
--- a/media-sound/gmorgan/files/gmorgan-amd64.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- gmorgan-0.23/src/GMORGAN.cxx.old	2006-11-07 14:01:15.000000000 +0100
-+++ gmorgan-0.23/src/GMORGAN.cxx	2006-11-07 18:14:56.000000000 +0100
-@@ -29997,7 +29997,7 @@
- }
- 
- inline void GMORGAN::a_ver_i(Fl_Slider* o, void*) {
--  int kd = (int) o->user_data();
-+  long kd = (long) o->user_data();
- int kv = (int) o->value();
- veloplus[kd] = kv;
- }
-@@ -30540,7 +30540,7 @@
- }
- 
- inline void GMORGAN::song_call_i(Fl_Input* o, void*) {
--  int kd = (int) o->user_data();
-+  long kd = (long) o->user_data();
- 
- if (kd <= 128) strcpy(S[kd].ch1,(char *) o->value());
- if ((kd > 128) && (kd <=256)) strcpy(S[kd-128].ch2,(char *) o->value());
-@@ -30555,7 +30555,7 @@
- }
- 
- inline void GMORGAN::song_call1_i(Fl_Value_Input* o, void*) {
--  int kd = (int) o->user_data();
-+  long kd = (long) o->user_data();
- if ((kd > 896) && (kd <=1024)) S[kd-896].times = (int) o->value();
- if ((kd > 1024) && (kd <=1152)) S[kd-1024].pattern = (int) o->value();
- if ((kd > 1792) && (kd <=1920)) S[kd-1792].atimes = (int) o->value();
-@@ -30567,7 +30567,7 @@
- 
- inline void GMORGAN::song_call2_i(Fl_Button* o, void*) {
-   int i;
--int kd = (int) o->user_data();
-+long kd = (long) o->user_data();
- if ((kd > 256) && (kd <=384))
- {
-  for(i=1; i<=128; i++)
-@@ -30868,7 +30868,7 @@
- inline void GMORGAN::dr_call1_i(Fl_Value_Input* o, void*) {
-   int i,j;
- 
--int kd = (int) o->user_data();
-+long kd = (long) o->user_data();
- int kv = (int) o->value();
- i = kd / 130;
- j = kd % 130;
-@@ -30881,7 +30881,7 @@
- 
- inline void GMORGAN::dr_call2_i(Fl_Output* o, void*) {
-   lastcasdr = sde + 10000;
--int kd = (int) o->user_data();
-+long kd = (long) o->user_data();
- if (kd != lastcasdr) cambiacasdr = 1;
- o->cursor_color(FL_WHITE);
- o->color(FL_WHITE);
-@@ -31873,7 +31873,7 @@
- inline void GMORGAN::ctrl_call1_i(Fl_Value_Input* o, void*) {
-   int i,j;
- 
--int kd = (int) o->user_data();
-+long kd = (long) o->user_data();
- int kv = (int) o->value();
- i = kd / 130;
- j = kd % 130;
-@@ -31886,7 +31886,7 @@
- 
- inline void GMORGAN::ctrl_call2_i(Fl_Output* o, void*) {
-   lastcascr = sdec + 10000;
--int kd = (int) o->user_data();
-+long kd = (long) o->user_data();
- if (kd != lastcascr) cambiacascr=1;
- sdec = kd-10000;
- o->color(FL_WHITE);
-@@ -32956,11 +32956,11 @@
- 
- void GMORGAN::PonColores(int usdata) {
-   int i;
--int ladata;
-+long ladata;
- for(i=0; i<61; i++)
- 
- {
--ladata = (int) Scroll1->child(i)->user_data();
-+ladata = (long) Scroll1->child(i)->user_data();
- if ( ladata == usdata) 
- {
- Scroll1->child(i)->color(59);
-@@ -32972,11 +32972,11 @@
- 
- void GMORGAN::PonColores2(int usdata) {
-   int i;
--int ladata;
-+long ladata;
- for(i=0; i<32; i++)
- 
- {
--ladata = (int) CScroll1->child(i)->user_data();
-+ladata = (long) CScroll1->child(i)->user_data();
- if ( ladata == usdata) 
- {
- CScroll1->child(i)->color(59);
diff --git a/media-sound/gmorgan/gmorgan-0.70.ebuild b/media-sound/gmorgan/gmorgan-0.70.ebuild
new file mode 100644
index 000000000000..b2499c0d2e11
--- /dev/null
+++ b/media-sound/gmorgan/gmorgan-0.70.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmorgan/gmorgan-0.70.ebuild,v 1.1 2015/08/04 07:58:55 polynomial-c Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils
+
+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 )"
+
+DOCS=(AUTHORS ChangeLog NEWS README)
+
+PATCHES=( "${FILESDIR}/${P}-cxxflags.patch" )
+
+src_configure() {
+	econf \
+		$(use_enable nls)
+}