| 1 |
commit: 5ffe68d79d60fd194ab2faaf997de5104a4ede68 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 29 11:16:47 2020 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 29 11:32:06 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ffe68d7 |
| 7 |
|
| 8 |
x11-misc/xcave: Set CFLAGS=-fcommon |
| 9 |
|
| 10 |
Also fix pkg-config variable prefix in configure.ac: |
| 11 |
./configure: line 1425: ac_env_libxml-2.0_CFLAGS_set=2.0_CFLAGS+set: |
| 12 |
command not found |
| 13 |
(etc.) |
| 14 |
|
| 15 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
| 16 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=706928 |
| 17 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 18 |
|
| 19 |
x11-misc/xcave/files/xcave-2.4.0-pkg-config.patch | 13 ++++++++++++ |
| 20 |
x11-misc/xcave/xcave-2.4.0.ebuild | 26 +++++++++++++++++++---- |
| 21 |
2 files changed, 35 insertions(+), 4 deletions(-) |
| 22 |
|
| 23 |
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 |
| 24 |
new file mode 100644 |
| 25 |
index 00000000000..f0e331dccfe |
| 26 |
--- /dev/null |
| 27 |
+++ b/x11-misc/xcave/files/xcave-2.4.0-pkg-config.patch |
| 28 |
@@ -0,0 +1,13 @@ |
| 29 |
+--- a/configure.ac |
| 30 |
++++ b/configure.ac |
| 31 |
+@@ -49,10 +49,6 @@ |
| 32 |
+ |
| 33 |
+ |
| 34 |
+ |
| 35 |
+-PKG_CHECK_MODULES(libxml-2.0, libxml-2.0) |
| 36 |
+-AC_SUBST(libxml-2.0_CFLAGS) |
| 37 |
+-AC_SUBST(libxml-2.0_LIBS) |
| 38 |
+- |
| 39 |
+ AC_OUTPUT([ |
| 40 |
+ Makefile |
| 41 |
+ src/Makefile |
| 42 |
|
| 43 |
diff --git a/x11-misc/xcave/xcave-2.4.0.ebuild b/x11-misc/xcave/xcave-2.4.0.ebuild |
| 44 |
index 3e6245d4498..96c74893f67 100644 |
| 45 |
--- a/x11-misc/xcave/xcave-2.4.0.ebuild |
| 46 |
+++ b/x11-misc/xcave/xcave-2.4.0.ebuild |
| 47 |
@@ -1,7 +1,8 @@ |
| 48 |
-# Copyright 1999-2019 Gentoo Authors |
| 49 |
+# Copyright 1999-2020 Gentoo Authors |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
|
| 52 |
EAPI=7 |
| 53 |
+inherit autotools flag-o-matic |
| 54 |
|
| 55 |
DESCRIPTION="View and manage contents of your wine cellar" |
| 56 |
HOMEPAGE="http://xcave.free.fr/index-en.php" |
| 57 |
@@ -14,13 +15,30 @@ RESTRICT="test" |
| 58 |
|
| 59 |
RDEPEND=" |
| 60 |
x11-libs/gtk+:2 |
| 61 |
- dev-libs/libxml2:2" |
| 62 |
-DEPEND="${RDEPEND}" |
| 63 |
+ dev-libs/libxml2:2 |
| 64 |
+" |
| 65 |
+DEPEND=" |
| 66 |
+ ${RDEPEND} |
| 67 |
+" |
| 68 |
BDEPEND=" |
| 69 |
dev-util/intltool |
| 70 |
sys-devel/gettext |
| 71 |
- virtual/pkgconfig" |
| 72 |
+ virtual/pkgconfig |
| 73 |
+" |
| 74 |
+PATCHES=( |
| 75 |
+ "${FILESDIR}"/${PN}-2.4.0-pkg-config.patch |
| 76 |
+) |
| 77 |
|
| 78 |
+src_prepare() { |
| 79 |
+ mkdir m4 || die |
| 80 |
+ default |
| 81 |
+ eautoreconf |
| 82 |
+} |
| 83 |
+ |
| 84 |
+src_configure() { |
| 85 |
+ append-cflags -fcommon |
| 86 |
+ default |
| 87 |
+} |
| 88 |
src_install() { |
| 89 |
default |
Archives