[gentoo-commits] proj/kde:master commit in: kde-apps/gwenview/, kde-apps/okular/, media-gfx/kphotoalbum/, ...

[gentoo-commits] proj/kde:master commit in: kde-apps/gwenview/, kde-apps/okular/, media-gfx/kphotoalbum/, ...

[Andreas Sturmlechner]

commit:     df8e8b4720c3aa258d743ac120a43cd8e846529c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 17:45:34 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 17:45:34 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=df8e8b47

*/*: Revert "Switch from virtual/jpeg to media-libs/libjpeg-turbo:="

All packages checked were linking to libjpeg.so.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/gwenview/gwenview-20.12.49.9999.ebuild | 2 +-
 kde-apps/gwenview/gwenview-9999.ebuild          | 2 +-
 kde-apps/okular/okular-20.12.49.9999.ebuild     | 2 +-
 kde-apps/okular/okular-9999.ebuild              | 2 +-
 kde-frameworks/khtml/khtml-9999.ebuild          | 2 +-
 media-gfx/digikam/digikam-9999.ebuild           | 2 +-
 media-gfx/kphotoalbum/kphotoalbum-9999.ebuild   | 2 +-
 media-gfx/krita/krita-9999.ebuild               | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-20.12.49.9999.ebuild b/kde-apps/gwenview/gwenview-20.12.49.9999.ebuild
index c9b69f8b37..52b827017f 100644
--- a/kde-apps/gwenview/gwenview-20.12.49.9999.ebuild
+++ b/kde-apps/gwenview/gwenview-20.12.49.9999.ebuild
@@ -45,10 +45,10 @@ COMMON_DEPEND="
 	>=kde-frameworks/solid-${KFMIN}:5
 	media-gfx/exiv2:=
 	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
 	media-libs/libpng:0=
 	>=media-libs/phonon-4.11.0
 	media-libs/tiff
+	virtual/jpeg:0
 	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 	fits? ( sci-libs/cfitsio )
 	kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )

diff --git a/kde-apps/gwenview/gwenview-9999.ebuild b/kde-apps/gwenview/gwenview-9999.ebuild
index c9b69f8b37..52b827017f 100644
--- a/kde-apps/gwenview/gwenview-9999.ebuild
+++ b/kde-apps/gwenview/gwenview-9999.ebuild
@@ -45,10 +45,10 @@ COMMON_DEPEND="
 	>=kde-frameworks/solid-${KFMIN}:5
 	media-gfx/exiv2:=
 	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
 	media-libs/libpng:0=
 	>=media-libs/phonon-4.11.0
 	media-libs/tiff
+	virtual/jpeg:0
 	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 	fits? ( sci-libs/cfitsio )
 	kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )

diff --git a/kde-apps/okular/okular-20.12.49.9999.ebuild b/kde-apps/okular/okular-20.12.49.9999.ebuild
index 1098c59a9a..8f80cd0cd9 100644
--- a/kde-apps/okular/okular-20.12.49.9999.ebuild
+++ b/kde-apps/okular/okular-20.12.49.9999.ebuild
@@ -56,7 +56,7 @@ DEPEND="
 	markdown? ( app-text/discount )
 	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
 	pdf? ( app-text/poppler[qt5] )
-	plucker? ( media-libs/libjpeg-turbo:= )
+	plucker? ( virtual/jpeg:0 )
 	postscript? ( app-text/libspectre )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index c306f66c13..fe8d00a846 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -56,7 +56,7 @@ DEPEND="
 	markdown? ( app-text/discount )
 	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
 	pdf? ( app-text/poppler[nss,qt5] )
-	plucker? ( media-libs/libjpeg-turbo:= )
+	plucker? ( virtual/jpeg:0 )
 	postscript? ( app-text/libspectre )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )

diff --git a/kde-frameworks/khtml/khtml-9999.ebuild b/kde-frameworks/khtml/khtml-9999.ebuild
index 6253c629e7..43c4e8901f 100644
--- a/kde-frameworks/khtml/khtml-9999.ebuild
+++ b/kde-frameworks/khtml/khtml-9999.ebuild
@@ -47,10 +47,10 @@ RDEPEND="
 	=kde-frameworks/kxmlgui-${PVCUT}*:5
 	=kde-frameworks/sonnet-${PVCUT}*:5
 	media-libs/giflib:=
-	media-libs/libjpeg-turbo:=
 	media-libs/libpng:0=
 	>=media-libs/phonon-4.11.0
 	sys-libs/zlib
+	virtual/jpeg:0
 	!libressl? ( dev-libs/openssl:0 )
 	libressl? ( dev-libs/libressl )
 	X? (

diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild
index f09f9c4d12..73ceac0b60 100644
--- a/media-gfx/digikam/digikam-9999.ebuild
+++ b/media-gfx/digikam/digikam-9999.ebuild
@@ -61,11 +61,11 @@ COMMON_DEPEND="
 	>=kde-frameworks/solid-${KFMIN}:5
 	>=media-gfx/exiv2-0.27:=
 	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
 	media-libs/liblqr
 	media-libs/libpng:0=
 	>=media-libs/opencv-3.3.0:=[contrib,contribdnn]
 	media-libs/tiff:0
+	virtual/jpeg:0
 	addressbook? (
 		>=kde-apps/akonadi-contacts-19.04.3:5
 		>=kde-frameworks/kcontacts-${KFMIN}:5

diff --git a/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild b/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild
index b78fd50e3c..05d99b7e2d 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild
@@ -41,8 +41,8 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	media-gfx/exiv2:=
-	media-libs/libjpeg-turbo:=
 	>=media-libs/phonon-4.11.0
+	virtual/jpeg:0
 	map? ( kde-apps/marble:5 )
 	raw? ( kde-apps/libkdcraw:5 )
 	share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )

diff --git a/media-gfx/krita/krita-9999.ebuild b/media-gfx/krita/krita-9999.ebuild
index 39d0533373..23b774faba 100644
--- a/media-gfx/krita/krita-9999.ebuild
+++ b/media-gfx/krita/krita-9999.ebuild
@@ -68,7 +68,7 @@ RDEPEND="${PYTHON_DEPS}
 	fftw? ( sci-libs/fftw:3.0= )
 	gif? ( media-libs/giflib )
 	gsl? ( sci-libs/gsl:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg? ( virtual/jpeg:0 )
 	heif? ( media-libs/libheif:= )
 	mypaint-brush-engine? ( media-libs/libmypaint:= )
 	openexr? (