summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2019-08-29 01:07:53 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2019-08-29 01:07:53 +0000
commita6f131b78dee953cf7d715332abc4e9d410847ee (patch)
treedeb28c63cd30e7336c4d36640d923d328681bc6c
parent2019-08-29 00:28:14 UTC (diff)
parentgames-simulation/crrcsim: remove automake restriction; resurrect (diff)
downloadgentoo-a6f131b78dee953cf7d715332abc4e9d410847ee.tar.gz
gentoo-a6f131b78dee953cf7d715332abc4e9d410847ee.tar.bz2
gentoo-a6f131b78dee953cf7d715332abc4e9d410847ee.zip
Merge updates from master
-rw-r--r--app-emacs/ebuild-mode/ebuild-mode-1.47.ebuild2
-rw-r--r--games-simulation/crrcsim/crrcsim-0.9.13.ebuild4
-rw-r--r--gui-apps/waybar/waybar-0.7.2-r1.ebuild (renamed from gui-apps/waybar/waybar-0.7.2.ebuild)2
-rw-r--r--gui-apps/waybar/waybar-9999.ebuild2
-rw-r--r--profiles/package.mask1
5 files changed, 5 insertions, 6 deletions
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.47.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.47.ebuild
index 17fae095339b..62f2cf76c60d 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.47.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.47.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
BDEPEND="sys-apps/texinfo"
diff --git a/games-simulation/crrcsim/crrcsim-0.9.13.ebuild b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
index ef5b5ce752df..4d20e437844b 100644
--- a/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
+++ b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-WANT_AUTOMAKE="1.10"
+
inherit autotools eutils gnome2-utils
DESCRIPTION="model-airplane flight simulation program"
diff --git a/gui-apps/waybar/waybar-0.7.2.ebuild b/gui-apps/waybar/waybar-0.7.2-r1.ebuild
index fc844ec121d2..c26192592d71 100644
--- a/gui-apps/waybar/waybar-0.7.2.ebuild
+++ b/gui-apps/waybar/waybar-0.7.2-r1.ebuild
@@ -25,7 +25,7 @@ DEPEND="
dev-libs/jsoncpp:=
dev-libs/libinput:=
dev-libs/libsigc++:2
- >=dev-libs/libfmt-5.3.0:=
+ >=dev-libs/libfmt-5.3.0:0/5
>=dev-libs/spdlog-1.3.1:=
dev-libs/wayland
dev-libs/wayland-protocols
diff --git a/gui-apps/waybar/waybar-9999.ebuild b/gui-apps/waybar/waybar-9999.ebuild
index fc844ec121d2..c26192592d71 100644
--- a/gui-apps/waybar/waybar-9999.ebuild
+++ b/gui-apps/waybar/waybar-9999.ebuild
@@ -25,7 +25,7 @@ DEPEND="
dev-libs/jsoncpp:=
dev-libs/libinput:=
dev-libs/libsigc++:2
- >=dev-libs/libfmt-5.3.0:=
+ >=dev-libs/libfmt-5.3.0:0/5
>=dev-libs/spdlog-1.3.1:=
dev-libs/wayland
dev-libs/wayland-protocols
diff --git a/profiles/package.mask b/profiles/package.mask
index 3f1fd1869098..38fe1b95cb64 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -147,7 +147,6 @@ sys-kernel/bliss-initramfs
# Aaron Bauman <bman@gentoo.org> (2019-08-17)
# Relies on vulnerable automake:{1.9,1.10}
# Removal in 30 days
-games-simulation/crrcsim
media-gfx/pixie
net-irc/eiwic
net-misc/openrdate