commit: 1253c252ba356a624323718c0f7c120f1310275d
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 23:48:52 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 23:48:52 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1253c252
media-sound/alsamixergui: Port to EAPI 7
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild | 31 ++++++++++++----------
.../files/alsamixergui-0.9.0.1.2-fltk-1.1.patch | 4 +--
.../files/alsamixergui-0.9.0.1.2-gcc34.patch | 4 +--
.../alsamixergui/files/segfault-on-exit.patch | 4 +--
4 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
index 2a3d2ac79e9..bca2f9d1f99 100644
--- a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
+++ b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
-inherit autotools eutils flag-o-matic
+EAPI=7
+
+inherit autotools desktop flag-o-matic
MY_P=${PN}-0.9.0rc1-2
@@ -15,32 +16,34 @@ SLOT="0"
KEYWORDS="amd64 arm ppc ppc64 sparc x86"
IUSE=""
-RDEPEND="media-libs/alsa-lib
+RDEPEND="
+ media-libs/alsa-lib:=
media-sound/alsa-utils
x11-libs/fltk:1"
DEPEND="${RDEPEND}"
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog README )
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc34.patch
+ "${FILESDIR}"/segfault-on-exit.patch
+ "${FILESDIR}"/${P}-fltk-1.1.patch
+)
src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-gcc34.patch \
- "${FILESDIR}"/segfault-on-exit.patch \
- "${FILESDIR}"/${P}-fltk-1.1.patch
-
+ default
+ mv configure.{in,ac} || die
eautoreconf
}
src_configure() {
- append-ldflags "-L$(dirname $(fltk-config --libs))"
- append-flags "-I$(fltk-config --includedir)"
+ append-libs "-L$(dirname $(fltk-config --libs))"
+ append-cppflags "-I$(fltk-config --includedir)"
econf
}
src_install() {
default
+
newicon src/images/alsalogo.xpm ${PN}.xpm
make_desktop_entry ${PN} "Alsa Mixer GUI"
}
diff --git
a/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-fltk-1.1.patch
b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-fltk-1.1.patch
index a7c121dbc9d..8c650141985 100644
--- a/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-fltk-1.1.patch
+++ b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-fltk-1.1.patch
@@ -1,5 +1,5 @@
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
@@ -11,11 +11,11 @@
AC_PROG_LN_S
diff --git a/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-gcc34.patch
b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-gcc34.patch
index 6f37970aa56..a17452cbbe4 100644
--- a/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-gcc34.patch
+++ b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-gcc34.patch
@@ -1,5 +1,5 @@
---- src/alsamixer.cxx
-+++ src/alsamixer.cxx
+--- a/src/alsamixer.cxx
++++ b/src/alsamixer.cxx
@@ -654,7 +654,7 @@
if (joined) {
#ifdef ALSAMIXER_GUI
diff --git a/media-sound/alsamixergui/files/segfault-on-exit.patch
b/media-sound/alsamixergui/files/segfault-on-exit.patch
index 6dc2feb8cc5..f2106d08841 100644
--- a/media-sound/alsamixergui/files/segfault-on-exit.patch
+++ b/media-sound/alsamixergui/files/segfault-on-exit.patch
@@ -1,5 +1,5 @@
---- src/alsamixer.cxx
-+++ src/alsamixer.cxx
+--- a/src/alsamixer.cxx
++++ b/src/alsamixer.cxx
@@ -1869,7 +1869,7 @@
if (procWindow) delete procWindow;
if (mainWindow) delete mainWindow;
