From e9d044d4b9b71200a96adfa280848858c0f468c9 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 13 Nov 2021 13:10:00 +0000
Subject: gentoo resync : 13.11.2021

---
 x11-misc/gbdfed/Manifest                        |  3 ++-
 x11-misc/gbdfed/files/gbdfed-1.6-makefile.patch | 13 +++++++++++++
 x11-misc/gbdfed/gbdfed-1.6.ebuild               | 21 ++++++++-------------
 3 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 x11-misc/gbdfed/files/gbdfed-1.6-makefile.patch

(limited to 'x11-misc/gbdfed')

diff --git a/x11-misc/gbdfed/Manifest b/x11-misc/gbdfed/Manifest
index c9133818a158..a9cea23c4acb 100644
--- a/x11-misc/gbdfed/Manifest
+++ b/x11-misc/gbdfed/Manifest
@@ -1,3 +1,4 @@
+AUX gbdfed-1.6-makefile.patch 323 BLAKE2B 51fc81c1b752cb199d48dbc41dff219cac4ebab9409b5c3caee114f97e89cd1bad3a2844a54073b9a41276a87fa9464c7e50e7aa00b5246472d6992bf75b7f4e SHA512 da573f5fcbd51b954f2a2cfdf38aa22bd93d43d21abdc94c0aa49cc72649f47249b9a5cd9eff7a5bf4caa3cbdfed70093c33b2f12b7027fd59d5aedaa93cc550
 DIST gbdfed-1.6.tar.bz2 236166 BLAKE2B deca4c3a4c421b60848e5fca0abbe760582ed5b0ca78ae9a3568d87f19975601732575e911934272c74ad58205ac4b1e9a4fb67aa80c24b0580e631b365b0997 SHA512 45cdccd86d01d104c14db5c320066f167a25b7967a13f4bc962a2936c94f549efbae792b7828cf21c43e2989858c3482c5daba74cb267db24ca5daada0ad44ef
-EBUILD gbdfed-1.6.ebuild 620 BLAKE2B 9760ab43c9d0de85d150f50d38e90259cf4e51ea7520999f8623b015cde713ce6f4d98ec1042ada93be96e75530d75ae7666a3547fdc50de6b193b0162471a42 SHA512 3eaaeed222bc67ab2267274f7eafe2b60ca22bd34d45280961da6aa54be79584aa96fa6d02a0735209a9cb12fa1c999aaa212e2da4bc5a6ad062c3880881261d
+EBUILD gbdfed-1.6.ebuild 506 BLAKE2B 95c5636bfc903875c79048c3129f560741ca992e9eb20b0583a280c3bfc7e025768113374fbc3424acd02354b798f21126fc9b443c3fca3142339a2e6d7b9e1c SHA512 519849ad8dd5b964d1152f9a17fdf46782a54774f9478c2c9baa2e3571a17a13b830b2bf93ac78e153716103fcb324dcca16b9c2bbfbc997156472a655829021
 MISC metadata.xml 239 BLAKE2B 5aaac778361cc8f607c6587e338cb80fd9a032e722766c60e011327e58b327fd4ca5113b66b281273c718c7492edd2477a0d702acd900fd9e376faeaedf717b0 SHA512 333c4df4d2002923cb872edc1e4e4f121563d73b157a8b2a4605ee449c759417014e9bc1342acaf697325d3d3bd8babe5930bbe4e08df90650cd1a52a0ecd337
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 000000000000..20c8f3856de8
--- /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 2166c768e873..3f72a17df64b 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
+)
-- 
cgit v1.2.3