summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/media-sound
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/media-sound')
-rw-r--r--metadata/md5-cache/media-sound/Manifest.gzbin85190 -> 85060 bytes
-rw-r--r--metadata/md5-cache/media-sound/ardour-5.124
-rw-r--r--metadata/md5-cache/media-sound/ardour-99994
-rw-r--r--metadata/md5-cache/media-sound/audex-0.95_pre201907214
-rw-r--r--metadata/md5-cache/media-sound/elisa-0.4.2-r14
-rw-r--r--metadata/md5-cache/media-sound/kaudiocreator-1.3_p201902254
-rw-r--r--metadata/md5-cache/media-sound/mpd-0.21.144
-rw-r--r--metadata/md5-cache/media-sound/pulseaudio-13.04
-rw-r--r--metadata/md5-cache/media-sound/soundkonverter-3.0.1-r24
9 files changed, 32 insertions, 0 deletions
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 720599e6fee8..2f4246a6fc04 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/media-sound/ardour-5.12 b/metadata/md5-cache/media-sound/ardour-5.12
index 36b984742777..eb8888ff60a7 100644
--- a/metadata/md5-cache/media-sound/ardour-5.12
+++ b/metadata/md5-cache/media-sound/ardour-5.12
@@ -9,5 +9,9 @@ LICENSE=GPL-2
RDEPEND=>=dev-cpp/glibmm-2.32.0 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 dev-libs/boost:= >=dev-libs/glib-2.10.1:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2.6:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo >=media-libs/liblrdf-0.4.0-r20 >=media-libs/libsamplerate-0.1 >=media-libs/libsndfile-1.0.18 >=media-libs/libsoundtouch-1.6.0 media-libs/raptor:2 >=media-libs/rubberband-1.6.0 >=media-libs/taglib-1.7 media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo >=x11-libs/gtk+-2.8.1:2 x11-libs/pango jack? ( virtual/jack ) media-libs/lilv media-libs/sratom dev-libs/sord >=media-libs/suil-0.6.10 >=media-libs/lv2-1.4.0
SLOT=6
SRC_URI=mirror://gentoo/Ardour-5.12.0.tar.bz2 -> ardour-5.12.tar.bz2
+<<<<<<< HEAD
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf waf-utils 1fab5379519d4b71bff5790435a71986
+=======
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf waf-utils 1fab5379519d4b71bff5790435a71986
+>>>>>>> next
_md5_=68806e45f555c878d774096efb9bcefa
diff --git a/metadata/md5-cache/media-sound/ardour-9999 b/metadata/md5-cache/media-sound/ardour-9999
index 0325ff35ba78..76b57a4b6457 100644
--- a/metadata/md5-cache/media-sound/ardour-9999
+++ b/metadata/md5-cache/media-sound/ardour-9999
@@ -8,5 +8,9 @@ LICENSE=GPL-2
PROPERTIES=live
RDEPEND=>=dev-cpp/glibmm-2.32.0 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 dev-libs/boost:= >=dev-libs/glib-2.10.1:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2.6:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo >=media-libs/liblrdf-0.4.0-r20 >=media-libs/libsamplerate-0.1 >=media-libs/libsndfile-1.0.18 >=media-libs/libsoundtouch-1.6.0 media-libs/raptor:2 >=media-libs/rubberband-1.6.0 >=media-libs/taglib-1.7 media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo >=x11-libs/gtk+-2.8.1:2 x11-libs/pango jack? ( virtual/jack ) media-libs/lilv media-libs/sratom dev-libs/sord >=media-libs/suil-0.6.10 >=media-libs/lv2-1.4.0
SLOT=6
+<<<<<<< HEAD
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf waf-utils 1fab5379519d4b71bff5790435a71986
+=======
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 b5f01473006ccc2cd78bc3dab20fced4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf waf-utils 1fab5379519d4b71bff5790435a71986
+>>>>>>> next
_md5_=68806e45f555c878d774096efb9bcefa
diff --git a/metadata/md5-cache/media-sound/audex-0.95_pre20190721 b/metadata/md5-cache/media-sound/audex-0.95_pre20190721
index 9ae2574107b0..9aa6764d1cb1 100644
--- a/metadata/md5-cache/media-sound/audex-0.95_pre20190721
+++ b/metadata/md5-cache/media-sound/audex-0.95_pre20190721
@@ -10,5 +10,9 @@ LICENSE=GPL-3
RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-apps/libkcddb-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-sound/cdparanoia !media-sound/audex:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
SLOT=5
SRC_URI=https://github.com/KDE/audex/archive/1389389e7341a749f95b313045f9d0cd809748b4.tar.gz -> audex-0.95_pre20190721.tar.gz
+<<<<<<< HEAD
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+=======
_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+>>>>>>> next
_md5_=297753eaa81790d9c25b14a30b43f58d
diff --git a/metadata/md5-cache/media-sound/elisa-0.4.2-r1 b/metadata/md5-cache/media-sound/elisa-0.4.2-r1
index d231bef7ca0a..b5c7aa94242d 100644
--- a/metadata/md5-cache/media-sound/elisa-0.4.2-r1
+++ b/metadata/md5-cache/media-sound/elisa-0.4.2-r1
@@ -11,5 +11,9 @@ RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=k
RESTRICT=test
SLOT=5
SRC_URI=mirror://kde/stable/elisa/0.4.2/elisa-0.4.2.tar.xz
+<<<<<<< HEAD
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+=======
_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+>>>>>>> next
_md5_=ac1c4030daab4671fbc0b954b05ac84b
diff --git a/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20190225 b/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20190225
index ac90c21b5439..574972455c51 100644
--- a/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20190225
+++ b/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20190225
@@ -10,5 +10,9 @@ LICENSE=GPL-2 FDL-1.2
RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-apps/libkcddb-19.04.3:5 >=kde-apps/libkcompactdisc-19.04.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libdiscid media-libs/phonon[qt5(+)] >=media-libs/taglib-1.5 >=kde-apps/audiocd-kio-19.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
SLOT=5
SRC_URI=https://github.com/KDE/kaudiocreator/archive/471cab933bf9e5a299d07e7cb1c0851e31e299f2.tar.gz -> kaudiocreator-1.3_p20190225.tar.gz
+<<<<<<< HEAD
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+=======
_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+>>>>>>> next
_md5_=a61a5a6ade96510ebbc899e0c099f42b
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.14 b/metadata/md5-cache/media-sound/mpd-0.21.14
index e3dd19e85f9d..9413a847e20b 100644
--- a/metadata/md5-cache/media-sound/mpd-0.21.14
+++ b/metadata/md5-cache/media-sound/mpd-0.21.14
@@ -12,5 +12,9 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.14.tar.xz
+<<<<<<< HEAD
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca linux-info 953c3b1c472dcadbf62098a9301327f2 meson b5ee7a05833ab91225acf30ffdeed006 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+=======
_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 linux-info 953c3b1c472dcadbf62098a9301327f2 meson b5ee7a05833ab91225acf30ffdeed006 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+>>>>>>> next
_md5_=78cf4497b4c0efea44997a8d4aee313c
diff --git a/metadata/md5-cache/media-sound/pulseaudio-13.0 b/metadata/md5-cache/media-sound/pulseaudio-13.0
index ea7657aa222e..519a55cf5479 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-13.0
+++ b/metadata/md5-cache/media-sound/pulseaudio-13.0
@@ -11,5 +11,9 @@ RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-li
REQUIRED_USE=?? ( elogind systemd ) bluetooth? ( dbus ) equalizer? ( dbus ) ofono-headset? ( bluetooth ) native-headset? ( bluetooth ) realtime? ( dbus ) udev? ( || ( alsa oss ) )
SLOT=0
SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-13.0.tar.xz
+<<<<<<< HEAD
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+=======
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 0d0c25170069d06d0eb233154229af97 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a udev 452708c3f55cf6e918b045adb949a9e6 user 00484e1be1aac73e24fca1c99557a7d6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+>>>>>>> next
_md5_=ad36c125d9e9e664619a09bf2a701dfb
diff --git a/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r2 b/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r2
index 9cbff4db18fc..be9a91475ae2 100644
--- a/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r2
+++ b/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r2
@@ -10,5 +10,9 @@ LICENSE=GPL-2
RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-apps/libkcddb-19.04.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.10 media-sound/cdparanoia !media-sound/soundkonverter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
SLOT=5
SRC_URI=https://github.com/dfaust/soundkonverter/archive/v3.0.1.tar.gz -> soundkonverter-3.0.1.tar.gz
+<<<<<<< HEAD
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+=======
_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+>>>>>>> next
_md5_=dcf9e2ff7ce9c737a42943f0966f795a