public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/
Date: Fri, 25 Nov 2022 17:49:16 +0000 (UTC)	[thread overview]
Message-ID: <1669398493.aabd7357b827327c6e4a772cd8dcf9560ecced6b.conikost@gentoo> (raw)

commit:     aabd7357b827327c6e4a772cd8dcf9560ecced6b
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Nov 25 15:48:32 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 17:48:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabd7357

app-backup/bareos: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28428
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../bareos/files/bareos-20.0.2-cmake-gentoo.patch  | 24 ----------------------
 app-backup/bareos/files/bareos-cmake-gentoo.patch  | 11 ----------
 2 files changed, 35 deletions(-)

diff --git a/app-backup/bareos/files/bareos-20.0.2-cmake-gentoo.patch b/app-backup/bareos/files/bareos-20.0.2-cmake-gentoo.patch
deleted file mode 100644
index 9d3cf8092e1c..000000000000
--- a/app-backup/bareos/files/bareos-20.0.2-cmake-gentoo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urw bareos-Release-20.0.2.orig/core/cmake/distname.sh bareos-Release-20.0.2/core/cmake/distname.sh
---- bareos-Release-20.0.2.orig/core/cmake/distname.sh	2021-06-10 06:07:18.000000000 -0930
-+++ bareos-Release-20.0.2/core/cmake/distname.sh	2021-08-15 17:07:37.168216517 -0930
-@@ -153,7 +153,7 @@
-       elif test -f /etc/gentoo-release
-       then
-          PLATFORM=gentoo
--         DISTVER=`awk '/version / { print $5 }' < /etc/gentoo-release`
-+         DISTVER=`awk '/release / { print $5 }' < /etc/gentoo-release`
-       elif test -f /etc/debian_version
-       then
-          if `test -f /etc/apt/sources.list && grep -q ubuntu /etc/apt/sources.list`; then
-diff -urw bareos-Release-20.0.2.orig/core/platforms/CMakeLists.txt bareos-Release-20.0.2/core/platforms/CMakeLists.txt
---- bareos-Release-20.0.2.orig/core/platforms/CMakeLists.txt	2021-06-10 06:07:18.000000000 -0930
-+++ bareos-Release-20.0.2/core/platforms/CMakeLists.txt	2021-08-15 17:07:37.549226558 -0930
-@@ -30,6 +30,8 @@
-     message(STATUS "adding subdirectories debian and univention")
-     add_subdirectory(debian)
-     add_subdirectory(univention)
-+  elseif(${PLATFORM} STREQUAL gentoo)
-+    message(STATUS "PLATFORM: " ${PLATFORM})
-   elseif(${PLATFORM} STREQUAL hpux)
-     message(STATUS "PLATFORM: " ${PLATFORM})
-   elseif(${PLATFORM} STREQUAL archlinux)

diff --git a/app-backup/bareos/files/bareos-cmake-gentoo.patch b/app-backup/bareos/files/bareos-cmake-gentoo.patch
deleted file mode 100644
index 0f67a9e5d9de..000000000000
--- a/app-backup/bareos/files/bareos-cmake-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- core/cmake/distname.sh.orig	2019-01-31 12:39:26.000000000 +0100
-+++ core/cmake/distname.sh	2019-02-05 10:26:43.258936535 +0100
-@@ -134,7 +134,7 @@
-       elif test -f /etc/gentoo-release
-       then
-          DISTNAME=gentoo
--         DISTVER=`awk '/version / { print $5 }' < /etc/gentoo-release`
-+         DISTVER=`awk '/release / { print $5 }' < /etc/gentoo-release`
-       elif test -f /etc/debian_version
-       then
-          if `test -f /etc/apt/sources.list && grep -q ubuntu /etc/apt/sources.list`; then


             reply	other threads:[~2022-11-25 17:49 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-25 17:49 Conrad Kostecki [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-02-17 14:35 [gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/ David Seifert
2023-06-18 11:13 Marc Schiffbauer
2022-12-16 13:28 Marc Schiffbauer
2022-12-10 18:31 Marc Schiffbauer
2021-09-08 23:42 Marc Schiffbauer
2021-08-20 12:36 Marc Schiffbauer
2020-08-03 21:07 Marc Schiffbauer
2020-05-14  4:06 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=1669398493.aabd7357b827327c6e4a772cd8dcf9560ecced6b.conikost@gentoo \
    --to=conikost@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