Version bump. Removed old

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

5 files changed, 75 insertions, 105 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/Manifest b/media-sound/gmorgan/Manifest
index b1335493ff5e..9d3df786f644 100644
--- a/media-sound/gmorgan/Manifest
+++ b/media-sound/gmorgan/Manifest
@@ -1,6 +1,28 @@
-AUX gmorgan-amd64.patch 2767 SHA256 07355b2ca25bae3a15b3286e7d6b05fe049a600800b2a290f29d4549a095f4f5 SHA512 db374d59856182b4c0d8f341626a5147736f12afb71d909d0b046646e219ca731f9ff6e7d3f56e8073b759264e567fc3fe66a8aaa71c29b2f7c8c38b292655f1 WHIRLPOOL cf0bfa692c7d2ad5f06e05fd27ce7909ea64cff86d1dc2821537a5cb7b7756d37655083fc01476678c0d4448d0f8e955155e2806307278cbf353b96304fed12c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX gmorgan-0.70-cxxflags.patch 468 SHA256 cb05a4a2fc205cc91ea2d72f6ece6e088f8e26e792b4471a5408ad6f5c5506ed SHA512 c466c2079ecc79238fe6b01447002d569771f856be626d32b7936e400ce8942d0bdd28728f6d7752dfc1b151a7856f858a27ff82ea72fd17a6541e91fcf68eb1 WHIRLPOOL 47da0a692bf4b145af0dfbce197a71b6e6102a8cff2ea0faa8cb9d4c87ca9898752faad26c6ade09d1897c30ef7622fff92e1c2d177c8a726bd640b23a1d7d5f
 AUX gmorgan-cflags.patch 597 SHA256 cb1e7b196bd252ab7dc8117b09603250ccbcaafaac80a5ae2e7fdc62d3ecf8b5 SHA512 d33092eb45f1716d78902045a5ce1609e6264dd95ed079c05b02c19935f4686598352aeb6007b3d4a3a77215a7663b06865771419ad319c2f583dddb57d9c1b0 WHIRLPOOL 3f6910a4165e52c088f1b9646ea88a9bf000cf9b8c3a12cfa7f885761477c289b1c28fbf313ca7bb01736b287baf84b9bcaae8053cb3223b41045d5f6fee78c8
+DIST gmorgan-0.70.tar.gz 7010268 SHA256 be9da04dffecb879583eab221217a40ecec3dea22b5538f10cd65191a87abe01 SHA512 d003b8e06707b6e3d707caa368f916a932a3e2f21927c90f3918e28705d2185d56661aa5fd937370b8f5c23ef1873510fd6848d7eba6ee4aa57df1a608cda3b6 WHIRLPOOL 9557eac232201a0a75d26d8d50a04fa96afb17d077d0836d7e7220457d37868c565a3497125453990f18c087d9298319f999075102a62dfef180fa9e9decf915
 DIST gmorgan_0.39.tar.gz 1370780 SHA256 37f6c3d4b43c415e0edaf5d8acc80d7a60fb9318f684acde0eaa723f3ef58b56
 EBUILD gmorgan-0.39.ebuild 1066 SHA256 5ce22544a73d3eb31706ec276f6758e4e91f10ad9098a32682d9f4ebcfb9cf66 SHA512 2464e53f23341ddaca1a2690082f2a38e7830a778f1997258ac7422c5e4c16ad4516cc573cb740989a2f8a87822fd9a0e29c5d8e65b9b87853eb97d10e7ad826 WHIRLPOOL 7a7db8907a36288887b90ff6c40497d3e32870fa6abb545647b990b57bbc4596e55a79d35f1a647d027e174c1d663e7f35c52fd9abd4e64f203639f019cc76f4
