From feb0daf81d888e9160f9f94502de09b66f2a63fd Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 21 Jun 2020 17:50:24 +0100
Subject: gentoo resync : 21.06.2020

---
 x11-plugins/wmacpi/Manifest                        |  3 ++
 x11-plugins/wmacpi/files/wmacpi-2.4-makefile.patch | 48 ++++++++++++++++++++++
 x11-plugins/wmacpi/wmacpi-2.4.ebuild               | 24 +++++++++++
 3 files changed, 75 insertions(+)
 create mode 100644 x11-plugins/wmacpi/files/wmacpi-2.4-makefile.patch
 create mode 100644 x11-plugins/wmacpi/wmacpi-2.4.ebuild

(limited to 'x11-plugins/wmacpi')

diff --git a/x11-plugins/wmacpi/Manifest b/x11-plugins/wmacpi/Manifest
index b5ffd2325285..58f3a847a296 100644
--- a/x11-plugins/wmacpi/Manifest
+++ b/x11-plugins/wmacpi/Manifest
@@ -1,5 +1,8 @@
 AUX wmacpi-2.3-fno-common.patch 790 BLAKE2B 8ffbc5c6549c8f57ff768f6a3c171b6961121458a6ce9e7fa13dc9e33223493ded768f1e91ec2786fb5bd7d3d62dc13fd805155eccc560a4c7806726a2dccd12 SHA512 c1c17e68c4605ea885bf335e4f55e0fbb5427ec8405dbab0f3c3cc76f3cc9f61e43d90b2d3fb7c69d7b2e516716b53288a255b3bdbee4c6b134fa876adc878ac
 AUX wmacpi-2.3-makefile.patch 1103 BLAKE2B 8f0d0f15d322d0b318e9d5e94f120bf0eab00fc9559de72f5449abe4b0f78315cbb513ce7d8d84100257e21205d47136d2e9308c1f266d2ed26fe956eca17f14 SHA512 0c7e46514604b5f9e36e0ffbfda7a3a5d86d7932bd31cf88286e937db61fc516b5f5c0fac0edb96d6e1f657cb12d694b4b1505f7fd1e901872fc80e6aae50ab7
+AUX wmacpi-2.4-makefile.patch 1217 BLAKE2B a55fb93f1d716439b1032ab73fede38325457447d3a25901bc9acc297937227f9439591682e5cc9f13d847cee5f98f8a07baff3affcf19b9c1890256f17bd2f9 SHA512 026c120bdfd0c41706c68cca3d79ef3c30150bcca42442633831ce4ca4aafda45378daa3285b478070d6d2b95c0730f209a254c3fe5a1478b7276820dc256bbf
 DIST wmacpi-2.3.tar.gz 39374 BLAKE2B bcf55a801fbc7b7c4484cc8987366786e1a1dbaf4d9ff6800975de14bd295ced774eaeedfe0c9da524b774de7633d5d250e7be55742fca7893f7314b8b4fe6fc SHA512 47c260989cd3fdb8d7ceadba19224e6350056741b03c6f1b73a38b06d7e471a08972dfbcaeacdcbc460bc19b0f952641eda75e11468b4d7155eecd07e1e14cd9
+DIST wmacpi-2.4.tar.gz 40265 BLAKE2B 5acd0b8506b762909893bb8d3ac28dc193166db67195bc14fb321b1d7f3a177cf60412b5d854d039ec0d6289dfefd9ea660a98e69a41148930b71437405ca65a SHA512 56a2967354a16f1ae03ee159dfe787a96c0d7ecf654852833ed71c7f65ca9a3717d9a582f2900a9fd925b0648ef5fcdf08cc4c68e78e75dedbd44a0a35ce752b
 EBUILD wmacpi-2.3-r1.ebuild 656 BLAKE2B 4ade245a55e1efc25e18eb8049f0ead5ce64cbb453c9a0190dcdbe7df1ffd1ca9650302f7adc8fc4f6454c6dc03eedf79bdc90ee4cb46da658a80fed5ca15516 SHA512 5cdcc29e02a2b1574af2aecd34cf20a2985b5e76293efd8a653d5b1082e57eed8b7626ce91641ab4d0e430c7156ac3867267261ef2e472a43d185bf269f1ca5b
