gentoo auto-resync : 05:11:2022 - 03:17:06

4 files changed, 73 insertions, 46 deletions

diff --git a/media-libs/blib/Manifest b/media-libs/blib/Manifest
index 07c228aeb01e..ed2a660b7d01 100644
--- a/media-libs/blib/Manifest
+++ b/media-libs/blib/Manifest
@@ -1,3 +1,4 @@
+AUX blib-1.1.7-deprecated.patch 409 BLAKE2B 8fd46eae8511441442f1da04e38b27dc63f03f485bb8610667cb162e29fdba51996de58ec8046e227c48e90e2ef6785edaeb7dfbea55338f7b10639194d33ed9 SHA512 7b1e845db80ff2071d4e20ed40b5f5349978a9e8a5f68fa09ca51a69dc596e4752c838092fc24bf8226da95acb1f34477a3ff5d4ac2bb2844e83bd7cc6e229f3
 DIST blib-1.1.7.tar.gz 570809 BLAKE2B 4b6c6738dd67a81b09ff0a280d3522d8cd41046b6eebe0ff4d6bf78df49fa3aa20382e0b02b3ee17c8c536fe34445a85a80433a39a87c2f0f650612fcd37914a SHA512 060fe2ff453c1dd073ff6105217618157da54416243b0f086a4f1324028b2fc222f6f732de1914d0e2e82df3565801b68d1ff49df4e6b89cd409bad73eb01ad6
-EBUILD blib-1.1.7-r2.ebuild 994 BLAKE2B 2f9c78c4600ccf51439ed6fc98cdff2df648c2203693111ee963a68e3680fb2d85d2e333a122c66dffc9a5afe8ceea71137fb412685836bf5de551427636a695 SHA512 73bfc1c89c2b9338c8061c7432f6042649200ccb2e6a08624167769c80202d148a24a06131aeab4d8befd14951969f333825678e2c8935afa069da3c00bbf0c9
+EBUILD blib-1.1.7-r3.ebuild 1078 BLAKE2B 71275b3dafd020a5bb627c5148677871e8fe2be567dc063a3278bf4a3ffd22a6655cddd3f3e1b58f1a00926094086386606aedb12d01b9063e0194cd678a0293 SHA512 27161f6947681f4ade56d37d891367dbb8b51a90c501b1e3ae69b4b3d61f63c4df513127583468712d4a5593ea29b98464a2cf5959fa5bf08cf1bed68f8e293a
 MISC metadata.xml 220 BLAKE2B 6f39345ea8474519439cc9768baf57bf07c0d8051eba252c30638ce35f30f8cbd1ecb06f7448893fa72ab9338630c83211fd366d66136b6ed090558fb376982c SHA512 3a2781821a74f9512a2b1fa55c8982a23f880b96b1707fdedf129d37685c2793eefe75a8080afe2bac64ed44d5f24648e6a25e163f87fe76a2b6be76b995647a
diff --git a/media-libs/blib/blib-1.1.7-r2.ebuild b/media-libs/blib/blib-1.1.7-r2.ebuild
deleted file mode 100644
index 972273ede564..000000000000
--- a/media-libs/blib/blib-1.1.7-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="blib is a library full of useful things to hack the Blinkenlights"
-HOMEPAGE="http://www.blinkenlights.de"
-SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="aalib gtk"
-
-RDEPEND="
-	>=dev-libs/glib-2:2
-	aalib? ( >=media-libs/aalib-1.4_rc4-r2 )
-	gtk? ( >=x11-libs/gtk+-2.4.4:2 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	# Drop DEPRECATED flags, bug #391105
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
-		blib/Makefile.am blib/Makefile.in \
-		gfx/Makefile.am gfx/Makefile.in \
-		modules/Makefile.am modules/Makefile.in \
-		test/modules/Makefile.am test/modules/Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--disable-directfb \
-		--disable-static \
-		$(use_enable aalib) \
-		$(use_enable gtk gtk2)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/blib/blib-1.1.7-r3.ebuild b/media-libs/blib/blib-1.1.7-r3.ebuild
new file mode 100644
index 000000000000..fd6cbbc9415e
--- /dev/null
+++ b/media-libs/blib/blib-1.1.7-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Library full of useful things to hack the Blinkenlights"
+HOMEPAGE="http://www.blinkenlights.de"
+SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="aalib gtk"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2
+	aalib? ( media-libs/aalib )
+	gtk? (
+		app-accessibility/at-spi2-core:2
+		media-libs/fontconfig
+		media-libs/freetype
+		media-libs/harfbuzz:=
+		x11-libs/cairo
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-deprecated.patch
+)
+
+src_prepare() {
+	default
+
+	# drop DEPRECATED flags, bug #391105
+	sed -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+		-i {blib,gfx,{,test/}modules}/Makefile.{am,in} || die
+}
+
+src_configure() {
+	local econfargs=(
+		$(use_enable aalib aa)
+		--disable-directfb
+		$(use_enable gtk)
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/blib/files/blib-1.1.7-deprecated.patch b/media-libs/blib/files/blib-1.1.7-deprecated.patch
new file mode 100644
index 000000000000..13e43aedadf1
--- /dev/null
+++ b/media-libs/blib/files/blib-1.1.7-deprecated.patch
@@ -0,0 +1,14 @@
+This disables deprecated functions, then proceeds to use newly
+deprecated functions. Given GTK2 is now EOL and unchanging,
+there's no reason to avoid these without migration to newer GTK.
+
+https://bugs.gentoo.org/874642
+https://bugs.gentoo.org/391105 (see also)
+--- a/test/test-module.c
++++ b/test/test-module.c
+@@ -23,5 +23,4 @@
+ #include <string.h>
+ 
+-#define GTK_DISABLE_DEPRECATED
+ 
+ #include <gtk/gtk.h>