gentoo resync : 25.10.2021

7 files changed, 25 insertions, 205 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 31bff2ac11d9..9afa887f193e 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index 7f8d9aed945e..ce10703fecc8 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -7,6 +7,7 @@ AUX clanlib-0.8.1-glibc2.34.patch 536 BLAKE2B 17eab65b09e8764831ed11ad6ef12d3c9a
 AUX clanlib-0.8.1-libpng15.patch 381 BLAKE2B 4f928698bd0121d6a1c4475b4aa58ae00a1146004f3273440fc257cc324d9ab26841247e0241ad2b6016162692136906131d5dc5f3730aab3b52783a95ba154c SHA512 2b54b5c5094de33582292fa84572fb826668f48cf6e6f82c4fa978db888fbc2ea379a08951e2084ab6eb1d3f2007d19aa00940d2760fa5bee973f6181a0ba804
 AUX clanlib-0.8.1-llvm.patch 4301 BLAKE2B c1472ca77f985da747c84e20ebc60b401f7d3178e96cbfb0d81adf5039ce1c8917743dcdc2d35e613243d59c9b8a5bdf1ebba3f76108c738d9b21b34348f06f5 SHA512 277901f40ee7bc16327378f5895382b7249c0d0f0c0084605357966b7f4a665dcf1147dd95b65753ba33f126f58027364289f9540bf0711b20fc4887d0016e6a
 AUX clanlib-0.8.1-ndebug.patch 553 BLAKE2B 3ad0629f0598a3d9191dafb596aece7aa5f40db99bc959e13bcd4bdd9082483988fca49d3ebd22812eef1502d7bd5eb2b831707ee4f5f2abe7270ef9f1b94a11 SHA512 dcda9fdf32861c05b37ed71194d7ca595fe07c85e754016324fce9fcf668cb4042d071c68c4019234faac4a116ae4877d457374fc11fc74be148e132fdee7cce
+AUX clanlib-2.3.7-32bit-opengl.patch 515 BLAKE2B 96823139c5235c5e780727c8be48615d860fcc4ad0f46f9e2846836bd42571697d7e4a9201bbdde676dca3ffcbaa0dc6e96b3507dbc0cf79b8dc447b35b45717 SHA512 5a76c9a85f0b7881ae494749f379f1d5dd177d0d271e328da5ffbc580c02c1965da95ba204b10d9b25e80a2b9ff42e7257d8cb0915264be58f4349920e663175
 AUX clanlib-2.3.7-autotools.patch 1458 BLAKE2B ecf797fa09893422b94364ac0df8156b3e2c3b2164530cd845201ad266977426b692860efce1b2cf6f6dee0cb098c6e28e8c3e203567c81713f63fc6099c30a9 SHA512 170580de7780e638e3a1788eb2bfcfe58f64d5f5695cbbd550ddc5bf59933303dea7970191792adefc8b1408647d4e3c816c30aaf253a9ceb139f9300b9e5807
 AUX clanlib-2.3.7-doc.patch 434 BLAKE2B e17cedc12f9b840231dae739edb933a6c8dffaac7feb53e4d4ce2639603e6ce03e716476bfa3b75f964aa1799676f18f19dfc09f3fa918d40b66519878f78904 SHA512 993edfcf9955bf89c6458933b1db9b4cdf6b3935f856c71aa82c3f9ad0f9a2d3704657fa8bd6f6760262a0f8d0669998f7c1ab426ecee7c57954f5674a24f8e4
 AUX clanlib-2.3.7-freetype_pkgconfig.patch 1069 BLAKE2B 48fe4d540a9dd5cce20efcea7802b45b13d8e56831abcf1f1d9aef9aa747dc40e4209a1a37f061b4162459619e8174fbba18963c3c3acb4b0457642c1a9a6142 SHA512 db151e1b5a07f01890ec0a164a3a82217f5a0f47fa6c15f566991965feedae50b69e99d801f04d1ca7583a6192e1d0f4766d66a0cbcca6278c03713ae7837233
