gentoo auto-resync : 18:11:2024 - 03:03:03

3 files changed, 100 insertions, 0 deletions

diff --git a/media-libs/aalib/Manifest b/media-libs/aalib/Manifest
index 527cb2619e4a..87108adab0f1 100644
--- a/media-libs/aalib/Manifest
+++ b/media-libs/aalib/Manifest
@@ -5,7 +5,9 @@ AUX aalib-1.4_rc5-fix-protos.patch 2105 BLAKE2B 4b701691a61a400a52a7ab7cdc213f0e
 AUX aalib-1.4_rc5-free-offset-pointer.patch 404 BLAKE2B dee15643e51c9d6c481215b5d8135a3e0b31ebb061432fc36bd6d45992b36cd767aa44d262d8ebfd7ca8c600b9418843eb384d4c3ed4de5255df39c6b177ce24 SHA512 57d92c401057cd5ba8e034378ab137d1eff777dfaf51bde4281bb4882459b2e47d374f20b7520ca0b0d17371cb0942de75d9faca16a56aab7f47dfa0ac7b3c72
 AUX aalib-1.4_rc5-key-down-OOB.patch 504 BLAKE2B 1742e3d22889e7faabaf0fcacecc7db4dff4d126361f02d0311e11a93a2a1445de78f1e5a38cb43860bee1809c8350829715b843b52f7354f2ffe22cd21e7e1a SHA512 e3a79459024e25180b5407b92031c1b675659038289daff5a62485a01dc79afd8223652f9bd3e521a975158ecaa8210e35e536dfe3719259f2631a87d83e19b7
 AUX aalib-1.4_rc5-more-protos.patch 1499 BLAKE2B abf425195f87f83dc019ded382c365f1f780c37f5d5282c27985ef064e53221d369974c3147634b1bfb1af6df7232088a71fdd12230e587c475c5817180a602c SHA512 c2b723af88a0ca70505086bc7436e5c213d2f52698b293392be2a6b18ef26ef285a09e460577a4a60b328df45b1d61c50064f3ba1f3df43a844082f2c5da25b2
+AUX aalib-1.4_rc5-ncurses-opaque.patch 836 BLAKE2B 8cfeea29baf5ab46d6dce4d5014472fe44734ed4e5171d1eccd55f8f0435f6f08c2ba31eff992f8ef521aa5dbbfe9194156935d053d7d556f62c20f260355f8c SHA512 467dee6c541b34f69561ad46ec79998b596a8c5fe5e85bcdf9a6c4e56413b92dd272851903317048afb8978553347a76ed2f5bf9e5dc81778ad1d9e9685873ba
 AUX aalib-1.4_rc5-tinfo.patch 709 BLAKE2B fb7dd0eb1e39046c66de0466b0411f97fa948d9da03719fcd759a7331c7da0a6cfcba92353ef5363cf651501d73ce4fd29a5baf94897f10f0518284ebb4db10c SHA512 2abab613af549f4c24f7d617cf65de773e7850ec8485dfa23de2405ed59cf14f7cb70c2f1b701e27ae541e5f75302f4d28c3f866303bfc901a96074c9d9d534b
 DIST aalib-1.4rc5.tar.gz 391028 BLAKE2B fd527716c0484d45fa3b75712a24301bd485fab8191ac1d5c6d35f8af093a00e11f0f8d2797ddcc32f4d87a39649fd50145dcc557e5ba98e67336cff2bb79002 SHA512 3e4506eccce3b81ccbbb79a4a1b90abd39e2259e6043fde90f70b9ca279bd4c37758a047167267b97c4ec92f64fb17c7c8f548114f0d0c6e78ddb9463b5f1299
 EBUILD aalib-1.4_rc5-r10.ebuild 1990 BLAKE2B 5519f566e0ed3c58853f3cb9a026f8d87a3733bcfd078328117f3d15bad3e56b3da22a75cfcb0e757ecedbe3619fb33b6e1fd40361de22186456072ef7b64392 SHA512 5c7653e0116967b7883053dc94cbb4b367d55116ba5f1fdffbb31505563975c3b246c2f5ab3bb6672a9f31c660e41bebaecd8f723ea6899f6608a40388d49a62
