[gentoo-commits] repo/gentoo:master commit in: www-apps/bareos-webui/

[Marc Schiffbauer]

commit:     3bc583ad649bc07da19a8381a7a35efb895d8ce0
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  5 15:59:06 2023 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Tue Dec  5 16:00:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bc583ad

www-apps/bareos-webui: fix DuplicateEclassInherit

Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org>

 www-apps/bareos-webui/bareos-webui-22.1.2.ebuild | 7 ++++---
 www-apps/bareos-webui/bareos-webui-9999.ebuild   | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/www-apps/bareos-webui/bareos-webui-22.1.2.ebuild 
b/www-apps/bareos-webui/bareos-webui-22.1.2.ebuild
index c4e88a5fb0e1..6aad5017bec6 100644
--- a/www-apps/bareos-webui/bareos-webui-22.1.2.ebuild
+++ b/www-apps/bareos-webui/bareos-webui-22.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,18 +6,19 @@ EAPI=8
 CMAKE_WARN_UNUSED_CLI=no
 CMAKE_MAKEFILE_GENERATOR="emake"
 
+inherit cmake webapp
+
 MY_PV=${PV/_/-}
 MY_PN="bareos"
 MY_P="${MY_PN}-${MY_PV}"
 
 if [[ ${PV} == 9999 ]]; then
-       inherit cmake webapp git-r3
+       inherit git-r3
        S=${WORKDIR}/${PF}/webui
        SRC_URI=""
        EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git";
        KEYWORDS=""
 else
-       inherit cmake webapp
        S=${WORKDIR}/${MY_PN}-Release-${PV}/webui
        
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/Release/${MY_PV}.tar.gz 
-> ${MY_P}.tar.gz"
        KEYWORDS="~amd64 ~x86"

diff --git a/www-apps/bareos-webui/bareos-webui-9999.ebuild 
b/www-apps/bareos-webui/bareos-webui-9999.ebuild
index 3fa8560579d8..6aad5017bec6 100644
--- a/www-apps/bareos-webui/bareos-webui-9999.ebuild
+++ b/www-apps/bareos-webui/bareos-webui-9999.ebuild
@@ -6,18 +6,19 @@ EAPI=8
 CMAKE_WARN_UNUSED_CLI=no
 CMAKE_MAKEFILE_GENERATOR="emake"
 
+inherit cmake webapp
+
 MY_PV=${PV/_/-}
 MY_PN="bareos"
 MY_P="${MY_PN}-${MY_PV}"
 
 if [[ ${PV} == 9999 ]]; then
-       inherit cmake webapp git-r3
+       inherit git-r3
        S=${WORKDIR}/${PF}/webui
        SRC_URI=""
        EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git";
        KEYWORDS=""
 else
-       inherit cmake webapp
        S=${WORKDIR}/${MY_PN}-Release-${PV}/webui
        
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/Release/${MY_PV}.tar.gz 
-> ${MY_P}.tar.gz"
        KEYWORDS="~amd64 ~x86"