From 871cbf857f01091e71c535bef0747d2d6d351c53 Mon Sep 17 00:00:00 2001
From: Bernard Cafarelli <voyageur@gentoo.org>
Date: Sun, 29 Mar 2020 17:12:09 +0200
Subject: [PATCH] x11-plugins/wmacpi: undo last bump

libdockapp fix is enough to build with -fno-common

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>
---
 .../wmacpi/files/wmacpi-2.3-fno-common.patch  | 11 -------
 x11-plugins/wmacpi/wmacpi-2.3-r2.ebuild       | 33 -------------------
 2 files changed, 44 deletions(-)
 delete mode 100644 x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch
 delete mode 100644 x11-plugins/wmacpi/wmacpi-2.3-r2.ebuild

diff --git a/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch b/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch
deleted file mode 100644
index 068c00c592ff..000000000000
--- a/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur dockapps.orig/wmacpi.c dockapps/wmacpi.c
---- dockapps.orig/wmacpi.c	2015-01-12 11:24:15.000000000 +0100
-+++ dockapps/wmacpi.c	2020-03-29 13:11:56.712022800 +0200
-@@ -72,6 +72,7 @@
- 
- /* globals */
- struct dockapp *dockapp;
-+Display *display;
- /* global_t *globals; */
- 
- /* this gives us a variable scroll rate, depending on the importance of the
diff --git a/x11-plugins/wmacpi/wmacpi-2.3-r2.ebuild b/x11-plugins/wmacpi/wmacpi-2.3-r2.ebuild
deleted file mode 100644
index 25640e9e0283..000000000000
--- a/x11-plugins/wmacpi/wmacpi-2.3-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="DockApp ACPI status monitor for laptops"
-HOMEPAGE="https://www.dockapps.net/wmacpi"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 -ppc -sparc ~x86"
-
-DEPEND=">=x11-libs/libdockapp-0.7-r1:=
-	x11-libs/libX11"
-
-S=${WORKDIR}/dockapps
-
-PATCHES=(
-	"${FILESDIR}"/${P}-makefile.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-	)
-
-src_prepare() {
-	default
-
-	sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-- 
2.26.2