summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2018-11-24 22:24:09 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2018-11-24 22:24:09 +0000
commit1b83a51f623659f9cdc76ecfb18816640f3efcc0 (patch)
tree70d27983d58aabdd029944602b51c5cf22f963fb
parentMerge commit '9edef71eed02970d0c59487d41cf49ef45bb1e8d' (diff)
parentapp-antivirus/clamav: stable 0.100.1-r1 for ppc, bug #660820 (diff)
downloadgentoo-1b83a51f623659f9cdc76ecfb18816640f3efcc0.tar.gz
gentoo-1b83a51f623659f9cdc76ecfb18816640f3efcc0.tar.bz2
gentoo-1b83a51f623659f9cdc76ecfb18816640f3efcc0.zip
Merge updates from master
-rw-r--r--app-antivirus/clamav/clamav-0.100.1-r1.ebuild2
-rw-r--r--dev-db/phpmyadmin/phpmyadmin-4.7.8.ebuild4
-rw-r--r--dev-libs/libmspack/libmspack-0.6_alpha.ebuild4
-rw-r--r--mail-client/roundcube/roundcube-1.3.8.ebuild2
4 files changed, 6 insertions, 6 deletions
diff --git a/app-antivirus/clamav/clamav-0.100.1-r1.ebuild b/app-antivirus/clamav/clamav-0.100.1-r1.ebuild
index 2f4bd0aa4fdf..c8f5513c563c 100644
--- a/app-antivirus/clamav/clamav-0.100.1-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.100.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs system-libmspack test uclibc"
CDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.7.8.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.8.ebuild
index cab151563aaa..1d0f18f80395 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.7.8.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.7.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
IUSE="setup"
RDEPEND="
diff --git a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
index dbb66269d83f..d7c6bfb768c0 100644
--- a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86"
IUSE="debug doc static-libs utils"
DEPEND=""
diff --git a/mail-client/roundcube/roundcube-1.3.8.ebuild b/mail-client/roundcube/roundcube-1.3.8.ebuild
index d1a39af89b12..f8f2785064cc 100644
--- a/mail-client/roundcube/roundcube-1.3.8.ebuild
+++ b/mail-client/roundcube/roundcube-1.3.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${PV}/${MY_P}-compl
# roundcube is GPL-licensed, the rest of the licenses here are
# for bundled PEAR components, googiespell and utf8.class.php
LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-KEYWORDS="amd64 arm ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ppc ppc64 sparc x86"
IUSE="change-password enigma ldap managesieve mysql postgres sqlite ssl spell"
REQUIRED_USE="|| ( mysql postgres sqlite )"