commit: 2b5890e83c87fca4de755fbb33b0965f49a1737c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 15 12:21:29 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 15 13:22:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b5890e8
x11-themes/oxygen-gtk: EAPI-8 bump
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild | 13 +++++--------
x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild | 13 +++++--------
2 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild
b/x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild
index 8f1e41d55b76..c521d8ddc331 100644
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-CMAKE_ECLASS=cmake
MY_PN=${PN}3
MY_P=${MY_PN}-${PV}
inherit cmake-multilib
@@ -11,13 +10,12 @@ inherit cmake-multilib
DESCRIPTION="Official GTK+:3 port of KDE's Oxygen widget style"
HOMEPAGE="https://store.kde.org/p/1005553/"
SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~ppc x86"
SLOT="3"
-IUSE="debug"
+KEYWORDS="amd64 ~ppc x86"
-BDEPEND="virtual/pkgconfig"
DEPEND="
dev-libs/dbus-glib[${MULTILIB_USEDEP}]
dev-libs/glib:2[${MULTILIB_USEDEP}]
@@ -30,6 +28,7 @@ DEPEND="
RDEPEND="${DEPEND}
!x11-themes/oxygen-gtk:0
"
+BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${P}-gtk-3.14.patch"
@@ -37,8 +36,6 @@ PATCHES=(
"${FILESDIR}/${PN}-1.4.6-tabstyle.patch"
)
-S=${WORKDIR}/${MY_P}
-
multilib_src_configure() {
if ! multilib_is_native_abi; then
local mycmakeargs=(
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild
b/x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild
index deac2e20f0e3..c10ba3f64989 100644
--- a/x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-CMAKE_ECLASS=cmake
MY_PN=${PN}2
MY_P=${MY_PN}-${PV}
inherit cmake-multilib
@@ -11,13 +10,12 @@ inherit cmake-multilib
DESCRIPTION="Official GTK+:2 port of KDE's Oxygen widget style"
HOMEPAGE="https://store.kde.org/p/1005553/"
SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~ppc x86"
SLOT="2"
-IUSE="debug"
+KEYWORDS="amd64 ~ppc x86"
-BDEPEND="virtual/pkgconfig"
DEPEND="
dev-libs/dbus-glib[${MULTILIB_USEDEP}]
dev-libs/glib:2[${MULTILIB_USEDEP}]
@@ -30,6 +28,7 @@ DEPEND="
RDEPEND="${DEPEND}
!x11-themes/oxygen-gtk:0
"
+BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${P}-xul.patch"
@@ -40,8 +39,6 @@ PATCHES=(
"${FILESDIR}/${P}-tabstyle.patch"
)
-S=${WORKDIR}/${MY_P}
-
multilib_src_configure() {
if ! multilib_is_native_abi; then
local mycmakeargs=(