From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 827331581C1 for ; Wed, 3 Jul 2024 22:37:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B9356E2A86; Wed, 3 Jul 2024 22:37:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 99927E2A72 for ; Wed, 3 Jul 2024 22:37:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B27F934300E for ; Wed, 3 Jul 2024 22:37:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 52BDF1DBF for ; Wed, 3 Jul 2024 22:37:09 +0000 (UTC) From: "Eli Schwartz" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Eli Schwartz" Message-ID: <1720046207.514b8668d9e8beeba0f6530fe1254df337e75f07.eschwartz@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/clanlib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-games/clanlib/clanlib-2.3.7-r4.ebuild X-VCS-Directories: dev-games/clanlib/ X-VCS-Committer: eschwartz X-VCS-Committer-Name: Eli Schwartz X-VCS-Revision: 514b8668d9e8beeba0f6530fe1254df337e75f07 X-VCS-Branch: master Date: Wed, 3 Jul 2024 22:37:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 40e0c3e9-2d98-4393-a767-807b15a054af X-Archives-Hash: d7556db53e1fdae851823f9a8e13f0a9 commit: 514b8668d9e8beeba0f6530fe1254df337e75f07 Author: Eli Schwartz gmail com> AuthorDate: Sun Jun 30 23:51:10 2024 +0000 Commit: Eli Schwartz gentoo org> CommitDate: Wed Jul 3 22:36:47 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=514b8668 dev-games/clanlib: fix ignored USE=static-libs in slot 2.3 It is a no-op. In gentoo-historical-2.git, the addition of version 2.4.3 to the tree reworked the econf flags and dropped the functionality of actually passing $(use_enable) based on this USE flag. https://gitweb.gentoo.org/archive/repo/gentoo-2.git/commit/?id=dde0b5c459de07f06abeea223a9fe5612bdc0ab1 One might ponder why the flag should exist at all, if no one used it. In fact, due to EAPI 7 it was always installed. :( That being said, the other slots for this package supported it correctly, which means by default they weren't installed. Fix this slot to act the same way: correctly. Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Eli Schwartz gentoo.org> dev-games/clanlib/clanlib-2.3.7-r4.ebuild | 120 ++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/dev-games/clanlib/clanlib-2.3.7-r4.ebuild b/dev-games/clanlib/clanlib-2.3.7-r4.ebuild new file mode 100644 index 000000000000..6ba2413bff53 --- /dev/null +++ b/dev-games/clanlib/clanlib-2.3.7-r4.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2024 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="https://github.com/sphair/ClanLib" +SRC_URI="mirror://gentoo/${MY_P}.tgz" +S="${WORKDIR}"/${MY_P} + +LICENSE="ZLIB" +SLOT="2.3" +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-text/doxygen + dev-lang/perl + media-gfx/graphviz + ) +" +RDEPEND=" + sys-libs/zlib + X? ( + app-arch/bzip2 + media-libs/libpng:0 + media-libs/freetype + media-libs/fontconfig + media-libs/libjpeg-turbo: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 + "${FILESDIR}"/${P}-32bit-opengl.patch + # From Fedora + "${FILESDIR}"/${P}-gcc47.patch + "${FILESDIR}"/${P}-gcc7.patch + "${FILESDIR}"/${P}-non-x86.patch + "${FILESDIR}"/${P}-no-ldflags-for-conftest.patch + "${FILESDIR}"/${P}-no-wm_type-in-fs.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_enable static-libs static) + ) + + 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 + + find "${ED}" -type f -name '*.la' -delete || die + + if use doc ; then + emake DESTDIR="${D}" install-html + dodoc -r Examples Resources + fi +}