| 1 |
commit: 5363d5bb44ed7a015c8c06d2dcf7a61d9d82f133 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 30 12:39:19 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 30 15:10:07 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5363d5bb |
| 7 |
|
| 8 |
app-office/dia: EAPI-6 bump |
| 9 |
|
| 10 |
Acked-by: Mart Raudsepp <leio <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
app-office/dia/dia-0.97.3-r1.ebuild | 19 ++++++++++--------- |
| 15 |
app-office/dia/files/dia-0.97.2-underlinking.patch | 8 ++++---- |
| 16 |
2 files changed, 14 insertions(+), 13 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-office/dia/dia-0.97.3-r1.ebuild b/app-office/dia/dia-0.97.3-r1.ebuild |
| 19 |
index f697cd004ba..fc0207a5f05 100644 |
| 20 |
--- a/app-office/dia/dia-0.97.3-r1.ebuild |
| 21 |
+++ b/app-office/dia/dia-0.97.3-r1.ebuild |
| 22 |
@@ -1,11 +1,10 @@ |
| 23 |
# Copyright 1999-2020 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
-EAPI=5 |
| 27 |
-GCONF_DEBUG=yes |
| 28 |
-GNOME2_LA_PUNT=yes |
| 29 |
+EAPI=6 |
| 30 |
|
| 31 |
-inherit autotools eutils gnome2 multilib |
| 32 |
+GNOME2_EAUTORECONF="yes" |
| 33 |
+inherit gnome2 |
| 34 |
|
| 35 |
DESCRIPTION="Diagram/flowchart creation program" |
| 36 |
HOMEPAGE="https://wiki.gnome.org/Apps/Dia" |
| 37 |
@@ -40,13 +39,15 @@ DEPEND="${RDEPEND} |
| 38 |
virtual/pkgconfig |
| 39 |
doc? ( dev-libs/libxslt )" |
| 40 |
|
| 41 |
-src_prepare() { |
| 42 |
- DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO" |
| 43 |
+DOCS=( AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO ) |
| 44 |
|
| 45 |
- epatch "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159381 , upstream #470812 #558690 |
| 46 |
- epatch "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream #678761 |
| 47 |
- epatch "${FILESDIR}"/${PN}-0.97.3-freetype_pkgconfig.patch #654814, upstream https://gitlab.gnome.org/GNOME/dia/merge_requests/1 |
| 48 |
+PATCHES=( |
| 49 |
+ "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159381 , upstream #470812 #558690 |
| 50 |
+ "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream #678761 |
| 51 |
+ "${FILESDIR}"/${PN}-0.97.3-freetype_pkgconfig.patch #654814, upstream https://gitlab.gnome.org/GNOME/dia/merge_requests/1 |
| 52 |
+) |
| 53 |
|
| 54 |
+src_prepare() { |
| 55 |
if ! use doc; then |
| 56 |
# Skip man generation |
| 57 |
sed -i -e '/if HAVE_DB2MAN/,/endif/d' doc/*/Makefile.am || die |
| 58 |
|
| 59 |
diff --git a/app-office/dia/files/dia-0.97.2-underlinking.patch b/app-office/dia/files/dia-0.97.2-underlinking.patch |
| 60 |
index 903e077f23f..297888cc9b6 100644 |
| 61 |
--- a/app-office/dia/files/dia-0.97.2-underlinking.patch |
| 62 |
+++ b/app-office/dia/files/dia-0.97.2-underlinking.patch |
| 63 |
@@ -6,13 +6,13 @@ Subject: [PATCH] Fix missing linkage with gmodule-2.0. |
| 64 |
Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=678761 |
| 65 |
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=420685 |
| 66 |
--- |
| 67 |
- dia-0.97.2/configure.in | 2 +- |
| 68 |
+ configure.in | 2 +- |
| 69 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 70 |
|
| 71 |
-diff --git a/dia-0.97.2/configure.in b/dia-0.97.2/configure.in |
| 72 |
+diff --git a/configure.in b/configure.in |
| 73 |
index 72830de..6b7394a 100644 |
| 74 |
---- a/dia-0.97.2/configure.in |
| 75 |
-+++ b/dia-0.97.2/configure.in |
| 76 |
+--- a/configure.in |
| 77 |
++++ b/configure.in |
| 78 |
@@ -55,7 +55,7 @@ AC_SUBST(GMODULE_CFLAGS) |
| 79 |
AC_SUBST(GMODULE_LIBS) |
| 80 |
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) |
Archives