+EBUILD wmacpi-2.4.ebuild 498 BLAKE2B be2a3bde74d74fe7be0aae77e01e33c171db7e5fcae8476f971d625ce61b38d913dc90f986e34e8a861691ac632b28915d903edc19bc051f5582100cd6594149 SHA512 614c8aaac2f0bf78a8d0211fabee79094f98f3570d6d3b2a0e0db7ca17e5ceb2d4a25fd9b4df111dd9f5f752b9d8d09aaca1de6ae6816eb90f7aa78dce7bf2e8
 MISC metadata.xml 334 BLAKE2B f36478f76f93ad154022208ad0f1417400de70c9091166fb46e60a05c1f920f20e736f45628f7681c3f1e607d077c0a93689529fde8866c15b2dda7d07838e18 SHA512 708cecfa079327ebfa542b48b792e049348df0664e197c68cc148931820882aaa423ddcb996b47db98a05a87d1b65824ae7fb60492f77936592e3817c0af71b9
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.4-makefile.patch b/x11-plugins/wmacpi/files/wmacpi-2.4-makefile.patch
new file mode 100644
index 000000000000..d772c99b6ed4
--- /dev/null
+++ b/x11-plugins/wmacpi/files/wmacpi-2.4-makefile.patch
@@ -0,0 +1,48 @@
+diff -Naur wmacpi-2.4.orig/Makefile wmacpi-2.4/Makefile
+--- wmacpi-2.4.orig/Makefile	2020-05-03 14:30:36.000000000 +0200
++++ wmacpi-2.4/Makefile	2020-06-15 17:32:49.549006100 +0200
+@@ -15,8 +15,8 @@
+ #OPT	= -pg -g
+ 
+ CC	:= gcc
+-CFLAGS	+= $(OPT) -Wall -W -g -ansi -DWMACPI_VER='"$(WMACPI_VER)"'
+-LDFLAGS += $(OPT) -lX11 -ldockapp
++CFLAGS	+= -DWMACPI_VER='"$(WMACPI_VER)"'
++LIBS := -lX11 -ldockapp
+ 
+ WMSRC	:= wmacpi.c libacpi.c
+ HEADERS := libacpi.h
+@@ -28,7 +28,7 @@
+ doc_targets += wmacpi-cli.1
+ endif
+ 
+-PREFIX := /usr/local
++PREFIX := /usr
+ 
+ all: $(targets)
+ 
+@@ -39,7 +39,7 @@
+ -include $(WMOBJ:.o=.d)
+ 
+ wmacpi:	$(WMOBJ)
+-	$(CC) -o $@ $^ $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ # for the Debian package, we want to make building the command line tools
+ # optional. So, we hide all the necessary stuff here . . .
+@@ -49,13 +49,13 @@
+ -include $(CLOBJ:.o=.d)
+ 
+ wmacpi-cli: $(CLOBJ)
+-	$(CC) $(LDFLAGS) -o $@ $^
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ endif
+ 
+ # build per-file dependencies - note that -MM may not be supported
+ # in gcc versions older than 2.95.4, but most likely is.
+ %.d: %.c
+-	gcc -MM $(CFLAGS) $< > $@
++	$(CC) -MM $(CFLAGS) $< > $@
+ 
+ clean:
+ 	rm -f TAGS *.o *~ trace *.out *.bb *.bbg
diff --git a/x11-plugins/wmacpi/wmacpi-2.4.ebuild b/x11-plugins/wmacpi/wmacpi-2.4.ebuild
new file mode 100644
index 000000000000..b2ad3b89acca
--- /dev/null
+++ b/x11-plugins/wmacpi/wmacpi-2.4.ebuild
@@ -0,0 +1,24 @@
+# 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://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 -ppc -sparc ~x86"
+
+DEPEND=">=x11-libs/libdockapp-0.7:=
+	x11-libs/libX11"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	)
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
-- 
cgit v1.2.3