gentoo resync : 28.04.2021

5 files changed, 78 insertions, 21 deletions

diff --git a/dev-games/guichan/Manifest b/dev-games/guichan/Manifest
index a237d932c995..19f2b57714fe 100644
--- a/dev-games/guichan/Manifest
+++ b/dev-games/guichan/Manifest
@@ -1,5 +1,6 @@
-AUX guichan-0.8.2-as-needed.patch 545 BLAKE2B d7e42927c989ed2271432c48c427c52f6753362b0b7d36e2121f50f00bfa75877d307925bfe96965f5eddc52a32e233b6ef2be68d112abde9256c2cbd1dccf4e SHA512 521fc3fa1e85d8ffc5758b5b8ae16a04e44391867b7a660179505980fd572d8e3430e2c2ed4bcf7def645ae1a1b54d16802b06c1cfd254e11cd9813529f06de1
-AUX guichan-0.8.2-automake-1.13.patch 263 BLAKE2B 0b6eb223af234dd3731909bb433bb2757d83167d5422479fa7b354931e4da9ad3cf624f6c6f3e6b7f0e2f60d010fcf1a0a4c300553f7f15b33d280a06a4c1521 SHA512 804684f620de981890e60d68c25c7d36cb23faae038144b6e65df2927ddc20b6d072fcc9fd6aecd9c73410bc21e532087f349f7d5acd17a9799e6073d53af410
+AUX guichan-0.8.2-as-needed.patch 553 BLAKE2B 61214a1e8bdf15208ab996511d9102fba2db2e68db9dc028b9492936d4f4c92b7f30a91f4e3dae513ff1271de197e75f547ef976ac207e6a91410e62d2d67e66 SHA512 90dc9aecc19f5bb40ae298dcff45b0263e792b14ee88ab733a51da219c8fc8b1dfaf44fb3cb6a741f422cf6787115be467efcdde10791a117e362a1ec29d6cf6
+AUX guichan-0.8.2-automake-1.13.patch 239 BLAKE2B 6b9545f5fea0a0b656f3e9fb122941832dc2965750889f17648581073d99ef0d00f5bb9a288f62835b13429df813f9cdbc83f012ae0b4421f118ffe674fe78a5 SHA512 eb4421b3a08aac004d4ac6d0f86994bb64a6fdb00698224ded7aacffc418f7f0e4f75234fe733653fc1fd43b4fe01610b5c883c9e654658692ccb62470ad1f0d
+AUX guichan-0.8.2-slibtool-undefined-references.patch 1700 BLAKE2B fb876f3b370be1f1dc92b1e7e48da2afa6146faaf9fefb6fe2e654a31bcc1052a55d15f0c4c12251260cd5311875cf307b6c4de05a12df87bfff302c41bf481b SHA512 92c92919feb46d88771fc1c0dd396c375d77fb2ee994a552c0695bfc33cba90057e0085655a970edc58760a2851cc0e8c19cd59fa393c90a5e94146bd39b82c7
 DIST guichan-0.8.2.tar.gz 574662 BLAKE2B eb8d5754d86c57e28bffe20420873ca4c5c0d0e72ad98d09717385be06ccb2572ae1f09e80d5b3119fb01d77f1ad7181af683b536e8ed3e493686687a9cef212 SHA512 b05b3da3c998399eadbaf3154de533038bb394919569c361c26245aa0e7072493b12d3556c94a2420622007525e19dcd76a27db06a76fb56ec96d50429a6ed98
-EBUILD guichan-0.8.2.ebuild 946 BLAKE2B e9fac61db77f4a7427b90c7f4d4a4dd6b7e7fd3a43e9e21843acc9597c89e376e698049173ad358b6ec2314186aefa703c8683878d026bd9a60096b0dbcd8d34 SHA512 46c0d0203b77561b1eaf296f707396e7679960ba3a3186291a1c95730090713dd3e927c00ac842ace05d44a94dc8d2d253633d2a3846b5e0056f95308e8039a6
+EBUILD guichan-0.8.2.ebuild 994 BLAKE2B 73c699c7d5a21f10d595697691c1f2182a4e38b757c128a341a1c5121c2b1896d43063ac60b39f3bbc38aef7c6a7ed4e71f3f3e7a5e4414311a1c9da9fb17c13 SHA512 86e655a9f635781d90e491dd8188f253f45b5b11090960365362c44e5e57ab8a436e8cfcf2c34fe141dc52af82d51e77ed8bcdd9901c08812ddba501110b92ac
 MISC metadata.xml 454 BLAKE2B 3a64aa2bb08b19c9543193b15c7af1cd35fcc62db103f746e707204c9ffa10bef91c79c5d4b0e00e409c1c7862344b22ac8ad3570896a6086d7e5ff95aef0e57 SHA512 251a56d1bc96013f0b04e30586ab367d9ccf3ef6f39b375ee48186e40669574f3026297c7d3214cc5dca143bf71d7d91db071f64dd05ee9c07a8005ed483af09
diff --git a/dev-games/guichan/files/guichan-0.8.2-as-needed.patch b/dev-games/guichan/files/guichan-0.8.2-as-needed.patch
index 79eb563c0f8d..c4d8228e9ac6 100644
--- a/dev-games/guichan/files/guichan-0.8.2-as-needed.patch
+++ b/dev-games/guichan/files/guichan-0.8.2-as-needed.patch
@@ -1,13 +1,13 @@
---- src/Makefile.am
-+++ src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -1,4 +1,4 @@
 -SUBDIRS = widgets @GUICHAN_EXTRADIRS@ hge openlayer contrib
 +SUBDIRS = widgets . @GUICHAN_EXTRADIRS@ hge openlayer contrib
  
  INCLUDES = -I$(top_srcdir)/include
  
