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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 656801382C5 for ; Sun, 28 Feb 2021 12:26:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84F6AE08F6; Sun, 28 Feb 2021 12:26:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5EE06E08F6 for ; Sun, 28 Feb 2021 12:26:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E09C4340EA5 for ; Sun, 28 Feb 2021 12:26:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC556590 for ; Sun, 28 Feb 2021 12:26:38 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1614515174.3e5c54adf02f84fff35e746792a7c3e4cce6ce72.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/sdl-mixer/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild X-VCS-Directories: media-libs/sdl-mixer/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 3e5c54adf02f84fff35e746792a7c3e4cce6ce72 X-VCS-Branch: master Date: Sun, 28 Feb 2021 12:26:38 +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: 23b83451-7252-406d-a910-26df3a55ca10 X-Archives-Hash: 7974d274ca176e27db6c26106642adbc commit: 3e5c54adf02f84fff35e746792a7c3e4cce6ce72 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 27 21:10:32 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 28 12:26:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e5c54ad media-libs/sdl-mixer: EAPI-7 bump, https, drop eutils/ltprune Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild | 87 +++++++++++++------------ 1 file changed, 47 insertions(+), 40 deletions(-) diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild index d9efb2a003f..7757eec8749 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild @@ -1,18 +1,20 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils ltprune multilib-minimal +EAPI=7 MY_P=${P/sdl-/SDL_} +inherit multilib-minimal + DESCRIPTION="Simple Direct Media Layer Mixer Library" -HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/" -SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz" +HOMEPAGE="https://www.libsdl.org/projects/SDL_mixer/" +SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz" LICENSE="ZLIB" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav" + REQUIRED_USE=" midi? ( || ( timidity fluidsynth ) ) timidity? ( midi ) @@ -23,60 +25,65 @@ REQUIRED_USE=" mod? ( || ( mikmod modplug ) ) mikmod? ( mod ) modplug? ( mod ) - " +" -RDEPEND=">=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}] +RDEPEND=" + >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}] flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] ) midi? ( fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[${MULTILIB_USEDEP}] ) timidity? ( media-sound/timidity++ ) ) + mod? ( + mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] ) + modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) + ) mp3? ( mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] ) smpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] ) ) - mod? ( - modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) - mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] ) - ) vorbis? ( - >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - )" -DEPEND=${RDEPEND} + >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}" -S=${WORKDIR}/${MY_P} +PATCHES=( + "${FILESDIR}"/${P}-wav.patch + "${FILESDIR}"/${P}-clang.patch + "${FILESDIR}"/${P}-Fix-compiling-against-libmodplug-0.8.8.5.patch + "${FILESDIR}"/${P}-mikmod-r58{7,8}.patch # bug 445980 +) src_prepare() { - epatch \ - "${FILESDIR}"/${P}-wav.patch \ - "${FILESDIR}"/${P}-clang.patch \ - "${FILESDIR}"/${P}-Fix-compiling-against-libmodplug-0.8.8.5.patch \ - "${FILESDIR}"/${P}-mikmod-r58{7,8}.patch #445980 - sed -i \ - -e '/link.*play/s/-o/$(LDFLAGS) -o/' \ - Makefile.in || die + default + sed -e '/link.*play/s/-o/$(LDFLAGS) -o/' -i Makefile.in || die } multilib_src_configure() { + local myeconfargs=( + --disable-music-flac-shared + --disable-music-fluidsynth-shared + --disable-music-mod-shared + --disable-music-mp3-shared + --disable-music-ogg-shared + $(use_enable wav music-wave) + $(use_enable vorbis music-ogg) + $(use_enable mikmod music-mod) + $(use_enable modplug music-mod-modplug) + $(use_enable flac music-flac) + $(use_enable static-libs static) + $(use_enable smpeg music-mp3) + $(use_enable mad music-mp3-mad-gpl) + $(use_enable timidity music-timidity-midi) + $(use_enable fluidsynth music-fluidsynth-midi) + LIBMIKMOD_CONFIG="${EPREFIX}"/usr/bin/${CHOST}-libmikmod-config + ) ECONF_SOURCE=${S} \ - econf \ - --disable-music-flac-shared \ - --disable-music-fluidsynth-shared \ - --disable-music-mod-shared \ - --disable-music-mp3-shared \ - --disable-music-ogg-shared \ - $(use_enable wav music-wave) \ - $(use_enable vorbis music-ogg) \ - $(use_enable mikmod music-mod) \ - $(use_enable modplug music-mod-modplug) \ - $(use_enable flac music-flac) \ - $(use_enable static-libs static) \ - $(use_enable smpeg music-mp3) \ - $(use_enable mad music-mp3-mad-gpl) \ - $(use_enable timidity music-timidity-midi) \ - $(use_enable fluidsynth music-fluidsynth-midi) \ - LIBMIKMOD_CONFIG=${EPREFIX}/usr/bin/${CHOST}-libmikmod-config + econf "${myeconfargs[@]}" } multilib_src_install() { @@ -88,7 +95,7 @@ multilib_src_install() { multilib_src_install_all() { dodoc CHANGES README - prune_libtool_files + find "${ED}" -name '*.la' -delete || die } pkg_postinst() {