[gentoo-commits] repo/gentoo:master commit in: media-sound/rexima/

2017-03-11 Thread David Seifert
commit: 6a898fff45993a04ecd991c29c15c92b86400c4e
Author: David Seifert  gentoo  org>
AuthorDate: Sat Mar 11 20:45:11 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Mar 11 20:47:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a898fff

media-sound/rexima: Modernise to EAPI 6

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 .../{rexima-1.4.ebuild => rexima-1.4-r1.ebuild}| 26 +-
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/media-sound/rexima/rexima-1.4.ebuild 
b/media-sound/rexima/rexima-1.4-r1.ebuild
similarity index 59%
rename from media-sound/rexima/rexima-1.4.ebuild
rename to media-sound/rexima/rexima-1.4-r1.ebuild
index cdfc20bdfad..cd78692ee67 100644
--- a/media-sound/rexima/rexima-1.4.ebuild
+++ b/media-sound/rexima/rexima-1.4-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 inherit toolchain-funcs
 
 DESCRIPTION="A curses-based interactive mixer which can also be used from the 
command-line"
@@ -12,18 +14,22 @@ SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}"
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
 
-src_compile() {
+src_configure() {
tc-export CC
-   echo "LDLIBS=-lncurses" > Makefile
-   echo "all: rexima" >> Makefile
-   emake || die "emake failed"
+
+   cat > Makefile <<- _EOF_ || die
+   LDLIBS=$($(tc-getPKG_CONFIG) --libs ncurses)
+   all: rexima
+   _EOF_
 }
 
 src_install () {
-   dobin rexima || die
-   doman rexima.1 || die
-   dodoc NEWS README ChangeLog
+   dobin rexima
+
+   einstalldocs
+   doman rexima.1
 }



[gentoo-commits] repo/gentoo:master commit in: media-sound/rexima/files/, media-sound/rexima/

2022-07-29 Thread David Seifert
commit: db14af220396e76af001dcc0cab6cd019e2539b2
Author: David Seifert  gentoo  org>
AuthorDate: Fri Jul 29 21:38:22 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jul 29 21:38:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db14af22

media-sound/rexima: update EAPI 6 -> 8

Signed-off-by: David Seifert  gentoo.org>

 media-sound/rexima/files/rexima-1.4-makefile.patch | 24 ++
 .../{rexima-1.4-r1.ebuild => rexima-1.4-r2.ebuild} | 20 --
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/media-sound/rexima/files/rexima-1.4-makefile.patch 
b/media-sound/rexima/files/rexima-1.4-makefile.patch
new file mode 100644
index ..9c70493b4cd5
--- /dev/null
+++ b/media-sound/rexima/files/rexima-1.4-makefile.patch
@@ -0,0 +1,24 @@
+--- a/Makefile
 b/Makefile
+@@ -1,7 +1,9 @@
+ # Makefile - makefile for rexima
+ 
+-CC=gcc
+-CFLAGS=-O -Wall
++PKG_CONFIG ?= pkg-config
++CFLAGS += -Wall
++CPPFLAGS += $(shell $(PKG_CONFIG) --cflags ncurses)
++LDLIBS = $(shell $(PKG_CONFIG) --libs ncurses)
+ 
+ # Set BINDIR to directory for binary,
+ # MANDIR to directory for man page.
+@@ -16,9 +18,6 @@
+ 
+ all: rexima
+ 
+-rexima: rexima.o
+-  $(CC) $(CFLAGS) -o rexima rexima.o -lncurses
+-
+ installdirs:
+   /bin/sh ./mkinstalldirs $(BINDIR) $(MANDIR)
+ 

diff --git a/media-sound/rexima/rexima-1.4-r1.ebuild 
b/media-sound/rexima/rexima-1.4-r2.ebuild
similarity index 65%
rename from media-sound/rexima/rexima-1.4-r1.ebuild
rename to media-sound/rexima/rexima-1.4-r2.ebuild
index 60fcf194acd7..72dfeb4e8a71 100644
--- a/media-sound/rexima/rexima-1.4-r1.ebuild
+++ b/media-sound/rexima/rexima-1.4-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 toolchain-funcs
 
@@ -12,19 +12,15 @@ 
SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/apps/sound/mixers/${P}.tar.gz";
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
 
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_configure() {
-   tc-export CC
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
-   cat > Makefile <<- _EOF_ || die
-   LDLIBS=$($(tc-getPKG_CONFIG) --libs ncurses)
-   all: rexima
-   _EOF_
+src_configure() {
+   tc-export CC PKG_CONFIG
 }
 
 src_install() {