gentoo resync : 02.02.2022

3 files changed, 3 insertions, 51 deletions

diff --git a/media-sound/paprefs/Manifest b/media-sound/paprefs/Manifest
index df94f3ba59f2..cc80c8acb8eb 100644
--- a/media-sound/paprefs/Manifest
+++ b/media-sound/paprefs/Manifest
@@ -1,5 +1,3 @@
-DIST paprefs-1.1.tar.xz 69144 BLAKE2B 9809bb73156be1e4020679637c1203524a0ccc5f5e1fb3696724925bb196cd397e433c22e993e7353cfaadd38260980676af6ace2cac795c0b615298d1d85805 SHA512 4203fcb485b40223a5c8672fdbbd2875a25d05d85366773015728f54a17020098ee9e9fd1c02180c01799e100b99389c970855fc1bd69921d32d8e43c749ce76
 DIST paprefs-1.2.tar.xz 74820 BLAKE2B 5b4e3b2e4e0e940a7685dbff287cf42951931da1aad6f011a72115a8393bae11f6e80dc09a3e5724afaaac0e6580dcc7a37a9b9b4ab6fc6a53f29647d9980a4d SHA512 2bc50116528c150060711899c66976179e433f6be36f6b7806f0fd3f66346ce14037875e7f119dc205d2047c3998d78105fa7d7c397dfcf02fb8d3bfec34154c
-EBUILD paprefs-1.1-r1.ebuild 939 BLAKE2B e392fae53c00d30b07e9dbe843c360edde26cce313b78f9b96b00e2aaf63924c0a5aec2029dde26da8434b32b14112721b91e2fec036b2acfe76d68bea7b697e SHA512 e8fe1c5cc828753144974db389296a9e58ec38ea6101aef5b0d426f711860bf121cf2d3ea82289ad7d432dc279b698deadab158854d472997c02a20ad76f6764
-EBUILD paprefs-1.2.ebuild 823 BLAKE2B e94127ffa5bf4cced9e3ffcaf3fb261863c399e3aed19adb278b68f48a726c67b14d5da8496b7647e3dec1397ff95b766b8c268512f896513cd3aa618f1147e7 SHA512 2b32aeb3b8b03007b6f984e905fd3d86218c96d4bbd49f5db2b570dd4d224ed7ec6ba9dcd042ba1104c4902ef7e9732e434ac79b2aa6151f19c02ddde39d4b40
+EBUILD paprefs-1.2.ebuild 821 BLAKE2B 8a4a6544daef81f7380dc3748c40802e32052d5c5d9390368f14dd2cb4902c0fd254b65666ffd57939873771b556e5d41dfe6fc4994bfdee74d1c12950c6d7a7 SHA512 cd1977ab72ce74740355d19e713b9d03e17e0ff60b27515a365a8488709205839025527929a1a66590ce329d910d1669fa585f022a268136d37e84ef21759ca9
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/paprefs/paprefs-1.1-r1.ebuild b/media-sound/paprefs/paprefs-1.1-r1.ebuild
deleted file mode 100644
index fcf064732a0d..000000000000
--- a/media-sound/paprefs/paprefs-1.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic meson xdg-utils
-
-DESCRIPTION="PulseAudio Preferences, configuration dialog for PulseAudio"
-HOMEPAGE="https://freedesktop.org/software/pulseaudio/paprefs"
-SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-
-RDEPEND="dev-cpp/atkmm:0
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:3.0
-	dev-libs/glib:2
-	>=dev-libs/libsigc++-2.2:2
-	>=media-sound/pulseaudio-12.0-r1[glib]
-	x11-libs/gtk+:3
-	|| (
-		x11-themes/tango-icon-theme
-		x11-themes/adwaita-icon-theme
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	append-cxxflags -std=c++11 #568590
-	local mymesonargs=(
-		-Dlynx=false
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/paprefs/paprefs-1.2.ebuild b/media-sound/paprefs/paprefs-1.2.ebuild
index ee0a35651ddf..0e6bd7270503 100644
--- a/media-sound/paprefs/paprefs-1.2.ebuild
+++ b/media-sound/paprefs/paprefs-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 RDEPEND="dev-cpp/atkmm:0
 	dev-cpp/glibmm:2