summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-sound/gmorgan/files/gmorgan-0.79-remove-gettext-version-check.patch18
-rw-r--r--media-sound/gmorgan/gmorgan-0.79-r2.ebuild (renamed from media-sound/gmorgan/gmorgan-0.79-r1.ebuild)16
2 files changed, 15 insertions, 19 deletions
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
index 5a076a7ba2a8..430159271b65 100644
--- 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
@@ -5,22 +5,18 @@ 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
+@@ -16,9 +16,8 @@
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`"
+-LIBS="`fltk-config --use-images --ldflags` -lasound"
+-CXXFLAGS="-g `fltk-config --use-images --cxxflags`"
++LIBS="$(fltk-config --use-images --ldflags) -lasound ${LIBS}"
++CXXFLAGS="$(fltk-config --use-images --cxxflags) ${CXXFLAGS}"
AC_CHECK_HEADERS([unistd.h])
---
-2.12.0
-
+ 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/gmorgan-0.79-r1.ebuild b/media-sound/gmorgan/gmorgan-0.79-r2.ebuild
index 54db2b24697d..074f938d622c 100644
--- a/media-sound/gmorgan/gmorgan-0.79-r1.ebuild
+++ b/media-sound/gmorgan/gmorgan-0.79-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit autotools
@@ -14,10 +14,11 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE="nls"
-RDEPEND="media-libs/alsa-lib
+RDEPEND="
+ media-libs/alsa-lib
x11-libs/fltk:1"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
PATCHES=(
"${FILESDIR}"/${P}-remove-gettext-version-check.patch
@@ -35,11 +36,10 @@ src_prepare() {
}
src_configure() {
- econf \
- $(use_enable nls)
+ econf $(use_enable nls)
}
src_install() {
default
- doman man/${PN}.1
+ doman man/gmorgan.1
}