From 43dd3aa0f40c1753cde839e94f3898d889610f2d Mon Sep 17 00:00:00 2001
From: Marc Schiffbauer <mschiff@gentoo.org>
Date: Thu, 14 Nov 2024 00:20:37 +0100
Subject: www-apps/bareos-webui: add 23.1.0, drop 23.0.2

Signed-off-by: Marc Schiffbauer <mschiff@gentoo.org>
---
 www-apps/bareos-webui/Manifest                   |   2 +-
 www-apps/bareos-webui/bareos-webui-23.0.2.ebuild | 108 -----------------------
 www-apps/bareos-webui/bareos-webui-23.1.0.ebuild | 107 ++++++++++++++++++++++
 3 files changed, 108 insertions(+), 109 deletions(-)
 delete mode 100644 www-apps/bareos-webui/bareos-webui-23.0.2.ebuild
 create mode 100644 www-apps/bareos-webui/bareos-webui-23.1.0.ebuild

(limited to 'www-apps')

diff --git a/www-apps/bareos-webui/Manifest b/www-apps/bareos-webui/Manifest
index 9f3fa2522b50..ede82ca0967c 100644
--- a/www-apps/bareos-webui/Manifest
+++ b/www-apps/bareos-webui/Manifest
@@ -1,4 +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-23.0.2.tar.gz 14724410 BLAKE2B 0fe86c10d62ad322dfbcd5ac972aec27d6f0ad31e156d359398739b2bfd784a02ce89b26b6bdfcf279265114a4e6e13efe21edab8b87cff15f1f9f3ad055c64b SHA512 a8d8270c8060480fe87da9252de86a75eea1cc427db63536f848d19a2c23c499ca294a9656d9a6aac73a756f84c96a2d72f13d1cede7948e18bf93efc2ecfc29
 DIST bareos-23.0.4.tar.gz 13954430 BLAKE2B dfeea6ca63be1cb376507a1270cc835d8f6ea336a8cf9c07ac74a2817d84f044da7ac974b11a34b3d6c8a66ed4cb27a1e9ba06b4dad697937e6068181f42eb03 SHA512 50686548cb2bb398d524fa208db97a68e30f40e53ac8a8f57182157e713d743baf8a3177453327943b17de128f6dd6c5b5de0fe65ddcedf7cbca715e7ae05bd5
+DIST bareos-23.1.0.tar.gz 14002357 BLAKE2B f063bf0d4ce422766f8d71133e69ed39bf914672f2ff3321d792cd28bf58d6e2daac53a1fe48586e4accd6a895e9ef83b17e51e3f6b4dabccf7c54bf02fb2680 SHA512 480a7f420c7f0a626f5261e0b9c136f3ed71f08ee09ce9d493b66645e0f2c5dc00455719a3ce06a57a5424206b1c0f62cd19904f83bcaaa45066726a6b223281
diff --git a/www-apps/bareos-webui/bareos-webui-23.0.2.ebuild b/www-apps/bareos-webui/bareos-webui-23.0.2.ebuild
deleted file mode 100644
index 1891ba820469..000000000000
--- a/www-apps/bareos-webui/bareos-webui-23.0.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-23.1.0.ebuild b/www-apps/bareos-webui/bareos-webui-23.1.0.ebuild
new file mode 100644
index 000000000000..77c9bfd5119b
--- /dev/null
+++ b/www-apps/bareos-webui/bareos-webui-23.1.0.ebuild
@@ -0,0 +1,107 @@
+# 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/"
+LICENSE="AGPL-3"
+RESTRICT="mirror"
+
+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 ""
+}
-- 
cgit v1.2.3-65-gdbad