gentoo auto-resync : 29:08:2022 - 22:47:16

4 files changed, 32 insertions, 22 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 5d00093d1694..b8e48572d045 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/mp3fs/Manifest b/sys-fs/mp3fs/Manifest
index 7c914e723fa2..0e76ae75da72 100644
--- a/sys-fs/mp3fs/Manifest
+++ b/sys-fs/mp3fs/Manifest
@@ -1,5 +1,5 @@
 DIST mp3fs-0.91.tar.gz 357098 BLAKE2B 39f77f1f6d2c6e86aa08be925060c6cc72e0737ead2578f5b7ac5cfcf92aaf27dc31ae10e38646d0460c0087a7100229bc150ec443879b7c1c15c485cf3946c8 SHA512 9499566afbaf181acd9efb8a4d6253e288ab9be0c8b036b2993553d0d4f4692d7dbcf34ac03787d8dbbfc35b2cc29e1d78612933c428a908c9c48290fedb8681
 DIST mp3fs-1.1.1.tar.gz 804399 BLAKE2B 9e7f99b923ad744d172fa261315498c7df13d2416a7eca45108d47a7926c40c527e306c1b7d3f0aeded01ad5d32325640358fab5b5327a5c11e0e91d21d4f290 SHA512 b1e4f403666122056f924514a7e63ddd53dc00346d7750e37e8150ad5f13294129595d79398677c69726fb2abf942d4ddb8fdcac3b1312a01ed467475f22592b
 EBUILD mp3fs-0.91-r2.ebuild 520 BLAKE2B e1362cf48a7c909d1d292562430c3d7aa1f5070be4dd571246ab7b819ec0c004476beb94f8957ffc301a179370879d7aad404781c2f5e2b3e203327621c4853c SHA512 f8a5ec67b65e16e96f95dd28d3234b5367df0a926c47218b28187447234550e1b0a20896ceed9d138f1a69a06762ba150f4b860c6c6d3478dc032d3281942fbd
-EBUILD mp3fs-1.1.1-r1.ebuild 522 BLAKE2B 8c9661263462bb5bfa95194100f92c874c19dd14fc1600e449e801405ed0eda9177ff29590fe587dfb33b9b2c061d150f3dbbeaac84dd265ba63af3c44e66824 SHA512 bfc02ea56422cf701d8a0ae7717ac94589a00f13c0cf148513012efe6ab4c1e5c542d77915ce128223bf4e9823c43cff07a0759ab3ea560b10fb8d66342a2ae1
+EBUILD mp3fs-1.1.1-r2.ebuild 690 BLAKE2B 7f02579b0918960569e9c33b462c1b4b9e50ed340bd7d541cf40c1571ba8f0bb46934abb742208a78f000e2eb2bf8539029c49618e33223405cd80afa485bbfd SHA512 e79887789852381b05c809f4ec1dfd895d2236c3ccea6163a70316e3320d9868523e9b503c53dd9175e2ff471d70e5a461612c3ded50d4857fb12b1bc7f6064e
 MISC metadata.xml 327 BLAKE2B 345f8452dabea6d75a6b5b71c0561054435b8f4bb398bed8b3c1456a01787c1aa6ca3ab2205ddf9aa8c34d4fd74ce5a5ee701063f53f00cfdc3b03a3e768eb3a SHA512 76a69ea028b3713bc345a5b69404a439afa588a77ff00a21111de0e67f9608f347ec73e8fb8d20289fcd6b3fa2fb44eee0afd59b882b474e43e988be88bf3469
diff --git a/sys-fs/mp3fs/mp3fs-1.1.1-r1.ebuild b/sys-fs/mp3fs/mp3fs-1.1.1-r1.ebuild
deleted file mode 100644
index e7f70ab2f022..000000000000
--- a/sys-fs/mp3fs/mp3fs-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A read-only FUSE filesystem which transcodes FLAC audio files to MP3 when read"
-HOMEPAGE="https://khenriks.github.com/mp3fs/"
-SRC_URI="https://github.com/khenriks/mp3fs/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT="test"
-
-DEPEND="sys-fs/fuse:0=
-	media-libs/libid3tag:=
-	media-libs/flac
-	media-sound/lame
-	media-libs/libogg"
-RDEPEND="${DEPEND}"
diff --git a/sys-fs/mp3fs/mp3fs-1.1.1-r2.ebuild b/sys-fs/mp3fs/mp3fs-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..91cf99c844be
--- /dev/null
+++ b/sys-fs/mp3fs/mp3fs-1.1.1-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Read-only FUSE filesystem which transcodes FLAC audio files to MP3 when read"
+HOMEPAGE="https://khenriks.github.com/mp3fs/"
+SRC_URI="https://github.com/khenriks/mp3fs/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+flac vorbis"
+
+REQUIRED_USE="|| ( flac vorbis )"
+RESTRICT="test"
+
+DEPEND="
+	media-libs/libid3tag:=
+	media-sound/lame
+	sys-fs/fuse:0=
+	flac? ( >=media-libs/flac-1.1.4 )
+	vorbis? ( >=media-libs/libvorbis-1.3.0 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		$(use_with flac) \
+		$(use_with vorbis)
+}