commit: ad434bbb7f0e4820834948adada2bdc7e27a3449
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 29 09:49:29 2024 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Mon Jan 29 09:50:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad434bbb
app-backup/bareos: add 23.0.1
Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org>
app-backup/bareos/Manifest | 1 +
.../bareos/{bareos-9999.ebuild => bareos-23.0.1.ebuild} | 16 +++++++++++++---
app-backup/bareos/bareos-9999.ebuild | 16 +++++++++++++---
3 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index c80b58d18e88..1eb4e935ecb7 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +1,4 @@
DIST bareos-20.0.9.tar.gz 13432902 BLAKE2B
c92b7b2a3d8a78d2119cef21ea5f13ae4898d750ac15f5b91fc143b0ab057a7537d3a190ef7f910810190c275f5cf885f07d819c6165f49ded25d11a329b02c0
SHA512
04386ef9a6f83bc9569f42d9567951a0e06c2dcda9409d1a17a07ccafaf55ff4a22e2b49ec9cd93c0d8bad244469aa87ad8ef4f27b7c6ae6820fd2b9c98d5d22
DIST bareos-21.1.8.tar.gz 11663322 BLAKE2B
5f8c66d44c702b187f56434925417f3eff5f9f515f52d5707d5dce2edfcf566474bae52518adab1d6f87d479fd05cc906f48350eec4f21b858720a607f9b4311
SHA512
643561d4bd92989e0b9356dab500083073daa2717159b5b061f5680ab96e8532c13753e94480419239bcad9938818c203d43dc72b690404ae5a143fdd3cd0738
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/app-backup/bareos/bareos-9999.ebuild
b/app-backup/bareos/bareos-23.0.1.ebuild
similarity index 96%
copy from app-backup/bareos/bareos-9999.ebuild
copy to app-backup/bareos/bareos-23.0.1.ebuild
index 3ec758c53539..675afe347439 100644
--- a/app-backup/bareos/bareos-9999.ebuild
+++ b/app-backup/bareos/bareos-23.0.1.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
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{9..12} )
CMAKE_WARN_UNUSED_CLI=no
-inherit python-any-r1 systemd cmake tmpfiles
+inherit python-any-r1 systemd cmake tmpfiles flag-o-matic
if [[ ${PV} == *9999 ]] ; then
inherit git-r3
@@ -30,7 +30,7 @@ RESTRICT="mirror test"
LICENSE="AGPL-3"
SLOT="0"
-IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
+IUSE="X acl ceph clientonly cpu_flags_x86_avx +director glusterfs ipv6 lmdb
logwatch ndmp readline scsi-crypto split-usr
static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
@@ -99,6 +99,14 @@ REQUIRED_USE="
x86? ( !ceph )
"
+PATCHES=(
+ # fix gentoo platform support
+ "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
+ "${FILESDIR}/${PN}-22.0.2-werror.patch"
+ "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
+ "${FILESDIR}/${PN}-22.1.2-include-algorithm.patch"
+)
+
pkg_pretend() {
local active_removed_backend=""
if has_version "<app-backup/bareos-21[director,mysql]"; then
@@ -224,6 +232,8 @@ src_configure() {
-Dx=$(usex X)
)
+ use cpu_flags_x86_avx && append-flags
"-DXXH_X86DISPATCH_ALLOW_AVX"
+
# disable droplet support for now as it does not build with gcc
10
# ... and this is a bundled lib, which should have its own
package
cd core && cmake_comment_add_subdirectory "src/droplet"
diff --git a/app-backup/bareos/bareos-9999.ebuild
b/app-backup/bareos/bareos-9999.ebuild
index 3ec758c53539..675afe347439 100644
--- a/app-backup/bareos/bareos-9999.ebuild
+++ b/app-backup/bareos/bareos-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
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{9..12} )
CMAKE_WARN_UNUSED_CLI=no
-inherit python-any-r1 systemd cmake tmpfiles
+inherit python-any-r1 systemd cmake tmpfiles flag-o-matic
if [[ ${PV} == *9999 ]] ; then
inherit git-r3
@@ -30,7 +30,7 @@ RESTRICT="mirror test"
LICENSE="AGPL-3"
SLOT="0"
-IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
+IUSE="X acl ceph clientonly cpu_flags_x86_avx +director glusterfs ipv6 lmdb
logwatch ndmp readline scsi-crypto split-usr
static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
@@ -99,6 +99,14 @@ REQUIRED_USE="
x86? ( !ceph )
"
+PATCHES=(
+ # fix gentoo platform support
+ "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
+ "${FILESDIR}/${PN}-22.0.2-werror.patch"
+ "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
+ "${FILESDIR}/${PN}-22.1.2-include-algorithm.patch"
+)
+
pkg_pretend() {
local active_removed_backend=""
if has_version "<app-backup/bareos-21[director,mysql]"; then
@@ -224,6 +232,8 @@ src_configure() {
-Dx=$(usex X)
)
+ use cpu_flags_x86_avx && append-flags
"-DXXH_X86DISPATCH_ALLOW_AVX"
+
# disable droplet support for now as it does not build with gcc
10
# ... and this is a bundled lib, which should have its own
package
cd core && cmake_comment_add_subdirectory "src/droplet"
