gentoo resync : 11.05.2018

4 files changed, 2 insertions, 84 deletions

diff --git a/x11-misc/xbattbar/Manifest b/x11-misc/xbattbar/Manifest
index 8e89a260f752..42f180679589 100644
--- a/x11-misc/xbattbar/Manifest
+++ b/x11-misc/xbattbar/Manifest
@@ -1,8 +1,5 @@
-AUX xbattbar-1.4.3.patch 1206 BLAKE2B 1d014f0995d6f3ad7826e579c41948663e30d7ad78463dda180916dbf06d7eb6cf1268ef7c45df37eff67e6b89d9508a86a07a08b324efede4f9fe9bd447ba5a SHA512 e8adf912868b6fef383b9c09783c7a74c74e95446c3d4e37555b2b8cec1d7753ad6ba50de308c51f3a536dc19f616e1bf1363e98153d33e87988ba3fe3d2aa5a
 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.3.orig.tar.gz 15722 BLAKE2B 85a6dbce98ec0109360881763fdf57501e0db21ab2d614b583996d2164c0d8aed94f3e20968cb6c91cf34a7181c66efe94a6e6f32007f6dc26dd94c163bb9d46 SHA512 1c809de998cae1dd4652b20d5c8fecf8f674910893fd458115beae8f873452a82c276afeef9b1ce3293498e372a74add190dc6a447ef0de219df98c5c36fae32
 DIST xbattbar_1.4.8.orig.tar.gz 16254 BLAKE2B 3e2215bcee10f140a078266e128ae17185e5900090b057e845f966098c69371ab5115d3cdc620a87e27e2dd223a83ab33e5fef55119cdbac68491c0e88e63585 SHA512 1ec535ba997da4aa08b225b61b22eb87d74fc15c522d30f5361e1f56db6fd774f4230a95afdb7f1170144c0939724a80118c7289ea50d027a76649fa20164191
-EBUILD xbattbar-1.4.3.ebuild 902 BLAKE2B 7c00dd2d955179f5d6c64eb973e839edffb9d85e0b15f3b142aa6857fa2b733115d7f123a9db1d859270daa5ba0e20ae65f49020d3031e19e76ee179b8023efb SHA512 34696dc48ee16955280f979adf447e1622c2436d230852a6bf9021e1e4d98ec978025d273d482079a11de2f996e3690f03af68777ff54113345957ac88c866f2
-EBUILD xbattbar-1.4.8.ebuild 1086 BLAKE2B 44a2366a1d20de10b4da868033e9dd7b493d732afe13a5d22d95ecfbe17048d745d0c663b718fea4589e2ed0594b7b99cc9427cd04bcda08e9ad041b9b6a59ee SHA512 1bc10247f586ac957127a831027de6ea2116dee702aaec642458a02e958df5c0e11360616f4128330244d0e6561af5e36f9171117e51737f562fcb322de3078f
+EBUILD xbattbar-1.4.8.ebuild 1085 BLAKE2B e546287ae2c16206eb9ba5d81ad0950ff82b8cfca610c9ede4b6e511be31cf38cce352bb0d0846f58e06a89e7ef628f90f8ffa1f15c2304241b52258a956f1cd SHA512 f2447d4f3bd865106114fc467828dab08c0940e3de7cc465af046dc203f02f4d2373e97609978d68c741cffd91d9657e34f13c4323abfe9a6ca6979d5661b4de
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.3.patch b/x11-misc/xbattbar/files/xbattbar-1.4.3.patch
deleted file mode 100644
index ad5b9e49c1fa..000000000000
--- a/x11-misc/xbattbar/files/xbattbar-1.4.3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -8,16 +8,16 @@
- all: $(TARGET) $(APM_CHECK)
- 
- $(TARGET): obj/xbattbar.o
--	gcc -o $@ $< -lX11
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< -lX11
- 
- obj/xbattbar.o: xbattbar.c obj/stamp
--	gcc -MMD -o $@ -c $<
-+	$(CC) $(CFLAGS) -MMD -o $@ -c $<
- 
- $(APM_CHECK): obj/xbattbar-check-apm.o
--	gcc -o $@ $<
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
- 
- obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp
--	gcc -MMD -D$(OS_TYPE) -o $@ -c $<
-+	$(CC) $(CFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $<
- 
- obj/stamp:
- 	mkdir obj
-@@ -29,11 +29,11 @@
- 
- 
- install: $(TARGET) $(APM_CHECK)
--	install -d -m 0755 $(DESTDIR)/usr/lib/$(PROJECT)
-+	install -d -m 0755 $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT)
- 	install -d -m 0755 $(DESTDIR)/usr/bin
- 	install -d -m 0755 $(DESTDIR)/usr/share/man/man1
--	install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib/$(PROJECT)/
--	install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib/$(PROJECT)/
-+	install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT)/
-+	install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT)/
- 	install -m 0755 $(TARGET) $(DESTDIR)/usr/bin/
- 	install -m 0644 xbattbar.man $(DESTDIR)/usr/share/man/man1/$(PROJECT).1 
- 
diff --git a/x11-misc/xbattbar/xbattbar-1.4.3.ebuild b/x11-misc/xbattbar/xbattbar-1.4.3.ebuild
deleted file mode 100644
index 50b76944e6f3..000000000000
--- a/x11-misc/xbattbar/xbattbar-1.4.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils flag-o-matic multilib 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"
-IUSE=""
-
-DEPEND="dev-lang/perl
-	x11-libs/libX11"
-RDEPEND="${DEPEND}
-	!ppc? ( >=sys-power/acpi-1.5 )" # ppc has APM
-
-# XXX: Avoiding imake in purpose here.
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}.patch
-
-	sed -i \
-		-e "s:usr/lib:usr/$(get_libdir):" \
-		xbattbar.c || die
-}
-
-src_compile() {
-	[[ $(tc-arch) == amd64 ]] && export LIB_SUFFIX=64
-	tc-export CC
-	use kernel_linux && append-flags -Dlinux
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README
-}
diff --git a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild
index 8e044840e00e..07f440b75dcb 100644
--- a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild
+++ b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild
@@ -11,7 +11,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"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="