-MISC ChangeLog 4332 SHA256 e7d494421ecbc6e86b1d1219061923b812d41264e6385eb91d9d590b08ea764c SHA512 8ff804ae55b0890eb590e850c9fd98f1ea7124fef04a4ef9aa6d60b42387e3560828df842d97a5d5213cdeb0d8303007eacf65c23bbaffa9d4e5b4c8ff918f77 WHIRLPOOL de90e52ae4eef6ae74056745765ae39931afcd045e77c64cc5219fb0674f2f23e69725a5a199bdddfe6a8aa8b3d603f69a4cedc92f58b37f130916705f89e008
+EBUILD gmorgan-0.70.ebuild 747 SHA256 3932b68ef531ce9233a97a80134f05ec95d1d75dad31db99c9ff6ea4c9e2f3fa SHA512 c0fc10b8328fa12a218c456aec4d5cdc3b2372675d09e9ec9eec7abfab71943da2b586e30397bb88bb8b4f691d8e3487d06451b418f6e0e81845b8f5f05d760e WHIRLPOOL 7fd6537ff9f1be1e311872c1ff93ddf3b34a302ed0cadf1c1dcfbf631fbe5e338ebf89dce652565b1895a50a10f778f57435d8831a2c40a94416728215af6564
+MISC ChangeLog 4540 SHA256 4b3a4451d0260c37a4a1791d1a9ab263aa6fbb7bf368183acf7d5b4fe351e25b SHA512 512b3c24d74de2e08e3a58cc19b12c449c2e2dd8a2be40103e542e7759632c52a954446a309b8226d94606a7053cf992fd2d830b5c4b4554794736a05d7c698d WHIRLPOOL 3cbcc74b2e918462c16240be452dc0459bb0ec7459fe813695a77e8d87a2eb83b94fd670eb104c3f28b01d4c8fc5fb1391ea887a48899de51a4d846ed1c630b4
 MISC metadata.xml 239 SHA256 34719f08c365b65c99b743473ce15ef65fa6e5b72b6defdb9f23efc81b886936 SHA512 da2d7b81b0786d3bd379aab4e74e1bfc9a88a5bff848e63092286610585582c9a688b68bb9ad6cd537e176ebe4a76095835252c5ec0b7129d67371bfd221e640 WHIRLPOOL 9b9b0463309bf14222270e86e4cc0a57498437498c8bca62350ebbab9373ed85824a1a47c2a942d8e0f74132862760c0f6cc5dbd2bd43fb62a4095fc5bccbc1f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCgAGBQJVwHDAAAoJEPiazRVxLXTFrSwP/2pAQVbrhyBomrlmZAk5O3lW
+E+31YQrSScYbvk9HBzfKG0VXsDD96LH0ygdWQaVKaOQmrIpUUr0sWtHlnrU1lUeN
+Emp1w5lzTpEh/knusGAytzcZorZPjctrHU0QKn/TuzrB1y16/rSg9ENAm+vYYmol
+LYt+WjrEXs9R+LxIQHbLBuE9Fko41ruNj+SHZK9CStTJnJiL5II/Ipvs9c/3DrxO
+RlByITE3e3XGV3vGeVw3xSncgfRBK0+RRcArVwd0FqAuEd+9VsZm4+QTNekQqgwu
+s18dH9WTw9HwYzzUWytTDkeR19bsqzUjy/GYmbvRCjbOq0FIJxbvT28gtPrSK/EQ
+xwwQDf5iBwZhe0hJ4WcvdguXQfQiJUxA1r3NygoW7xSq4dUgI3pmimAQ3blpu/QI
++q65ETsVVWUyoTenhB7Pyz4BTnDKS73Mxfj1UH+q+asLvQuqwO+QdiFi/wLqquGY
+oFKC/mBDdwbhTU0VUNYET134MRLbPvj0bJgZAcqpjCXioVg4AT0Kk85vOPxR2NsT
+SVP0z8sancGYolqcGpW1bBdpJqx1pIyaQrX+Cf00sb/PM0XCYtIXp0//wQP16ti4
+jhIX+CjXzo21N3Idiw+qTnJogMUu4ij14kVPHimJrNoRiLu9w4DOl3TSTfMacJEP
+qYaftcJ6gyJvxMC5qTGM
+=EwvY
+-----END PGP SIGNATURE-----
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)
+}