diff options
author | 2018-10-28 17:44:16 +0000 | |
---|---|---|
committer | 2018-10-28 17:44:16 +0000 | |
commit | 2bbb9f579de94ee9428813f1a132eaea636f60cd (patch) | |
tree | b74b77e2cf001f7a55f74ae1e807902c266d8a77 | |
parent | 2018-10-28 17:24:54 UTC (diff) | |
parent | app-emulation/docker: Add new version of apparmor profile patch (diff) | |
download | gentoo-2bbb9f579de94ee9428813f1a132eaea636f60cd.tar.gz gentoo-2bbb9f579de94ee9428813f1a132eaea636f60cd.tar.bz2 gentoo-2bbb9f579de94ee9428813f1a132eaea636f60cd.zip |
Merge updates from master
136 files changed, 813 insertions, 133 deletions
diff --git a/app-emulation/docker/docker-18.03.1-r1.ebuild b/app-emulation/docker/docker-18.03.1-r1.ebuild new file mode 100644 index 000000000000..0af07da23fd9 --- /dev/null +++ b/app-emulation/docker/docker-18.03.1-r1.ebuild @@ -0,0 +1,303 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGO_PN="github.com/docker/docker-ce" + +if [[ ${PV} = *9999* ]]; then + # Docker cannot be fetched via "go get", thanks to autogenerated code + EGIT_REPO_URI="https://${EGO_PN}.git" + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}" + inherit git-r3 +else + inherit versionator + if [ "$(get_version_component_count)" = 4 ]; then + MY_PV="$(replace_version_separator 3 '-ce-')" + else + MY_PV="$PV-ce" + fi + DOCKER_GITCOMMIT="9ee9f40" + EGIT_COMMIT="v${MY_PV}" + SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm" + [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" + inherit golang-vcs-snapshot +fi +inherit bash-completion-r1 golang-base linux-info systemd udev user + +DESCRIPTION="The core functions you need to create Docker images and run Docker containers" +HOMEPAGE="https://dockerproject.org" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="apparmor aufs btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp" + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies +CDEPEND=" + >=dev-db/sqlite-3.7.9:3 + device-mapper? ( + >=sys-fs/lvm2-2.02.89[thin] + ) + seccomp? ( >=sys-libs/libseccomp-2.2.1 ) + apparmor? ( sys-libs/libapparmor ) +" + +DEPEND=" + ${CDEPEND} + + dev-go/go-md2man + + btrfs? ( + >=sys-fs/btrfs-progs-3.16.1 + ) +" + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies +RDEPEND=" + ${CDEPEND} + >=net-firewall/iptables-1.4 + sys-process/procps + >=dev-vcs/git-1.7 + >=app-arch/xz-utils-4.9 + dev-libs/libltdl + ~app-emulation/containerd-1.0.3 + ~app-emulation/runc-1.0.0_rc5[apparmor?,seccomp?] + ~app-emulation/docker-proxy-0.8.0_p20180411 + container-init? ( >=sys-process/tini-0.16.1[static] ) +" + +RESTRICT="installsources strip" + +S="${WORKDIR}/${P}/src/${EGO_PN}" + +PATCHES=( "${FILESDIR}"/bsc1073877-docker-apparmor-add-signal-r1.patch ) + +# see "contrib/check-config.sh" from upstream's sources +CONFIG_CHECK=" + ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS + ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG + ~KEYS + ~VETH ~BRIDGE ~BRIDGE_NETFILTER + ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE + ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS + ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED + ~POSIX_MQUEUE + + ~USER_NS + ~SECCOMP + ~CGROUP_PIDS + ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED + + ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED + ~CGROUP_PERF + ~CGROUP_HUGETLB + ~NET_CLS_CGROUP + ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED + ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR + + ~VXLAN + ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER + ~IPVLAN + ~MACVLAN ~DUMMY +" + +ERROR_KEYS="CONFIG_KEYS: is mandatory" +ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" +ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" + +ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" +ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" +ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" +ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" +ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" +ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" + +pkg_setup() { + if kernel_is lt 3 10; then + ewarn "" + ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." + ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies" + fi + + if kernel_is le 3 18; then + CONFIG_CHECK+=" + ~RESOURCE_COUNTERS + " + fi + + if kernel_is le 3 13; then + CONFIG_CHECK+=" + ~NETPRIO_CGROUP + " + else + CONFIG_CHECK+=" + ~CGROUP_NET_PRIO + " + fi + + if kernel_is lt 4 5; then + CONFIG_CHECK+=" + ~MEMCG_KMEM + " + ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" + fi + + if kernel_is lt 4 7; then + CONFIG_CHECK+=" + ~DEVPTS_MULTIPLE_INSTANCES + " + fi + + if use aufs; then + CONFIG_CHECK+=" + ~AUFS_FS + ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY + " + ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3" + fi + + if use btrfs; then + CONFIG_CHECK+=" + ~BTRFS_FS + ~BTRFS_FS_POSIX_ACL + " + fi + + if use device-mapper; then + CONFIG_CHECK+=" + ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY + " + fi + + if use overlay; then + CONFIG_CHECK+=" + ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL + " + fi + + linux-info_pkg_setup + + # create docker group for the code checking for it in /etc/group + enewgroup docker +} + +src_compile() { + export GOPATH="${WORKDIR}/${P}" + + # setup CFLAGS and LDFLAGS for separate build target + # see https://github.com/tianon/docker-overlay/pull/10 + export CGO_CFLAGS="-I${ROOT}/usr/include" + export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" + + # if we're building from a tarball, we need the GITCOMMIT value + [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT + + # fake golang layout + ln -s docker-ce/components/engine ../docker || die + ln -s docker-ce/components/cli ../cli || die + + # let's set up some optional features :) + export DOCKER_BUILDTAGS='' + for gd in aufs btrfs device-mapper overlay; do + if ! use $gd; then + DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" + fi + done + + for tag in apparmor pkcs11 seccomp; do + if use $tag; then + DOCKER_BUILDTAGS+=" $tag" + fi + done + + pushd components/engine || die + + if use hardened; then + sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die + grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' + sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ + -i hack/make/dynbinary-daemon || die + grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' + fi + + # build daemon + VERSION="$(cat ../../VERSION)" \ + ./hack/make.sh dynbinary || die 'dynbinary failed' + + popd || die # components/engine + + pushd components/cli || die + + # build cli + emake \ + LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ + VERSION="$(cat ../../VERSION)" \ + GITCOMMIT="${DOCKER_GITCOMMIT}" \ + DISABLE_WARN_OUTSIDE_CONTAINER=1 \ + dynbinary || die + + # build man pages + go build -o gen-manpages github.com/docker/cli/man || die + ./gen-manpages --root . --target ./man/man1 || die + ./man/md2man-all.sh -q || die + rm gen-manpages || die + # see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man) + + popd || die # components/cli +} + +src_install() { + dosym containerd /usr/bin/docker-containerd + dosym containerd-shim /usr/bin/docker-containerd-shim + dosym runc /usr/bin/docker-runc + use container-init && dosym tini /usr/bin/docker-init + + pushd components/engine || die + newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd + + newinitd contrib/init/openrc/docker.initd docker + newconfd contrib/init/openrc/docker.confd docker + + systemd_dounit contrib/init/systemd/docker.{service,socket} + + udev_dorules contrib/udev/*.rules + + dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md + dodoc -r docs/* + + insinto /usr/share/vim/vimfiles + doins -r contrib/syntax/vim/ftdetect + doins -r contrib/syntax/vim/syntax + + # note: intentionally not using "doins" so that we preserve +x bits + dodir /usr/share/${PN}/contrib + cp -R contrib/* "${ED}/usr/share/${PN}/contrib" + popd || die # components/engine + + pushd components/cli || die + + newbin build/docker-* docker + + doman man/man*/* + + dobashcomp contrib/completion/bash/* + insinto /usr/share/zsh/site-functions + doins contrib/completion/zsh/_* + popd || die # components/cli +} + +pkg_postinst() { + udev_reload + + elog + elog "To use Docker, the Docker daemon must be running as root. To automatically" + elog "start the Docker daemon at boot, add Docker to the default runlevel:" + elog " rc-update add docker default" + elog "Similarly for systemd:" + elog " systemctl enable docker.service" + elog + elog "To use Docker as a non-root user, add yourself to the 'docker' group:" + elog " usermod -aG docker youruser" + elog +} diff --git a/app-emulation/docker/docker-18.06.1-r1.ebuild b/app-emulation/docker/docker-18.06.1-r1.ebuild new file mode 100644 index 000000000000..149bfeb91e81 --- /dev/null +++ b/app-emulation/docker/docker-18.06.1-r1.ebuild @@ -0,0 +1,305 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGO_PN="github.com/docker/docker-ce" + +if [[ ${PV} = *9999* ]]; then + # Docker cannot be fetched via "go get", thanks to autogenerated code + EGIT_REPO_URI="https://${EGO_PN}.git" + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}" + inherit git-r3 +else + inherit versionator + if [ "$(get_version_component_count)" = 4 ]; then + MY_PV="$(replace_version_separator 3 '-ce-')" + else + MY_PV="$PV-ce" + fi + DOCKER_GITCOMMIT="e68fc7a" + EGIT_COMMIT="v${MY_PV}" + SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64" + [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" + inherit golang-vcs-snapshot +fi +inherit bash-completion-r1 golang-base linux-info systemd udev user + +DESCRIPTION="The core functions you need to create Docker images and run Docker containers" +HOMEPAGE="https://dockerproject.org" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="apparmor aufs btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp" + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies +CDEPEND=" + >=dev-db/sqlite-3.7.9:3 + device-mapper? ( + >=sys-fs/lvm2-2.02.89[thin] + ) + seccomp? ( >=sys-libs/libseccomp-2.2.1 ) + apparmor? ( sys-libs/libapparmor ) +" + +DEPEND=" + ${CDEPEND} + + dev-go/go-md2man + + btrfs? ( + >=sys-fs/btrfs-progs-3.16.1 + ) +" + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies +RDEPEND=" + ${CDEPEND} + >=net-firewall/iptables-1.4 + sys-process/procps + >=dev-vcs/git-1.7 + >=app-arch/xz-utils-4.9 + dev-libs/libltdl + ~app-emulation/containerd-1.1.2 + ~app-emulation/runc-1.0.0_rc5_p20180509[apparmor?,seccomp?] + ~app-emulation/docker-proxy-0.8.0_p20180626 + container-init? ( >=sys-process/tini-0.18.0[static] ) +" + +RESTRICT="installsources strip" + +S="${WORKDIR}/${P}/src/${EGO_PN}" + +PATCHES=( "${FILESDIR}"/bsc1073877-docker-apparmor-add-signal-r2.patch ) + +# see "contrib/check-config.sh" from upstream's sources +CONFIG_CHECK=" + ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS + ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG + ~KEYS + ~VETH ~BRIDGE ~BRIDGE_NETFILTER + ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE + ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS + ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED + ~POSIX_MQUEUE + + ~USER_NS + ~SECCOMP + ~CGROUP_PIDS + ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED + + ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED + ~CGROUP_PERF + ~CGROUP_HUGETLB + ~NET_CLS_CGROUP + ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED + ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR + + ~VXLAN + ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER + ~IPVLAN + ~MACVLAN ~DUMMY +" + +ERROR_KEYS="CONFIG_KEYS: is mandatory" +ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" +ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" + +ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" +ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" +ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" +ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" +ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" +ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" + +pkg_setup() { + if kernel_is lt 3 10; then + ewarn "" + ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." + ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies" + fi + + if kernel_is le 3 18; then + CONFIG_CHECK+=" + ~RESOURCE_COUNTERS + " + fi + + if kernel_is le 3 13; then + CONFIG_CHECK+=" + ~NETPRIO_CGROUP + " + else + CONFIG_CHECK+=" + ~CGROUP_NET_PRIO + " + fi + + if kernel_is lt 4 5; then + CONFIG_CHECK+=" + ~MEMCG_KMEM + " + ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" + fi + + if kernel_is lt 4 7; then + CONFIG_CHECK+=" + ~DEVPTS_MULTIPLE_INSTANCES + " + fi + + if use aufs; then + CONFIG_CHECK+=" + ~AUFS_FS + ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY + " + ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3" + fi + + if use btrfs; then + CONFIG_CHECK+=" + ~BTRFS_FS + ~BTRFS_FS_POSIX_ACL + " + fi + + if use device-mapper; then + CONFIG_CHECK+=" + ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY + " + fi + + if use overlay; then + CONFIG_CHECK+=" + ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL + " + fi + + linux-info_pkg_setup + + # create docker group for the code checking for it in /etc/group + enewgroup docker +} + +src_compile() { + export GOPATH="${WORKDIR}/${P}" + + # setup CFLAGS and LDFLAGS for separate build target + # see https://github.com/tianon/docker-overlay/pull/10 + export CGO_CFLAGS="-I${ROOT}/usr/include" + export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" + + # if we're building from a tarball, we need the GITCOMMIT value + [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT + + # fake golang layout + ln -s docker-ce/components/engine ../docker || die + ln -s docker-ce/components/cli ../cli || die + + # let's set up some optional features :) + export DOCKER_BUILDTAGS='' + for gd in aufs btrfs device-mapper overlay; do + if ! use $gd; then + DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" + fi + done + + for tag in apparmor pkcs11 seccomp; do + if use $tag; then + DOCKER_BUILDTAGS+=" $tag" + fi + done + + pushd components/engine || die + + if use hardened; then + sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die + grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' + sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ + -i hack/make/dynbinary-daemon || die + grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' + fi + + # build daemon + VERSION="$(cat ../../VERSION)" \ + ./hack/make.sh dynbinary || die 'dynbinary failed' + + popd || die # components/engine + + pushd components/cli || die + + # build cli + emake \ + LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ + VERSION="$(cat ../../VERSION)" \ + GITCOMMIT="${DOCKER_GITCOMMIT}" \ + DISABLE_WARN_OUTSIDE_CONTAINER=1 \ + dynbinary || die + + # build man pages + go build -o gen-manpages github.com/docker/cli/man || die + ./gen-manpages --root . --target ./man/man1 || die + ./man/md2man-all.sh -q || die + rm gen-manpages || die + # see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man) + + popd || die # components/cli +} + +src_install() { + dosym containerd /usr/bin/docker-containerd + dosym containerd-shim /usr/bin/docker-containerd-shim + dosym runc /usr/bin/docker-runc + use container-init && dosym tini /usr/bin/docker-init + + pushd components/engine || die + newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd + + newinitd contrib/init/openrc/docker.initd docker + newconfd contrib/init/openrc/docker.confd docker + + systemd_dounit contrib/init/systemd/docker.{service,socket} + + udev_dorules contrib/udev/*.rules + + dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md + dodoc -r docs/* + + insinto /usr/share/vim/vimfiles + doins -r contrib/syntax/vim/ftdetect + doins -r contrib/syntax/vim/syntax + + # note: intentionally not using "doins" so that we preserve +x bits + dodir /usr/share/${PN}/contrib + cp -R contrib/* "${ED}/usr/share/${PN}/contrib" + popd || die # components/engine + + pushd components/cli || die + + newbin build/docker-* docker + + doman man/man*/* + + dobashcomp contrib/completion/bash/* + insinto /usr/share/fish/vendor_completions.d/ + doins contrib/completion/fish/docker.fish + insinto /usr/share/zsh/site-functions + doins contrib/completion/zsh/_* + popd || die # components/cli +} + +pkg_postinst() { + udev_reload + + elog + elog "To use Docker, the Docker daemon must be running as root. To automatically" + elog "start the Docker daemon at boot, add Docker to the default runlevel:" + elog " rc-update add docker default" + elog "Similarly for systemd:" + elog " systemctl enable docker.service" + elog + elog "To use Docker as a non-root user, add yourself to the 'docker' group:" + elog " usermod -aG docker youruser" + elog +} diff --git a/app-emulation/docker/files/bsc1073877-docker-apparmor-add-signal-r2.patch b/app-emulation/docker/files/bsc1073877-docker-apparmor-add-signal-r2.patch new file mode 100644 index 000000000000..fd365425fb95 --- /dev/null +++ b/app-emulation/docker/files/bsc1073877-docker-apparmor-add-signal-r2.patch @@ -0,0 +1,72 @@ +From 4822fb1e2423d88cdf0ad5d039b8fd3274b05401 Mon Sep 17 00:00:00 2001 +From: Aleksa Sarai <asarai@suse.de> +Date: Sun, 8 Apr 2018 20:21:30 +1000 +Subject: [PATCH] apparmor: allow receiving of signals from 'docker kill' + +In newer kernels, AppArmor will reject attempts to send signals to a +container because the signal originated from outside of that AppArmor +profile. Correct this by allowing all unconfined signals to be received. + +Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com> +Signed-off-by: Aleksa Sarai <asarai@suse.de> +--- + profiles/apparmor/apparmor.go | 21 +++++++++++++++++++++ + profiles/apparmor/template.go | 6 ++++++ + 2 files changed, 27 insertions(+) + +diff --git a/components/engine/profiles/apparmor/apparmor.go b/components/engine/profiles/apparmor/apparmor.go +index b021668c8e4c..2f58ee852cab 100644 +--- a/components/engine/profiles/apparmor/apparmor.go ++++ b/components/engine/profiles/apparmor/apparmor.go +@@ -23,6 +23,8 @@ var ( + type profileData struct { + // Name is profile name. + Name string ++ // DaemonProfile is the profile name of our daemon. ++ DaemonProfile string + // Imports defines the apparmor functions to import, before defining the profile. + Imports []string + // InnerImports defines the apparmor functions to import in the profile. +@@ -70,6 +72,25 @@ func InstallDefault(name string) error { + Name: name, + } + ++ // Figure out the daemon profile. ++ currentProfile, err := ioutil.ReadFile("/proc/self/attr/current") ++ if err != nil { ++ // If we couldn't get the daemon profile, assume we are running ++ // unconfined which is generally the default. ++ currentProfile = nil ++ } ++ daemonProfile := string(currentProfile) ++ // Normally profiles are suffixed by " (enforcing)" or similar. AppArmor ++ // profiles cannot contain spaces so this doesn't restrict daemon profile ++ // names. ++ if parts := strings.SplitN(daemonProfile, " ", 2); len(parts) >= 1 { ++ daemonProfile = parts[0] ++ } ++ if daemonProfile == "" { ++ daemonProfile = "unconfined" ++ } ++ p.DaemonProfile = daemonProfile ++ + // Install to a temporary directory. + f, err := ioutil.TempFile("", name) + if err != nil { +diff --git a/components/engine/profiles/apparmor/template.go b/components/engine/profiles/apparmor/template.go +index c00a3f70e993..400b3bd50a11 100644 +--- a/components/engine/profiles/apparmor/template.go ++++ b/components/engine/profiles/apparmor/template.go +@@ -17,6 +17,12 @@ profile {{.Name}} flags=(attach_disconnected,mediate_deleted) { + capability, + file, + umount, ++{{if ge .Version 208096}} ++{{/* Allow 'docker kill' to actually send signals to container processes. */}} ++ signal (receive) peer={{.DaemonProfile}}, ++{{/* Allow container processes to send signals amongst themselves. */}} ++ signal (send,receive) peer={{.Name}}, ++{{end}} + + deny @{PROC}/* w, # deny write for all files directly in /proc (not in a subdir) + # deny write to files not in /proc/<number>/** or /proc/sys/** diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild index 7e4cedf33335..bfa36dc64cdf 100644 --- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild +++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/agmartin/linuxdoc-tools/-/archive/${PV}/${P}.tar.gz" LICENSE="GPL-3+ MIT SGMLUG" SLOT="0" -KEYWORDS="amd64 ~ia64 ~ppc x86 ~x86-fbsd" +KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd" IUSE="doc" RDEPEND=" diff --git a/app-xemacs/ada/ada-1.16.ebuild b/app-xemacs/ada/ada-1.16.ebuild index 66a19d9d2282..1b28d6d7083a 100644 --- a/app-xemacs/ada/ada-1.16.ebuild +++ b/app-xemacs/ada/ada-1.16.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/apel/apel-1.36.ebuild b/app-xemacs/apel/apel-1.36.ebuild index 34931628fd44..08cbf87900ca 100644 --- a/app-xemacs/apel/apel-1.36.ebuild +++ b/app-xemacs/apel/apel-1.36.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/fsf-compat app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd" inherit xemacs-packages diff --git a/app-xemacs/auctex/auctex-1.58.ebuild b/app-xemacs/auctex/auctex-1.58.ebuild index cee205904cc3..12cb2614841a 100644 --- a/app-xemacs/auctex/auctex-1.58.ebuild +++ b/app-xemacs/auctex/auctex-1.58.ebuild @@ -14,6 +14,6 @@ app-xemacs/mail-lib app-xemacs/edit-utils app-xemacs/xemacs-ispell " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/bbdb/bbdb-1.34.ebuild b/app-xemacs/bbdb/bbdb-1.34.ebuild index ac9c22820965..a5eae7e52ad0 100644 --- a/app-xemacs/bbdb/bbdb-1.34.ebuild +++ b/app-xemacs/bbdb/bbdb-1.34.ebuild @@ -25,6 +25,6 @@ app-xemacs/net-utils app-xemacs/os-utils app-xemacs/ecrypto " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/build/build-1.18.ebuild b/app-xemacs/build/build-1.18.ebuild index db8ea99aa208..f3e83058bb22 100644 --- a/app-xemacs/build/build-1.18.ebuild +++ b/app-xemacs/build/build-1.18.ebuild @@ -13,6 +13,6 @@ app-xemacs/dired app-xemacs/w3 app-xemacs/prog-modes " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/c-support/c-support-1.24.ebuild b/app-xemacs/c-support/c-support-1.24.ebuild index 5cdf07bc4734..faecd23fdf11 100644 --- a/app-xemacs/c-support/c-support-1.24.ebuild +++ b/app-xemacs/c-support/c-support-1.24.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/cc-mode app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/calc/calc-1.28.ebuild b/app-xemacs/calc/calc-1.28.ebuild index 12120f4afa31..7b989affb7b8 100644 --- a/app-xemacs/calc/calc-1.28.ebuild +++ b/app-xemacs/calc/calc-1.28.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/calendar/calendar-1.42.ebuild b/app-xemacs/calendar/calendar-1.42.ebuild index f204b9c9c2a1..7f9c87ebf34a 100644 --- a/app-xemacs/calendar/calendar-1.42.ebuild +++ b/app-xemacs/calendar/calendar-1.42.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base app-xemacs/fsf-compat " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/cc-mode/cc-mode-1.99.ebuild b/app-xemacs/cc-mode/cc-mode-1.99.ebuild index a9d15712a567..234f4e3afe95 100644 --- a/app-xemacs/cc-mode/cc-mode-1.99.ebuild +++ b/app-xemacs/cc-mode/cc-mode-1.99.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base app-xemacs/mail-lib " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/cedet-common/cedet-common-1.03.ebuild b/app-xemacs/cedet-common/cedet-common-1.03.ebuild index 389a7f52c3d6..e9a8385cf36f 100644 --- a/app-xemacs/cedet-common/cedet-common-1.03.ebuild +++ b/app-xemacs/cedet-common/cedet-common-1.03.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base app-xemacs/edebug " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/clearcase/clearcase-1.12.ebuild b/app-xemacs/clearcase/clearcase-1.12.ebuild index c6027c31c322..6a9a7177aeb9 100644 --- a/app-xemacs/clearcase/clearcase-1.12.ebuild +++ b/app-xemacs/clearcase/clearcase-1.12.ebuild @@ -12,6 +12,6 @@ app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/sh-script " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/cogre/cogre-1.04.ebuild b/app-xemacs/cogre/cogre-1.04.ebuild index 1e424709f39d..fc18ab9e5204 100644 --- a/app-xemacs/cogre/cogre-1.04.ebuild +++ b/app-xemacs/cogre/cogre-1.04.ebuild @@ -15,6 +15,6 @@ app-xemacs/cedet-common app-xemacs/eieio app-xemacs/semantic " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/cookie/cookie-1.17.ebuild b/app-xemacs/cookie/cookie-1.17.ebuild index ef229e24adf4..aab5720c1be6 100644 --- a/app-xemacs/cookie/cookie-1.17.ebuild +++ b/app-xemacs/cookie/cookie-1.17.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/crisp/crisp-1.17.ebuild b/app-xemacs/crisp/crisp-1.17.ebuild index 8a6841f13f4d..27593fd42663 100644 --- a/app-xemacs/crisp/crisp-1.17.ebuild +++ b/app-xemacs/crisp/crisp-1.17.ebuild @@ -7,6 +7,6 @@ SLOT="0" DESCRIPTION="Crisp/Brief emulation" XEMACS_PKG_CAT="standard" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/debug/debug-1.20.ebuild b/app-xemacs/debug/debug-1.20.ebuild index 683579dae6ea..299bd96e5d53 100644 --- a/app-xemacs/debug/debug-1.20.ebuild +++ b/app-xemacs/debug/debug-1.20.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd" inherit xemacs-packages diff --git a/app-xemacs/dictionary/dictionary-1.18.ebuild b/app-xemacs/dictionary/dictionary-1.18.ebuild index 925f818a7faa..786192cdeec9 100644 --- a/app-xemacs/dictionary/dictionary-1.18.ebuild +++ b/app-xemacs/dictionary/dictionary-1.18.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/dired/dired-1.22.ebuild b/app-xemacs/dired/dired-1.22.ebuild index e4a8b318ddf1..e47f12a72252 100644 --- a/app-xemacs/dired/dired-1.22.ebuild +++ b/app-xemacs/dired/dired-1.22.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base app-xemacs/prog-modes " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/docbookide/docbookide-0.10.ebuild b/app-xemacs/docbookide/docbookide-0.10.ebuild index f87d53c07f24..43cf05646ea8 100644 --- a/app-xemacs/docbookide/docbookide-0.10.ebuild +++ b/app-xemacs/docbookide/docbookide-0.10.ebuild @@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base app-xemacs/xemacs-ispell app-xemacs/mail-lib " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/easypg/easypg-1.05.ebuild b/app-xemacs/easypg/easypg-1.05.ebuild index f9b934da1b3d..947d05743851 100644 --- a/app-xemacs/easypg/easypg-1.05.ebuild +++ b/app-xemacs/easypg/easypg-1.05.ebuild @@ -10,7 +10,7 @@ inherit xemacs-packages SLOT="0" DESCRIPTION="GnuPG interface for Emacs" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" RDEPEND="app-xemacs/xemacs-base app-xemacs/dired diff --git a/app-xemacs/ecb/ecb-1.25.ebuild b/app-xemacs/ecb/ecb-1.25.ebuild index a3d355184718..d36e154d3a13 100644 --- a/app-xemacs/ecb/ecb-1.25.ebuild +++ b/app-xemacs/ecb/ecb-1.25.ebuild @@ -22,6 +22,6 @@ app-xemacs/speedbar app-xemacs/c-support app-xemacs/os-utils " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/ecrypto/ecrypto-0.23.ebuild b/app-xemacs/ecrypto/ecrypto-0.23.ebuild index b6a38d1c5b41..cd4e940c6921 100644 --- a/app-xemacs/ecrypto/ecrypto-0.23.ebuild +++ b/app-xemacs/ecrypto/ecrypto-0.23.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/ede/ede-1.07.ebuild b/app-xemacs/ede/ede-1.07.ebuild index c6d8e2f660d8..f6606560f59d 100644 --- a/app-xemacs/ede/ede-1.07.ebuild +++ b/app-xemacs/ede/ede-1.07.ebuild @@ -10,4 +10,4 @@ inherit xemacs-packages SLOT="0" DESCRIPTION="Emacs Development Environment" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" diff --git a/app-xemacs/edebug/edebug-1.24.ebuild b/app-xemacs/edebug/edebug-1.24.ebuild index 5e63b1ef9f96..2f8d2152913c 100644 --- a/app-xemacs/edebug/edebug-1.24.ebuild +++ b/app-xemacs/edebug/edebug-1.24.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base app-xemacs/xemacs-devel " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/edict/edict-1.19.ebuild b/app-xemacs/edict/edict-1.19.ebuild index 50bdee1c53c6..63b04996dc6a 100644 --- a/app-xemacs/edict/edict-1.19.ebuild +++ b/app-xemacs/edict/edict-1.19.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="mule" RDEPEND="app-xemacs/mule-base app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/ediff/ediff-1.84.ebuild b/app-xemacs/ediff/ediff-1.84.ebuild index 181a6472bd4b..fa5a45b84be4 100644 --- a/app-xemacs/ediff/ediff-1.84.ebuild +++ b/app-xemacs/ediff/ediff-1.84.ebuild @@ -18,6 +18,6 @@ app-xemacs/tramp app-xemacs/vc app-xemacs/sh-script " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/edit-utils/edit-utils-2.58.ebuild b/app-xemacs/edit-utils/edit-utils-2.58.ebuild index c1a6583efcc6..569702f9bf3c 100644 --- a/app-xemacs/edit-utils/edit-utils-2.58.ebuild +++ b/app-xemacs/edit-utils/edit-utils-2.58.ebuild @@ -13,6 +13,6 @@ app-xemacs/fsf-compat app-xemacs/dired app-xemacs/mail-lib " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/edt/edt-1.16.ebuild b/app-xemacs/edt/edt-1.16.ebuild index 60ec98b86735..555dd1352416 100644 --- a/app-xemacs/edt/edt-1.16.ebuild +++ b/app-xemacs/edt/edt-1.16.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/efs/efs-1.37.ebuild b/app-xemacs/efs/efs-1.37.ebuild index 1284a2d3cc10..7451fd04e952 100644 --- a/app-xemacs/efs/efs-1.37.ebuild +++ b/app-xemacs/efs/efs-1.37.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base app-xemacs/dired " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/egg-its/egg-its-1.29.ebuild b/app-xemacs/egg-its/egg-its-1.29.ebuild index f57e0b661c31..d23f9c9c37ad 100644 --- a/app-xemacs/egg-its/egg-its-1.29.ebuild +++ b/app-xemacs/egg-its/egg-its-1.29.ebuild @@ -12,6 +12,6 @@ app-xemacs/mule-base app-xemacs/fsf-compat app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/eieio/eieio-1.10.ebuild b/app-xemacs/eieio/eieio-1.10.ebuild index f9bb9b8304af..910fcc7ef006 100644 --- a/app-xemacs/eieio/eieio-1.10.ebuild +++ b/app-xemacs/eieio/eieio-1.10.ebuild @@ -12,6 +12,6 @@ app-xemacs/edebug app-xemacs/cedet-common app-xemacs/speedbar " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/elib/elib-1.15.ebuild b/app-xemacs/elib/elib-1.15.ebuild index b5217c8ee5a3..be710b4ecf3f 100644 --- a/app-xemacs/elib/elib-1.15.ebuild +++ b/app-xemacs/elib/elib-1.15.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/emerge/emerge-1.13.ebuild b/app-xemacs/emerge/emerge-1.13.ebuild index 7a5bc78de12e..992cc8f18e85 100644 --- a/app-xemacs/emerge/emerge-1.13.ebuild +++ b/app-xemacs/emerge/emerge-1.13.ebuild @@ -7,6 +7,6 @@ SLOT="0" DESCRIPTION="Another interface over GNU patch" XEMACS_PKG_CAT="standard" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/erc/erc-0.26.ebuild b/app-xemacs/erc/erc-0.26.ebuild index 20d3e2c90fe3..735c5e04b453 100644 --- a/app-xemacs/erc/erc-0.26.ebuild +++ b/app-xemacs/erc/erc-0.26.ebuild @@ -7,7 +7,7 @@ SLOT="0" DESCRIPTION="ERC - The Emacs IRC Client" XEMACS_PKG_CAT="standard" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/escreen/escreen-1.03.ebuild b/app-xemacs/escreen/escreen-1.03.ebuild index c371a2fbfdcd..1f781c520257 100644 --- a/app-xemacs/escreen/escreen-1.03.ebuild +++ b/app-xemacs/escreen/escreen-1.03.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/eshell/eshell-1.21.ebuild b/app-xemacs/eshell/eshell-1.21.ebuild index 5fa401bf5e17..39502c55dc4d 100644 --- a/app-xemacs/eshell/eshell-1.21.ebuild +++ b/app-xemacs/eshell/eshell-1.21.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base app-xemacs/xemacs-eterm " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/eudc/eudc-1.43.ebuild b/app-xemacs/eudc/eudc-1.43.ebuild index 20c9a1b71855..a0c340dcf844 100644 --- a/app-xemacs/eudc/eudc-1.43.ebuild +++ b/app-xemacs/eudc/eudc-1.43.ebuild @@ -20,6 +20,6 @@ app-xemacs/sh-script app-xemacs/net-utils app-xemacs/ecrypto " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/footnote/footnote-1.18.ebuild b/app-xemacs/footnote/footnote-1.18.ebuild index 6970c68c0a6d..34451c79198a 100644 --- a/app-xemacs/footnote/footnote-1.18.ebuild +++ b/app-xemacs/footnote/footnote-1.18.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/mail-lib app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/forms/forms-1.17.ebuild b/app-xemacs/forms/forms-1.17.ebuild index 9e1fa09f2775..7c885c6972ad 100644 --- a/app-xemacs/forms/forms-1.17.ebuild +++ b/app-xemacs/forms/forms-1.17.ebuild @@ -7,6 +7,6 @@ SLOT="0" DESCRIPTION="Forms editing support (obsolete, use Widget instead)" XEMACS_PKG_CAT="standard" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild b/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild index 48cccc898581..178a54c60758 100644 --- a/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild +++ b/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/frame-icon/frame-icon-1.13.ebuild b/app-xemacs/frame-icon/frame-icon-1.13.ebuild index 0d8c9592a73a..ffebcd0303c9 100644 --- a/app-xemacs/frame-icon/frame-icon-1.13.ebuild +++ b/app-xemacs/frame-icon/frame-icon-1.13.ebuild @@ -7,6 +7,6 @@ SLOT="0" DESCRIPTION="Set up mode-specific icons for each frame under XEmacs" XEMACS_PKG_CAT="standard" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/fsf-compat/fsf-compat-1.24.ebuild b/app-xemacs/fsf-compat/fsf-compat-1.24.ebuild index 3d310d149b5f..1f483eb7e02d 100644 --- a/app-xemacs/fsf-compat/fsf-compat-1.24.ebuild +++ b/app-xemacs/fsf-compat/fsf-compat-1.24.ebuild @@ -7,7 +7,7 @@ SLOT="0" DESCRIPTION="FSF Emacs compatibility files" XEMACS_PKG_CAT="standard" -KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd" inherit xemacs-packages diff --git a/app-xemacs/games/games-1.23.ebuild b/app-xemacs/games/games-1.23.ebuild index 798cfa1badeb..53b578e14dcd 100644 --- a/app-xemacs/games/games-1.23.ebuild +++ b/app-xemacs/games/games-1.23.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/general-docs/general-docs-1.10.ebuild b/app-xemacs/general-docs/general-docs-1.10.ebuild index c8f9d5bf57bb..e2843817abb8 100644 --- a/app-xemacs/general-docs/general-docs-1.10.ebuild +++ b/app-xemacs/general-docs/general-docs-1.10.ebuild @@ -8,6 +8,6 @@ DESCRIPTION="General XEmacs documentation" XEMACS_PKG_CAT="standard" RDEPEND="" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/gnats/gnats-1.19.ebuild b/app-xemacs/gnats/gnats-1.19.ebuild index 060149dc1b14..89ae95c5ddda 100644 --- a/app-xemacs/gnats/gnats-1.19.ebuild +++ b/app-xemacs/gnats/gnats-1.19.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/mail-lib app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/gnus/gnus-2.04.ebuild b/app-xemacs/gnus/gnus-2.04.ebuild index de5132f6f163..6db94230623d 100644 --- a/app-xemacs/gnus/gnus-2.04.ebuild +++ b/app-xemacs/gnus/gnus-2.04.ebuild @@ -23,6 +23,6 @@ app-xemacs/mailcrypt app-xemacs/ecrypto app-xemacs/sasl " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild b/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild index b31614dea847..7d2cec9155ca 100644 --- a/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild +++ b/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild @@ -12,6 +12,6 @@ app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/edit-utils " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild b/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild index 8c27a4cdf8c5..1df098273dcf 100644 --- a/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild +++ b/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild @@ -11,6 +11,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/dired app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/hyperbole/hyperbole-1.22.ebuild b/app-xemacs/hyperbole/hyperbole-1.22.ebuild index 8721caa27612..b6d528608d7b 100644 --- a/app-xemacs/hyperbole/hyperbole-1.22.ebuild +++ b/app-xemacs/hyperbole/hyperbole-1.22.ebuild @@ -21,6 +21,6 @@ app-xemacs/sh-script app-xemacs/net-utils app-xemacs/ecrypto " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/ibuffer/ibuffer-1.12.ebuild b/app-xemacs/ibuffer/ibuffer-1.12.ebuild index 7efc6a98c730..877dfa8fbda8 100644 --- a/app-xemacs/ibuffer/ibuffer-1.12.ebuild +++ b/app-xemacs/ibuffer/ibuffer-1.12.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/idlwave/idlwave-1.34.ebuild b/app-xemacs/idlwave/idlwave-1.34.ebuild index 19cd93ba36d3..4234acf9dd22 100644 --- a/app-xemacs/idlwave/idlwave-1.34.ebuild +++ b/app-xemacs/idlwave/idlwave-1.34.ebuild @@ -11,6 +11,6 @@ RDEPEND="app-xemacs/fsf-compat app-xemacs/xemacs-base app-xemacs/mail-lib " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/igrep/igrep-1.18.ebuild b/app-xemacs/igrep/igrep-1.18.ebuild index 9590bc2a8eb6..f40ee3895de1 100644 --- a/app-xemacs/igrep/igrep-1.18.ebuild +++ b/app-xemacs/igrep/igrep-1.18.ebuild @@ -11,6 +11,6 @@ RDEPEND="app-xemacs/dired app-xemacs/xemacs-base app-xemacs/efs " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/ilisp/ilisp-1.38.ebuild b/app-xemacs/ilisp/ilisp-1.38.ebuild index 0c2d231cfd30..14a3bf9726f2 100644 --- a/app-xemacs/ilisp/ilisp-1.38.ebuild +++ b/app-xemacs/ilisp/ilisp-1.38.ebuild @@ -13,6 +13,6 @@ app-xemacs/fsf-compat app-xemacs/xemacs-eterm app-xemacs/sh-script " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/jde/jde-1.54.ebuild b/app-xemacs/jde/jde-1.54.ebuild index e408678a6a6c..859deb3ca414 100644 --- a/app-xemacs/jde/jde-1.54.ebuild +++ b/app-xemacs/jde/jde-1.54.ebuild @@ -23,6 +23,6 @@ app-xemacs/sh-script app-xemacs/fsf-compat app-xemacs/os-utils " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild b/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild index 13c4ad044502..2ae1e16b95e4 100644 --- a/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild +++ b/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="mule" RDEPEND="app-xemacs/mule-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/latin-unity/latin-unity-1.23.ebuild b/app-xemacs/latin-unity/latin-unity-1.23.ebuild index 55bc93ad716c..503449f08e0b 100644 --- a/app-xemacs/latin-unity/latin-unity-1.23.ebuild +++ b/app-xemacs/latin-unity/latin-unity-1.23.ebuild @@ -14,6 +14,6 @@ app-xemacs/leim app-xemacs/fsf-compat app-xemacs/dired " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/leim/leim-1.39.ebuild b/app-xemacs/leim/leim-1.39.ebuild index 787f571800c2..9c4fff79db11 100644 --- a/app-xemacs/leim/leim-1.39.ebuild +++ b/app-xemacs/leim/leim-1.39.ebuild @@ -12,6 +12,6 @@ app-xemacs/fsf-compat app-xemacs/xemacs-base app-xemacs/latin-euro-standards " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/locale/locale-1.30.ebuild b/app-xemacs/locale/locale-1.30.ebuild index 7826975d0457..2f0f72255327 100644 --- a/app-xemacs/locale/locale-1.30.ebuild +++ b/app-xemacs/locale/locale-1.30.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="mule" RDEPEND="app-xemacs/mule-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/lookup/lookup-1.17.ebuild b/app-xemacs/lookup/lookup-1.17.ebuild index 368930f056d7..7ab990c5bb68 100644 --- a/app-xemacs/lookup/lookup-1.17.ebuild +++ b/app-xemacs/lookup/lookup-1.17.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="mule" RDEPEND="app-xemacs/mule-base app-xemacs/cookie " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/mail-lib/mail-lib-1.84.ebuild b/app-xemacs/mail-lib/mail-lib-1.84.ebuild index 70b15a9b0506..60fa9677e00f 100644 --- a/app-xemacs/mail-lib/mail-lib-1.84.ebuild +++ b/app-xemacs/mail-lib/mail-lib-1.84.ebuild @@ -13,6 +13,6 @@ app-xemacs/fsf-compat app-xemacs/sh-script app-xemacs/ecrypto " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild b/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild index 2fe0cd8c7bc5..de9daa39cb73 100644 --- a/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild +++ b/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild @@ -16,6 +16,6 @@ app-xemacs/mh-e app-xemacs/rmail app-xemacs/vm " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/mew/mew-1.22.ebuild b/app-xemacs/mew/mew-1.22.ebuild index 8bc6a4ed7469..c444f9d00555 100644 --- a/app-xemacs/mew/mew-1.22.ebuild +++ b/app-xemacs/mew/mew-1.22.ebuild @@ -13,6 +13,6 @@ app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/fsf-compat " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/mh-e/mh-e-1.35.ebuild b/app-xemacs/mh-e/mh-e-1.35.ebuild index 92ae76075a0a..a47544f2212b 100644 --- a/app-xemacs/mh-e/mh-e-1.35.ebuild +++ b/app-xemacs/mh-e/mh-e-1.35.ebuild @@ -23,6 +23,6 @@ app-xemacs/ecrypto app-xemacs/cedet-common app-xemacs/speedbar " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/mine/mine-1.18.ebuild b/app-xemacs/mine/mine-1.18.ebuild index 3d269e068cdd..4a01ab97d197 100644 --- a/app-xemacs/mine/mine-1.18.ebuild +++ b/app-xemacs/mine/mine-1.18.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/misc-games/misc-games-1.25.ebuild b/app-xemacs/misc-games/misc-games-1.25.ebuild index 5a14e7b01bae..176a608a5350 100644 --- a/app-xemacs/misc-games/misc-games-1.25.ebuild +++ b/app-xemacs/misc-games/misc-games-1.25.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild b/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild index cb93feb0262c..d232cc5cf68e 100644 --- a/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild +++ b/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base app-xemacs/fsf-compat " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/mule-base/mule-base-1.60.ebuild b/app-xemacs/mule-base/mule-base-1.60.ebuild index 2c942cb59b4a..7978720b4d39 100644 --- a/app-xemacs/mule-base/mule-base-1.60.ebuild +++ b/app-xemacs/mule-base/mule-base-1.60.ebuild @@ -11,6 +11,6 @@ RDEPEND="app-xemacs/fsf-compat app-xemacs/xemacs-base app-xemacs/apel " -KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd" inherit xemacs-packages diff --git a/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild b/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild index a1cbba6b5ab5..6817d1691aee 100644 --- a/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild +++ b/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="mule" RDEPEND="app-xemacs/mule-base app-xemacs/latin-euro-standards " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/net-utils/net-utils-1.61.ebuild b/app-xemacs/net-utils/net-utils-1.61.ebuild index 29a5258b54a2..78537ea694bc 100644 --- a/app-xemacs/net-utils/net-utils-1.61.ebuild +++ b/app-xemacs/net-utils/net-utils-1.61.ebuild @@ -13,6 +13,6 @@ app-xemacs/bbdb app-xemacs/xemacs-base app-xemacs/efs " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/ocaml/ocaml-0.10.ebuild b/app-xemacs/ocaml/ocaml-0.10.ebuild index b6e233d263db..89653fec70af 100644 --- a/app-xemacs/ocaml/ocaml-0.10.ebuild +++ b/app-xemacs/ocaml/ocaml-0.10.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base app-xemacs/fsf-compat " -KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd" inherit xemacs-packages diff --git a/app-xemacs/oo-browser/oo-browser-1.07.ebuild b/app-xemacs/oo-browser/oo-browser-1.07.ebuild index 297c954d913a..70d664cab5a1 100644 --- a/app-xemacs/oo-browser/oo-browser-1.07.ebuild +++ b/app-xemacs/oo-browser/oo-browser-1.07.ebuild @@ -12,6 +12,6 @@ app-xemacs/hyperbole app-xemacs/gnus app-xemacs/sh-script " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/os-utils/os-utils-1.44.ebuild b/app-xemacs/os-utils/os-utils-1.44.ebuild index 57828eaa710d..1c9943cf045c 100644 --- a/app-xemacs/os-utils/os-utils-1.44.ebuild +++ b/app-xemacs/os-utils/os-utils-1.44.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/pc/pc-1.30.ebuild b/app-xemacs/pc/pc-1.30.ebuild index 0d7193f96f50..4167675f7499 100644 --- a/app-xemacs/pc/pc-1.30.ebuild +++ b/app-xemacs/pc/pc-1.30.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild b/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild index d4e10e830b37..7f94b2529416 100644 --- a/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild +++ b/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild @@ -20,6 +20,6 @@ app-xemacs/tramp app-xemacs/gnus app-xemacs/sh-script " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/pcomplete/pcomplete-1.08.ebuild b/app-xemacs/pcomplete/pcomplete-1.08.ebuild index b2f5c5a42c86..30f4c6c75ed2 100644 --- a/app-xemacs/pcomplete/pcomplete-1.08.ebuild +++ b/app-xemacs/pcomplete/pcomplete-1.08.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/sh-script app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/perl-modes/perl-modes-1.16.ebuild b/app-xemacs/perl-modes/perl-modes-1.16.ebuild index f06bf6dcfd3d..5946c4bcf2fc 100644 --- a/app-xemacs/perl-modes/perl-modes-1.16.ebuild +++ b/app-xemacs/perl-modes/perl-modes-1.16.ebuild @@ -13,6 +13,6 @@ app-xemacs/ps-print app-xemacs/edit-utils app-xemacs/fsf-compat " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/pgg/pgg-1.10.ebuild b/app-xemacs/pgg/pgg-1.10.ebuild index b390642709df..b6a2cf210f95 100644 --- a/app-xemacs/pgg/pgg-1.10.ebuild +++ b/app-xemacs/pgg/pgg-1.10.ebuild @@ -12,6 +12,6 @@ app-xemacs/fsf-compat app-xemacs/edebug app-xemacs/ecrypto " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/prog-modes/prog-modes-2.33.ebuild b/app-xemacs/prog-modes/prog-modes-2.33.ebuild index 718698f9064a..72d26baf26bc 100644 --- a/app-xemacs/prog-modes/prog-modes-2.33.ebuild +++ b/app-xemacs/prog-modes/prog-modes-2.33.ebuild @@ -25,6 +25,6 @@ app-xemacs/cedet-common app-xemacs/w3 app-xemacs/gnus " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/ps-print/ps-print-1.14.ebuild b/app-xemacs/ps-print/ps-print-1.14.ebuild index 3ed11d2e29f3..91b43ef7c120 100644 --- a/app-xemacs/ps-print/ps-print-1.14.ebuild +++ b/app-xemacs/ps-print/ps-print-1.14.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/text-modes app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild b/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild index c0e5d32e1623..4231cb37602b 100644 --- a/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild +++ b/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild @@ -15,6 +15,6 @@ app-xemacs/fsf-compat app-xemacs/xemacs-eterm app-xemacs/sh-script " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/psgml/psgml-1.50.ebuild b/app-xemacs/psgml/psgml-1.50.ebuild index 64203fab5ff0..1577d056a114 100644 --- a/app-xemacs/psgml/psgml-1.50.ebuild +++ b/app-xemacs/psgml/psgml-1.50.ebuild @@ -17,6 +17,6 @@ app-xemacs/xemacs-eterm app-xemacs/sh-script app-xemacs/ps-print " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/python-modes/python-modes-1.16.ebuild b/app-xemacs/python-modes/python-modes-1.16.ebuild index 583d7eda282f..17f1a08b8659 100644 --- a/app-xemacs/python-modes/python-modes-1.16.ebuild +++ b/app-xemacs/python-modes/python-modes-1.16.ebuild @@ -13,6 +13,6 @@ app-xemacs/edit-utils app-xemacs/fsf-compat app-xemacs/text-modes " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/re-builder/re-builder-1.07.ebuild b/app-xemacs/re-builder/re-builder-1.07.ebuild index 9307618ba63e..33063ddf2c71 100644 --- a/app-xemacs/re-builder/re-builder-1.07.ebuild +++ b/app-xemacs/re-builder/re-builder-1.07.ebuild @@ -8,6 +8,6 @@ DESCRIPTION="Interactive development tool for regular expressions" XEMACS_PKG_CAT="standard" RDEPEND="" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/reftex/reftex-1.36.ebuild b/app-xemacs/reftex/reftex-1.36.ebuild index d6c4581b64f2..5b61fc7109b5 100644 --- a/app-xemacs/reftex/reftex-1.36.ebuild +++ b/app-xemacs/reftex/reftex-1.36.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/riece/riece-1.26.ebuild b/app-xemacs/riece/riece-1.26.ebuild index 7cb735a17b7e..8c55f9a97dc4 100644 --- a/app-xemacs/riece/riece-1.26.ebuild +++ b/app-xemacs/riece/riece-1.26.ebuild @@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/bbdb " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/rmail/rmail-1.16.ebuild b/app-xemacs/rmail/rmail-1.16.ebuild index 6d79edc899db..855ab30b3827 100644 --- a/app-xemacs/rmail/rmail-1.16.ebuild +++ b/app-xemacs/rmail/rmail-1.16.ebuild @@ -12,6 +12,6 @@ app-xemacs/apel app-xemacs/mail-lib app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild b/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild index 158d4a0a3fd3..5b71cb005164 100644 --- a/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild +++ b/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base app-xemacs/debug " -KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd" inherit xemacs-packages diff --git a/app-xemacs/sasl/sasl-1.18.ebuild b/app-xemacs/sasl/sasl-1.18.ebuild index 8d85f6d0ceb5..4bb0e0c35ac5 100644 --- a/app-xemacs/sasl/sasl-1.18.ebuild +++ b/app-xemacs/sasl/sasl-1.18.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/ecrypto " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/scheme/scheme-1.22.ebuild b/app-xemacs/scheme/scheme-1.22.ebuild index 2ad605c14bcd..f7061c3ab6af 100644 --- a/app-xemacs/scheme/scheme-1.22.ebuild +++ b/app-xemacs/scheme/scheme-1.22.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/semantic/semantic-1.23.ebuild b/app-xemacs/semantic/semantic-1.23.ebuild index 1facb1d1d567..5c195cde7760 100644 --- a/app-xemacs/semantic/semantic-1.23.ebuild +++ b/app-xemacs/semantic/semantic-1.23.ebuild @@ -20,6 +20,6 @@ app-xemacs/cc-mode app-xemacs/edebug app-xemacs/sgml " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/sgml/sgml-1.13.ebuild b/app-xemacs/sgml/sgml-1.13.ebuild index b0d2679d8925..c4e1bf6360c6 100644 --- a/app-xemacs/sgml/sgml-1.13.ebuild +++ b/app-xemacs/sgml/sgml-1.13.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/sh-script/sh-script-1.26.ebuild b/app-xemacs/sh-script/sh-script-1.26.ebuild index 809dc99683cb..067d40b39b93 100644 --- a/app-xemacs/sh-script/sh-script-1.26.ebuild +++ b/app-xemacs/sh-script/sh-script-1.26.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/sieve/sieve-1.20.ebuild b/app-xemacs/sieve/sieve-1.20.ebuild index a09f0aa12196..d6ba96851fe4 100644 --- a/app-xemacs/sieve/sieve-1.20.ebuild +++ b/app-xemacs/sieve/sieve-1.20.ebuild @@ -14,6 +14,6 @@ app-xemacs/sasl app-xemacs/ecrypto app-xemacs/sh-script " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/skk/skk-1.27.ebuild b/app-xemacs/skk/skk-1.27.ebuild index 5596b93dfe19..0a14e1e41638 100644 --- a/app-xemacs/skk/skk-1.27.ebuild +++ b/app-xemacs/skk/skk-1.27.ebuild @@ -13,6 +13,6 @@ app-xemacs/elib app-xemacs/xemacs-base app-xemacs/apel " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/slider/slider-1.18.ebuild b/app-xemacs/slider/slider-1.18.ebuild index d200e395af1c..0077ddd598c1 100644 --- a/app-xemacs/slider/slider-1.18.ebuild +++ b/app-xemacs/slider/slider-1.18.ebuild @@ -7,6 +7,6 @@ SLOT="0" DESCRIPTION="User interface tool" XEMACS_PKG_CAT="standard" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/sml-mode/sml-mode-0.14.ebuild b/app-xemacs/sml-mode/sml-mode-0.14.ebuild index 3b31c9e82691..bc898045bdd6 100644 --- a/app-xemacs/sml-mode/sml-mode-0.14.ebuild +++ b/app-xemacs/sml-mode/sml-mode-0.14.ebuild @@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base app-xemacs/edebug app-xemacs/fsf-compat " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/sounds-au/sounds-au-1.14.ebuild b/app-xemacs/sounds-au/sounds-au-1.14.ebuild index aff7909c7e7d..eeff70080cf9 100644 --- a/app-xemacs/sounds-au/sounds-au-1.14.ebuild +++ b/app-xemacs/sounds-au/sounds-au-1.14.ebuild @@ -8,6 +8,6 @@ DESCRIPTION="XEmacs Sun sound files" XEMACS_PKG_CAT="standard" RDEPEND="" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild b/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild index 55dcc659a786..ed7e69614999 100644 --- a/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild +++ b/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild @@ -7,6 +7,6 @@ SLOT="0" DESCRIPTION="XEmacs Microsoft sound files" XEMACS_PKG_CAT="standard" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/speedbar/speedbar-1.32.ebuild b/app-xemacs/speedbar/speedbar-1.32.ebuild index 5e428298f97c..7ae3cac14a0f 100644 --- a/app-xemacs/speedbar/speedbar-1.32.ebuild +++ b/app-xemacs/speedbar/speedbar-1.32.ebuild @@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base app-xemacs/edebug app-xemacs/cedet-common " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/strokes/strokes-1.12.ebuild b/app-xemacs/strokes/strokes-1.12.ebuild index 9deed2c5a1b9..933d468a9ce5 100644 --- a/app-xemacs/strokes/strokes-1.12.ebuild +++ b/app-xemacs/strokes/strokes-1.12.ebuild @@ -12,6 +12,6 @@ app-xemacs/edit-utils app-xemacs/mail-lib app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/sun/sun-1.19.ebuild b/app-xemacs/sun/sun-1.19.ebuild index fd57a67cdaef..b60f159e94fe 100644 --- a/app-xemacs/sun/sun-1.19.ebuild +++ b/app-xemacs/sun/sun-1.19.ebuild @@ -13,6 +13,6 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/packages/${MY_PN}-${PV}-pkg.tar.gz" RDEPEND="app-xemacs/cc-mode app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/supercite/supercite-1.23.ebuild b/app-xemacs/supercite/supercite-1.23.ebuild index bacdf565ae88..b49aaac92818 100644 --- a/app-xemacs/supercite/supercite-1.23.ebuild +++ b/app-xemacs/supercite/supercite-1.23.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/mail-lib app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/texinfo/texinfo-1.32.ebuild b/app-xemacs/texinfo/texinfo-1.32.ebuild index 1d6d56378321..7e04feaddbd2 100644 --- a/app-xemacs/texinfo/texinfo-1.32.ebuild +++ b/app-xemacs/texinfo/texinfo-1.32.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/text-modes app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/text-modes/text-modes-2.06.ebuild b/app-xemacs/text-modes/text-modes-2.06.ebuild index 56c28c290f70..6a1a6206f270 100644 --- a/app-xemacs/text-modes/text-modes-2.06.ebuild +++ b/app-xemacs/text-modes/text-modes-2.06.ebuild @@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-ispell app-xemacs/fsf-compat app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/textools/textools-1.17.ebuild b/app-xemacs/textools/textools-1.17.ebuild index d1e67766e279..0b8843e0f13e 100644 --- a/app-xemacs/textools/textools-1.17.ebuild +++ b/app-xemacs/textools/textools-1.17.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/time/time-1.17.ebuild b/app-xemacs/time/time-1.17.ebuild index 5f3075647fb3..37159e69dd2d 100644 --- a/app-xemacs/time/time-1.17.ebuild +++ b/app-xemacs/time/time-1.17.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/tm/tm-1.42.ebuild b/app-xemacs/tm/tm-1.42.ebuild index 9cf194373f1d..c6cfff8a036c 100644 --- a/app-xemacs/tm/tm-1.42.ebuild +++ b/app-xemacs/tm/tm-1.42.ebuild @@ -20,6 +20,6 @@ app-xemacs/sh-script app-xemacs/net-utils app-xemacs/ecrypto " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/tooltalk/tooltalk-1.17.ebuild b/app-xemacs/tooltalk/tooltalk-1.17.ebuild index 40ec153a0ddb..4856e752bca8 100644 --- a/app-xemacs/tooltalk/tooltalk-1.17.ebuild +++ b/app-xemacs/tooltalk/tooltalk-1.17.ebuild @@ -7,6 +7,6 @@ SLOT="0" DESCRIPTION="Support for building with Tooltalk" XEMACS_PKG_CAT="standard" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/tpu/tpu-1.16.ebuild b/app-xemacs/tpu/tpu-1.16.ebuild index 04bcc26fdbb0..a6f1a962a4b5 100644 --- a/app-xemacs/tpu/tpu-1.16.ebuild +++ b/app-xemacs/tpu/tpu-1.16.ebuild @@ -8,6 +8,6 @@ DESCRIPTION="DEC EDIT/TPU support" XEMACS_PKG_CAT="standard" RDEPEND="" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/tramp/tramp-1.57.ebuild b/app-xemacs/tramp/tramp-1.57.ebuild index 8109a1f991c7..e4f6bc666a3e 100644 --- a/app-xemacs/tramp/tramp-1.57.ebuild +++ b/app-xemacs/tramp/tramp-1.57.ebuild @@ -17,6 +17,6 @@ app-xemacs/ediff app-xemacs/sh-script app-xemacs/edebug " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/vc-cc/vc-cc-1.24.ebuild b/app-xemacs/vc-cc/vc-cc-1.24.ebuild index 57177057dc40..03260f3519e5 100644 --- a/app-xemacs/vc-cc/vc-cc-1.24.ebuild +++ b/app-xemacs/vc-cc/vc-cc-1.24.ebuild @@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/dired app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/vc/vc-1.50.ebuild b/app-xemacs/vc/vc-1.50.ebuild index 94fcf89b8e75..621e0aae8243 100644 --- a/app-xemacs/vc/vc-1.50.ebuild +++ b/app-xemacs/vc/vc-1.50.ebuild @@ -19,6 +19,6 @@ app-xemacs/elib app-xemacs/edebug app-xemacs/gnus " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/vhdl/vhdl-1.24.ebuild b/app-xemacs/vhdl/vhdl-1.24.ebuild index 120d231937aa..a13b87b93839 100644 --- a/app-xemacs/vhdl/vhdl-1.24.ebuild +++ b/app-xemacs/vhdl/vhdl-1.24.ebuild @@ -15,6 +15,6 @@ app-xemacs/ps-print app-xemacs/os-utils app-xemacs/cedet-common " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/view-process/view-process-1.15.ebuild b/app-xemacs/view-process/view-process-1.15.ebuild index 3761a1c00876..cfb39cc46ebf 100644 --- a/app-xemacs/view-process/view-process-1.15.ebuild +++ b/app-xemacs/view-process/view-process-1.15.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/viper/viper-1.69.ebuild b/app-xemacs/viper/viper-1.69.ebuild index 31471c246258..4866ee1fc5d4 100644 --- a/app-xemacs/viper/viper-1.69.ebuild +++ b/app-xemacs/viper/viper-1.69.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/vm/vm-8.11.ebuild b/app-xemacs/vm/vm-8.11.ebuild index 6919757108c4..b0dc3aa8bf83 100644 --- a/app-xemacs/vm/vm-8.11.ebuild +++ b/app-xemacs/vm/vm-8.11.ebuild @@ -20,6 +20,6 @@ app-xemacs/os-utils app-xemacs/bbdb app-xemacs/fsf-compat " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/w3/w3-1.41.ebuild b/app-xemacs/w3/w3-1.41.ebuild index e3e793751661..44651cd97901 100644 --- a/app-xemacs/w3/w3-1.41.ebuild +++ b/app-xemacs/w3/w3-1.41.ebuild @@ -16,6 +16,6 @@ app-xemacs/sh-script app-xemacs/fsf-compat app-xemacs/xemacs-eterm " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/x-symbol/x-symbol-1.16.ebuild b/app-xemacs/x-symbol/x-symbol-1.16.ebuild index 818d5b141b54..7384deca8733 100644 --- a/app-xemacs/x-symbol/x-symbol-1.16.ebuild +++ b/app-xemacs/x-symbol/x-symbol-1.16.ebuild @@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base app-xemacs/auctex app-xemacs/mail-lib " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/xemacs-base/xemacs-base-2.46.ebuild b/app-xemacs/xemacs-base/xemacs-base-2.46.ebuild index 9b4689c82566..1168ec24b55d 100644 --- a/app-xemacs/xemacs-base/xemacs-base-2.46.ebuild +++ b/app-xemacs/xemacs-base/xemacs-base-2.46.ebuild @@ -7,6 +7,6 @@ SLOT="0" DESCRIPTION="Fundamental XEmacs support, you almost certainly need this" XEMACS_PKG_CAT="standard" -KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd" inherit xemacs-packages diff --git a/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild b/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild index 820b3b67241a..490fdecd20de 100644 --- a/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild +++ b/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild @@ -19,6 +19,6 @@ app-xemacs/net-utils app-xemacs/xemacs-eterm app-xemacs/ecrypto " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild b/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild index d6603400118c..d863a74ad32d 100644 --- a/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild +++ b/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild @@ -13,7 +13,7 @@ DESCRIPTION="Terminal emulation" SRC_URI="http://ftp.xemacs.org/pub/xemacs/packages/${MY_PN}-${PV}-pkg.tar.gz" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" RDEPEND="app-xemacs/xemacs-base " diff --git a/app-xemacs/xemacs-ispell/xemacs-ispell-1.37.ebuild b/app-xemacs/xemacs-ispell/xemacs-ispell-1.37.ebuild index 47192440f079..dfa1c79beb9b 100644 --- a/app-xemacs/xemacs-ispell/xemacs-ispell-1.37.ebuild +++ b/app-xemacs/xemacs-ispell/xemacs-ispell-1.37.ebuild @@ -12,6 +12,6 @@ MY_PN=${PN/xemacs-/} SRC_URI="http://ftp.xemacs.org/pub/xemacs/packages/${MY_PN}-${PV}-pkg.tar.gz" RDEPEND="" -KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/xemacs-packages-all/xemacs-packages-all-2018.08.11.ebuild b/app-xemacs/xemacs-packages-all/xemacs-packages-all-2018.08.11.ebuild index 648548cb8ad1..0fa656ff4466 100644 --- a/app-xemacs/xemacs-packages-all/xemacs-packages-all-2018.08.11.ebuild +++ b/app-xemacs/xemacs-packages-all/xemacs-packages-all-2018.08.11.ebuild @@ -8,7 +8,7 @@ HOMEPAGE="http://www.xemacs.org/" LICENSE="metapackage" SLOT="0" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" IUSE="mule" RDEPEND=" diff --git a/app-xemacs/xetla/xetla-1.04.ebuild b/app-xemacs/xetla/xetla-1.04.ebuild index 283867063fa6..c23b629ad833 100644 --- a/app-xemacs/xetla/xetla-1.04.ebuild +++ b/app-xemacs/xetla/xetla-1.04.ebuild @@ -21,6 +21,6 @@ app-xemacs/mail-lib app-xemacs/dired app-xemacs/prog-modes " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/xlib/xlib-1.16.ebuild b/app-xemacs/xlib/xlib-1.16.ebuild index 4205f692b05b..b159902a552e 100644 --- a/app-xemacs/xlib/xlib-1.16.ebuild +++ b/app-xemacs/xlib/xlib-1.16.ebuild @@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard" RDEPEND="app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/xslide/xslide-1.11.ebuild b/app-xemacs/xslide/xslide-1.11.ebuild index 5e1116368060..40e601a2816e 100644 --- a/app-xemacs/xslide/xslide-1.11.ebuild +++ b/app-xemacs/xslide/xslide-1.11.ebuild @@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-ispell app-xemacs/mail-lib app-xemacs/xemacs-base " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/xslt-process/xslt-process-1.14.ebuild b/app-xemacs/xslt-process/xslt-process-1.14.ebuild index b80e5f6d6f52..6ac1d6bf4a5e 100644 --- a/app-xemacs/xslt-process/xslt-process-1.14.ebuild +++ b/app-xemacs/xslt-process/xslt-process-1.14.ebuild @@ -24,6 +24,6 @@ app-xemacs/fsf-compat app-xemacs/xemacs-devel app-xemacs/os-utils " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/xwem/xwem-1.26.ebuild b/app-xemacs/xwem/xwem-1.26.ebuild index a079b5bf8948..778e8e92d1d2 100644 --- a/app-xemacs/xwem/xwem-1.26.ebuild +++ b/app-xemacs/xwem/xwem-1.26.ebuild @@ -18,6 +18,6 @@ app-xemacs/elib app-xemacs/ilisp app-xemacs/mail-lib " -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/app-xemacs/zenirc/zenirc-1.18.ebuild b/app-xemacs/zenirc/zenirc-1.18.ebuild index d6ec1af3f0c9..ebdde6e4081d 100644 --- a/app-xemacs/zenirc/zenirc-1.18.ebuild +++ b/app-xemacs/zenirc/zenirc-1.18.ebuild @@ -8,6 +8,6 @@ DESCRIPTION="ZENIRC IRC Client" XEMACS_PKG_CAT="standard" RDEPEND="" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" inherit xemacs-packages diff --git a/dev-libs/protobuf/protobuf-3.6.1.ebuild b/dev-libs/protobuf/protobuf-3.6.1.ebuild index 380f12778c9f..592dd11bce45 100644 --- a/dev-libs/protobuf/protobuf-3.6.1.ebuild +++ b/dev-libs/protobuf/protobuf-3.6.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}. LICENSE="BSD" SLOT="0/17" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="emacs examples static-libs test zlib" RDEPEND="emacs? ( virtual/emacs ) diff --git a/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild index 92eb2c7adb9b..1263e597ef86 100644 --- a/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild +++ b/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> pr LICENSE="BSD" SLOT="0/17" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="" DEPEND="${PYTHON_DEPS} diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild index 0c8dfc5c5db3..2940148b855b 100644 --- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild +++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame libav cpu_flags_x86_mmx opengl png schroedinger static-libs vorbis X x264" RDEPEND=" diff --git a/net-misc/whois/whois-5.3.2.ebuild b/net-misc/whois/whois-5.3.2.ebuild index 2047f5e1e3e6..1e3a872c9eaa 100644 --- a/net-misc/whois/whois-5.3.2.ebuild +++ b/net-misc/whois/whois-5.3.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="iconv idn nls" RESTRICT="test" #59327 |