From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B2547138351 for ; Thu, 30 Apr 2020 15:10:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 907C6E097E; Thu, 30 Apr 2020 15:10:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 659ECE097E for ; Thu, 30 Apr 2020 15:10:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A12F034EEC8 for ; Thu, 30 Apr 2020 15:10:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 24E39206 for ; Thu, 30 Apr 2020 15:10:51 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1588259407.5363d5bb44ed7a015c8c06d2dcf7a61d9d82f133.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/dia/files/, app-office/dia/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/dia/dia-0.97.3-r1.ebuild app-office/dia/files/dia-0.97.2-underlinking.patch X-VCS-Directories: app-office/dia/ app-office/dia/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5363d5bb44ed7a015c8c06d2dcf7a61d9d82f133 X-VCS-Branch: master Date: Thu, 30 Apr 2020 15:10:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b7711410-dbb8-4eab-b662-ba18a10729b1 X-Archives-Hash: 6913f4ab051ab337152d838f0f0309b4 commit: 5363d5bb44ed7a015c8c06d2dcf7a61d9d82f133 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Apr 30 12:39:19 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 30 15:10:07 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5363d5bb app-office/dia: EAPI-6 bump Acked-by: Mart Raudsepp gentoo.org> Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/dia/dia-0.97.3-r1.ebuild | 19 ++++++++++--------- app-office/dia/files/dia-0.97.2-underlinking.patch | 8 ++++---- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app-office/dia/dia-0.97.3-r1.ebuild b/app-office/dia/dia-0.97.3-r1.ebuild index f697cd004ba..fc0207a5f05 100644 --- a/app-office/dia/dia-0.97.3-r1.ebuild +++ b/app-office/dia/dia-0.97.3-r1.ebuild @@ -1,11 +1,10 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -GCONF_DEBUG=yes -GNOME2_LA_PUNT=yes +EAPI=6 -inherit autotools eutils gnome2 multilib +GNOME2_EAUTORECONF="yes" +inherit gnome2 DESCRIPTION="Diagram/flowchart creation program" HOMEPAGE="https://wiki.gnome.org/Apps/Dia" @@ -40,13 +39,15 @@ DEPEND="${RDEPEND} virtual/pkgconfig doc? ( dev-libs/libxslt )" -src_prepare() { - DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO" +DOCS=( AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO ) - epatch "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159381 , upstream #470812 #558690 - epatch "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream #678761 - epatch "${FILESDIR}"/${PN}-0.97.3-freetype_pkgconfig.patch #654814, upstream https://gitlab.gnome.org/GNOME/dia/merge_requests/1 +PATCHES=( + "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159381 , upstream #470812 #558690 + "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream #678761 + "${FILESDIR}"/${PN}-0.97.3-freetype_pkgconfig.patch #654814, upstream https://gitlab.gnome.org/GNOME/dia/merge_requests/1 +) +src_prepare() { if ! use doc; then # Skip man generation sed -i -e '/if HAVE_DB2MAN/,/endif/d' doc/*/Makefile.am || die diff --git a/app-office/dia/files/dia-0.97.2-underlinking.patch b/app-office/dia/files/dia-0.97.2-underlinking.patch index 903e077f23f..297888cc9b6 100644 --- a/app-office/dia/files/dia-0.97.2-underlinking.patch +++ b/app-office/dia/files/dia-0.97.2-underlinking.patch @@ -6,13 +6,13 @@ Subject: [PATCH] Fix missing linkage with gmodule-2.0. Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=678761 Fixes: https://bugs.gentoo.org/show_bug.cgi?id=420685 --- - dia-0.97.2/configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/dia-0.97.2/configure.in b/dia-0.97.2/configure.in +diff --git a/configure.in b/configure.in index 72830de..6b7394a 100644 ---- a/dia-0.97.2/configure.in -+++ b/dia-0.97.2/configure.in +--- a/configure.in ++++ b/configure.in @@ -55,7 +55,7 @@ AC_SUBST(GMODULE_CFLAGS) AC_SUBST(GMODULE_LIBS) AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)