summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-06-14 13:20:04 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-06-14 13:20:04 +0000
commitf62dae0119a3d60483f9947dbbf4eba436910898 (patch)
tree93c48529d12b55ad61ede9b569ea3dabca9df1e2
parent2021-06-14 13:05:17 UTC (diff)
parentdev-util/pkgcheck: Stabilize 0.10.1 arm, #790017 (diff)
downloadgentoo-f62dae0119a3d60483f9947dbbf4eba436910898.tar.gz
gentoo-f62dae0119a3d60483f9947dbbf4eba436910898.tar.bz2
gentoo-f62dae0119a3d60483f9947dbbf4eba436910898.zip
Merge updates from master
-rw-r--r--app-office/ledger/files/ledger-3.2.1-fix-build-boost-1-76.patch5
-rw-r--r--dev-util/pkgcheck/pkgcheck-0.10.1.ebuild2
-rw-r--r--net-print/cups/cups-2.3.3_p2.ebuild2
-rw-r--r--sys-apps/pkgcore/pkgcore-0.12.1-r1.ebuild2
4 files changed, 6 insertions, 5 deletions
diff --git a/app-office/ledger/files/ledger-3.2.1-fix-build-boost-1-76.patch b/app-office/ledger/files/ledger-3.2.1-fix-build-boost-1-76.patch
index 62d2d6095119..eff3e335f42e 100644
--- a/app-office/ledger/files/ledger-3.2.1-fix-build-boost-1-76.patch
+++ b/app-office/ledger/files/ledger-3.2.1-fix-build-boost-1-76.patch
@@ -1,9 +1,10 @@
+https://bugs.gentoo.org/790176
+https://github.com/ledger/ledger/issues/2030
+
From fa37f595b3c44dc7ac86b29d105ae6417c3e0080 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Mon, 14 Jun 2021 12:37:58 +0000
Subject: [PATCH] Fix compilation with Boost 1.76
-
----
--- a/src/expr.cc
+++ b/src/expr.cc
@@ -35,6 +35,8 @@
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.1.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.1.ebuild
index 1783fd20dd52..24f7444b4397 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
inherit git-r3
else
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
fi
diff --git a/net-print/cups/cups-2.3.3_p2.ebuild b/net-print/cups/cups-2.3.3_p2.ebuild
index a0e8c2d18549..447aacd76355 100644
--- a/net-print/cups/cups-2.3.3_p2.ebuild
+++ b/net-print/cups/cups-2.3.3_p2.ebuild
@@ -19,7 +19,7 @@ else
# SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz"
SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz"
if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
fi
diff --git a/sys-apps/pkgcore/pkgcore-0.12.1-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.12.1-r1.ebuild
index 7b0ac140b608..3e33434a3a02 100644
--- a/sys-apps/pkgcore/pkgcore-0.12.1-r1.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.12.1-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
inherit git-r3
else
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
fi