@@ -17,10 +18,8 @@ DIST ClanLib-0.8.1.tgz 7629019 BLAKE2B 7f238111931212e3f9c82ed43842706bf16ee1458
 DIST ClanLib-2.3.7.tgz 26132425 BLAKE2B 109ba92baf21174022c8dbc4044e39ec16ec77c730b57590733418e246ab71d18d81bbf281cd469dd9e2aebd4ac4302fbb581f27dc7fc0054a8c7ce69699e19d SHA512 73169afc0f639390f80403150757a8a14f842bc291a9457c9bca1319642b78bc4d03a93327d75254230e39545c5b4b690e56dc0149ed7b60b223e5a5364e882a
 DIST clanlib-4.0.0.tar.gz 7435551 BLAKE2B 243fc2519ee90a12af37e8925c99db77785a9a5da497d870545bb489e76cbfcbb4cac81352731326a0cc59689a361b8ab14db2bb1e255da07696e378a9cfb6e5 SHA512 e727239d782d2d52ce2f927e16a88c469b30f46d5b9eba4573baa520d98f60515df7ff4dd921092ddd5cfe4c6f5c441e0f33469b774287003db439feb8b027fe
 DIST clanlib-4.1.0.tar.gz 6871886 BLAKE2B 0aeb9e89998a9ef6975bf16a2e77f461e6415aacda9a26a5c0a9c6ec3c19a136a5f092c7866b60898251fbd6cb8aa7e96c86f6b87afb564824298fac77bf20c3 SHA512 34f5d1fdb7b071a218f081a6b06a6018a9c20cedc4c8500a9796be02d335f06fa148304379eeb1a35e08b9a734e504ceb490a6558a43d1611187bd97be01f4b0
-EBUILD clanlib-0.8.1-r1.ebuild 2252 BLAKE2B 5d04c8d1291f961c1567ae34cb9f148fe6993cc6a4c1694b3beaa454082248276eb0eda6edecfdddd704a57e98b0395cc49b38011c0fa71ea5f1fcfea1feb75b SHA512 380c236592632dcdd1b8743390678b72fa3420f0cfb92c001645fe73fc8ba5cee4fbb3437e69c81241a88181a2587d0813fbaee01b0439ea01bb694d63d8fb4b
-EBUILD clanlib-0.8.1-r2.ebuild 2290 BLAKE2B 6b8a493f72acaa344d6ef9c6c85223a9fd711891d58919582c01e6d5128a15e909e96ba7e77975fcad54eec0165852eb8afb45b80c64aa8f10f9828cf88ea0c6 SHA512 5b93e056a0b726ba410dca846b903ca5512ee4f7dec0994547cceaca4d7486993d7f51d34764d822a7de6566eab1008a0bd75e7a88116fa46b7563f624c3027a
-EBUILD clanlib-2.3.7-r1.ebuild 2149 BLAKE2B 5fb4ed60cb8ef0e0d10c4d3048bb05573019afce36129e09e680ae017604a78b950f80e6e8bbe95542a136099f059d272a3971eb18b7c74e99bbe03226eeef71 SHA512 abbbd82e4474b76c6bb3fb957f59599ac916276959ae30c42a5c53471aa67f51b76c80f5cb443fe29358f91c66197cce39ddca4ca7880fd5a9f27a7a67b34b0c
-EBUILD clanlib-2.3.7-r2.ebuild 2187 BLAKE2B 6dfd4ecab2d40651dc50710b37a35a93bac7d1aaec938f1e637a8f769813f498e32cd320f6ecf819ce399df4ea00fb72a62c8961afe4f02d0fd0f56b4075429c SHA512 c3b495fa65660d0d8558d810f555e2ac1afd9da9a22f165a5a3a8208ef36631acd4a49cb65e9d8aad9b0b123a38038cfa0f82671a3770453c7795448625b1db0
+EBUILD clanlib-0.8.1-r2.ebuild 2288 BLAKE2B ccb633ddd4ff1148a4c35f94a835888050552576bfa5e23adf367cb56b24bf9896244b11d59894bdeb7f4b1b0146ea7e114d9a0376215fbeb821a5055b47b3d6 SHA512 2d0279c1526e9e25bb94d5e849552c89879ea0265ce9e5e1540e29411adc040ea1a9049d78b7afcdb8ffd0c49725d1cd339a6999a04eaf74966d3e279bb7aace
+EBUILD clanlib-2.3.7-r2.ebuild 2224 BLAKE2B d9275002067b10c5955502b13f15c7a03849f7039d2b6e0dbe985ea5ab2785416be6241bb9b4e9bddaeeef22fea10fc092cc7229324b9dde96ab2704578e1f5a SHA512 6fe0fcc5f837e4db9126f3b0e090c4a72d0d5add331a96c847ce3905a7696f86c95e3957e1ac6b8c3d3657bbdefe31f029f73a0b430f5249018360549afadf9b
 EBUILD clanlib-4.0.0.ebuild 1604 BLAKE2B d7caae80e28aa0f4d40b34b5407282230c621a494d0bffe1739886dfd0e24966d1a5d73ac6a3bf64a8fcd3bc40ca60c936c2c81e1ddbd107d961e957e2c380eb SHA512 b73e467cea5bea574e53a74b125b96da408944ef2006ef3a31a044780ccbcd3d754362fdc138d7d153210b7722beb87ba0a9dceaf78c383d0ed383639f024b67
 EBUILD clanlib-4.1.0.ebuild 1491 BLAKE2B da46029e71367101d4ecbe76015b13660255732d93df2bfcc6f3d2b53feb7b0a70a85a5bd9f691822582a140eb0a5e1a800ece9f56ea2d25d3fefd373c24d1c9 SHA512 2548f5db4749ad2d4b569a1992370c1d56ad0d8120e67b246a9a787ce3c78da0ed350a626a0507a30d55a4ec2dd46b19d895f8287b78a1d41c7b4ddb65b98878
 MISC metadata.xml 3097 BLAKE2B a17189a5334540d64d105470c7785d223628d8cff00f5ac162084acc0b4905c537abfbe9383bfa293c751b2efbe5d30a9a3280c92c7954cb3c4a8e04d2c925c5 SHA512 e86eda205bb05a47d49160a458c27d6eb9d67ff1f23921880f6dd46e4c16a930b405f6f2fc41fcd1623458f50452ea5ccdea36abafee802cc6933a7b3b471992
