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

["Marc Schiffbauer" <mschiff@gentoo.org>]

commit:     23bdb098acd7462b85a568a935b0cbe97d3cb7d7
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 22 06:16:34 2025 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Tue Apr 22 06:21:34 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23bdb098

www-apps/bareos-webui: drop 22.1.2, 22.1.6, add 22.1.7

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

 www-apps/bareos-webui/Manifest                     |   3 +-
 www-apps/bareos-webui/bareos-webui-22.1.2.ebuild   | 108 ---------------------
 ...ui-22.1.6.ebuild => bareos-webui-22.1.7.ebuild} |   2 +-
 3 files changed, 2 insertions(+), 111 deletions(-)

diff --git a/www-apps/bareos-webui/Manifest b/www-apps/bareos-webui/Manifest
index a2d7c8a51b9a..f5c538680c93 100644
--- a/www-apps/bareos-webui/Manifest
+++ b/www-apps/bareos-webui/Manifest
@@ -1,5 +1,4 @@
-DIST bareos-22.1.2.tar.gz 14746158 BLAKE2B 5d8c9c098f61bd35b11f907a3e215a7c08b504c3e529c67a4c8c5cbbf24775158966800e63efca260b4cc513417332cdf43a158d21684f09be3d89dd93258880 SHA512 76d53425b2a28f4f7887b323a70bf9b37df44302e0e25aff7156c1b3ee26ffa60bbfb45ed29a0f2fe763d5c38b8f7135ac2a3e405d8e2b10717f4893baf9c327
-DIST bareos-22.1.6.tar.gz 14758055 BLAKE2B e49c2f6b38394b71a15e4826286a761e78b8c301429843630bbf024a76505381a84581296e7bcdd537bf04194e10abc3c8b4f358234ae968a10163993c9451bc SHA512 6fda879ed6ac05843d9c8c0da16228e2b009ee094230ce7cec0deb9125723f1bd8964517c355f61fda34ee5664ebaf4e76b3c6ce2b0e9b88c66788abf5d9b93e
+DIST bareos-22.1.7.tar.gz 13102201 BLAKE2B d7311dd8b72a164e371243b07c71721e6997061e01fc3237724d5f5ad885f67bea187e9e37e0e01f0b92110e6386ffe113708b390cf2bfd17eb9910c5fe84883 SHA512 f7884a1e6da156c5d31e10268047dd6d5f8a4cc5ad238a8407564b4c228fc7c06f313ba01cad8e0056b8df81eb0cb16892b0ed6cca5ae91c150aa2bb4c4fc807
 DIST bareos-23.1.0.tar.gz 14002357 BLAKE2B f063bf0d4ce422766f8d71133e69ed39bf914672f2ff3321d792cd28bf58d6e2daac53a1fe48586e4accd6a895e9ef83b17e51e3f6b4dabccf7c54bf02fb2680 SHA512 480a7f420c7f0a626f5261e0b9c136f3ed71f08ee09ce9d493b66645e0f2c5dc00455719a3ce06a57a5424206b1c0f62cd19904f83bcaaa45066726a6b223281
 DIST bareos-23.1.3.tar.gz 14009664 BLAKE2B 767796804eb6baa6e108430a8e25de51562a99212537607a43e727702cdc3dfbd2b11365d2efca518d62518970ee53779ff2fa1d369995c4bee5b2478ee689a6 SHA512 bec95f0278a68a7ab6a96e6af97cd7c30af411a2b8eba5aa73fa1f9d33f952d5eb60c79b9d29010ce2a91855edff351d8a7143d4399709769a76925d8909e764
 DIST bareos-24.0.1.tar.gz 13332658 BLAKE2B 1b5468a18816df51d77f465ff0ee9fc142b6b32e69e9875e0ae5deba8e57329f3eb142ad838c6889c2e6d7bae9cdf7e52358bd9c9dd36c6a62b98c4be21f9581 SHA512 ec510282f9b4bc5b80fddd706111ed891d776a713f4f2548fc48ea45bb59f636b92ae0c2d146c11c598f3d47a5bd9975220b0435123d084ed351ca3053110a8c

diff --git a/www-apps/bareos-webui/bareos-webui-22.1.2.ebuild b/www-apps/bareos-webui/bareos-webui-22.1.2.ebuild
deleted file mode 100644
index 1891ba820469..000000000000
--- a/www-apps/bareos-webui/bareos-webui-22.1.2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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 git-r3
-	S=${WORKDIR}/${PF}/webui
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
-else
-	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"
-fi
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bareos.org/"
-RESTRICT="mirror"
-
-LICENSE="AGPL-3"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-lang/php[bzip2,ctype,curl,fileinfo,filter,fpm,gd,iconv,intl,mhash,nls,pdo,postgres,session,simplexml,ssl,xml,xmlreader,xmlwriter,zip]
-	virtual/httpd-php
-"
-
-need_httpd
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_prepare() {
-	# fix missing VERSION
-	sed -i "s/@BAREOS_FULL_VERSION@/${PV}/g" version.php.in || die
-
-	cmake_src_prepare
-	default
-}
-
-src_configure() {
-	if [[ ${PV} == 9999 ]]; then
-		pushd "${WORKDIR}/${PF}"
-	else
-		pushd "${S}"/..
-	fi
-	CURRENT_VERSION=$(echo $(cmake -P get_version.cmake) | sed 's/[- ]//g')
-	popd
-	local mycmakeargs=(
-		-DVERSION_STRING=${CURRENT_VERSION}
-		-Wno-dev
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README.md doc/README-TRANSLATION.md
-
-	dodir /etc/bareos/bareos-dir.d
-	cp -r install/bareos/bareos-dir.d/* "${D}"/etc/bareos/bareos-dir.d
-
-	webapp_server_configfile nginx "${FILESDIR}"/nginx.include
-	webapp_server_configfile apache "${FILESDIR}"/apache.conf
-
-	insinto /etc/"${PN}"
-	doins install/{configuration,directors}.ini
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/config/application.config.php
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/config/autoload/global.php
-
-	keepdir "${MY_HTDOCSDIR#${EPREFIX}}"/data
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/data
-
-	# cleanup
-	find  "${D}/${MY_HTDOCSDIR#${EPREFIX}}" -name "*.in" -delete
-	rm -rf "${D}/${MY_HTDOCSDIR#${EPREFIX}}"/{CMakeLists.txt,install,cmake,phpunit.xml,scripts,doc,tests}
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "The webui uses 'webapp-config' to be installed to the webservers docroot"
-	einfo "E.g. to install webapp-config may be called like so:"
-	einfo ""
-	einfo "  ~# webapp-config -h localhost -d bareos-webui -I bareos-webui ${PV}"
-	einfo ""
-	einfo "See 'man webapp-config' for details."
-	einfo ""
-}

diff --git a/www-apps/bareos-webui/bareos-webui-22.1.6.ebuild b/www-apps/bareos-webui/bareos-webui-22.1.7.ebuild
similarity index 98%
rename from www-apps/bareos-webui/bareos-webui-22.1.6.ebuild
rename to www-apps/bareos-webui/bareos-webui-22.1.7.ebuild
index 77c9bfd5119b..19ec8cbbb7ad 100644
--- a/www-apps/bareos-webui/bareos-webui-22.1.6.ebuild
+++ b/www-apps/bareos-webui/bareos-webui-22.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8