public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: www-apps/bareos-webui/
@ 2023-12-05 14:56 Marc Schiffbauer
  0 siblings, 0 replies; 10+ messages in thread
From: Marc Schiffbauer @ 2023-12-05 14:56 UTC (permalink / raw
  To: gentoo-commits

commit:     e849c8712e22bbda6743a89f48aa73e4591078b6
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  5 14:55:49 2023 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Tue Dec  5 14:56:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e849c871

www-apps/bareos-webui: add 22.1.2, drop 22.1.0

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

 www-apps/bareos-webui/Manifest                                          | 2 +-
 .../{bareos-webui-22.1.0.ebuild => bareos-webui-22.1.2.ebuild}          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/bareos-webui/Manifest b/www-apps/bareos-webui/Manifest
index ede21f58a067..f5a1721f35bd 100644
--- a/www-apps/bareos-webui/Manifest
+++ b/www-apps/bareos-webui/Manifest
@@ -1 +1 @@
-DIST bareos-22.1.0.tar.gz 14719993 BLAKE2B 38e354d3227d401c69ffb003c83ae90c2067720490af089d529da636bc300e2fb5042451ab439b8b102f6850aeadbe8dedc4311dba13f800eab0bc77d89f809d SHA512 dea64c6eb34a93f1a93eb6b0ac628a75101ac8873e06800a256f226e8f3a556fe39ce4e500246f9c51de30a2b0907732f789c6394f29b7bb9d983a64c709ad2c
+DIST bareos-22.1.2.tar.gz 14746158 BLAKE2B 5d8c9c098f61bd35b11f907a3e215a7c08b504c3e529c67a4c8c5cbbf24775158966800e63efca260b4cc513417332cdf43a158d21684f09be3d89dd93258880 SHA512 76d53425b2a28f4f7887b323a70bf9b37df44302e0e25aff7156c1b3ee26ffa60bbfb45ed29a0f2fe763d5c38b8f7135ac2a3e405d8e2b10717f4893baf9c327

diff --git a/www-apps/bareos-webui/bareos-webui-22.1.0.ebuild b/www-apps/bareos-webui/bareos-webui-22.1.2.ebuild
similarity index 98%
rename from www-apps/bareos-webui/bareos-webui-22.1.0.ebuild
rename to www-apps/bareos-webui/bareos-webui-22.1.2.ebuild
index 3fa8560579d8..c4e88a5fb0e1 100644
--- a/www-apps/bareos-webui/bareos-webui-22.1.0.ebuild
+++ b/www-apps/bareos-webui/bareos-webui-22.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/bareos-webui/
@ 2023-12-05 16:00 Marc Schiffbauer
  0 siblings, 0 replies; 10+ messages in thread
From: Marc Schiffbauer @ 2023-12-05 16:00 UTC (permalink / raw
  To: gentoo-commits

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"


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/bareos-webui/
@ 2023-12-05 16:04 Marc Schiffbauer
  0 siblings, 0 replies; 10+ messages in thread
From: Marc Schiffbauer @ 2023-12-05 16:04 UTC (permalink / raw
  To: gentoo-commits

commit:     deb7fb1208e18feb6f19afbeed6794db13cb4d0d
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  5 16:03:31 2023 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Tue Dec  5 16:03:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deb7fb12

www-apps/bareos-webui: fix MultipleKeywordsLines

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

 www-apps/bareos-webui/bareos-webui-22.1.2.ebuild | 3 +--
 www-apps/bareos-webui/bareos-webui-9999.ebuild   | 3 +--
 2 files changed, 2 insertions(+), 4 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 6aad5017bec6..6d911f70e272 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-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,6 @@ if [[ ${PV} == 9999 ]]; then
 	S=${WORKDIR}/${PF}/webui
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
-	KEYWORDS=""
 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"

diff --git a/www-apps/bareos-webui/bareos-webui-9999.ebuild b/www-apps/bareos-webui/bareos-webui-9999.ebuild
index 6aad5017bec6..6d911f70e272 100644
--- a/www-apps/bareos-webui/bareos-webui-9999.ebuild
+++ b/www-apps/bareos-webui/bareos-webui-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,6 @@ if [[ ${PV} == 9999 ]]; then
 	S=${WORKDIR}/${PF}/webui
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
-	KEYWORDS=""
 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"


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/bareos-webui/
@ 2024-02-26 16:50 Marc Schiffbauer
  0 siblings, 0 replies; 10+ messages in thread
From: Marc Schiffbauer @ 2024-02-26 16:50 UTC (permalink / raw
  To: gentoo-commits

commit:     7d56b9331e53066c52a7c92e9ca9043b40c0fc5a
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 26 16:50:08 2024 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Mon Feb 26 16:50:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d56b933

www-apps/bareos-webui: add 23.0.1

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

 www-apps/bareos-webui/Manifest                   |   1 +
 www-apps/bareos-webui/bareos-webui-23.0.1.ebuild | 110 +++++++++++++++++++++++
 2 files changed, 111 insertions(+)

diff --git a/www-apps/bareos-webui/Manifest b/www-apps/bareos-webui/Manifest
index f5a1721f35bd..d4c70edffeab 100644
--- a/www-apps/bareos-webui/Manifest
+++ b/www-apps/bareos-webui/Manifest
@@ -1 +1,2 @@
 DIST bareos-22.1.2.tar.gz 14746158 BLAKE2B 5d8c9c098f61bd35b11f907a3e215a7c08b504c3e529c67a4c8c5cbbf24775158966800e63efca260b4cc513417332cdf43a158d21684f09be3d89dd93258880 SHA512 76d53425b2a28f4f7887b323a70bf9b37df44302e0e25aff7156c1b3ee26ffa60bbfb45ed29a0f2fe763d5c38b8f7135ac2a3e405d8e2b10717f4893baf9c327
+DIST bareos-23.0.1.tar.gz 14728566 BLAKE2B e5fe93f0e412fcc4b4cb31f3e7d7dbcd44b3c0f76c387f17685d97880af88949998faae502531e937201c1622350d226c2cc9f432b0dfda7893a3fb03e905b5f SHA512 5e3902c33c08dedbdd8dc7c74c5a1258da22288a728ada283b541316a7bff2f7773d1875b11f8fe12368afda3fd1bb2780242ff57441ef8fd596f71ea1af1e75

diff --git a/www-apps/bareos-webui/bareos-webui-23.0.1.ebuild b/www-apps/bareos-webui/bareos-webui-23.0.1.ebuild
new file mode 100644
index 000000000000..446090d5394d
--- /dev/null
+++ b/www-apps/bareos-webui/bareos-webui-23.0.1.ebuild
@@ -0,0 +1,110 @@
+# 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"
+
+IUSE=""
+
+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 ""
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/bareos-webui/
@ 2024-03-08 12:19 Marc Schiffbauer
  0 siblings, 0 replies; 10+ messages in thread
From: Marc Schiffbauer @ 2024-03-08 12:19 UTC (permalink / raw
  To: gentoo-commits

commit:     1f789094876b3ec925c7a6a2f6729aae104b6f54
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  8 12:13:13 2024 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 12:19:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f789094

www-apps/bareos-webui: add 23.0.2

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

 www-apps/bareos-webui/Manifest                   |   1 +
 www-apps/bareos-webui/bareos-webui-23.0.2.ebuild | 110 +++++++++++++++++++++++
 2 files changed, 111 insertions(+)

diff --git a/www-apps/bareos-webui/Manifest b/www-apps/bareos-webui/Manifest
index d4c70edffeab..9f73b79b736e 100644
--- a/www-apps/bareos-webui/Manifest
+++ b/www-apps/bareos-webui/Manifest
@@ -1,2 +1,3 @@
 DIST bareos-22.1.2.tar.gz 14746158 BLAKE2B 5d8c9c098f61bd35b11f907a3e215a7c08b504c3e529c67a4c8c5cbbf24775158966800e63efca260b4cc513417332cdf43a158d21684f09be3d89dd93258880 SHA512 76d53425b2a28f4f7887b323a70bf9b37df44302e0e25aff7156c1b3ee26ffa60bbfb45ed29a0f2fe763d5c38b8f7135ac2a3e405d8e2b10717f4893baf9c327
 DIST bareos-23.0.1.tar.gz 14728566 BLAKE2B e5fe93f0e412fcc4b4cb31f3e7d7dbcd44b3c0f76c387f17685d97880af88949998faae502531e937201c1622350d226c2cc9f432b0dfda7893a3fb03e905b5f SHA512 5e3902c33c08dedbdd8dc7c74c5a1258da22288a728ada283b541316a7bff2f7773d1875b11f8fe12368afda3fd1bb2780242ff57441ef8fd596f71ea1af1e75
+DIST bareos-23.0.2.tar.gz 14724410 BLAKE2B 0fe86c10d62ad322dfbcd5ac972aec27d6f0ad31e156d359398739b2bfd784a02ce89b26b6bdfcf279265114a4e6e13efe21edab8b87cff15f1f9f3ad055c64b SHA512 a8d8270c8060480fe87da9252de86a75eea1cc427db63536f848d19a2c23c499ca294a9656d9a6aac73a756f84c96a2d72f13d1cede7948e18bf93efc2ecfc29

diff --git a/www-apps/bareos-webui/bareos-webui-23.0.2.ebuild b/www-apps/bareos-webui/bareos-webui-23.0.2.ebuild
new file mode 100644
index 000000000000..446090d5394d
--- /dev/null
+++ b/www-apps/bareos-webui/bareos-webui-23.0.2.ebuild
@@ -0,0 +1,110 @@
+# 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"
+
+IUSE=""
+
+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 ""
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/bareos-webui/
@ 2024-08-05  7:18 Joonas Niilola
  0 siblings, 0 replies; 10+ messages in thread
From: Joonas Niilola @ 2024-08-05  7:18 UTC (permalink / raw
  To: gentoo-commits

commit:     4f6fdb1b9b53b70760106c147cfcf0a7c6ecc196
Author:     Filip Kobierski <fkobi <AT> pm <DOT> me>
AuthorDate: Tue Jul 30 11:16:53 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Aug  5 07:07:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f6fdb1b

www-apps/bareos-webui: remove empty IUSE

Signed-off-by: Filip Kobierski <fkobi <AT> pm.me>
Closes: https://github.com/gentoo/gentoo/pull/37802
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 www-apps/bareos-webui/bareos-webui-22.1.2.ebuild | 4 +---
 www-apps/bareos-webui/bareos-webui-23.0.1.ebuild | 2 --
 www-apps/bareos-webui/bareos-webui-23.0.2.ebuild | 2 --
 www-apps/bareos-webui/bareos-webui-9999.ebuild   | 2 --
 4 files changed, 1 insertion(+), 9 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 6d911f70e272..1891ba820469 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-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -29,8 +29,6 @@ RESTRICT="mirror"
 
 LICENSE="AGPL-3"
 
-IUSE=""
-
 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]

diff --git a/www-apps/bareos-webui/bareos-webui-23.0.1.ebuild b/www-apps/bareos-webui/bareos-webui-23.0.1.ebuild
index 446090d5394d..1891ba820469 100644
--- a/www-apps/bareos-webui/bareos-webui-23.0.1.ebuild
+++ b/www-apps/bareos-webui/bareos-webui-23.0.1.ebuild
@@ -29,8 +29,6 @@ RESTRICT="mirror"
 
 LICENSE="AGPL-3"
 
-IUSE=""
-
 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]

diff --git a/www-apps/bareos-webui/bareos-webui-23.0.2.ebuild b/www-apps/bareos-webui/bareos-webui-23.0.2.ebuild
index 446090d5394d..1891ba820469 100644
--- a/www-apps/bareos-webui/bareos-webui-23.0.2.ebuild
+++ b/www-apps/bareos-webui/bareos-webui-23.0.2.ebuild
@@ -29,8 +29,6 @@ RESTRICT="mirror"
 
 LICENSE="AGPL-3"
 
-IUSE=""
-
 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]

diff --git a/www-apps/bareos-webui/bareos-webui-9999.ebuild b/www-apps/bareos-webui/bareos-webui-9999.ebuild
index 6d911f70e272..e65d630438cb 100644
--- a/www-apps/bareos-webui/bareos-webui-9999.ebuild
+++ b/www-apps/bareos-webui/bareos-webui-9999.ebuild
@@ -29,8 +29,6 @@ RESTRICT="mirror"
 
 LICENSE="AGPL-3"
 
-IUSE=""
-
 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]


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/bareos-webui/
@ 2024-08-05  7:18 Joonas Niilola
  0 siblings, 0 replies; 10+ messages in thread
From: Joonas Niilola @ 2024-08-05  7:18 UTC (permalink / raw
  To: gentoo-commits

commit:     3bfb519450bd5e7d376bfb76b8147c6c8b4267f4
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  5 07:16:21 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Aug  5 07:16:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bfb5194

www-apps/bareos-webui: fix IncorrectCopyright

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 www-apps/bareos-webui/bareos-webui-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/bareos-webui/bareos-webui-9999.ebuild b/www-apps/bareos-webui/bareos-webui-9999.ebuild
index e65d630438cb..1891ba820469 100644
--- a/www-apps/bareos-webui/bareos-webui-9999.ebuild
+++ b/www-apps/bareos-webui/bareos-webui-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/bareos-webui/
@ 2024-09-10  9:46 Marc Schiffbauer
  0 siblings, 0 replies; 10+ messages in thread
From: Marc Schiffbauer @ 2024-09-10  9:46 UTC (permalink / raw
  To: gentoo-commits

commit:     3f028c7688a9d5fa0166a216d8574f74b0817c83
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 10 09:43:52 2024 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Tue Sep 10 09:45:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f028c76

www-apps/bareos-webui: add 22.1.6

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

 www-apps/bareos-webui/Manifest                   |   2 +
 www-apps/bareos-webui/bareos-webui-22.1.6.ebuild | 107 +++++++++++++++++++++++
 2 files changed, 109 insertions(+)

diff --git a/www-apps/bareos-webui/Manifest b/www-apps/bareos-webui/Manifest
index 9f73b79b736e..7cbb651f9cbc 100644
--- a/www-apps/bareos-webui/Manifest
+++ b/www-apps/bareos-webui/Manifest
@@ -1,3 +1,5 @@
 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.1.tar.gz 14728566 BLAKE2B e5fe93f0e412fcc4b4cb31f3e7d7dbcd44b3c0f76c387f17685d97880af88949998faae502531e937201c1622350d226c2cc9f432b0dfda7893a3fb03e905b5f SHA512 5e3902c33c08dedbdd8dc7c74c5a1258da22288a728ada283b541316a7bff2f7773d1875b11f8fe12368afda3fd1bb2780242ff57441ef8fd596f71ea1af1e75
 DIST bareos-23.0.2.tar.gz 14724410 BLAKE2B 0fe86c10d62ad322dfbcd5ac972aec27d6f0ad31e156d359398739b2bfd784a02ce89b26b6bdfcf279265114a4e6e13efe21edab8b87cff15f1f9f3ad055c64b SHA512 a8d8270c8060480fe87da9252de86a75eea1cc427db63536f848d19a2c23c499ca294a9656d9a6aac73a756f84c96a2d72f13d1cede7948e18bf93efc2ecfc29
+DIST bareos-23.0.4.tar.gz 13954430 BLAKE2B dfeea6ca63be1cb376507a1270cc835d8f6ea336a8cf9c07ac74a2817d84f044da7ac974b11a34b3d6c8a66ed4cb27a1e9ba06b4dad697937e6068181f42eb03 SHA512 50686548cb2bb398d524fa208db97a68e30f40e53ac8a8f57182157e713d743baf8a3177453327943b17de128f6dd6c5b5de0fe65ddcedf7cbca715e7ae05bd5

diff --git a/www-apps/bareos-webui/bareos-webui-22.1.6.ebuild b/www-apps/bareos-webui/bareos-webui-22.1.6.ebuild
new file mode 100644
index 000000000000..77c9bfd5119b
--- /dev/null
+++ b/www-apps/bareos-webui/bareos-webui-22.1.6.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 ""
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/bareos-webui/
@ 2024-09-10  9:46 Marc Schiffbauer
  0 siblings, 0 replies; 10+ messages in thread
From: Marc Schiffbauer @ 2024-09-10  9:46 UTC (permalink / raw
  To: gentoo-commits

commit:     ae670b67f1b10f9bfa6d5b4510c4376aa76d394f
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 10 09:44:42 2024 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Tue Sep 10 09:45:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae670b67

www-apps/bareos-webui: fix variable order

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

 www-apps/bareos-webui/bareos-webui-9999.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/www-apps/bareos-webui/bareos-webui-9999.ebuild b/www-apps/bareos-webui/bareos-webui-9999.ebuild
index 1891ba820469..77c9bfd5119b 100644
--- a/www-apps/bareos-webui/bareos-webui-9999.ebuild
+++ b/www-apps/bareos-webui/bareos-webui-9999.ebuild
@@ -25,9 +25,8 @@ fi
 
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="https://www.bareos.org/"
-RESTRICT="mirror"
-
 LICENSE="AGPL-3"
+RESTRICT="mirror"
 
 DEPEND=""
 RDEPEND="${DEPEND}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/bareos-webui/
@ 2024-09-10  9:46 Marc Schiffbauer
  0 siblings, 0 replies; 10+ messages in thread
From: Marc Schiffbauer @ 2024-09-10  9:46 UTC (permalink / raw
  To: gentoo-commits

commit:     2ad45eb418833dc7f2c0520931d8370708f1f946
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 10 09:44:16 2024 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Tue Sep 10 09:45:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ad45eb4

www-apps/bareos-webui: add 23.0.4, drop 23.0.1

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

 www-apps/bareos-webui/Manifest                                         | 1 -
 .../{bareos-webui-23.0.1.ebuild => bareos-webui-23.0.4.ebuild}         | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/www-apps/bareos-webui/Manifest b/www-apps/bareos-webui/Manifest
index 7cbb651f9cbc..9f3fa2522b50 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-23.0.1.tar.gz 14728566 BLAKE2B e5fe93f0e412fcc4b4cb31f3e7d7dbcd44b3c0f76c387f17685d97880af88949998faae502531e937201c1622350d226c2cc9f432b0dfda7893a3fb03e905b5f SHA512 5e3902c33c08dedbdd8dc7c74c5a1258da22288a728ada283b541316a7bff2f7773d1875b11f8fe12368afda3fd1bb2780242ff57441ef8fd596f71ea1af1e75
 DIST bareos-23.0.2.tar.gz 14724410 BLAKE2B 0fe86c10d62ad322dfbcd5ac972aec27d6f0ad31e156d359398739b2bfd784a02ce89b26b6bdfcf279265114a4e6e13efe21edab8b87cff15f1f9f3ad055c64b SHA512 a8d8270c8060480fe87da9252de86a75eea1cc427db63536f848d19a2c23c499ca294a9656d9a6aac73a756f84c96a2d72f13d1cede7948e18bf93efc2ecfc29
 DIST bareos-23.0.4.tar.gz 13954430 BLAKE2B dfeea6ca63be1cb376507a1270cc835d8f6ea336a8cf9c07ac74a2817d84f044da7ac974b11a34b3d6c8a66ed4cb27a1e9ba06b4dad697937e6068181f42eb03 SHA512 50686548cb2bb398d524fa208db97a68e30f40e53ac8a8f57182157e713d743baf8a3177453327943b17de128f6dd6c5b5de0fe65ddcedf7cbca715e7ae05bd5

diff --git a/www-apps/bareos-webui/bareos-webui-23.0.1.ebuild b/www-apps/bareos-webui/bareos-webui-23.0.4.ebuild
similarity index 99%
rename from www-apps/bareos-webui/bareos-webui-23.0.1.ebuild
rename to www-apps/bareos-webui/bareos-webui-23.0.4.ebuild
index 1891ba820469..77c9bfd5119b 100644
--- a/www-apps/bareos-webui/bareos-webui-23.0.1.ebuild
+++ b/www-apps/bareos-webui/bareos-webui-23.0.4.ebuild
@@ -25,9 +25,8 @@ fi
 
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="https://www.bareos.org/"
-RESTRICT="mirror"
-
 LICENSE="AGPL-3"
+RESTRICT="mirror"
 
 DEPEND=""
 RDEPEND="${DEPEND}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2024-09-10  9:46 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-05 16:04 [gentoo-commits] repo/gentoo:master commit in: www-apps/bareos-webui/ Marc Schiffbauer
  -- strict thread matches above, loose matches on Subject: below --
2024-09-10  9:46 Marc Schiffbauer
2024-09-10  9:46 Marc Schiffbauer
2024-09-10  9:46 Marc Schiffbauer
2024-08-05  7:18 Joonas Niilola
2024-08-05  7:18 Joonas Niilola
2024-03-08 12:19 Marc Schiffbauer
2024-02-26 16:50 Marc Schiffbauer
2023-12-05 16:00 Marc Schiffbauer
2023-12-05 14:56 Marc Schiffbauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox