gentoo resync : 24.09.2020

11 files changed, 6 insertions, 298 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 9e8b51bbf131..7df0c11e9867 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/fbpanel/Manifest b/x11-misc/fbpanel/Manifest
index 0360031d90b3..5828798f24bd 100644
--- a/x11-misc/fbpanel/Manifest
+++ b/x11-misc/fbpanel/Manifest
@@ -3,9 +3,6 @@ AUX fbpanel-7.0-clang.patch 2596 BLAKE2B cb9e42fb7afaf007d49c54270ee6e09a551ee5c
 AUX fbpanel-7.0-fno-common.patch 440 BLAKE2B ef20f4055b21b77f15e1946a3c94eb7dd1a74f85922ebd0059b74b7503467930b352888768948f0ca46c2966103b65b746bd2c095c03f77af7859d27bcaf3013 SHA512 a62c4514749d26bd2e77d5d0ed1eae3f83af765957ec5d5e94679f9787db3eadf192eccadfcb67dc087688d6d59303cd1f6ff0448dbca11dc8524cd3079c1d4c
 AUX fbpanel-7.0-images.patch 274 BLAKE2B f587453d0e66c5fb8c93ad936dbf1cd1291d6dd652dde29f6e995947663eae8f20da3f022e494bbc6406db48ed3acdc71a38d973638b6ec11fb63e7117efd41a SHA512 432884c3d397c24e28e909bb3626ebd29ce3023c4e1aa68ccc9defdd81b59e29f72e8d090b54a04e501852b6cda91b1e8157e49092c7562184d787c8085f3ec0
 AUX fbpanel-7.0-python3-shebangs.patch 2348 BLAKE2B 84c05bb718b5754d2679fa2b1807c9a0207058d5338dc59eb65643797d6aecc31f52eaf0134b26a3a4fa5364337fa577a641f05d58401441e14faca7ce83b0c5 SHA512 6791c1cd963f40db8df88b4758464fe99f308990ab86ee2e91c6e36c2e4f8ccf935275074352d432078ab4c3f8fb07f3535af43fb2627e0904153be087a5992e
-AUX fbpanel-7.0-shebangs.patch 2348 BLAKE2B 8a68eb84f0d4c28e23483724c2600e10375e6bd96bbe640f6d1ff4ef47c17ae140873229e95322de2fd825cf5dd54d6eca6a08a4058e70d3b185f4f8b1d3440f SHA512 547367bc298548b0936e4b83e8ddccc9c9e689f5aac8a7aac1ef5e09050ce33936dba4c39d971c4f3ff5065daa55bc28989588cb08e8277ca9e201ca6994eec7
 DIST fbpanel-7.0.tar.gz 3746477 BLAKE2B 6bc8ef39d44768b5fc9fc4c58ea0b89c723f0e5239198d3b1a5f6fe27252bf22c87fec5beb13fa3371af6c218e592d67d04644bd82cc62f357def610680fc2d2 SHA512 9706a96569c41241de4dbd250c9d6a473b53a5e26e880f4c782041b2b91c7570046e1bee3070059fd2d333fb7159490732ef397b86701c72d4c65c0784948874
