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 4F1B3158021 for ; Sat, 29 Oct 2022 12:08:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A4CDE088B; Sat, 29 Oct 2022 12:08:30 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 661D5E088B for ; Sat, 29 Oct 2022 12:08:30 +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 664493411F8 for ; Sat, 29 Oct 2022 12:08:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BAE5B6A1 for ; Sat, 29 Oct 2022 12:08:27 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1667045271.936b25bba53af1c03c63d3394fe166bce441a9bc.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libmikmod/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libmikmod/libmikmod-3.3.11.1-r1.ebuild media-libs/libmikmod/libmikmod-3.3.11.1.ebuild X-VCS-Directories: media-libs/libmikmod/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 936b25bba53af1c03c63d3394fe166bce441a9bc X-VCS-Branch: master Date: Sat, 29 Oct 2022 12:08:27 +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: 39768598-daf3-48a8-afbd-794b209f8ac4 X-Archives-Hash: 58707377c42aea41b947bac1f763b698 commit: 936b25bba53af1c03c63d3394fe166bce441a9bc Author: Sam James gentoo org> AuthorDate: Sat Oct 29 12:03:03 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Oct 29 12:07:51 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936b25bb media-libs/libmikmod: EAPI 8 Signed-off-by: Sam James gentoo.org> ....3.11.1.ebuild => libmikmod-3.3.11.1-r1.ebuild} | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.1-r1.ebuild similarity index 89% rename from media-libs/libmikmod/libmikmod-3.3.11.1.ebuild rename to media-libs/libmikmod/libmikmod-3.3.11.1-r1.ebuild index bb462fd8cdd0..96b5ee258b0b 100644 --- a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild +++ b/media-libs/libmikmod/libmikmod-3.3.11.1-r1.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit multilib-minimal +EAPI=8 + +inherit multilib multilib-minimal DESCRIPTION="A library to play a wide range of module formats" HOMEPAGE="http://mikmod.sourceforge.net/" @@ -15,23 +16,27 @@ IUSE="+alsa coreaudio cpu_flags_ppc_altivec debug nas openal oss pulseaudio cpu_ REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )" -RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] ) +RDEPEND=" + !${CATEGORY}/${PN}:2 + alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] ) nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] ) openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] ) - !${CATEGORY}/${PN}:2" +" DEPEND="${RDEPEND} - sys-apps/texinfo - oss? ( virtual/os-headers )" + oss? ( virtual/os-headers ) +" +BDEPEND="sys-apps/texinfo" MULTILIB_CHOST_TOOLS=( /usr/bin/libmikmod-config ) src_prepare() { + default + # USE=debug enables Werror, bug #621688 sed -i -e 's/-Werror//' configure || die - default } multilib_src_configure() { @@ -44,8 +49,7 @@ multilib_src_configure() { fi # sdl, sdl2: missing multilib supported ebuilds, temporarily disabled, remember to update REQUIRED_USE - ECONF_SOURCE=${S} \ - econf \ + ECONF_SOURCE=${S} econf \ $(use_enable alsa) \ $(use_enable nas) \ $(use_enable pulseaudio) \ @@ -70,5 +74,6 @@ multilib_src_install_all() { dodoc AUTHORS NEWS README TODO docinto html dodoc docs/*.html + find "${ED}" -name '*.la' -delete || die }