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 +)