-EBUILD fbpanel-7.0-r1.ebuild 1427 BLAKE2B 08a3742360ffe73505eb75d96aa64d662f935ce88a1ebece48bcb5c6f862920d5636fc7ebbcf752cebc7e3bdc9a6fd77c311ded7b9a8786d63278a16838558e3 SHA512 3161ec424feebf681fbae71432207348d0a41d834e8f7bbaca834b4e5c827206525d1841dffc129225b8e6a3a8693157ed9dd4610f2becd03e0e28b201a88a76
-EBUILD fbpanel-7.0-r2.ebuild 1533 BLAKE2B 2f5d874331e3618056974297856dc1a0868cf61d54095d44adf60fceaebd45774be2fa5d1a4fc41ef28d1e0970196c9a2ad31f69d0e3e0b7c4054e9b8f14cad5 SHA512 e22fac287617a349c1e80e4adc16bedf6d3bc2e0a73bc543ba0389d801c7f3a9c714c0710bfa44c1adde58a0b0736dc582f7fdd9135f17a35173ddf6e6bc9971
-EBUILD fbpanel-7.0.ebuild 1334 BLAKE2B 2bc40160ddc4e6b4543527fb273ec0006a06006fb2571294c5d5a87be1c39bc26d688479bc78bc135cf8482edf7d91a3baf5a380c2f6e493f8595f405dcb9314 SHA512 e5506238b3c62e5e3ce86d3b75883f6dee9e6a87fa1fddea8ca8163ccc71116e2d4080d0fb636b4e9302d135dff013e4c7fea2a7594d36b0e3ee923d907fa57e
+EBUILD fbpanel-7.0-r2.ebuild 1529 BLAKE2B e876db52198ce5ebd462019010a743479cd0c2d6e1aa21b7d2bbf2ab2786a453ca5293aa55acceddca97d62ddbcadb6b12981ad9746a3ba3b1ee91264f23189d SHA512 b634e26e8b129c61853648c71ea0bfd14a2322f4ba2cdbe84d1a1985e9ad219ec8df920ff94cda4b4b810b2708a7bcd35ed585c146440822fab6adfa5a66fd84
 MISC metadata.xml 421 BLAKE2B bec71cdd70517d1087d289c1124ed74c9540601d34de83aef4e2d45c0c3c1d3c6f6cef080edd7dd6641f146752c81a12a5c34658f8f097b940bf67ea9c024a96 SHA512 6e50dcf1443603726214701d8187864db64227db01b5c19f630d703864faec0d4692a5967a6286bd5fcd0b4762997a2bcb8ad6d4742ae5b2dc33bfe38d808fbe
diff --git a/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild
deleted file mode 100644
index b468b2a537e8..000000000000
--- a/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 toolchain-funcs
-
-DESCRIPTION="light-weight X11 desktop panel"
-HOMEPAGE="https://aanatoly.github.io/fbpanel/"
-SRC_URI="https://aanatoly.github.io/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="alsa"
-
-RDEPEND="
-	dev-libs/glib:2
-	alsa? ( media-libs/alsa-lib )
-	x11-libs/gdk-pixbuf:2[X]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1-underlinking.patch
-	"${FILESDIR}"/${PN}-7.0-clang.patch
-	"${FILESDIR}"/${PN}-7.0-images.patch
-	"${FILESDIR}"/${PN}-7.0-shebangs.patch
-	"${FILESDIR}"/${PN}-7.0-fno-common.patch
-)
-
-src_configure() {
-	tc-export CC
-	# not autotools based
-	local myconfigure=(
-		./configure V=1
-		--mandir="${EPREFIX}"/usr/share/man/man1
-		--datadir="${EPREFIX}"/usr/share/${PN}
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN}
-		$(usex alsa --sound --no-sound)
-	)
-	echo ${myconfigure[@]} || die
-	${myconfigure[@]} || die
-}
-
-pkg_postinst() {
-	elog "For the volume plugin to work, you need to configure your kernel"
-	elog "with CONFIG_SND_MIXER_OSS or CONFIG_SOUND_PRIME or some other means"
-	elog "that provide the /dev/mixer device node."
-}
diff --git a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild
index b122768dea13..ddb2acb616cb 100644
--- a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild
+++ b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://aanatoly.github.io/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~mips ppc ppc64 x86"
 IUSE="alsa"
 
 RDEPEND="
