Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

4 files changed, 11 insertions, 62 deletions

diff --git a/media-sound/soundkonverter/Manifest b/media-sound/soundkonverter/Manifest
index 3f49e1211d8e..093bcfbd3131 100644
--- a/media-sound/soundkonverter/Manifest
+++ b/media-sound/soundkonverter/Manifest
@@ -1,6 +1,4 @@
 AUX soundkonverter-3.0.0-deps.patch 471 BLAKE2B 083b379ce0e3ecda5723095f5aa865a9bd88251bd522fab0420710864a288468d9230466d8908ed5ca2ba76f5523021530bf0e4791dd677f3e2a4c3b38806443 SHA512 936bbe4b157b5a0a500678b364889c6e080652c03fde19243111a866e8bfa58cd5edcd2c62ea997becf9ae3391f666b8011a56c9e82fe2b5942e28f9a742d542
-AUX soundkonverter-3.0.1-fix-add-dirs.patch 936 BLAKE2B 93d19df6f74c46b5b5755c85fd548cbd5e654be6b0fbc1459db90358ce129ecf6f1afbe7b15528551e227edd61ffc4f6156c311f30a0939968b1dad86f86f7aa SHA512 2d692e3c304706b0cb135299da6d31ab1fcac352b055725e577435d44321f04ece3309ddbb3f9568dc11a85528348522cdc637ed195e7ff1c5e0710e85b1d513
-AUX soundkonverter-3.0.1-metainfodir.patch 1033 BLAKE2B d2c845bc2b5fc18ade9b7d689e291e088fa53c11d400fd1b598e74fd9da83e7082e406949722846013c413743ed672e40089ba0960086f3dcdeb2c8a2501f8b7 SHA512 d16314f12179a0caf9d09489c4dd838f814c468185f0c7bcb0eadc3078be4eedfa5ec0f76025216b3750cefe0b5a75039e645936e58a827ba10d6503442fec9f
 DIST soundkonverter-3.0.1.tar.gz 821278 BLAKE2B 3b54a0e8d728d15a1c0ae716e0d321fe37a866f755fee25dd284e46a04a514ace5e8b27fb612b928a3a6ddf32504d08ff0165ceb5c8d48ba1763fcd34994e586 SHA512 db0f9ff7b8d229012d08bb8030c7f11c428632867d0eeb7de8717d47f651a7641240aa0df9c947653fe6a2ad7d4930421f69fff8d038d47f28ca563dfa720911
-EBUILD soundkonverter-3.0.1-r2.ebuild 1547 BLAKE2B dfa49893b5daa640d15c9b0a2f8cfa2fe1a13f993b97e2b9a17cbfd076c669578f58a9244b088050c6c4ff63526038685eb9735e64cc70d286691d87c63a3a8b SHA512 b40b601e4c3654254df386af3eea1bd6e1e778992058770a16214a32518af17cc5ea95a05416b9539ff56e8bddf5ab426a925995dfd9034039e68ec7182441d7
+EBUILD soundkonverter-3.0.1-r1.ebuild 1531 BLAKE2B 162a9c595ae9c111dbeca6e5a9994763f440ba8bd82c459f6a33fa0e97d83ebff313527b67729ed51b88b537fc69ccdfbe9a88bf5e7271a80abfeda9ffc986f4 SHA512 801f8ffe7148b433b4ca1d6aece1866bf73cd23f6d4e99ca144e2178f887eecb97a95677ad5ae1cdc9fdb2d7c161f1710b7cb0342c2b19cde211d6d2393a3003
 MISC metadata.xml 363 BLAKE2B 56ccd083e2b002a49f00ede22967d7c35a2ad7d765200a668876993780b243c30b8c77f162432c750e0f23b7f1310491854b7b070a426a518ccb47410a19d12b SHA512 e84860f5f638b72aa6ddd10eb3b0dcd2f9f8acc00b31fb31718454665ab808f65262b29258ae44517bd091caa5c0f328d678cd9b98652ec0aba80d0e2227f044
diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-fix-add-dirs.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-fix-add-dirs.patch
deleted file mode 100644
index cc5a584b5e0c..000000000000
--- a/media-sound/soundkonverter/files/soundkonverter-3.0.1-fix-add-dirs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 16fb09fcbd5712b7b75004229dbb74f85f213b53 Mon Sep 17 00:00:00 2001
-From: Daniel Faust <hessijames@gmail.com>
-Date: Mon, 6 Aug 2018 18:35:15 +0200
-Subject: [PATCH] Fix adding directories to the Replay Gain tool
-
-Fixes #70
----
- replaygainscanner/replaygainfilelist.cpp | 2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/replaygainscanner/replaygainfilelist.cpp b/replaygainscanner/replaygainfilelist.cpp
-index edd64d0..3df5d58 100644
---- a/replaygainscanner/replaygainfilelist.cpp
-+++ b/replaygainscanner/replaygainfilelist.cpp
-@@ -355,7 +355,7 @@ int ReplayGainFileList::listDir( const QString& directory, const QStringList& fi
-             if( filter.contains(codecName) )
-             {
-                 QList<QUrl> urls;
--                urls.append(directory + "/" + fileName);
-+                urls.append("file://" + directory + "/" + fileName);
-                 addFiles( urls, codecName );
-             }
- 
diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-metainfodir.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-metainfodir.patch
deleted file mode 100644
index cae51b5790bc..000000000000
--- a/media-sound/soundkonverter/files/soundkonverter-3.0.1-metainfodir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8589c87095466f0785902dea6367192bcd813eb3 Mon Sep 17 00:00:00 2001
-From: eclipseo <30413512+eclipseo@users.noreply.github.com>
-Date: Fri, 7 Sep 2018 18:15:43 +0200
-Subject: [PATCH] Install appdata in /usr/share/metainfo
-
-appdata file should now be installed in /usr/share/metainfo.  /usr/share/appdata is deprecated.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a0e36de..521d0da 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -135,7 +135,7 @@ install(FILES soundkonverter_replaygainplugin.desktop DESTINATION ${SERVICETYPES
- install(FILES soundkonverter_ripperplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
- install(FILES soundkonverter-rip-audiocd.desktop DESTINATION ${DATA_INSTALL_DIR}/solid/actions)
- 
--install(FILES soundkonverter.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata)
-+install(FILES soundkonverter.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/metainfo)
- 
- add_subdirectory(icons)
- add_subdirectory(images)
diff --git a/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild b/media-sound/soundkonverter/soundkonverter-3.0.1-r1.ebuild
index b930b9c11d26..3dea21807b66 100644
--- a/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild
+++ b/media-sound/soundkonverter/soundkonverter-3.0.1-r1.ebuild
@@ -1,22 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=6
 
 inherit kde5
 
 DESCRIPTION="Frontend to various audio converters"
-HOMEPAGE="https://www.linux-apps.com/p/1126634/ https://github.com/dfaust/soundkonverter"
+HOMEPAGE="https://www.linux-apps.com/search?projectSearchText=soundKonverter
+	https://github.com/dfaust/soundkonverter"
 SRC_URI="https://github.com/dfaust/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -38,15 +36,14 @@ DEPEND="
 	>=media-libs/taglib-1.10
 	media-sound/cdparanoia
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
 	!media-sound/soundkonverter:4
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-deps.patch"
-	"${FILESDIR}/${P}-fix-add-dirs.patch"
-	"${FILESDIR}/${P}-metainfodir.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-3.0.0-deps.patch" )
 
 S="${WORKDIR}"/${P}/src