From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1337232-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3514E158086 for <garchives@archives.gentoo.org>; Sat, 6 Nov 2021 20:34:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 81A822BC072; Sat, 6 Nov 2021 20:34:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 68CB82BC072 for <gentoo-commits@lists.gentoo.org>; Sat, 6 Nov 2021 20:34:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9C740342E7D for <gentoo-commits@lists.gentoo.org>; Sat, 6 Nov 2021 20:33:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 627B61BD for <gentoo-commits@lists.gentoo.org>; Sat, 6 Nov 2021 20:33:55 +0000 (UTC) From: "Jakov Smolić" <jsmolic@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jakov Smolić" <jsmolic@gentoo.org> Message-ID: <1636230777.44791088ccbb887a3b11c29baed9d1765987c192.jsmolic@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/gbdfed/files/, x11-misc/gbdfed/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/gbdfed/files/gbdfed-1.6-makefile.patch x11-misc/gbdfed/gbdfed-1.6.ebuild X-VCS-Directories: x11-misc/gbdfed/files/ x11-misc/gbdfed/ X-VCS-Committer: jsmolic X-VCS-Committer-Name: Jakov Smolić X-VCS-Revision: 44791088ccbb887a3b11c29baed9d1765987c192 X-VCS-Branch: master Date: Sat, 6 Nov 2021 20:33:55 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bddd669d-0cb0-49cc-866d-164682cb0af0 X-Archives-Hash: 6eb7a4c4200269a135460f3f712435a0 commit: 44791088ccbb887a3b11c29baed9d1765987c192 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Fri Nov 5 19:08:23 2021 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Sat Nov 6 20:32:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44791088 x11-misc/gbdfed: Port to EAPI 8 Closes: https://bugs.gentoo.org/819159 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> x11-misc/gbdfed/files/gbdfed-1.6-makefile.patch | 13 +++++++++++++ x11-misc/gbdfed/gbdfed-1.6.ebuild | 21 ++++++++------------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/x11-misc/gbdfed/files/gbdfed-1.6-makefile.patch b/x11-misc/gbdfed/files/gbdfed-1.6-makefile.patch new file mode 100644 index 00000000000..20c8f3856de --- /dev/null +++ b/x11-misc/gbdfed/files/gbdfed-1.6-makefile.patch @@ -0,0 +1,13 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -27,9 +27,7 @@ MKINSTALLDIRS = ./mkinstalldirs + CC = @CC@ + CFLAGS = @XX_CFLAGS@ @CFLAGS@ + +-DEFINES = @DEFINES@ -DG_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED ++DEFINES = @DEFINES@ + + SRCS = bdf.c \ + bdfcons.c \ diff --git a/x11-misc/gbdfed/gbdfed-1.6.ebuild b/x11-misc/gbdfed/gbdfed-1.6.ebuild index 2166c768e87..3f72a17df64 100644 --- a/x11-misc/gbdfed/gbdfed-1.6.ebuild +++ b/x11-misc/gbdfed/gbdfed-1.6.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=8 DESCRIPTION="gbdfed Bitmap Font Editor" HOMEPAGE="http://sofia.nmsu.edu/~mleisher/Software/gbdfed/" @@ -11,19 +10,15 @@ SRC_URI="http://sofia.nmsu.edu/~mleisher/Software/gbdfed/${P}.tar.bz2" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND=">=x11-libs/gtk+-2.6:2 +RDEPEND=" >=media-libs/freetype-2 + >=x11-libs/gtk+-2.6:2 x11-libs/libX11 x11-libs/pango" DEPEND="${RDEPEND}" -src_prepare() { - sed "s:-D.*_DISABLE_DEPRECATED::" -i Makefile.in || die #248562 -} - -src_install() { - emake DESTDIR="${D}" install - dodoc README NEWS -} +PATCHES=( + # bug 248562 + "${FILESDIR}"/${P}-makefile.patch +)