+EBUILD aalib-1.4_rc5-r11.ebuild 2196 BLAKE2B 1e7f13febb291186a0455ddff1a149deab49f790d7bd3fdc1e7886fc6dabffc5b8d5651362d20e223c47fba92f4280f83242ae0cdcfc73c55944d6212e8ac00b SHA512 9624ab232ec57f10626ecba24a5d24a71444bd66648fa8078dbd30137c1c0f229a4fa3ad3bb6bdf7c11efa1f8990cf82c69513e99b141d6e6fccfeb55c1564a9
 MISC metadata.xml 304 BLAKE2B b65e1f76bcfc32ca5437f1b0d3125851047adcd4e3f0703c61b3d7fcf069349263dadb428a6bad946cd3e58ab9168340721f8b728b0204dddf6985aa8311f385 SHA512 c81ea7d8442a925944c7c1c84d2c04e3af7b068565140577e21725f058fae8e048971b017b989479a9b5e97378e489108483e16f6e9f6701ad7514a94ae02c7f
diff --git a/media-libs/aalib/aalib-1.4_rc5-r11.ebuild b/media-libs/aalib/aalib-1.4_rc5-r11.ebuild
new file mode 100644
index 000000000000..913b8cafce37
--- /dev/null
+++ b/media-libs/aalib/aalib-1.4_rc5-r11.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+MY_PV="${PV/_/}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A ASCII-Graphics Library"
+HOMEPAGE="https://aa-project.sourceforge.net/aalib/"
+SRC_URI="https://download.sourceforge.net/project/aa-project/aa-lib/${MY_PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${PN}-1.4.0"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="X gpm slang"
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
+	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
+	gpm? ( >=sys-libs/gpm-1.20.7-r2[${MULTILIB_USEDEP}] )
+	slang? ( >=sys-libs/slang-2.2.4-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4_rc4-gentoo.patch
+	"${FILESDIR}"/${PN}-1.4_rc4-m4.patch
+	"${FILESDIR}"/${PN}-1.4_rc5-fix-protos.patch #224267
+	"${FILESDIR}"/${PN}-1.4_rc5-fix-aarender.patch #214142
+	"${FILESDIR}"/${PN}-1.4_rc5-tinfo.patch #468566
+	"${FILESDIR}"/${PN}-1.4_rc5-key-down-OOB.patch
+	"${FILESDIR}"/${PN}-1.4_rc5-more-protos.patch
+	"${FILESDIR}"/${PN}-1.4_rc5-free-offset-pointer.patch #894978
+	"${FILESDIR}"/${PN}-1.4_rc5-ncurses-opaque.patch #932140
+)
+
+DOCS=( ANNOUNCE AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	default
+
+	sed -i -e 's:#include <malloc.h>:#include <stdlib.h>:g' "${S}"/src/*.c
+
+	# Fix bug #165617.
+	use gpm || sed -i \
+		's/gpm_mousedriver_test=yes/gpm_mousedriver_test=no/' "${S}/configure.in"
+
+	#467988 automake-1.13
+	mv configure.{in,ac} || die
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Gpm_Wgetch from sys-libs/gpm is unprototyped in gpm.h
+	# https://github.com/telmich/gpm/issues/48
+	append-cflags -std=gnu17
+
+	ECONF_SOURCE=${S} econf \
+		$(use_with slang slang-driver) \
+		$(use_with X x11-driver) \
+		PKG_CONFIG=$(tc-getPKG_CONFIG)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/aalib/files/aalib-1.4_rc5-ncurses-opaque.patch b/media-libs/aalib/files/aalib-1.4_rc5-ncurses-opaque.patch
new file mode 100644
index 000000000000..91271fba4f7f
--- /dev/null
+++ b/media-libs/aalib/files/aalib-1.4_rc5-ncurses-opaque.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/932140
+https://sourceforge.net/p/aa-project/patches/10/
+
+Without the change build fails on ncurses-6.5 (enables opaque WINDOW by
+default) as:
+
+    aacurses.c: In function 'curses_getsize':
+    aacurses.c:74:20: error: invalid use of incomplete typedef 'WINDOW' {aka 'struct _win_st'}
+     74 |     *width = stdscr->_maxx + 1;
+        |                    ^~
+--- a/src/aacurses.c
++++ b/src/aacurses.c
+@@ -71,8 +71,8 @@ static void curses_getsize(aa_context * c, int *width, int *height)
+ {
+     if (__resized_curses)
+ 	curses_uninit(c), curses_init(&c->params, NULL,&c->driverparams, NULL), __resized_curses = 0;
+-    *width = stdscr->_maxx + 1;
+-    *height = stdscr->_maxy + 1;
++    *width = getmaxx(stdscr);
++    *height = getmaxy(stdscr);
+ #ifdef GPM_MOUSEDRIVER
+     gpm_mx = *width;
+     gpm_my = *height;
+