[gentoo-commits] repo/gentoo:master commit in: x11-misc/xcave/, x11-misc/xcave/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xcave/, x11-misc/xcave/files/

[Jeroen Roovers]

commit:     5ffe68d79d60fd194ab2faaf997de5104a4ede68
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 29 11:16:47 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jan 29 11:32:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ffe68d7

x11-misc/xcave: Set CFLAGS=-fcommon

Also fix pkg-config variable prefix in configure.ac:
./configure: line 1425: ac_env_libxml-2.0_CFLAGS_set=2.0_CFLAGS+set:
command not found
(etc.)

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Closes: https://bugs.gentoo.org/show_bug.cgi?id=706928
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 x11-misc/xcave/files/xcave-2.4.0-pkg-config.patch | 13 ++++++++++++
 x11-misc/xcave/xcave-2.4.0.ebuild                 | 26 +++++++++++++++++++----
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/x11-misc/xcave/files/xcave-2.4.0-pkg-config.patch b/x11-misc/xcave/files/xcave-2.4.0-pkg-config.patch
new file mode 100644
index 00000000000..f0e331dccfe
--- /dev/null
+++ b/x11-misc/xcave/files/xcave-2.4.0-pkg-config.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -49,10 +49,6 @@
+ 
+ 
+ 
+-PKG_CHECK_MODULES(libxml-2.0, libxml-2.0)
+-AC_SUBST(libxml-2.0_CFLAGS)
+-AC_SUBST(libxml-2.0_LIBS)
+-
+ AC_OUTPUT([
+ Makefile
+ src/Makefile

diff --git a/x11-misc/xcave/xcave-2.4.0.ebuild b/x11-misc/xcave/xcave-2.4.0.ebuild
index 3e6245d4498..96c74893f67 100644
--- a/x11-misc/xcave/xcave-2.4.0.ebuild
+++ b/x11-misc/xcave/xcave-2.4.0.ebuild
@@ -1,7 +1,8 @@
-# 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 flag-o-matic
 
 DESCRIPTION="View and manage contents of your wine cellar"
 HOMEPAGE="http://xcave.free.fr/index-en.php"
@@ -14,13 +15,30 @@ RESTRICT="test"
 
 RDEPEND="
 	x11-libs/gtk+:2
-	dev-libs/libxml2:2"
-DEPEND="${RDEPEND}"
+	dev-libs/libxml2:2
+"
+DEPEND="
+	${RDEPEND}
+"
 BDEPEND="
 	dev-util/intltool
 	sys-devel/gettext
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.0-pkg-config.patch
+)
 
+src_prepare() {
+	mkdir m4 || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cflags -fcommon
+	default
+}
 src_install() {
 	default