public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Marc Schiffbauer" <mschiff@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/
Date: Tue, 20 Jun 2023 13:44:41 +0000 (UTC)	[thread overview]
Message-ID: <1687268670.a4a75f5678aa7cefc0728c5ea448804ef068a477.mschiff@gentoo> (raw)

commit:     a4a75f5678aa7cefc0728c5ea448804ef068a477
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 20 13:42:22 2023 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Tue Jun 20 13:44:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4a75f56

app-backup/bareos: add 22.1.0, drop 22.0.3-r1

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

 app-backup/bareos/Manifest                              |  2 +-
 .../{bareos-22.0.3-r1.ebuild => bareos-22.1.0.ebuild}   | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 78af12842104..c53f55f7b3ef 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +1,3 @@
 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

diff --git a/app-backup/bareos/bareos-22.0.3-r1.ebuild b/app-backup/bareos/bareos-22.1.0.ebuild
similarity index 97%
rename from app-backup/bareos/bareos-22.0.3-r1.ebuild
rename to 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"


             reply	other threads:[~2023-06-20 13:44 UTC|newest]

Thread overview: 127+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-20 13:44 Marc Schiffbauer [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-21 22:32 [gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/ Marc Schiffbauer
2025-10-21 22:22 Marc Schiffbauer
2025-10-21 22:22 Marc Schiffbauer
2025-09-03 15:03 Marc Schiffbauer
2025-09-03 13:36 Marc Schiffbauer
2025-09-03 12:52 Marc Schiffbauer
2025-09-03 12:52 Marc Schiffbauer
2025-09-03 12:52 Marc Schiffbauer
2025-07-23 20:29 Marc Schiffbauer
2025-07-10 14:33 Marc Schiffbauer
2025-06-03 20:14 Sam James
2025-05-19 16:18 Marc Schiffbauer
2025-05-19 16:18 Marc Schiffbauer
2025-04-22  6:22 Marc Schiffbauer
2025-04-22  6:22 Marc Schiffbauer
2025-04-22  6:22 Marc Schiffbauer
2025-04-22  6:22 Marc Schiffbauer
2025-04-22  6:22 Marc Schiffbauer
2025-04-22  6:22 Marc Schiffbauer
2025-03-27 12:30 Marc Schiffbauer
2025-03-27 12:30 Marc Schiffbauer
2025-03-27 12:30 Marc Schiffbauer
2025-03-27 12:30 Marc Schiffbauer
2025-03-27 12:30 Marc Schiffbauer
2025-03-27 12:30 Marc Schiffbauer
2025-03-22 12:48 Marc Schiffbauer
2025-03-22 12:48 Marc Schiffbauer
2024-12-02 15:33 Marc Schiffbauer
2024-12-02 15:33 Marc Schiffbauer
2024-11-16 13:51 Marc Schiffbauer
2024-11-16 13:51 Marc Schiffbauer
2024-11-14 10:29 Marc Schiffbauer
2024-11-13 23:23 Marc Schiffbauer
2024-11-13 23:23 Marc Schiffbauer
2024-09-10  9:46 Marc Schiffbauer
2024-09-10  9:46 Marc Schiffbauer
2024-09-10  9:46 Marc Schiffbauer
2024-09-10  9:46 Marc Schiffbauer
2024-06-16 21:39 Marc Schiffbauer
2024-06-16 21:39 Marc Schiffbauer
2024-06-16 21:39 Marc Schiffbauer
2024-06-16 21:39 Marc Schiffbauer
2024-05-08 21:58 Marc Schiffbauer
2024-03-08 12:19 Marc Schiffbauer
2024-01-29 10:28 Marc Schiffbauer
2024-01-29 10:17 Marc Schiffbauer
2024-01-29 10:17 Marc Schiffbauer
2024-01-29  9:50 Marc Schiffbauer
2024-01-29  9:50 Marc Schiffbauer
2023-12-05 21:50 Marc Schiffbauer
2023-12-05 14:52 Marc Schiffbauer
2023-09-18 10:54 Sam James
2023-06-20 13:44 Marc Schiffbauer
2023-04-20 20:22 Marc Schiffbauer
2023-04-20 20:22 Marc Schiffbauer
2023-04-20 20:22 Marc Schiffbauer
2023-04-20 20:22 Marc Schiffbauer
2023-04-02 22:14 Marc Schiffbauer
2023-04-02 22:14 Marc Schiffbauer
2023-04-02 22:14 Marc Schiffbauer
2023-03-06 10:17 Marc Schiffbauer
2023-03-01 17:43 Marc Schiffbauer
2023-03-01 17:20 Marc Schiffbauer
2023-01-22 18:00 Marc Schiffbauer
2023-01-18 10:53 Marc Schiffbauer
2022-12-14  9:20 Sam James
2022-12-12  3:09 Marc Schiffbauer
2022-12-12  3:09 Marc Schiffbauer
2022-12-12  2:58 Marc Schiffbauer
2022-11-27 10:04 Marc Schiffbauer
2022-11-24 15:05 John Helmert III
2022-03-25  7:17 Marc Schiffbauer
2022-03-21  9:59 Marc Schiffbauer
2022-03-21  9:59 Marc Schiffbauer
2022-03-21  9:59 Marc Schiffbauer
2022-02-02  9:47 Marc Schiffbauer
2022-02-01 10:50 Marc Schiffbauer
2022-02-01 10:22 Marc Schiffbauer
2021-09-30 11:16 Marc Schiffbauer
2021-09-25 19:08 Sam James
2021-09-20 10:29 Marc Schiffbauer
2021-09-20 10:29 Marc Schiffbauer
2021-09-20 10:29 Marc Schiffbauer
2021-09-20  9:34 Marc Schiffbauer
2021-09-06 22:30 Marc Schiffbauer
2021-09-06 22:30 Marc Schiffbauer
2021-08-21  9:20 Marc Schiffbauer
2021-08-20 13:10 Marc Schiffbauer
2021-08-20 11:04 Marc Schiffbauer
2021-07-31 22:17 Sam James
2021-04-30 17:32 Mikle Kolyada
2020-12-15 11:33 Marc Schiffbauer
2020-12-15 11:33 Marc Schiffbauer
2020-08-01 14:21 Marc Schiffbauer
2020-08-01 14:14 Marc Schiffbauer
2020-08-01 14:14 Marc Schiffbauer
2020-08-01 14:14 Marc Schiffbauer
2020-08-01 14:14 Marc Schiffbauer
2020-08-01 14:14 Marc Schiffbauer
2020-08-01 14:14 Marc Schiffbauer
2020-05-14  4:06 Marc Schiffbauer
2020-05-14  4:06 Marc Schiffbauer
2020-05-14  4:06 Marc Schiffbauer
2020-03-03  7:03 Marc Schiffbauer
2019-04-16  6:50 Marc Schiffbauer
2019-02-08 16:05 Brian Evans
2018-11-30 13:53 Marc Schiffbauer
2018-05-13  6:56 Andreas Sturmlechner
2017-12-10 22:52 Marc Schiffbauer
2016-12-30 23:03 Marc Schiffbauer
2016-10-31 14:28 Marc Schiffbauer
2016-03-22  0:45 Anthony G. Basile
2015-12-29 15:20 Marc Schiffbauer
2015-12-29 15:14 Marc Schiffbauer
2015-12-07  0:35 Marc Schiffbauer
2015-11-25  1:06 Marc Schiffbauer
2015-09-19  0:15 Marc Schiffbauer
2015-09-19  0:15 Marc Schiffbauer
2015-09-19  0:15 Marc Schiffbauer
2015-09-14  0:15 Marc Schiffbauer
2015-09-13 23:53 Marc Schiffbauer
2015-09-13 23:53 Marc Schiffbauer
2015-09-13 23:53 Marc Schiffbauer
2015-09-13 23:53 Marc Schiffbauer
2015-09-13 23:53 Marc Schiffbauer
2015-08-09 23:49 Marc Schiffbauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1687268670.a4a75f5678aa7cefc0728c5ea448804ef068a477.mschiff@gentoo \
    --to=mschiff@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox