| 1 |
commit: aa5c2cbdcb88e16b7de70f62427fc073b8c1b27e |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 4 21:55:48 2022 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 4 21:55:48 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa5c2cbd |
| 7 |
|
| 8 |
media-sound/gmorgan: update EAPI 6 -> 8 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/635680 |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
|
| 13 |
.../gmorgan-0.79-remove-gettext-version-check.patch | 18 +++++++----------- |
| 14 |
.../{gmorgan-0.79-r1.ebuild => gmorgan-0.79-r2.ebuild} | 16 ++++++++-------- |
| 15 |
2 files changed, 15 insertions(+), 19 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
index 5a076a7ba2a8..430159271b65 100644 |
| 19 |
--- a/media-sound/gmorgan/files/gmorgan-0.79-remove-gettext-version-check.patch |
| 20 |
+++ b/media-sound/gmorgan/files/gmorgan-0.79-remove-gettext-version-check.patch |
| 21 |
@@ -5,22 +5,18 @@ Subject: [PATCH 1/3] Remove useless gettext version check |
| 22 |
|
| 23 |
Fixes following error: |
| 24 |
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 |
| 25 |
---- |
| 26 |
- configure.ac | 1 - |
| 27 |
- 1 file changed, 1 deletion(-) |
| 28 |
|
| 29 |
-diff --git a/configure.ac b/configure.ac |
| 30 |
-index ed48b6f..f6ba2af 100644 |
| 31 |
--- a/configure.ac |
| 32 |
+++ b/configure.ac |
| 33 |
-@@ -16,7 +16,6 @@ AC_HEADER_STDC |
| 34 |
+@@ -16,9 +16,8 @@ |
| 35 |
AC_FUNC_SELECT_ARGTYPES |
| 36 |
AC_CHECK_FUNCS([bzero memset select strdup]) |
| 37 |
AM_GNU_GETTEXT([external]) |
| 38 |
-AM_GNU_GETTEXT_VERSION |
| 39 |
- LIBS="`fltk-config --use-images --ldflags` -lasound" |
| 40 |
- CXXFLAGS="-g `fltk-config --use-images --cxxflags`" |
| 41 |
+-LIBS="`fltk-config --use-images --ldflags` -lasound" |
| 42 |
+-CXXFLAGS="-g `fltk-config --use-images --cxxflags`" |
| 43 |
++LIBS="$(fltk-config --use-images --ldflags) -lasound ${LIBS}" |
| 44 |
++CXXFLAGS="$(fltk-config --use-images --cxxflags) ${CXXFLAGS}" |
| 45 |
AC_CHECK_HEADERS([unistd.h]) |
| 46 |
--- |
| 47 |
-2.12.0 |
| 48 |
- |
| 49 |
+ AC_CHECK_HEADER(alsa/asoundlib.h, true, AC_MSG_ERROR([Alsa is required])) |
| 50 |
+ AC_PATH_PROG(FLTK_CONFIG, fltk-config, no) |
| 51 |
|
| 52 |
diff --git a/media-sound/gmorgan/gmorgan-0.79-r1.ebuild b/media-sound/gmorgan/gmorgan-0.79-r2.ebuild |
| 53 |
similarity index 80% |
| 54 |
rename from media-sound/gmorgan/gmorgan-0.79-r1.ebuild |
| 55 |
rename to media-sound/gmorgan/gmorgan-0.79-r2.ebuild |
| 56 |
index 54db2b24697d..074f938d622c 100644 |
| 57 |
--- a/media-sound/gmorgan/gmorgan-0.79-r1.ebuild |
| 58 |
+++ b/media-sound/gmorgan/gmorgan-0.79-r2.ebuild |
| 59 |
@@ -1,7 +1,7 @@ |
| 60 |
-# Copyright 1999-2020 Gentoo Authors |
| 61 |
+# Copyright 1999-2022 Gentoo Authors |
| 62 |
# Distributed under the terms of the GNU General Public License v2 |
| 63 |
|
| 64 |
-EAPI=6 |
| 65 |
+EAPI=8 |
| 66 |
|
| 67 |
inherit autotools |
| 68 |
|
| 69 |
@@ -14,10 +14,11 @@ SLOT="0" |
| 70 |
KEYWORDS="amd64 x86" |
| 71 |
IUSE="nls" |
| 72 |
|
| 73 |
-RDEPEND="media-libs/alsa-lib |
| 74 |
+RDEPEND=" |
| 75 |
+ media-libs/alsa-lib |
| 76 |
x11-libs/fltk:1" |
| 77 |
-DEPEND="${RDEPEND} |
| 78 |
- nls? ( sys-devel/gettext )" |
| 79 |
+DEPEND="${RDEPEND}" |
| 80 |
+BDEPEND="nls? ( sys-devel/gettext )" |
| 81 |
|
| 82 |
PATCHES=( |
| 83 |
"${FILESDIR}"/${P}-remove-gettext-version-check.patch |
| 84 |
@@ -35,11 +36,10 @@ src_prepare() { |
| 85 |
} |
| 86 |
|
| 87 |
src_configure() { |
| 88 |
- econf \ |
| 89 |
- $(use_enable nls) |
| 90 |
+ econf $(use_enable nls) |
| 91 |
} |
| 92 |
|
| 93 |
src_install() { |
| 94 |
default |
| 95 |
- doman man/${PN}.1 |
| 96 |
+ doman man/gmorgan.1 |
| 97 |
} |
Archives