diff --git a/x11-misc/fbpanel/fbpanel-7.0.ebuild b/x11-misc/fbpanel/fbpanel-7.0.ebuild
deleted file mode 100644
index 81e254f58b80..000000000000
--- a/x11-misc/fbpanel/fbpanel-7.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 toolchain-funcs
-
-DESCRIPTION="light-weight X11 desktop panel"
-HOMEPAGE="https://aanatoly.github.io/fbpanel/"
-SRC_URI="https://github.com/aanatoly/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~mips ppc ppc64 x86"
-IUSE="alsa"
-
-RDEPEND="
-	dev-libs/glib:2
-	alsa? ( media-libs/alsa-lib )
-	x11-libs/gdk-pixbuf:2[X]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1-underlinking.patch
-	"${FILESDIR}"/${P}-shebangs.patch
-	"${FILESDIR}"/${P}-clang.patch
-)
-
-src_configure() {
-	tc-export CC
-	# not autotools based
-	local myconfigure=(
-		./configure V=1
-		--mandir="${EPREFIX}"/usr/share/man/man1
-		--datadir="${EPREFIX}"/usr/share/${PN}
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN}
-		$(usex alsa --sound --no-sound)
-	)
-	echo ${myconfigure[@]} || die
-	${myconfigure[@]} || die
-}
-
-pkg_postinst() {
-	elog "For the volume plugin to work, you need to configure your kernel"
-	elog "with CONFIG_SND_MIXER_OSS or CONFIG_SOUND_PRIME or some other means"
-	elog "that provide the /dev/mixer device node."
-}
diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-shebangs.patch b/x11-misc/fbpanel/files/fbpanel-7.0-shebangs.patch
deleted file mode 100644
index cdbe998e0660..000000000000
--- a/x11-misc/fbpanel/files/fbpanel-7.0-shebangs.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- a/.config/help
-+++ b/.config/help
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python2
- 
- import re, os, sys, textwrap
- # Formats help message
---- a/.config/repl.py
-+++ b/.config/repl.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python2
- 
- import re, sys
- 
---- a/.config/tar.py
-+++ b/.config/tar.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python2
- 
- import subprocess as sp
- import re, tempfile
---- a/configure
-+++ b/configure
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python2
- 
- import sys
- if sys.version_info < (2, 7):
---- a/exec/make_profile.in
-+++ b/exec/make_profile.in
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- umask 0077
- # new profile directory
---- a/exec/xlogout
-+++ b/exec/xlogout
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- # xlogout - logs user out of its X session
- # Linux specific since uses /proc
---- a/scripts/endianess.sh
-+++ b/scripts/endianess.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- # When cross compiling, you may put cross compiler directory 
- # in PATH before native gcc (aka spoofing), or you may set CC 
---- a/scripts/install_locale.sh
-+++ b/scripts/install_locale.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- dir=/tmp/lo-$$
- mkdir $dir
---- a/scripts/install_locale.sh.in
-+++ b/scripts/install_locale.sh.in
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- dir=/tmp/lo-$$
- mkdir $dir
---- a/scripts/install.sh
-+++ b/scripts/install.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- usage () 
- {
---- a/scripts/mk_tar
-+++ b/scripts/mk_tar
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- 
- function info()
---- a/scripts/rfs-pkg-config
-+++ b/scripts/rfs-pkg-config
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- # Tt runs pkg-config in a way that everything is searched under RFS
- # but reported including full path. Suitable for cross-compiling
---- a/scripts/update-proj.sh
-+++ b/scripts/update-proj.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- 
- function usage () 
- {
---- a/www/plugins/mk_gallery
-+++ b/www/plugins/mk_gallery
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/env sh
- 
- echo > "$1"
- #echo '<table cellpadding="0" cellspacing="0" border="0" align="left" bgcolor="#ffffff">' >> "$1"
---- a/www/shots/mk_gallery
-+++ b/www/shots/mk_gallery
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/env sh
- 
- function help ()
- {
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index c4e1b1c85cdf..11cfb6163675 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -3,5 +3,5 @@ DIST polybar-3.4.2.tar.gz 253194 BLAKE2B 136dd32d524902fccbf9db2b2fa8ed582d45565
 DIST polybar-3.4.3.tar.gz 253207 BLAKE2B 213b5ea67cc337c47f62afcdce9cacf66516e6f410d2d93570567cddf9f0f5b93764f16e3eaf7c03c56a5ddad62ade92bd83fcfe30c6b91d067c2343f7264342 SHA512 20ac34375da4634a7fd596f38e98a245186c94f8fd624d1dfdcd6633a3c8470fcc57946a50a59177e9d34689aeb5f6cde49e95b30ad699239a2aabbf0635d31a
 DIST xpp-8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33.tar.gz 83974 BLAKE2B 6ea8599136288c006b6993bd6c704ec32d82773153733b4bc6a9c3f326eaf6f3b155d92f270eeb14d57b399f7b5ea0f6bdd5cee41bb5bdf4c1650f337b77f857 SHA512 92874b25305b3be777e739122ff82f1ba16b8e2e445e8ee4891918074ea8ea371f2016d7901cfc477d0286a9e15910c4cee431a11eb71e32728bfbf561313e4f
 EBUILD polybar-3.4.2-r1.ebuild 1824 BLAKE2B 7c4b4365b75d2d4d6103f2231810f5e7189f06fd170ecf06150b687f5802359db8992dfab2ee7ab3b1a41e5a6efa6a1a7732544b2708941e8c5e764f042a77b7 SHA512 19cbde22158c9e5c8924c5ee4f706473ae900c9d7e42466ab25c24ea63dc4deffccc7821868130ec97211c35c1560a6270220b18cea7252d86f7fd351695e1d7
-EBUILD polybar-3.4.3.ebuild 1810 BLAKE2B f486c0ecadfd0c4c48f88fc680aaec50c5a05facf34214ebd3246e895893d819bbf07d4f0eb38f95769656dfc1c4c3cbc32296dedd5a7795f008b38385988f89 SHA512 835ef90b9d945ddddef6a28cd59c071b9ce0273241f322cd69e390662d698ea9d7aa5ed1b4bef06bb4177b53e840d429c1ef090a8ac553d34c565c3a3ad4c7b3
+EBUILD polybar-3.4.3.ebuild 1808 BLAKE2B 383e0c9b63385237bf1ecf2b0650f3bdcdb8df85cd72b8fbcbdab391b509de5736592de7d9684209c332be857f79cbeec0f51a3d04b2a5ec3b1783a01bc3e846 SHA512 170c1bfe1a8b80b7feed829496724fd3f90a6a0ade553ca828ef06552f1e38cc78180ff2eeed0690b0072f7d2c82494835fb23a76a6d4eeaddb152d9c5381f01
 MISC metadata.xml 582 BLAKE2B bd70511d8795f71413b5134b7f2203882a3f7ef8e190ef05b109baf9d1164a47fd4ec9f3f955076cf3634fea7469990b1a725bf151f03a0112604113633262a9 SHA512 447e0e0dfa1cc9563ef6399d6fbd4c1bc49db4eac60263ce6abc1d7b488f3881247b74e16f421ef73061ebbd285491d271554cc468e4a44a9c9f9f25b08e1b3a
diff --git a/x11-misc/polybar/polybar-3.4.3.ebuild b/x11-misc/polybar/polybar-3.4.3.ebuild
index e6f8b9feaf99..c21a9d97e864 100644
--- a/x11-misc/polybar/polybar-3.4.3.ebuild
+++ b/x11-misc/polybar/polybar-3.4.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/polybar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/polybar/xpp/archive/${XPP_COMMIT}.tar.gz -> xpp-${XPP_COMMIT}.tar.gz
 	https://github.com/polybar/i3ipcpp/archive/${I3IPCPP_COMMIT}.tar.gz -> i3ipcpp-${I3IPCPP_COMMIT}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="alsa curl i3wm ipc mpd network pulseaudio"
diff --git a/x11-misc/xbattbar/Manifest b/x11-misc/xbattbar/Manifest
index cd5c0178963d..e7899520a500 100644
--- a/x11-misc/xbattbar/Manifest
+++ b/x11-misc/xbattbar/Manifest
@@ -1,7 +1,5 @@
 AUX xbattbar-1.4.5.patch 1427 BLAKE2B 06142c445fbce221b8ca871c2717790e1bbe6b56f50d3003e82eb024ad012fc2677cbc4cbebaac7284e3291a9e95754c19f773fc3cfc1dd3ad9ee8c15b4dd451 SHA512 190df4894fcb29f5b2b5387523429947b967e48fb710ad256f8ba31bf33d22e04b4325ba3d6b3228aee14257e241815a5b99c4284d1cedb6b4e977e47a9c54df
 AUX xbattbar-1.4.8-const.patch 303 BLAKE2B d33ff7f8bc273e1ef3e493e2411b4aff025a36316163b31df52299a77c6409023b069a7ef2d2f55a189e2848b8e73d37a54a8957c9f71fdc3e51b6a48a179bda SHA512 987116af9d8e50b6ef96924199e5d348a9910030adbe2b2a8de0425107eee93cfe04740b343542c97edc6ed846bcff05724470b6fff1f5209c92c42e8648af0b
-DIST xbattbar_1.4.8.orig.tar.gz 16254 BLAKE2B 3e2215bcee10f140a078266e128ae17185e5900090b057e845f966098c69371ab5115d3cdc620a87e27e2dd223a83ab33e5fef55119cdbac68491c0e88e63585 SHA512 1ec535ba997da4aa08b225b61b22eb87d74fc15c522d30f5361e1f56db6fd774f4230a95afdb7f1170144c0939724a80118c7289ea50d027a76649fa20164191
 DIST xbattbar_1.4.9.orig.tar.gz 19105 BLAKE2B e33631f02266150fc494312c0a78cba145813e3f19ffa4a8fd46ce3adde3e50cb820617e5118a9bb6935fb7be26840e6a9525bf95e2f2fbf585e4e2542d35228 SHA512 e6d0efe0a97b2cb7d0c8a992b7a68a26155dfb625649a5fc8abc4bc37b2c286224185b57d6b2d3671f571690d278970976da5380c1d1bbcd9212e2001f9c40b8
-EBUILD xbattbar-1.4.8.ebuild 1085 BLAKE2B e546287ae2c16206eb9ba5d81ad0950ff82b8cfca610c9ede4b6e511be31cf38cce352bb0d0846f58e06a89e7ef628f90f8ffa1f15c2304241b52258a956f1cd SHA512 f2447d4f3bd865106114fc467828dab08c0940e3de7cc465af046dc203f02f4d2373e97609978d68c741cffd91d9657e34f13c4323abfe9a6ca6979d5661b4de
-EBUILD xbattbar-1.4.9.ebuild 937 BLAKE2B a8ad829e8e42ad36c2fb29b836c0a120f1c8185b41e29fd1617625d72338b05ab15663b2ab8d63f81255e10d1dec93ff37c8b7a6422fe1b9e8d2fc1ce37ab4f9 SHA512 2e2e53ec6d8b6ce20a1a719bb2fe8eead3fad7502c061835175899666d03f91ca3b144a8b30ab91ec0b447d1e95112a151b59d70d4ceacc0e6d41156681219b9
+EBUILD xbattbar-1.4.9.ebuild 934 BLAKE2B d45b43f82ab29a686b7b70cab643e017992546aa079955db2db7b64c643675ed0f0d8a17aa5f9420e2b29a472fe7d62193ec706d7ee18ce3e9fabab11448c5a6 SHA512 5bb1301aeee2d071134f7166f24c0f696b7973dc7f1e1f545de0d084cf407d16e2ac6d8a1ab278ae42ce9b1aedaf9e935b09eea0c28593cc1cab6ad470560732
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild
deleted file mode 100644
index 07f440b75dcb..000000000000
--- a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs
-
-DESCRIPTION="Advanced Power Management battery status display for X"
-HOMEPAGE="https://packages.qa.debian.org/x/xbattbar.html"
-SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	dev-lang/perl
-	x11-libs/libX11
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-	!ppc? ( >=sys-power/acpi-1.5 )
-" # ppc has APM
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.4.5.patch \
-		"${FILESDIR}"/${PN}-1.4.8-const.patch
-
-	sed -i \
-		-e "s:usr/lib:usr/$(get_libdir):" \
-		xbattbar.c || die
-
-	tc-export PKG_CONFIG
-}
-
-src_compile() {
-	use kernel_linux && append-flags -Dlinux
-	emake \
-		CC=$(tc-getCC) \
-		LIBDIR="$(get_libdir)" \
-		LDFLAGS="${LDFLAGS}"
-	python_fix_shebang ${PN}-check-sys
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
-	dodoc README
-}
diff --git a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild
index e246e6005e66..7b0f8988d5bf 100644
--- a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild
+++ b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="
 	dev-lang/perl