gentoo resync : 08.10.2021

6 files changed, 239 insertions, 0 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 76a66cd923a9..45d8e05707c5 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index 837fd236958d..7f8d9aed945e 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -3,12 +3,14 @@ AUX clanlib-0.8.1-gcc43.patch 613 BLAKE2B 9b8a6506567e150aacde3138b0ff017fe80094
 AUX clanlib-0.8.1-gcc44.patch 872 BLAKE2B 0d7086bc769951c09860459dcae267d6420f73d5e9c54e2b72fc27ec69a90d495cc955e673dd0499db9d409894522397a6b8dd5b1a2fd641ba51bad646c18a0c SHA512 352df0077ea1a31bb3347183672c26695d7eb6c746f2d6b093c952dc580ac92242868002d657b03b926163fca5b2e4df55585878ada2a2afe76510797f14225b
 AUX clanlib-0.8.1-gcc47.patch 261 BLAKE2B be606aa95e870d13db792749900c0e038e4bbfa3b4c804fa95f7f58cde3f0b422cf2b66533378f850edd9e8580039cba268b42cf532126393ba33bd0117ba1b7 SHA512 ddb40224609e57fa441e31e4cd1f4df9dfd5709ebd061535f9f7290513f1d6c0812a8ba98b698bd1c680a7de925fd2a7e22852afcb3a23b31250515fd541e8d7
 AUX clanlib-0.8.1-gcc6.patch 530 BLAKE2B f076e15e0061aad13da8f608ed966f7929a2e71a00f0dd10822d42fcd28af33350494ad4273f80cba7d29dc51b96215c9483638239a8ce7910994a174f1b4932 SHA512 94a49f2aed8487fb03b97219802fd4b525b1de304d1dd3fcc9f7ccc392d5385438005c8198e3db8ec666f4fc875860159fbac94e5d90626c8aaf8730d3831f72
+AUX clanlib-0.8.1-glibc2.34.patch 536 BLAKE2B 17eab65b09e8764831ed11ad6ef12d3c9a6ff46445e6ad423b4480366ea017f6577b309661fc0bf31e26c2bc27621a50551880ffdf8a37dd240b5aea19c3a491 SHA512 119a4b5aef1f9aceac0ad424f5bd5b4a60203485b1e6394c2f9c1b00d2bbf5d5072967812ae210d255b18d6d255a81953f5794971780ccd5eaa23a7b57e6b68b
 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-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
+AUX clanlib-2.3.7-glibc2.34.patch 612 BLAKE2B 7a1c5407a228fe7c245f6e4aa530a371d5e9c424935cd3688a4cd34e543ddfbfbfe77a31e3845226679409d2aebb6bfc0b96d5817a3284940f85f6a07f6e4e1d SHA512 dfa58ec02fd0e5f0a767203e9518504f0255078688dd97e47e6c0dc8207122318e80bf9a42ee02bb8f2501b621e3538437b37a5102b50186cd3c83315369789f
 AUX clanlib-4.0.0-fix-build-system.patch 622 BLAKE2B 4dd50ea87fb7dc2dccf2f5db5b1e00941ead76313b847b6e6e574b85f8a9ac0b884fbd5b5548125e886f1a405efc1087c978317e9a935c0f0e1ac0dae2da1e76 SHA512 bda813264f552eff8cc7cea45ec4ea29517a8590066c4b435942e97ea7d68e8d2f21bebf83141b04f1fcc84e936bb3a7ad354b644184dd56b746ab3bfeff9e19
 AUX clanlib-4.0.0-freetype_pkgconfig.patch 1101 BLAKE2B 07d6ad6d64998fced66fd3954a9e402f2d9a46d761b31e064806e7ffe8d0e4a2d62707fbad4a17920acba0332618b018387db815fb53424a9e13eb721fb8bfb6 SHA512 07760b7cb52e3a467498ddecf014cec1c8252524389bd25adc923a8704f70a2f5907b121bc299273ddfbe79eb124dfca23af8c023f546b5936e66310498a8587
 DIST ClanLib-0.8.1.tgz 7629019 BLAKE2B 7f238111931212e3f9c82ed43842706bf16ee145896735ca35595e29dd357e52364cc592be55d88e231f962adc313bc8f57357bc74c9f1b8b134bc411497f5e9 SHA512 277daaf1055ae0198be7a6bbfd415c79cfae9e2145f62553e83849d670f56e50b8484c83f8b85f23290002e0b0c72c1e01ca597ad608a0954a4add828177293b
@@ -16,7 +18,9 @@ DIST ClanLib-2.3.7.tgz 26132425 BLAKE2B 109ba92baf21174022c8dbc4044e39ec16ec77c7
 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-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-r2.ebuild b/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
new file mode 100644
index 000000000000..a52b9730199e
--- /dev/null
+++ b/dev-games/clanlib/clanlib-0.8.1-r2.ebuild
@@ -0,0 +1,94 @@
+# 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"
+	"${FILESDIR}/${P}-glibc2.34.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-2.3.7-r2.ebuild b/dev-games/clanlib/clanlib-2.3.7-r2.ebuild
new file mode 100644
index 000000000000..b27100b9778d
--- /dev/null
+++ b/dev-games/clanlib/clanlib-2.3.7-r2.ebuild
@@ -0,0 +1,107 @@
+# 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
+	"${FILESDIR}"/${P}-glibc2.34.patch
+)
+
+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/files/clanlib-0.8.1-glibc2.34.patch b/dev-games/clanlib/files/clanlib-0.8.1-glibc2.34.patch
new file mode 100644
index 000000000000..85c20ccdbcfd
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.8.1-glibc2.34.patch
@@ -0,0 +1,17 @@
+pthread_mutexattr_setkind_np() is long deprecated and should be using
+pthread_mutexattr_settype() instead even on Linux. Fixes consumers
+when built against glibc-2.34.
+
+https://bugs.gentoo.org/808707
+--- a/Sources/Core/System/Unix/mutex_pthread.cpp
++++ b/Sources/Core/System/Unix/mutex_pthread.cpp
+@@ -42,3 +42,3 @@
+ {
+-#ifdef __FreeBSD__
++#if 1
+ 	int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int kind);
+@@ -65,3 +65,3 @@
+ #else
+-#ifdef __FreeBSD__
++#if 1
+         pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
diff --git a/dev-games/clanlib/files/clanlib-2.3.7-glibc2.34.patch b/dev-games/clanlib/files/clanlib-2.3.7-glibc2.34.patch
new file mode 100644
index 000000000000..05e7320428ca
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-glibc2.34.patch
@@ -0,0 +1,17 @@
+pthread_mutexattr_setkind_np() is long deprecated and should be using
+pthread_mutexattr_settype() instead even on Linux. Fixes consumers
+when built against glibc-2.34.
+
+https://bugs.gentoo.org/811591
+--- a/Sources/Core/System/mutex.cpp
++++ b/Sources/Core/System/mutex.cpp
+@@ -37,3 +37,3 @@
+ {
+-#if defined(__APPLE__) || defined (__FreeBSD__) || defined(__OpenBSD__)
++#if 1
+ 	int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int kind);
+@@ -55,3 +55,3 @@
+ 	pthread_mutexattr_init(&attr);
+-	#if defined(__FreeBSD__) || defined(__APPLE__)
++	#if 1
+ 	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);