gentoo auto-resync : 24:02:2023 - 21:49:24

4 files changed, 87 insertions, 3 deletions

diff --git a/media-libs/aalib/Manifest b/media-libs/aalib/Manifest
index 3b872b2f100f..aab9955aae08 100644
--- a/media-libs/aalib/Manifest
+++ b/media-libs/aalib/Manifest
@@ -2,9 +2,11 @@ AUX aalib-1.4_rc4-gentoo.patch 1245 BLAKE2B 59451b7cad10881b27d5eb13211106c278d8
 AUX aalib-1.4_rc4-m4.patch 241 BLAKE2B 0fc63b7936334bfa171cdafdb0d8813ce499d3dfe29f32b59e8ca1873d5ca55f1154a3f2e1aa5c187b5ea8f5c138c60992378b4e7ba8e1fb4e646bd6ea85200d SHA512 bea8e769596ec8d529d67a2b6081d2a7c1e47d9089551a31356f8b15a4dbfd36fdc97839754ef188621d8870628707b274f2183cebffc219ea0f3784fa12d8f1
 AUX aalib-1.4_rc5-fix-aarender.patch 1354 BLAKE2B e9456d951d0ac69685dc79243d1f17abbc304acbe247390a832208c5d9ea691ace9383dd0ce34b8edad254d95857ed729db6f26f16dc82765542981a3f73ef00 SHA512 4e30144ce0df3e1f063fc1bef34690ffc88719f3f52fa62f25f4d2e28a22b59713b5ea23f14c07f0fec5b3988a093572b3e9886ef052cbba48a028f84eb84588
 AUX aalib-1.4_rc5-fix-protos.patch 2105 BLAKE2B 4b701691a61a400a52a7ab7cdc213f0e47bb47c7f7d5f72ea862b7744641df5b510b434e85f0b5bfcc2c88f864ee6d651441d41571283661a9008018068c7e0c SHA512 e46268f5fb972500851f5489cc6311171a07a8b1a7a564bdafe5760008db72787650ad74e5144cbdb30b7fef027ee646e5534dd2eabddbd057bef1b27229af37
+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-tinfo.patch 709 BLAKE2B fb7dd0eb1e39046c66de0466b0411f97fa948d9da03719fcd759a7331c7da0a6cfcba92353ef5363cf651501d73ce4fd29a5baf94897f10f0518284ebb4db10c SHA512 2abab613af549f4c24f7d617cf65de773e7850ec8485dfa23de2405ed59cf14f7cb70c2f1b701e27ae541e5f75302f4d28c3f866303bfc901a96074c9d9d534b
 DIST aalib-1.4rc5.tar.gz 391028 BLAKE2B fd527716c0484d45fa3b75712a24301bd485fab8191ac1d5c6d35f8af093a00e11f0f8d2797ddcc32f4d87a39649fd50145dcc557e5ba98e67336cff2bb79002 SHA512 3e4506eccce3b81ccbbb79a4a1b90abd39e2259e6043fde90f70b9ca279bd4c37758a047167267b97c4ec92f64fb17c7c8f548114f0d0c6e78ddb9463b5f1299
-EBUILD aalib-1.4_rc5-r9.ebuild 1948 BLAKE2B 201794aa10275d9f503dd3ea21df8ccd0b252cdd627d62442177976ab12cc55f44dcd9b6d1e4344e79f3caf4d6d8a42e237d944d567419d2fa3ea1b0516ebc04 SHA512 30d0b14f423481a0a987164e7e63923a40cd0a952285281f7ebd25bd9ec5b5fa474af497e3069d91073af5293da4e01689a7e526ee7a7ba43b7ff53cf3e3b104
+EBUILD aalib-1.4_rc5-r10.ebuild 1943 BLAKE2B 1c52e7e4ba10479137e4132b34a2762867cd41bf817670eedf20ac492a19371d5e739660f6bec5c92976285f2c92842f7addada1cfce63e7215fffdc555427f6 SHA512 e5ffdeae8e0cedec1b856a638eda8bc72888b3379c77d6c9015d469224fda05af1dec8ef539286c15acfb8cbd5fd6219b8049f3dc866ddad246db522b3ffdb20
+EBUILD aalib-1.4_rc5-r9.ebuild 1949 BLAKE2B 83585440398d08ba7905f6b8e716c92f3c111b281f00f6194e413f0c5064448946324d04441af427c5c804f4365e6b0bb0f1c9f34e0ee30a9edcf4252a7c1e5e SHA512 b533c7d386c1aaf72484b7cdd6262b3bfe7234c87e5c803a0a7e220cd12543f0bdf5ebaf07cbaab399d6cf2970ea01576a3d36994ac655999f4060dddd4f400a
 MISC metadata.xml 410 BLAKE2B 2f08a7a6bcc149aafd7d9493ea4f87945b3c38fae8e79a80991fb8b23506b7c503d7a0f4c3acd815537a823b0f2f6f49d727d0d34d1476b988811acfa6e89905 SHA512 b35f23f666eb8225269db37aeadf96af19d464b3835933d8fbae839c574cff6ff71bc9553260e383a2a77ca798063eb2529452c99057c4fbd0a0c028ccf86cdd
diff --git a/media-libs/aalib/aalib-1.4_rc5-r10.ebuild b/media-libs/aalib/aalib-1.4_rc5-r10.ebuild
new file mode 100644
index 000000000000..366beee3347f
--- /dev/null
+++ b/media-libs/aalib/aalib-1.4_rc5-r10.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal toolchain-funcs
+
+MY_P="${P/_/}"
+S="${WORKDIR}/${PN}-1.4.0"
+
+DESCRIPTION="A ASCII-Graphics Library"
+HOMEPAGE="https://aa-project.sourceforge.net/aalib/"
+SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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
+)
+
+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() {
+	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/aalib-1.4_rc5-r9.ebuild b/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
index 53a76ebdff1c..509be2da5485 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ MY_P="${P/_/}"
 S="${WORKDIR}/${PN}-1.4.0"
 
 DESCRIPTION="A ASCII-Graphics Library"
-HOMEPAGE="http://aa-project.sourceforge.net/aalib/"
+HOMEPAGE="https://aa-project.sourceforge.net/aalib/"
 SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-libs/aalib/files/aalib-1.4_rc5-free-offset-pointer.patch b/media-libs/aalib/files/aalib-1.4_rc5-free-offset-pointer.patch
new file mode 100644
index 000000000000..3ae697e3189c
--- /dev/null
+++ b/media-libs/aalib/files/aalib-1.4_rc5-free-offset-pointer.patch
@@ -0,0 +1,14 @@
+--- a/src/aarender.c
++++ b/src/aarender.c
+@@ -63,10 +63,10 @@ void aa_renderpalette(aa_context * c, __
+ 	errors[0] = calloc(1, (x2 + 5) * sizeof(int));
+ 	if (errors[0] == NULL)
+ 	    dither = AA_ERRORDISTRIB;
+-	errors[0] += 3;
+ 	errors[1] = calloc(1, (x2 + 5) * sizeof(int));
+ 	if (errors[1] == NULL)
+ 	    free(errors[0]), dither = AA_ERRORDISTRIB;
++	errors[0] += 3;
+ 	errors[1] += 3;
+ 	cur = 0;
+     }