diff --git a/dev-games/clanlib/clanlib-0.8.1-r1.ebuild b/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
deleted file mode 100644
index d5fb6234027e..000000000000
--- a/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Multi-platform game development library"
-HOMEPAGE="http://www.clanlib.org/"
-SRC_URI="http://clanlib.org/download/releases-${PV:0:3}/ClanLib-${PV}.tgz"
-S="${WORKDIR}"/ClanLib-${PV}
-
-LICENSE="ZLIB"
-SLOT="0.8"
-# Not big endian safe! #82779
-KEYWORDS="amd64 x86"
-IUSE="doc ipv6 mikmod opengl sdl static-libs vorbis"
-
-# opengl keyword does not drop the GL/GLU requirement.
-# Autoconf files need to be fixed
-RDEPEND="
-	media-libs/alsa-lib
-	media-libs/libpng:0
-	virtual/jpeg:0
-	virtual/glu
-	virtual/opengl
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXxf86vm
-	mikmod? ( media-libs/libmikmod )
-	sdl? (
-		media-libs/libsdl[X]
-		media-libs/sdl-gfx
-	)
-	vorbis? ( media-libs/libvorbis )
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ndebug.patch"
-	"${FILESDIR}/${P}-gcc43.patch"
-	"${FILESDIR}/${P}-gcc44.patch"
-	"${FILESDIR}/${P}-gcc47.patch"
-	"${FILESDIR}/${P}-gcc6.patch"
-	"${FILESDIR}/${P}-llvm.patch"
-	"${FILESDIR}/${P}-libpng15.patch"
-	"${FILESDIR}/${P}-docbuilder.patch"
-)
-
-DOCS=(
-	CODING_STYLE CREDITS NEWS PATCHES
-	README{,.anjuta,.distros,.kdevelop,.sdl,.upgrade} INSTALL.linux
-)
-
-src_prepare() {
-	default
-	# See #739358
-	sed -i -e "s:libdir=\${exec_prefix}/lib:libdir=@libdir@:g" \
-		pkgconfig/*.pc.in || die
-}
-
-src_configure() {
-	# clanSound only controls mikmod/vorbis so there's
-	# no need to pass --{en,dis}able-clanSound ...
-	# clanDisplay only controls X, SDL, OpenGL plugins
-	# so no need to pass --{en,dis}able-clanDisplay
-	# also same reason why we don't have to use clanGUI
-	econf \
-		--enable-dyn \
-		--enable-clanNetwork \
-		$(use_enable x86 asm386) \
-		$(use_enable doc docs) \
-		$(use_enable opengl clanGL) \
-		$(use_enable sdl clanSDL) \
-		$(use_enable vorbis clanVorbis) \
-		$(use_enable mikmod clanMikMod) \
-		$(use_enable ipv6 getaddr) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		dodir /usr/share/doc/${PF}/html
-		mv "${D}"/usr/share/doc/clanlib/* "${D}"/usr/share/doc/${PF}/html/ || die
-		rm -rf "${D}"/usr/share/doc/clanlib
-		cp -r Examples Resources "${D}"/usr/share/doc/${PF}/ || die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-games/clanlib/clanlib-0.8.1-r2.ebuild b/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
index a52b9730199e..dc731f1467d2 100644
--- a/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
+++ b/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"/ClanLib-${PV}
 LICENSE="ZLIB"
 SLOT="0.8"
 # Not big endian safe! #82779
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc ipv6 mikmod opengl sdl static-libs vorbis"
 
 # opengl keyword does not drop the GL/GLU requirement.
diff --git a/dev-games/clanlib/clanlib-2.3.7-r1.ebuild b/dev-games/clanlib/clanlib-2.3.7-r1.ebuild
deleted file mode 100644
index de31fc373c2b..000000000000
--- a/dev-games/clanlib/clanlib-2.3.7-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-MY_P=ClanLib-${PV}
-DESCRIPTION="Multi-platform game development library"
-HOMEPAGE="http://www.clanlib.org/"
-SRC_URI="http://clanlib.org/download/releases-2.0/${MY_P}.tgz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="ZLIB"
-SLOT="2.3"
-# Not big endian safe! #82779
-KEYWORDS="amd64 x86"
-IUSE="doc ipv6 mikmod opengl sound sqlite cpu_flags_x86_sse2 static-libs vorbis X"
-REQUIRED_USE="opengl? ( X )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen dev-lang/perl )
-"
-RDEPEND="
-	sys-libs/zlib
-	X? (
-		app-arch/bzip2
-		media-libs/libpng:0
-		media-libs/freetype
-		media-libs/fontconfig
-		virtual/jpeg:0
-		x11-libs/libX11
-		opengl? ( virtual/opengl )
-	)
-	mikmod? (
-		media-libs/alsa-lib
-		media-libs/libmikmod
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	sound? ( media-libs/alsa-lib )
-	vorbis? (
-		media-libs/alsa-lib
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-autotools.patch
-	"${FILESDIR}"/${P}-doc.patch
-	"${FILESDIR}"/${P}-freetype_pkgconfig.patch #764902
-)
-
-DOCS=( CODING_STYLE CREDITS PATCHES README )
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	ln -sf ../../../Sources/API Documentation/Utilities/ReferenceDocs/ClanLib || die
-}
-
-src_configure() {
-	# Add -DPACKAGE_BUGREPORT?
-	local myeconfargs=(
-		$(use_enable doc docs)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable opengl clanGL)
-		$(use_enable opengl clanGL1)
-		$(use_enable opengl clanGUI)
-		$(use_enable X clanDisplay)
-		$(use_enable vorbis clanVorbis)
-		$(use_enable mikmod clanMikMod)
-		$(use_enable sqlite clanSqlite)
-		$(use_enable ipv6 getaddr)
-	)
-
-	use sound \
-		|| use vorbis \
-		|| use mikmod \
-		|| myeconfargs+=( --disable-clanSound )
-
-	tc-export PKG_CONFIG
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake
-
-	use doc && emake html
-}
-
-# html files are keeped in a directory that is dependent on the SLOT
-# so to keep eventual bookmarks to the doc from version to version
-src_install() {
-	default
-
-	if use doc ; then
-		emake DESTDIR="${D}" install-html
-		dodoc -r Examples Resources
-	fi
-}
diff --git a/dev-games/clanlib/clanlib-2.3.7-r2.ebuild b/dev-games/clanlib/clanlib-2.3.7-r2.ebuild
index b27100b9778d..600c112305e3 100644
--- a/dev-games/clanlib/clanlib-2.3.7-r2.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
 LICENSE="ZLIB"
 SLOT="2.3"
 # Not big endian safe! #82779
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc ipv6 mikmod opengl sound sqlite cpu_flags_x86_sse2 static-libs vorbis X"
 REQUIRED_USE="opengl? ( X )"
 
@@ -52,6 +52,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-doc.patch
 	"${FILESDIR}"/${P}-freetype_pkgconfig.patch #764902
 	"${FILESDIR}"/${P}-glibc2.34.patch
+	"${FILESDIR}"/${P}-32bit-opengl.patch
 )
 
 DOCS=( CODING_STYLE CREDITS PATCHES README )
diff --git a/dev-games/clanlib/files/clanlib-2.3.7-32bit-opengl.patch b/dev-games/clanlib/files/clanlib-2.3.7-32bit-opengl.patch
new file mode 100644
index 000000000000..73d5287c5dd9
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-32bit-opengl.patch
@@ -0,0 +1,19 @@
+Patch taken from Fedora, removes redefinitions that conflicts on x86.
+--- a/Sources/API/GL/opengl_defines.h
++++ b/Sources/API/GL/opengl_defines.h
+@@ -69,6 +69,4 @@
+ typedef void GLvoid;
+ typedef char GLchar;
+-typedef ptrdiff_t GLintptr;
+-typedef ptrdiff_t GLsizeiptr;
+ typedef struct __CLsync *CLsync;
+ 
+--- a/Sources/API/GL1/opengl1_defines.h
++++ b/Sources/API/GL1/opengl1_defines.h
+@@ -65,6 +65,4 @@
+ typedef void GLvoid;
+ typedef char GLchar;
+-typedef ptrdiff_t GLintptr;
+-typedef ptrdiff_t GLsizeiptr;
+ 
+ #else