From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1140211-garchives=archives.gentoo.org@lists.gentoo.org>
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 7BB26138350
	for <garchives@archives.gentoo.org>; Sat, 25 Jan 2020 19:02:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 397D5E0843;
	Sat, 25 Jan 2020 19:02:49 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(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 06408E0843
	for <gentoo-commits@lists.gentoo.org>; Sat, 25 Jan 2020 19:02:48 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(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 C0BDC34E2C1
	for <gentoo-commits@lists.gentoo.org>; Sat, 25 Jan 2020 19:02:47 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 52852D7
	for <gentoo-commits@lists.gentoo.org>; Sat, 25 Jan 2020 19:02:46 +0000 (UTC)
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org>
Message-ID: <1579978945.722799d0fd39b4e6950248b354842226fab12b47.soap@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mpd/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-sound/mpd/metadata.xml media-sound/mpd/mpd-0.21.18-r1.ebuild media-sound/mpd/mpd-0.21.18.ebuild media-sound/mpd/mpd-0.21.19-r1.ebuild media-sound/mpd/mpd-0.21.19.ebuild
X-VCS-Directories: media-sound/mpd/
X-VCS-Committer: soap
X-VCS-Committer-Name: David Seifert
X-VCS-Revision: 722799d0fd39b4e6950248b354842226fab12b47
X-VCS-Branch: master
Date: Sat, 25 Jan 2020 19:02:46 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 029aa72e-837c-4851-a853-7f0154965525
X-Archives-Hash: a4898363a7f2e4b7d73a5e15b7bfff49

commit:     722799d0fd39b4e6950248b354842226fab12b47
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 19:02:25 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 19:02:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=722799d0

media-sound/mpd: Remove USE="adplug"

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-sound/mpd/metadata.xml                                  | 1 -
 media-sound/mpd/{mpd-0.21.18.ebuild => mpd-0.21.18-r1.ebuild} | 8 ++++----
 media-sound/mpd/{mpd-0.21.19.ebuild => mpd-0.21.19-r1.ebuild} | 8 ++++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index a0ce8601810..621b406d3e2 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -6,7 +6,6 @@
     <name>Mikle Kolyada</name>
   </maintainer>
   <use>
-    <flag name="adplug">Enable the AdPlug decoder plugin</flag>
     <flag name="cdio">Use libcdio for ISO9660 parsing support</flag>
     <flag name="chromaprint">Enable ChromaPrint / AcoustID support</flag>
     <flag name="cue">Enable CUE sheet support</flag>

diff --git a/media-sound/mpd/mpd-0.21.18.ebuild b/media-sound/mpd/mpd-0.21.18-r1.ebuild
similarity index 97%
rename from media-sound/mpd/mpd-0.21.18.ebuild
rename to media-sound/mpd/mpd-0.21.18-r1.ebuild
index db09890f55c..41e1d18a0a0 100644
--- a/media-sound/mpd/mpd-0.21.18.ebuild
+++ b/media-sound/mpd/mpd-0.21.18-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sh x86 ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+IUSE="+alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
 	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
@@ -21,7 +21,7 @@ IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	zeroconf zip zlib"
 
 OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
 	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
 ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
 
@@ -38,7 +38,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/mpd
-	adplug? ( media-libs/adplug:= )
 	alsa? (
 		media-libs/alsa-lib
 		media-sound/alsa-utils
@@ -214,7 +213,8 @@ src_configure() {
 	fi
 
 	emesonargs+=(
-		-Dadplug=$(usex adplug enabled disabled)
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=disabled
 		-Daudiofile=$(usex audiofile enabled disabled)
 		-Dfaad=$(usex faad enabled disabled)
 		-Dffmpeg=$(usex ffmpeg enabled disabled)

diff --git a/media-sound/mpd/mpd-0.21.19.ebuild b/media-sound/mpd/mpd-0.21.19-r1.ebuild
similarity index 97%
rename from media-sound/mpd/mpd-0.21.19.ebuild
rename to media-sound/mpd/mpd-0.21.19-r1.ebuild
index 3395216d6d3..3f87664378e 100644
--- a/media-sound/mpd/mpd-0.21.19.ebuild
+++ b/media-sound/mpd/mpd-0.21.19-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+IUSE="+alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
 	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
@@ -21,7 +21,7 @@ IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	zeroconf zip zlib"
 
 OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
 	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
 ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
 
@@ -38,7 +38,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/mpd
-	adplug? ( media-libs/adplug:= )
 	alsa? (
 		media-libs/alsa-lib
 		media-sound/alsa-utils
@@ -214,7 +213,8 @@ src_configure() {
 	fi
 
 	emesonargs+=(
-		-Dadplug=$(usex adplug enabled disabled)
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=disabled
 		-Daudiofile=$(usex audiofile enabled disabled)
 		-Dfaad=$(usex faad enabled disabled)
 		-Dffmpeg=$(usex ffmpeg enabled disabled)