diff options
| author |   Marc Schiffbauer <mschiff@gentoo.org> | 2023-12-05 16:59:06 +0100 |
|---|---|---|
| committer | Marc Schiffbauer <mschiff@gentoo.org> | 2023-12-05 17:00:27 +0100 |
| commit | 3bc583ad649bc07da19a8381a7a35efb895d8ce0 (patch) | |
| tree | 03ec87488351b5b7ab07f7404265dfae42969c0e /www-apps/bareos-webui | |
| parent | sys-apps/fwupd-efi: fix llvm-objcopy build error (diff) | |
| download | gentoo-3bc583ad649bc07da19a8381a7a35efb895d8ce0.tar.gz gentoo-3bc583ad649bc07da19a8381a7a35efb895d8ce0.tar.bz2 gentoo-3bc583ad649bc07da19a8381a7a35efb895d8ce0.zip | |
www-apps/bareos-webui: fix DuplicateEclassInherit
Signed-off-by: Marc Schiffbauer <mschiff@gentoo.org>
Diffstat (limited to 'www-apps/bareos-webui')
| -rw-r--r-- | www-apps/bareos-webui/bareos-webui-22.1.2.ebuild | 7 | ||||
| -rw-r--r-- | 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" |