---- src/sdl/Makefile.am
-+++ src/sdl/Makefile.am
+--- a/src/sdl/Makefile.am
++++ b/src/sdl/Makefile.am
 @@ -6,6 +6,8 @@
  
  libguichan_sdl_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
diff --git a/dev-games/guichan/files/guichan-0.8.2-automake-1.13.patch b/dev-games/guichan/files/guichan-0.8.2-automake-1.13.patch
index e2f46097b82a..abc0d80ef62d 100644
--- a/dev-games/guichan/files/guichan-0.8.2-automake-1.13.patch
+++ b/dev-games/guichan/files/guichan-0.8.2-automake-1.13.patch
@@ -1,5 +1,5 @@
---- guichan-0.8.2/configure.in
-+++ guichan-0.8.2/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -38,7 +38,7 @@
  AC_SUBST(LT_AGE)
  
diff --git a/dev-games/guichan/files/guichan-0.8.2-slibtool-undefined-references.patch b/dev-games/guichan/files/guichan-0.8.2-slibtool-undefined-references.patch
new file mode 100644
index 000000000000..bec3cc9bb484
--- /dev/null
+++ b/dev-games/guichan/files/guichan-0.8.2-slibtool-undefined-references.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/779040
+
+commit a1e784de2edc4784c440246998fb8ad28065cc39
+Author: orbea <orbea@riseup.net>
+Date:   Tue Mar 30 07:34:15 2021 -0700
+
+    build: Fix the build with -no-undefined.
+
+--- a/src/allegro/Makefile.am
++++ b/src/allegro/Makefile.am
+@@ -3,6 +3,7 @@ lib_LTLIBRARIES = libguichan_allegro.la
+ INCLUDES = -I$(top_srcdir)/include
+ 
+ libguichan_allegro_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++libguichan_allegro_la_LIBADD = $(top_srcdir)/src/libguichan.la -lalleg
+ 
+ libguichan_allegro_la_SOURCES =		\
+ 		allegro.cpp		\
+@@ -10,4 +11,4 @@ libguichan_allegro_la_SOURCES =		\
+ 		allegrographics.cpp	\
+ 		allegroimage.cpp	\
+ 		allegroimageloader.cpp	\
+-		allegroinput.cpp
+\ No newline at end of file
++		allegroinput.cpp
+--- a/src/opengl/Makefile.am
++++ b/src/opengl/Makefile.am
+@@ -3,6 +3,7 @@ lib_LTLIBRARIES = libguichan_opengl.la
+ INCLUDES = -I$(top_srcdir)/include
+ 
+ libguichan_opengl_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 
++libguichan_opengl_la_LIBADD = $(top_srcdir)/src/libguichan.la -lGL
+ 
+ libguichan_opengl_la_SOURCES =	\
+ 	opengl.cpp		\
+diff --git a/src/sdl/Makefile.am b/src/sdl/Makefile.am
+index 61b3d50..728ca3c 100644
+--- a/src/sdl/Makefile.am
++++ b/src/sdl/Makefile.am
+@@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir)/include
+ 
+ libguichan_sdl_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+-libguichan_sdl_la_LIBADD = -lSDL_image -L$(top_srcdir)/src -lguichan
++libguichan_sdl_la_LIBADD = $(top_srcdir)/src/libguichan.la -lSDL -lSDL_image
+ 
+ libguichan_sdl_la_SOURCES =	\
+ 	sdl.cpp			\
diff --git a/dev-games/guichan/guichan-0.8.2.ebuild b/dev-games/guichan/guichan-0.8.2.ebuild
index 049a09d0547b..3c7dbd3c59ff 100644
--- a/dev-games/guichan/guichan-0.8.2.ebuild
+++ b/dev-games/guichan/guichan-0.8.2.ebuild
@@ -1,30 +1,37 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils autotools ltprune
+EAPI=7
 
-DESCRIPTION="a portable C++ GUI library designed for games using Allegro, SDL and/or OpenGL"
+inherit autotools
+
+DESCRIPTION="A portable C++ GUI library designed for games using Allegro, SDL and/or OpenGL"
 HOMEPAGE="http://guichan.sourceforge.net/"
 SRC_URI="https://guichan.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="allegro opengl sdl static-libs"
+IUSE="allegro opengl sdl"
 
-DEPEND="allegro? ( <media-libs/allegro-5 )
+DEPEND="
+	allegro? ( media-libs/allegro:0 )
 	opengl? ( virtual/opengl )
 	sdl? (
 		media-libs/libsdl
 		media-libs/sdl-image
 	)"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${P}-automake-1.13.patch
+	"${FILESDIR}"/${P}-slibtool-undefined-references.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-automake-1.13.patch
+	default
+
 	mv configure.in configure.ac || die
 	eautoreconf
 }
@@ -35,10 +42,11 @@ src_configure() {
 		$(use_enable opengl) \
 		$(use_enable sdl) \
 		$(use_enable sdl sdlimage) \
-		$(use_enable static-libs static)
+		--disable-static
 }
 
 src_install() {
 	default
-	prune_libtool_files
+
+	find "${ED}" -name '*.la' -delete || die
 }