5 files changed, 4 insertions, 180 deletions
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index 8a2f83216a13..f558ecf5e32a 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -14,9 +14,7 @@ AUX clanlib-4.0.0-freetype_pkgconfig.patch 1243 BLAKE2B 1ffe267b206dd5f17a30883e
 DIST ClanLib-0.8.1.tgz 7629019 BLAKE2B 7f238111931212e3f9c82ed43842706bf16ee145896735ca35595e29dd357e52364cc592be55d88e231f962adc313bc8f57357bc74c9f1b8b134bc411497f5e9 SHA512 277daaf1055ae0198be7a6bbfd415c79cfae9e2145f62553e83849d670f56e50b8484c83f8b85f23290002e0b0c72c1e01ca597ad608a0954a4add828177293b
 DIST ClanLib-2.3.7.tgz 26132425 BLAKE2B 109ba92baf21174022c8dbc4044e39ec16ec77c730b57590733418e246ab71d18d81bbf281cd469dd9e2aebd4ac4302fbb581f27dc7fc0054a8c7ce69699e19d SHA512 73169afc0f639390f80403150757a8a14f842bc291a9457c9bca1319642b78bc4d03a93327d75254230e39545c5b4b690e56dc0149ed7b60b223e5a5364e882a
 DIST clanlib-4.0.0.tar.gz 7435551 BLAKE2B 243fc2519ee90a12af37e8925c99db77785a9a5da497d870545bb489e76cbfcbb4cac81352731326a0cc59689a361b8ab14db2bb1e255da07696e378a9cfb6e5 SHA512 e727239d782d2d52ce2f927e16a88c469b30f46d5b9eba4573baa520d98f60515df7ff4dd921092ddd5cfe4c6f5c441e0f33469b774287003db439feb8b027fe
-EBUILD clanlib-0.8.1-r1.ebuild 2254 BLAKE2B c331fe221ea1c6c1a77ba70f025f57b43857e7bcc5416b230eb7dbe478fe479e83c3f22933ecf740be370fb75b136ce9e7501fa72181a5f4b78cb388e65a102e SHA512 9ccc72172e882c1b3d06a3b077c700f8e40d57f94596997a598f97e3e6c83988858e0bc3f64643dc39b9919aab504e4dc38c255a88b9941b56f7ddcf658c2b2d
-EBUILD clanlib-0.8.1.ebuild 2043 BLAKE2B 216259750a2c4f1f9b55ddbcbe74ab26b59c38ac6fed64db2ade0cdde2efec8778bd3a7348a6528bd2ac84a92dca1856ebbfffefa55ed4a3967f8fb92aa0481b SHA512 b21de7ec8024ebe0c07db99f783abc98dc1b6bfb5a137745d45c10591fa4466a5922571098d453a05c87d3faf8e755613c3815ec4210320290a83f2d7c908e3d
-EBUILD clanlib-2.3.7-r1.ebuild 2125 BLAKE2B 98a86cdfd4c177bdb73777549771a077eaadaff616c3e04312279c6ccf5c8a11a8ac4b0e0bff75e8c083f776bdc02a62b8c4c606dcd2bd1ff18d3cfff8a83c85 SHA512 91a5faeefc5e0814ade2f796761adedfb8eab83f034b20b8915ca6bb15bc3854a6dc507bed80d003d1601f264d6343d19a9bffcc4153bd17fc24fdfcb36f5c37
-EBUILD clanlib-2.3.7.ebuild 2200 BLAKE2B daed6241575bc1b5324a10c980f6035b79e56c620c7affb1c1bc9e47b67e44f699bcfbf64436a231882a74a91734622a13c4143ec6fdb231afab39370a896795 SHA512 8df5c094f60c825f6c22fbb923fb4e88c35a8a5a076c7426e72c9bffdb62da9dc11f3268d450aed727c0c5ef13ecdd35d01c33e4ee2b5e10c0801edc8c436ca1
+EBUILD clanlib-0.8.1-r1.ebuild 2252 BLAKE2B 5d04c8d1291f961c1567ae34cb9f148fe6993cc6a4c1694b3beaa454082248276eb0eda6edecfdddd704a57e98b0395cc49b38011c0fa71ea5f1fcfea1feb75b SHA512 380c236592632dcdd1b8743390678b72fa3420f0cfb92c001645fe73fc8ba5cee4fbb3437e69c81241a88181a2587d0813fbaee01b0439ea01bb694d63d8fb4b
+EBUILD clanlib-2.3.7-r1.ebuild 2123 BLAKE2B 2641ee84fc7400f8c9227f849179746101e0cb8751fba9d92f2b1a4cb0d042e06363b0af1d8bfca821367d37007b4279656ceddcf5f0ae12b04118c266f03ac4 SHA512 1ba8e97e83bd0e5029d27a0be7157e2479edf0f7d985ce55539ba5770128598b74e29deb0583e2cf3c76471c9850fbe11b5498a6bd6dbb987f84817779d896c9
 EBUILD clanlib-4.0.0.ebuild 1567 BLAKE2B 050e1c8a108dd5ac8ad39caed85e05be9bfea7b21b6e763f9b6e9fdecf940a780de970f94e2c7c480411c5e37d336a0be4f6db8f842f2271d873b281a1c6a11f SHA512 012b62b2ad5ee8a8ff87befccbf33f18186f81bdb0b202606f68a50d22ee978f51cfcdff4ed7119be101de0ae8a7e40202a8e007571616068240fbc502db8d0a
 MISC metadata.xml 3096 BLAKE2B a800d15375b63fd801b1941937815e34197ff8c598f7d6f539a0bb50205e182434506ccf44a9677527a9edd4c9470d3b7d344830d21d7c20386a1998f123fdf8 SHA512 7973a8121a9ae268d6572c9ae980f2b81650e159cfcbee7895097d906637159e4e3470fb7dadb1f58c4928d377860c73978b38c8bb03c44f8dc73d715d9139bd
