Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/kde-frameworks/khtml
diff options
context:
space:
mode:
Diffstat (limited to 'kde-frameworks/khtml')
-rw-r--r--kde-frameworks/khtml/Manifest3
-rw-r--r--kde-frameworks/khtml/khtml-5.115.0.ebuild (renamed from kde-frameworks/khtml/khtml-5.77.0.ebuild)35
-rw-r--r--kde-frameworks/khtml/khtml-5.79.0.ebuild72
-rw-r--r--kde-frameworks/khtml/metadata.xml10
4 files changed, 28 insertions, 92 deletions
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 3a724cda03ba..5bf2bcc69881 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,2 +1 @@
-DIST khtml-5.77.0.tar.xz 2089548 BLAKE2B 6c9487884da7d23bcc4794f5a023b575da75950179d4a52cbded94ce70c47793adb0dba6d2dafc2b529faa3d32eed66d86833d8341f2d85478a1087ae307aae2 SHA512 9a38133c4dc8aa49199c78ae221f5b678fd1294781a5f37918d6ca600201d718d22ff193f3ba9bb29b298f4f488d57fcadd6e51ad40e943b3ad5b3360e120939
-DIST khtml-5.79.0.tar.xz 2089572 BLAKE2B a64e02ff526c8dd79aa72f221f001bdd3469f622be27be84ef37a8ec0ece0f63ab58f0785e9a773c05daa0bb37f9734f643c6de5ed2126b45473f5547ac95558 SHA512 3e77964bd66aee361712e06e09d3cbf92fea9603da304a064e6974a4ce00504367b3455cc435a942737724e8b26a4b0dc07de4d9da656ac9ad57049062b7ccaf
+DIST khtml-5.115.0.tar.xz 4012440 BLAKE2B 490005551036e3b14cd036af07fed97e2109fa4c6c2782f4086bdf612688652d1992b19b2d83c26efa70d4ea0025f96e6398df9fe0f803f6fee6ae03311379d5 SHA512 0141aca1b04a779522fb7a7c93e6ec1795b09cebe7f2b079698b076556b78aff807b90462199784e3fdfcddeb97da23a68910c52542994b39f327c5b4a4f1ddc
diff --git a/kde-frameworks/khtml/khtml-5.77.0.ebuild b/kde-frameworks/khtml/khtml-5.115.0.ebuild
index 20ce70d2e5e5..82be319b7559 100644
--- a/kde-frameworks/khtml/khtml-5.77.0.ebuild
+++ b/kde-frameworks/khtml/khtml-5.115.0.ebuild
@@ -1,24 +1,21 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_QTHELP="false"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+QTMIN=5.15.9
+inherit ecm flag-o-matic frameworks.kde.org
DESCRIPTION="KHTML web rendering engine"
+
LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="libressl X"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="X"
-BDEPEND="
- dev-lang/perl
- dev-util/gperf
-"
RDEPEND="
+ dev-libs/openssl:0
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
@@ -43,16 +40,14 @@ RDEPEND="
=kde-frameworks/ktextwidgets-${PVCUT}*:5
=kde-frameworks/kwallet-${PVCUT}*:5
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
=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
+ >=media-libs/phonon-4.11.0[qt5(+)]
sys-libs/zlib
- virtual/jpeg:0
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
X? (
>=dev-qt/qtx11extras-${QTMIN}:5
x11-libs/libX11
@@ -62,10 +57,16 @@ DEPEND="${RDEPEND}
test? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
X? ( x11-base/xorg-proto )
"
+BDEPEND="
+ dev-lang/perl
+ dev-util/gperf
+"
src_configure() {
+ filter-lto # bug 921686
+
local mycmakeargs=(
- $(cmake_use_find_package X X11)
+ -DWITH_X11=$(usex X)
)
ecm_src_configure
diff --git a/kde-frameworks/khtml/khtml-5.79.0.ebuild b/kde-frameworks/khtml/khtml-5.79.0.ebuild
deleted file mode 100644
index 5a233aba9a24..000000000000
--- a/kde-frameworks/khtml/khtml-5.79.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KHTML web rendering engine"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="libressl X"
-
-BDEPEND="
- dev-lang/perl
- dev-util/gperf
-"
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kcodecs-${PVCUT}*:5
- =kde-frameworks/kcompletion-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kglobalaccel-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kio-${PVCUT}*:5
- =kde-frameworks/kjobwidgets-${PVCUT}*:5
- =kde-frameworks/kjs-${PVCUT}*:5
- =kde-frameworks/knotifications-${PVCUT}*:5
- =kde-frameworks/kparts-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/ktextwidgets-${PVCUT}*:5
- =kde-frameworks/kwallet-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
- =kde-frameworks/sonnet-${PVCUT}*:5
- media-libs/giflib:=
- 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? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- )
-"
-DEPEND="${RDEPEND}
- test? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
- X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/khtml/metadata.xml b/kde-frameworks/khtml/metadata.xml
index 2fdbf33d963d..506ecf605bc4 100644
--- a/kde-frameworks/khtml/metadata.xml
+++ b/kde-frameworks/khtml/metadata.xml
@@ -1,8 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
+ <upstream>
+ <bugs-to>https://bugs.kde.org/</bugs-to>
+ </upstream>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
</pkgmetadata>