From cdb747b791914a30c287a3a8e33d1b635e431707 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 30 Jul 2022 03:08:54 +0100
Subject: gentoo auto-resync : 30:07:2022 - 03:08:54

---
 media-sound/rexima/Manifest                        |  3 +-
 media-sound/rexima/files/rexima-1.4-makefile.patch | 24 +++++++++++++++
 media-sound/rexima/rexima-1.4-r1.ebuild            | 35 ----------------------
 media-sound/rexima/rexima-1.4-r2.ebuild            | 31 +++++++++++++++++++
 4 files changed, 57 insertions(+), 36 deletions(-)
 create mode 100644 media-sound/rexima/files/rexima-1.4-makefile.patch
 delete mode 100644 media-sound/rexima/rexima-1.4-r1.ebuild
 create mode 100644 media-sound/rexima/rexima-1.4-r2.ebuild

(limited to 'media-sound/rexima')

diff --git a/media-sound/rexima/Manifest b/media-sound/rexima/Manifest
index f6d12246ce94..cc328adfbf63 100644
--- a/media-sound/rexima/Manifest
+++ b/media-sound/rexima/Manifest
@@ -1,3 +1,4 @@
+AUX rexima-1.4-makefile.patch 493 BLAKE2B e51d7cf175f7a355a4c33932a2607cdf22484e1e16c6f6522bb5ba8955bb4f09f35867313a71ddc48cbacac8d62ca04f0bac8cc21f672ec701e6e6072d6bcb0b SHA512 226ecbebd01740ada86b4f7f0b8d5e5626cdd6c3af4cdcbe7606effbc8d23d4f4459967a31e57f97b0f418d1dfe1c32a940d0883f2a5e6f8354b418c13e72200
 DIST rexima-1.4.tar.gz 15903 BLAKE2B 9852560036ef58a2e22974bca153d24ab07735fe5c679b3e4bd6a8a22c81a246fa28b0d52034736952faa599a0a8f4a73f34dcfa8cfb8df079148fa82bbf995b SHA512 6a4c70fd2f61446a2e79a3a22218d443f7ae4df9928b73c66f8d4d2f592d50c57f5fe53875bf975a8ffb6d9d8f99bc99d083ced2714b7623bef06229f8e37fd6
-EBUILD rexima-1.4-r1.ebuild 688 BLAKE2B a8c9f5b9bfedb05860b42597aac9a12a6dbdf9ff612b9aee25cddf8911b616664fcc65813bc012f4b44e9e228deb9136b60c0624b20ebdf47302c63805a68d6a SHA512 92b8944b62b761b78f28a428c70d733ae9695fa88d121a1d5c4b9f0c27bd28fea4bb17ecb4a6185950fd31d77062651f2180cfa1918d5a9a8c668066651b4868
+EBUILD rexima-1.4-r2.ebuild 644 BLAKE2B 7f26f1afccb706ffcd7c954974cd3b2f03aca9d91fdaa1d25122253185b6753070bd6a42c31e326fa80a40f25db0045818f437997851d1530bf5fe03f4e7d576 SHA512 ff3d11ab54868547974e7823ff493dbeb2e9f325408e615cfa0183f8fe6775d167e61769545f8654aaff14683a5f0ba35b6d86de2fe28b19c11a71458f47375f
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
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 000000000000..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-r1.ebuild
deleted file mode 100644
index 60fcf194acd7..000000000000
--- a/media-sound/rexima/rexima-1.4-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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"
-HOMEPAGE="http://www.svgalib.org/rus/rexima.html"
-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"
-
-src_configure() {
-	tc-export CC
-
-	cat > Makefile <<- _EOF_ || die
-		LDLIBS=$($(tc-getPKG_CONFIG) --libs ncurses)
-		all: rexima
-	_EOF_
-}
-
-src_install() {
-	dobin rexima
-
-	einstalldocs
-	doman rexima.1
-}
diff --git a/media-sound/rexima/rexima-1.4-r2.ebuild b/media-sound/rexima/rexima-1.4-r2.ebuild
new file mode 100644
index 000000000000..72dfeb4e8a71
--- /dev/null
+++ b/media-sound/rexima/rexima-1.4-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A curses-based interactive mixer which can also be used from the command-line"
+HOMEPAGE="http://www.svgalib.org/rus/rexima.html"
+SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/apps/sound/mixers/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+}
+
+src_install() {
+	dobin rexima
+
+	einstalldocs
+	doman rexima.1
+}
-- 
cgit v1.2.3