diff --git a/dev-games/clanlib/clanlib-0.8.1-r1.ebuild b/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
index cae77b9cb155..d5fb6234027e 100644
--- a/dev-games/clanlib/clanlib-0.8.1-r1.ebuild
+++ b/dev-games/clanlib/clanlib-0.8.1-r1.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-0.8.1.ebuild b/dev-games/clanlib/clanlib-0.8.1.ebuild
deleted file mode 100644
index 7aa5d3df56ef..000000000000
--- a/dev-games/clanlib/clanlib-0.8.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic eutils ltprune
-
-DESCRIPTION="multi-platform game development library"
-HOMEPAGE="http://www.clanlib.org/"
-SRC_URI="http://clanlib.org/download/releases-${PV:0:3}/ClanLib-${PV}.tgz"
-
-LICENSE="ZLIB"
-SLOT="0.8"
-KEYWORDS="amd64 x86" #not big endian safe #82779
-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/libpng:0
-	virtual/jpeg:0
-	virtual/glu
-	virtual/opengl
-	sdl? (
-		media-libs/libsdl[X]
-		media-libs/sdl-gfx
-	)
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXxf86vm
-	media-libs/alsa-lib
-	mikmod? ( media-libs/libmikmod )
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/ClanLib-${PV}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-ndebug.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-gcc47.patch \
-		"${FILESDIR}"/${P}-gcc6.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
-}
-
-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() {
-	DOCS="CODING_STYLE CREDITS NEWS PATCHES README* INSTALL.linux" \
-		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
-	prune_libtool_files
-}
diff --git a/dev-games/clanlib/clanlib-2.3.7-r1.ebuild b/dev-games/clanlib/clanlib-2.3.7-r1.ebuild
index 824f8a34c6d6..b0eac87e66dc 100644
--- a/dev-games/clanlib/clanlib-2.3.7-r1.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7-r1.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 )"
 
diff --git a/dev-games/clanlib/clanlib-2.3.7.ebuild b/dev-games/clanlib/clanlib-2.3.7.ebuild
deleted file mode 100644
index 08584b0cf5d6..000000000000
--- a/dev-games/clanlib/clanlib-2.3.7.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic eutils autotools-utils
-
-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"
-
-LICENSE="ZLIB"
-SLOT="2.3"
-KEYWORDS="amd64 x86" #not big endian safe #82779
-IUSE="doc ipv6 mikmod opengl sound sqlite cpu_flags_x86_sse2 static-libs vorbis X"
-REQUIRED_USE="opengl? ( X )"
-
-RDEPEND="sys-libs/zlib
-	X? (
-		media-libs/libpng:0
-		virtual/jpeg:0
-		media-libs/freetype
-		media-libs/fontconfig
-		opengl? ( virtual/opengl )
-		app-arch/bzip2
-		x11-libs/libX11
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	sound? ( media-libs/alsa-lib )
-	mikmod? (
-		media-libs/libmikmod
-		media-libs/alsa-lib
-	)
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-		media-libs/alsa-lib
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen dev-lang/perl )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-autotools.patch
-	"${FILESDIR}"/${P}-doc.patch
-	"${FILESDIR}"/${P}-freetype_pkgconfig.patch #764902
-)
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-DOCS=(
-	CODING_STYLE
-	CREDITS
-	PATCHES
-	README
-)
-
-src_prepare() {
-	autotools-utils_src_prepare
-	ln -sf ../../../Sources/API Documentation/Utilities/ReferenceDocs/ClanLib
-}
-
-src_configure() {
-	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 )
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile 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() {
-	autotools-utils_src_install
-	if use doc ; then
-		emake DESTDIR="${D}" install-html
-		dodoc -r Examples Resources
-	fi
-}