From d162ba1860a88062f4cd61f8b52fc303ba0b2991 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Aug 2021 00:16:33 +0100 Subject: gentoo resync : 07.08.2021 --- games-arcade/xgalaga/Manifest | 4 ++-- .../xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch | 16 +++++++++++++++- games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild | 4 ---- 3 files changed, 17 insertions(+), 7 deletions(-) (limited to 'games-arcade/xgalaga') diff --git a/games-arcade/xgalaga/Manifest b/games-arcade/xgalaga/Manifest index f7732150d11e..613edeb15865 100644 --- a/games-arcade/xgalaga/Manifest +++ b/games-arcade/xgalaga/Manifest @@ -1,4 +1,4 @@ -AUX xgalaga-2.1.1.0-respect-AR.patch 358 BLAKE2B 99e600a4cd2dba46b774e50cb54a303593a22c979385e5a891a525ee6685bb3429f843cfd5737a1d49b2fa96e0118294273c4f5f377c08374b15217fe5a9ccce SHA512 4e2283d8bd7b8b974d1df9e83945e215355204a4746ea2ba3e0a4a8179d794ce85f226526007cc5d88092baa06bbd9fc1bfd00f366c45014e233cc3a1ddf8aa9 +AUX xgalaga-2.1.1.0-respect-AR.patch 633 BLAKE2B 9bfcf18f6bfc8deaa39427269539c0f07ffff02dcec7cbdebdfd432bb07138ca85464d4bc4db96bf49ce8cbecaeb544074a22ba3a424526c4b2b6af4bd5f9668 SHA512 e094a8158bae4ac25573ce99f12e070eb444bb14e15f80c7d5380b0b9697ccc696797fb575e82ac9f5b214ef1a6561f71f8a84d42576bacae6d9c14718cb0367 DIST xgalaga-2.1.1.0.tar.gz 331621 BLAKE2B 290881eb89cacc7a2be469af8da2c11d710dea45f165daa43d4a10a310e681c9f6ffb012e057e266f1e50c5629122ca38cfd97e31a788104e7710f02d756f59d SHA512 087db9e0501cedb042bb673a217f9de32640d3e4f4f529a29fd25ed682a1aece9ae1beacdc2ee77fc93ac931411a1051e2cd19873578ccffe5f03a083bffe513 -EBUILD xgalaga-2.1.1.0-r1.ebuild 1499 BLAKE2B ab130acab095ca4edd4938a5c422dcce41ba6c4898cab46b9e0975cf5c58ee9f4edbbab917c2c1479461dac098b348425d93b030e118698cd041e73bfd56653b SHA512 13021e7f56a0456ef3b0a2da52cba7d9b95df54c75f38459c3977f9834073cdc6487c761147eb6b51f4e4c855406f0bbdf07d3483a812f2eccf78ee4842c7fbd +EBUILD xgalaga-2.1.1.0-r1.ebuild 1427 BLAKE2B c37ccc685beea069675296c7d3ae9122e201bf1769f4e7ffbe20c5c922e6d0bb36a3ef65d03eb839cf23d9c3c6d359aea3d8c40171d302933944ca9503dd6126 SHA512 e2d02a5e628a29e13c6ce091884dbb9063323bad0dab3c46701a25884611691dd1178eaca7c92d538cbd53f3a2fc50cd63e61763ce3001e0afeba62b98812325 MISC metadata.xml 330 BLAKE2B b3e61a8f4911203a72c70798959045a62572b4a814bbf8f03ccf17f8da74eaa4c542883da6f2ff780c7e83ab26398ff95a46b36a41c22785903b0299707e6e9c SHA512 2c0045dadc3b72dda9b7f3389aebb5a2d38b91f2cd63891a9bd97e2f23971c916ce515cbbda6b0c6f2b8a600fc56bd77d9db749d223eee5cd6edc99525217545 diff --git a/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch index eedc9b24ce17..8a4991d4299b 100644 --- a/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch +++ b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch @@ -1,10 +1,24 @@ +Allow user to specify AR. Derive ar from --host=. + +Bug: https://bugs.gentoo.org/730796 --- a/configure.in +++ b/configure.in @@ -14,6 +14,7 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_RANLIB -+AM_PROG_AR ++AC_CHECK_TOOL(AR, ar) AC_ARG_WITH(xpm-lib,[ --with-xpm-lib Directory containing libXpm (may be autodetected)],xpm_lib=$withval) AC_ARG_WITH(sound, [ --with-sound Type of sound to use (native or nas)],sound_type=$withval) +--- a/libsprite/Makefile.in ++++ b/libsprite/Makefile.in +@@ -8,7 +8,7 @@ VPATH = @srcdir@ + .SUFFIXES: + .SUFFIXES: .c .o + +-AR = ar ++AR = @AR@ + AR_FLAGS = rc + RANLIB = @RANLIB@ + diff --git a/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild b/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild index d644d2087dd3..45c550a058be 100644 --- a/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild +++ b/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild @@ -41,10 +41,6 @@ src_prepare() { -e "/SOUNDDEFS/ s:(SOUNDSRVDIR):(SOUNDSRVDIR)/bin:" \ -e 's:make ;:$(MAKE) ;:' \ Makefile.in || die "sed Makefile.in failed" - - sed -i \ - -e 's/AR = ar/AR = @AR@/' \ - libsprite/Makefile.in || die } src_install() { -- cgit v1.2.3