summaryrefslogtreecommitdiff
path: root/app-backup/bareos
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-06-20 19:17:08 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-06-20 19:17:08 +0100
commit1941d371dc945a34f7070c341af1392edb5ca3a9 (patch)
treee827c75ecfe184ed595a64cc562c654341edf373 /app-backup/bareos
parent332b9eb4903f99b0e65722058ce481fdc21b93d3 (diff)
gentoo auto-resync : 20:06:2023 - 19:17:08
Diffstat (limited to 'app-backup/bareos')
-rw-r--r--app-backup/bareos/Manifest6
-rw-r--r--app-backup/bareos/bareos-22.1.0.ebuild (renamed from app-backup/bareos/bareos-22.0.3-r1.ebuild)17
-rw-r--r--app-backup/bareos/bareos-9999.ebuild3
3 files changed, 15 insertions, 11 deletions
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 1f170f9ef30a..ff711feb97d5 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -23,9 +23,9 @@ AUX bareos-sd.service 812 BLAKE2B 7ac9754d98ea177614450045fbbaf7406592b30a280646
AUX tmpfiles.d-bareos.conf 33 BLAKE2B 68feed7629dde0dad019470851cea33140be3b17186fbbee7ad6c6a591978236ec09252d890117030d8706d22ea02f9971063aa80a393d3726510128527401d0 SHA512 65d3f72e57eb3afc557ab6b56a8ec1895a679b904114fefd1c9d0ceeb6b9fa8413575591ed81e1ce6963bdaf34dad227e781865b39bb237afc6bb5652306d2ef
DIST bareos-20.0.8.tar.gz 13429247 BLAKE2B 5576cf738fccad0ac39f7c92e8da01f4925d58e4373c8bc19f68ddb8cc8d6a07bf73dfd39bd2111766ccd20ce2da224680b8ab9adf7b84421874ae916e633f75 SHA512 1da30d0ff2f1fda2c4a41ec6d41ec60e3212b1bdb153c7f397931580894f31e36ab84f655d263aed47b9eb21e68ef7e59ec3b7bbd4f2c8981ae04b84733ffb68
DIST bareos-21.1.7.tar.gz 11666508 BLAKE2B 8b5efffb987b53d1bc289aa104c10827c6bed630ffee16c26e8ab428ee20aa63a9e1e2fc03a7656d26f5905443b06c6a6f6d4860be413776874917e2c1cd0ef2 SHA512 2b7dfb16b74aa912449269efb92c85b6720f08526122c7dc9bfb648aed70b2ca81df41eacb60c53e2a154793c6ed209dd1571ecec7913a357e491064b1faab41
-DIST bareos-22.0.3.tar.gz 14529338 BLAKE2B 7759059f8652cf0b55a8754325b86257130695918f0b2d4672a7a21aa3ed6595da9fcba9a5a5f1c854af7994aa21c304720131ab99d577f01cd706f55184b621 SHA512 cbdf4bfb5284104894e7fb8ddbb20d6ecedd827c8133b13913e9a27c4e3b98b550ec60a9a23c2c4efe6d566c94ed745d77946a444e5fccb56c09ab8f740d9f8c
+DIST bareos-22.1.0.tar.gz 14719993 BLAKE2B 38e354d3227d401c69ffb003c83ae90c2067720490af089d529da636bc300e2fb5042451ab439b8b102f6850aeadbe8dedc4311dba13f800eab0bc77d89f809d SHA512 dea64c6eb34a93f1a93eb6b0ac628a75101ac8873e06800a256f226e8f3a556fe39ce4e500246f9c51de30a2b0907732f789c6394f29b7bb9d983a64c709ad2c
EBUILD bareos-20.0.8-r1.ebuild 11465 BLAKE2B 6707f8e66f5f7686116acd344ee76c696c939fb53a2b0b93ee914224c40c1a9315ddc358888803fada80ca6012eddd9125b2a651a56d1ef1edf1a68e1321b692 SHA512 d1ab338becdf64fd3912a8e80b1ddd259a3f2434c870acd961750aff3194ce612ca00d67ff40908e320e9cc85d998234316eee44034e0566fd5d7cc3990d6a87
EBUILD bareos-21.1.7-r1.ebuild 11619 BLAKE2B ea30ee7467c0b5d27178333f524ce5b3300275259f1c22ed1eec3d42262d7e5aabc737f9cc7cb4ffd306a66b10fc3cb1c61cc1362284a391c8e432268d5b52f3 SHA512 4e64533af533d5a8b9e61d0cc162722242e22ec73c01544042888db6ae94a6fe24fa3b97b750461ce42466dda21a088c93fca440b34cad0e0ee1d81cec5b9523
-EBUILD bareos-22.0.3-r1.ebuild 11884 BLAKE2B 794d734c400d639ef92d5f4768cfe9c2c793902ce80b189875d8e32764b501375665904cc703260ff45164a6a29fdc506cad46572c8dd748a20038f42e87bd9e SHA512 f54ddfef0be808be169ffc730edf06aad38b548bd55d04df041d48a22984ade4a5c44057caf251542550fff92007957134c06273db7eb5f4c44b8ed7110c4a89
-EBUILD bareos-9999.ebuild 11995 BLAKE2B 4c72dd688ca5412abd30fd2e12aa919bcc68e5bdac242ee33cafa9adb2bab1064ae4d0ae38cdab2ad627013378dc772305d7db9194f38a65e53895276ba3a343 SHA512 060703b7602eab39e731cdc55fc36f871d62ab388d9fcb3172545e051c08ad95bd8c795831582d6920784c01f301fbbcda0de399c884dc2f3221e97c70a6f498
+EBUILD bareos-22.1.0.ebuild 11949 BLAKE2B 5070d5dd16d4bc04b9e4a7e18fd74305f75f0353fb15f7d4a224fdbc9d3c81ffcf9fe47142919758c5abaf3f2e1058f9ca5cd04cc232c0321353a7f6cf70235a SHA512 86c2c0716bf4c643a3836f315d0f8b8d9e8950313c54777b93fa2a85da993fe14925ca9e656383981f664e8e857ae9d67f0d5c7cc9af541f7972ba106c36cff3
+EBUILD bareos-9999.ebuild 11949 BLAKE2B 5070d5dd16d4bc04b9e4a7e18fd74305f75f0353fb15f7d4a224fdbc9d3c81ffcf9fe47142919758c5abaf3f2e1058f9ca5cd04cc232c0321353a7f6cf70235a SHA512 86c2c0716bf4c643a3836f315d0f8b8d9e8950313c54777b93fa2a85da993fe14925ca9e656383981f664e8e857ae9d67f0d5c7cc9af541f7972ba106c36cff3
MISC metadata.xml 1221 BLAKE2B 190840f3e1003bd12c5d6b3b1904f37ea102982c5bb97de4c11adc128fcb86c3af17812b4ad886969bcade9b460753291bb4508321892f1b85e3e43f068a737e SHA512 bf55fff95a0bd8695fdea054b827453f7c8dd96caeee60af7755c25c88bab62548c57dcfb03cf09fbe23f32228878084b8fc3056d2c41b793c9b8ef024c20455
diff --git a/app-backup/bareos/bareos-22.0.3-r1.ebuild b/app-backup/bareos/bareos-22.1.0.ebuild
index d246f05e5727..cc7cccd6ca49 100644
--- a/app-backup/bareos/bareos-22.0.3-r1.ebuild
+++ b/app-backup/bareos/bareos-22.1.0.ebuild
@@ -3,15 +3,24 @@
EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
CMAKE_WARN_UNUSED_CLI=no
#CMAKE_REMOVE_MODULES=yes
inherit python-any-r1 systemd cmake tmpfiles
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+ SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
+
+ KEYWORDS="~amd64 ~x86"
+ S=${WORKDIR}/${PN}-Release-${PV}
+fi
+
DESCRIPTION="Featureful client/server network backup suite"
HOMEPAGE="https://www.bareos.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
# some tests still fail propably due to missing bits in src_test -> TODO
RESTRICT="mirror test"
@@ -22,7 +31,6 @@ RESTRICT="mirror test"
LICENSE="AGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
logwatch ndmp readline scsi-crypto split-usr
static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
@@ -89,8 +97,6 @@ REQUIRED_USE="
x86? ( !ceph )
"
-S=${WORKDIR}/${PN}-Release-${PV}
-
pkg_pretend() {
local active_removed_backend=""
if has_version "<app-backup/bareos-21[director,mysql]"; then
@@ -145,7 +151,6 @@ src_prepare() {
eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
eapply "${FILESDIR}/${PN}-22.0.2-werror.patch"
eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
- eapply "${FILESDIR}/${PN}-gcc13-fixes.patch"
# fix missing DESTDIR in symlink creation
sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
diff --git a/app-backup/bareos/bareos-9999.ebuild b/app-backup/bareos/bareos-9999.ebuild
index 29fb6bda15a5..cc7cccd6ca49 100644
--- a/app-backup/bareos/bareos-9999.ebuild
+++ b/app-backup/bareos/bareos-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
CMAKE_WARN_UNUSED_CLI=no
#CMAKE_REMOVE_MODULES=yes
@@ -151,7 +151,6 @@ src_prepare() {
eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
eapply "${FILESDIR}/${PN}-22.0.2-werror.patch"
eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
- eapply "${FILESDIR}/${PN}-gcc13-fixes.patch"
# fix missing DESTDIR in symlink creation
sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"