Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/gwenview/, kde-apps/okular/, media-gfx/kphotoalbum/, ...
Date: Sat, 30 Jan 2021 17:59:47
Message-Id: 1612028734.df8e8b4720c3aa258d743ac120a43cd8e846529c.asturm@gentoo
1 commit: df8e8b4720c3aa258d743ac120a43cd8e846529c
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 30 17:45:34 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 30 17:45:34 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=df8e8b47
7
8 */*: Revert "Switch from virtual/jpeg to media-libs/libjpeg-turbo:="
9
10 All packages checked were linking to libjpeg.so.
11
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 kde-apps/gwenview/gwenview-20.12.49.9999.ebuild | 2 +-
15 kde-apps/gwenview/gwenview-9999.ebuild | 2 +-
16 kde-apps/okular/okular-20.12.49.9999.ebuild | 2 +-
17 kde-apps/okular/okular-9999.ebuild | 2 +-
18 kde-frameworks/khtml/khtml-9999.ebuild | 2 +-
19 media-gfx/digikam/digikam-9999.ebuild | 2 +-
20 media-gfx/kphotoalbum/kphotoalbum-9999.ebuild | 2 +-
21 media-gfx/krita/krita-9999.ebuild | 2 +-
22 8 files changed, 8 insertions(+), 8 deletions(-)
23
24 diff --git a/kde-apps/gwenview/gwenview-20.12.49.9999.ebuild b/kde-apps/gwenview/gwenview-20.12.49.9999.ebuild
25 index c9b69f8b37..52b827017f 100644
26 --- a/kde-apps/gwenview/gwenview-20.12.49.9999.ebuild
27 +++ b/kde-apps/gwenview/gwenview-20.12.49.9999.ebuild
28 @@ -45,10 +45,10 @@ COMMON_DEPEND="
29 >=kde-frameworks/solid-${KFMIN}:5
30 media-gfx/exiv2:=
31 media-libs/lcms:2
32 - media-libs/libjpeg-turbo:=
33 media-libs/libpng:0=
34 >=media-libs/phonon-4.11.0
35 media-libs/tiff
36 + virtual/jpeg:0
37 activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
38 fits? ( sci-libs/cfitsio )
39 kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
40
41 diff --git a/kde-apps/gwenview/gwenview-9999.ebuild b/kde-apps/gwenview/gwenview-9999.ebuild
42 index c9b69f8b37..52b827017f 100644
43 --- a/kde-apps/gwenview/gwenview-9999.ebuild
44 +++ b/kde-apps/gwenview/gwenview-9999.ebuild
45 @@ -45,10 +45,10 @@ COMMON_DEPEND="
46 >=kde-frameworks/solid-${KFMIN}:5
47 media-gfx/exiv2:=
48 media-libs/lcms:2
49 - media-libs/libjpeg-turbo:=
50 media-libs/libpng:0=
51 >=media-libs/phonon-4.11.0
52 media-libs/tiff
53 + virtual/jpeg:0
54 activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
55 fits? ( sci-libs/cfitsio )
56 kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
57
58 diff --git a/kde-apps/okular/okular-20.12.49.9999.ebuild b/kde-apps/okular/okular-20.12.49.9999.ebuild
59 index 1098c59a9a..8f80cd0cd9 100644
60 --- a/kde-apps/okular/okular-20.12.49.9999.ebuild
61 +++ b/kde-apps/okular/okular-20.12.49.9999.ebuild
62 @@ -56,7 +56,7 @@ DEPEND="
63 markdown? ( app-text/discount )
64 mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
65 pdf? ( app-text/poppler[qt5] )
66 - plucker? ( media-libs/libjpeg-turbo:= )
67 + plucker? ( virtual/jpeg:0 )
68 postscript? ( app-text/libspectre )
69 share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
70 speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
71
72 diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
73 index c306f66c13..fe8d00a846 100644
74 --- a/kde-apps/okular/okular-9999.ebuild
75 +++ b/kde-apps/okular/okular-9999.ebuild
76 @@ -56,7 +56,7 @@ DEPEND="
77 markdown? ( app-text/discount )
78 mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
79 pdf? ( app-text/poppler[nss,qt5] )
80 - plucker? ( media-libs/libjpeg-turbo:= )
81 + plucker? ( virtual/jpeg:0 )
82 postscript? ( app-text/libspectre )
83 share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
84 speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
85
86 diff --git a/kde-frameworks/khtml/khtml-9999.ebuild b/kde-frameworks/khtml/khtml-9999.ebuild
87 index 6253c629e7..43c4e8901f 100644
88 --- a/kde-frameworks/khtml/khtml-9999.ebuild
89 +++ b/kde-frameworks/khtml/khtml-9999.ebuild
90 @@ -47,10 +47,10 @@ RDEPEND="
91 =kde-frameworks/kxmlgui-${PVCUT}*:5
92 =kde-frameworks/sonnet-${PVCUT}*:5
93 media-libs/giflib:=
94 - media-libs/libjpeg-turbo:=
95 media-libs/libpng:0=
96 >=media-libs/phonon-4.11.0
97 sys-libs/zlib
98 + virtual/jpeg:0
99 !libressl? ( dev-libs/openssl:0 )
100 libressl? ( dev-libs/libressl )
101 X? (
102
103 diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild
104 index f09f9c4d12..73ceac0b60 100644
105 --- a/media-gfx/digikam/digikam-9999.ebuild
106 +++ b/media-gfx/digikam/digikam-9999.ebuild
107 @@ -61,11 +61,11 @@ COMMON_DEPEND="
108 >=kde-frameworks/solid-${KFMIN}:5
109 >=media-gfx/exiv2-0.27:=
110 media-libs/lcms:2
111 - media-libs/libjpeg-turbo:=
112 media-libs/liblqr
113 media-libs/libpng:0=
114 >=media-libs/opencv-3.3.0:=[contrib,contribdnn]
115 media-libs/tiff:0
116 + virtual/jpeg:0
117 addressbook? (
118 >=kde-apps/akonadi-contacts-19.04.3:5
119 >=kde-frameworks/kcontacts-${KFMIN}:5
120
121 diff --git a/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild b/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild
122 index b78fd50e3c..05d99b7e2d 100644
123 --- a/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild
124 +++ b/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild
125 @@ -41,8 +41,8 @@ DEPEND="
126 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
127 >=kde-frameworks/kxmlgui-${KFMIN}:5
128 media-gfx/exiv2:=
129 - media-libs/libjpeg-turbo:=
130 >=media-libs/phonon-4.11.0
131 + virtual/jpeg:0
132 map? ( kde-apps/marble:5 )
133 raw? ( kde-apps/libkdcraw:5 )
134 share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
135
136 diff --git a/media-gfx/krita/krita-9999.ebuild b/media-gfx/krita/krita-9999.ebuild
137 index 39d0533373..23b774faba 100644
138 --- a/media-gfx/krita/krita-9999.ebuild
139 +++ b/media-gfx/krita/krita-9999.ebuild
140 @@ -68,7 +68,7 @@ RDEPEND="${PYTHON_DEPS}
141 fftw? ( sci-libs/fftw:3.0= )
142 gif? ( media-libs/giflib )
143 gsl? ( sci-libs/gsl:= )
144 - jpeg? ( media-libs/libjpeg-turbo:= )
145 + jpeg? ( virtual/jpeg:0 )
146 heif? ( media-libs/libheif:= )
147 mypaint-brush-engine? ( media-libs/libmypaint:= )
148 openexr? (