From aa3411e241a201d53a2689766fe419f2756819f3 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 24 Mar 2019 17:22:19 +0000
Subject: gentoo resync : 24.03.2019

---
 media-sound/aumix/Manifest                      |  3 ++-
 media-sound/aumix/aumix-2.9.1.ebuild            | 35 ++++++++++++++++---------
 media-sound/aumix/files/aumix-2.9.1-tinfo.patch | 22 ++++++++++++++++
 3 files changed, 46 insertions(+), 14 deletions(-)
 create mode 100644 media-sound/aumix/files/aumix-2.9.1-tinfo.patch

(limited to 'media-sound/aumix')

diff --git a/media-sound/aumix/Manifest b/media-sound/aumix/Manifest
index 2181a34ef61c..42a3076727dc 100644
--- a/media-sound/aumix/Manifest
+++ b/media-sound/aumix/Manifest
@@ -1,4 +1,5 @@
+AUX aumix-2.9.1-tinfo.patch 737 BLAKE2B faae7740cbdf0af61df2febed5a7901822b73682b3e294a46b901b033c87e1900e7256b073cf0e5257ec3db32218e106cf350059a0f62ba7d29992179ea98d64 SHA512 9a2e68378d7bf7920ae2004ecefb2bcffdd829cab0c09340796de4d1617f0959e2b68432c9e29f748179abcfef87c22b8a3698615eef6485e1d7e17383d3d7eb
 AUX aumix.rc6 1037 BLAKE2B ba9842705caa5e78c7d5886afa6c8408a50169ec79a788d49ca04a8c90bcf581dcb96f4b11c8b6004370143ee6a92d9e0b660132826b2b9e167a07a6dfe73001 SHA512 8960c6c5e61e15e981bfafff7b03aded627971c11d6c21ce9e0d953737f440885fb5dda6a9f942112697c344b4f3ad9f222e2a7cfa493a504dc75a8f4c8cf1c9
 DIST aumix-2.9.1.tar.bz2 231622 BLAKE2B b96075d310b1d04bfc697a9097fd656d85705f68f1b06b1e6ee5bc0ca2b2a3614df67980d0f6e293c4d99adb9d12fae3608ac446eefd1cdf4f04de7f4a5fd1db SHA512 bd063dc9dab8455f467fbe9e4ea1baa5cef914923e66ab5a8fca1e6964cac7851e3755f054bfe41657371e221920fe9a52f9807457996244f4bcd5db4659b21d
-EBUILD aumix-2.9.1.ebuild 924 BLAKE2B a12d1ccea387fffdc81812b4e8563fb446914444dc7362fdfdec2a6867ee8afb9a2c1993723d7d6d82ee24675550228db8de4b8f3d1478716525f61e33d11daa SHA512 99bb83a33f82b18d203d07c754c0f948206545b1639fdc41c74ef04f66e84758503e5212e89fd4c4a3ae4392566b8275dcde51543a518812c518a8c1d91dd347
+EBUILD aumix-2.9.1.ebuild 997 BLAKE2B f61e38c06cdb32cac7ffa212fd938c1ea383826d39fcbaeeb8589f3e22a5ec1790bcb5e191b204a9bcf6b7211683dfbbf20b7ac4dfd353dfbddb81c52941e877 SHA512 7bdcb6e6bf892acb276be89f228cb4c214e367e7372ca65b2bb3928790ef1ce61e7d2c916cc727ba78b7b687ac4ba7a047df1b69efd1bf896fe5efe851a7f934
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/aumix/aumix-2.9.1.ebuild b/media-sound/aumix/aumix-2.9.1.ebuild
index fc6bf40487e4..deffad3e7208 100644
--- a/media-sound/aumix/aumix-2.9.1.ebuild
+++ b/media-sound/aumix/aumix-2.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop
+inherit autotools desktop
 
 DESCRIPTION="Aumix volume/mixer control program"
 HOMEPAGE="http://jpj.net/~trevor/aumix.html"
@@ -14,24 +14,33 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
 IUSE="gpm gtk nls"
 
-RDEPEND="sys-libs/ncurses:0
+RDEPEND="sys-libs/ncurses:0=
 	gpm? ( sys-libs/gpm )
 	gtk? ( x11-libs/gtk+:2 )
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
 
-src_configure() {
-	local myconf
+PATCHES=(
+	"${FILESDIR}/${P}-tinfo.patch" #578722
+)
 
-	use gtk || myconf="${myconf} --without-gtk"
-	use gpm || myconf="${myconf} --without-gpm"
+src_prepare() {
+	default
+	eautoreconf #578722
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable nls)
+		$(usex gtk '' --without-gtk)
+		$(usex gpm '' --without-gpm)
+	)
 
-	econf \
-		$(use_enable nls) \
-		--disable-dependency-tracking \
-		${myconf}
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/media-sound/aumix/files/aumix-2.9.1-tinfo.patch b/media-sound/aumix/files/aumix-2.9.1-tinfo.patch
new file mode 100644
index 000000000000..969e034e0cbb
--- /dev/null
+++ b/media-sound/aumix/files/aumix-2.9.1-tinfo.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/578722
+
+--- aumix-2.9.1/configure.ac
++++ aumix-2.9.1/configure.ac
+@@ -69,6 +69,8 @@
+    [  --without-ncurses       compile with no ncurses or mouse support],
+   AC_MSG_RESULT([Compiling without ncurses support]),[
+   dnl Checks for ncurses library.
++  AC_CHECK_LIB(tinfo, main, TINFO_LIB="-ltinfo", TINFO_LIB=)
++  AC_SUBST(TINFO_LIB)
+   AC_CHECK_LIB(ncurses, initscr, initscr=on, initscr=off)
+   if test $initscr = on; then
+     CURSLIB="ncurses"
+@@ -83,7 +85,7 @@
+     fi
+   fi
+   if test x$CURSLIB != x; then
+-    LIBS="-l$CURSLIB $LIBS"
++    LIBS="-l$CURSLIB $TINFO_LIB $LIBS"
+     AC_DEFINE(HAVE_CURSES, 1,
+       [Define this if you have (n)curses and want to use it.])
+     AC_CHECK_LIB($CURSLIB, getmouse,
-- 
cgit v1.2.3