diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-01-20 19:19:51 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-01-20 19:19:51 +0000 |
| commit | adb546d10d299e4616c89efa2122196bab47af70 (patch) | |
| tree | c50507d6c6ae1c3ce457b889d9a4227d831ad692 /media-sound/alsamixergui | |
| parent | Version bump and switch to autotools-utils, bug #387215 thanks Eckard Brauer (diff) | |
| download | gentoo-2-adb546d10d299e4616c89efa2122196bab47af70.tar.gz gentoo-2-adb546d10d299e4616c89efa2122196bab47af70.tar.bz2 gentoo-2-adb546d10d299e4616c89efa2122196bab47af70.zip | |
use eapi4. tidy
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/alsamixergui')
5 files changed, 28 insertions, 21 deletions
diff --git a/media-sound/alsamixergui/ChangeLog b/media-sound/alsamixergui/ChangeLog index f12464f65aeb..e40efc238358 100644 --- a/media-sound/alsamixergui/ChangeLog +++ b/media-sound/alsamixergui/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/alsamixergui -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsamixergui/ChangeLog,v 1.32 2011/03/22 10:01:35 jlec Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsamixergui/ChangeLog,v 1.33 2012/01/20 19:19:51 ssuominen Exp $ + + 20 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> + alsamixergui-0.9.0.1.2-r4.ebuild: + Use EAPI=4 22 Mar 2011; Justin Lecher <jlec@gentoo.org> alsamixergui-0.9.0.1.2-r4.ebuild: 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 9c7e33e6348d..11e085cb6176 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,15 +1,14 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild,v 1.19 2011/03/22 10:01:35 jlec Exp $ - -EAPI=2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild,v 1.20 2012/01/20 19:19:51 ssuominen Exp $ +EAPI=4 inherit autotools eutils flag-o-matic MY_P=${PN}-0.9.0rc1-2 DESCRIPTION="FLTK based amixer Frontend" -HOMEPAGE="http://www.gentoo.org" +HOMEPAGE="http://www.gentoo.org/" SRC_URI="mirror://gentoo/${MY_P}.tar.gz" LICENSE="GPL-2" @@ -17,26 +16,32 @@ SLOT="0" KEYWORDS="amd64 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 ) + src_prepare() { - epatch "${FILESDIR}"/${P}-gcc34.patch \ + epatch \ + "${FILESDIR}"/${P}-gcc34.patch \ "${FILESDIR}"/segfault-on-exit.patch \ "${FILESDIR}"/${P}-fltk-1.1.patch + eautoreconf +} + +src_configure() { append-ldflags "-L$(dirname $(fltk-config --libs))" append-flags "-I/usr/include/fltk-1" + econf } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc README AUTHORS ChangeLog + default newicon src/images/alsalogo.xpm ${PN}.xpm - make_desktop_entry alsamixergui "Alsa Mixer GUI" ${PN} + 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 751f8cc29273..a7c121dbc9d1 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,6 +1,5 @@ -diff -ur alsamixergui-0.9.0rc1-2.orig/configure.in alsamixergui-0.9.0rc1-2/configure.in ---- alsamixergui-0.9.0rc1-2.orig/configure.in 2002-05-03 12:40:21.000000000 +0300 -+++ alsamixergui-0.9.0rc1-2/configure.in 2009-07-19 23:45:10.000000000 +0300 +--- configure.in ++++ 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 d8317e6ba1e5..6f37970aa568 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,6 +1,5 @@ -diff -Nurd alsamixergui-0.9.0rc1-2-old/src/alsamixer.cxx alsamixergui-0.9.0rc1-2/src/alsamixer.cxx ---- alsamixergui-0.9.0rc1-2-old/src/alsamixer.cxx 2004-06-06 23:35:40.994686104 -0500 -+++ alsamixergui-0.9.0rc1-2/src/alsamixer.cxx 2004-06-06 23:36:04.514110608 -0500 +--- src/alsamixer.cxx ++++ 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 0435146d7d7a..6dc2feb8cc58 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 2004-12-07 00:02:52.649159520 +1100 -+++ src/alsamixer.cxx 2004-12-07 00:00:26.385394992 +1100 +--- src/alsamixer.cxx ++++ src/alsamixer.cxx @@ -1869,7 +1869,7 @@ if (procWindow) delete procWindow; if (mainWindow) delete mainWindow; |