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

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

[Lars Wendler]

commit:     22e8fe9d148be427cd278dbc7de4b512e744627a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 14:31:49 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 14:32:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22e8fe9d

media-sound/gom: Fixed build with sys-libs/ncurses[tinfo]

Closes: https://bugs.gentoo.org/690092
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-sound/gom/files/gom-0.29.103-tinfo.patch | 29 ++++++++++++++++++++++++++
 media-sound/gom/gom-0.29.103-r1.ebuild         | 25 +++++++++++++++-------
 2 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/media-sound/gom/files/gom-0.29.103-tinfo.patch b/media-sound/gom/files/gom-0.29.103-tinfo.patch
new file mode 100644
index 00000000000..bb93fc2d39c
--- /dev/null
+++ b/media-sound/gom/files/gom-0.29.103-tinfo.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/690092
+
+--- gom-0.29.103/configure.in
++++ gom-0.29.103/configure.in
+@@ -25,6 +25,7 @@
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
++PKG_PROG_PKG_CONFIG
+ 
+ 
+ dnl Custom options to configure
+@@ -39,11 +40,11 @@
+ 
+ dnl Checks for libraries.
+ 
+-AC_CHECK_LIB(ncurses, beep)
+-if [[ "$ac_cv_lib_ncurses_beep" != "yes" ]]
+-    then AC_MSG_ERROR("Need ncurses library for terminal gomii!")
+-fi
+-
++PKG_CHECK_MODULES(NCURSES, ncurses, [
++		  LIBS="$LIBS $NCURSES_LIBS"
++		 ],[
++		  AC_MSG_ERROR([Need ncurses library for terminal gomii!])
++		 ])
+ 
+ if [[ "$enable_x_gomii" = "yes" ]]; then
+       AC_CHECK_LIB(X11, main)

diff --git a/media-sound/gom/gom-0.29.103-r1.ebuild b/media-sound/gom/gom-0.29.103-r1.ebuild
index 30295a79e97..b49d71e781e 100644
--- a/media-sound/gom/gom-0.29.103-r1.ebuild
+++ b/media-sound/gom/gom-0.29.103-r1.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=0
+EAPI=7
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Console Mixer Program for OSS"
 HOMEPAGE="http://www.fh-worms.de/~inf222"
@@ -14,15 +14,24 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ~ppc sparc x86"
 IUSE="examples"
 
-DEPEND=">=sys-libs/ncurses-5.2"
+DEPEND=">=sys-libs/ncurses-5.2:0="
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-tinfo.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_compile() {
-	econf
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed."
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 }
 
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed."
+src_install() {
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS NEWS ChangeLog README
 
 	if use examples; then

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

[David Seifert]

commit:     4b8beef54932a5061260b82a78c2e6032e8192dc
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  8 16:54:12 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Aug  8 16:54:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b8beef5

media-sound/gom: Fix building under -fno-common

Closes: https://bugs.gentoo.org/708028
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../gom/files/gom-0.29.103-fno-common.patch        | 11 +++++++
 media-sound/gom/gom-0.29.103-r1.ebuild             | 34 +++++++++-------------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/media-sound/gom/files/gom-0.29.103-fno-common.patch b/media-sound/gom/files/gom-0.29.103-fno-common.patch
new file mode 100644
index 00000000000..b1ee6a1930b
--- /dev/null
+++ b/media-sound/gom/files/gom-0.29.103-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/gom_info.h
++++ b/src/gom_info.h
+@@ -52,7 +52,7 @@
+ enum gom_info_types {GOM_INFO_ERROR=-1, GOM_INFO_QUIET, GOM_INFO_NORMAL, GOM_INFO_VERBOSE, GOM_INFO_DEBUG};
+ 
+ /* shown errors count */
+-int gom_info_errors;
++extern int gom_info_errors;
+ 
+ /*
+  * FUNCTION PROTOTYPES

diff --git a/media-sound/gom/gom-0.29.103-r1.ebuild b/media-sound/gom/gom-0.29.103-r1.ebuild
index b49d71e781e..241883a1f65 100644
--- a/media-sound/gom/gom-0.29.103-r1.ebuild
+++ b/media-sound/gom/gom-0.29.103-r1.ebuild
@@ -1,45 +1,37 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools toolchain-funcs
+inherit autotools
 
 DESCRIPTION="Console Mixer Program for OSS"
 HOMEPAGE="http://www.fh-worms.de/~inf222"
 SRC_URI="http://www.Fh-Worms.DE./~inf222/code/c/gom/released/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
-IUSE="examples"
 
-DEPEND=">=sys-libs/ncurses-5.2:0="
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${P}-tinfo.patch"
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {
 	default
+	rmdir examples/standard || die
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS ChangeLog README
-
-	if use examples; then
-		docinto examples
-		dodoc README
-		docinto examples/default
-		dodoc examples/default/*
-		docinto examples/two-mixers
-		dodoc examples/two-mixers/*
-	fi
+	default
+
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
 }