From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 28 Apr 2021 20:21:43 +0100
Subject: gentoo resync : 28.04.2021

---
 x11-misc/apwal/Manifest                         |  4 ++--
 x11-misc/apwal/apwal-0.4.5-r2.ebuild            | 25 +++++++++++++++----------
 x11-misc/apwal/files/apwal-0.4.5-makefile.patch |  4 ++--
 3 files changed, 19 insertions(+), 14 deletions(-)

(limited to 'x11-misc/apwal')

diff --git a/x11-misc/apwal/Manifest b/x11-misc/apwal/Manifest
index f5654699f282..017b6f1520a4 100644
--- a/x11-misc/apwal/Manifest
+++ b/x11-misc/apwal/Manifest
@@ -1,4 +1,4 @@
-AUX apwal-0.4.5-makefile.patch 1796 BLAKE2B cf6ff8051f5fd6ba5659b6bb873aa709f3f0816e87da46cfd3b221e60b004d87cfff660171558e70efc4fe391a04773ae31571764d60d3ad203693a80824cd92 SHA512 e87ea9d0fdc328d46fb9dc345135efdb6b2801da583a1a6dc5569869f2854e062ca3c676c5477a23f0b07bc0557cf1af9a76383115bd44111dd0d17d4ad97f74
+AUX apwal-0.4.5-makefile.patch 1802 BLAKE2B f55a67515f80898e32eb268c2f2e33182271825ae602e196394ceb06b3781a3018d84ef06e0fedebc9165f9fa960461dfeb6dbea7921f775f3933fac57f2fd5c SHA512 3ddc21238220216537bc0fa5bb49d2830195a6886a9ac0a1baab4037c5d367deded5617ad58ea200828b836cfade21bbef0efea6e28487268339704d30a09673
 DIST apwal-0.4.5.tar.gz 73999 BLAKE2B 6e20dbe611c305188224bd334750ccb0d3f9a855be74e658e6e68b5c575ce4620f87a2b405a41990df89ea90affef97a92170e7ade0a36ac35f4d7b44acd7ac1 SHA512 a37f5453d49bc276d2e16d4fd739cb9034a841af1a60f723ec705751da1ea77be79e63d6a29a0f16b52f1021368e73e513c9081a3d73f34e0332639f0f243dc9
-EBUILD apwal-0.4.5-r2.ebuild 572 BLAKE2B b51a0ed9018c4c25f20c1c35b6e718d87e0a64395bc3c69d22d7194832605b7489cb70a23081d86ddc49cfc9d4c71460c4dd4b00ace98492da842c2c1ab4c7ba SHA512 8b261cd564fc4dd47a1149510f47e5e3ace8019a53321a19459c14614bf32bcc99428a372b3039114863aad4270c9c4c50815cf0abe002cd3eeb108639717b2b
+EBUILD apwal-0.4.5-r2.ebuild 581 BLAKE2B 61c6e0c9a02414fb9a785cda5759a80a8cc63105f9c015669695c55063e888c6df0e10853d8b3103f62ff16c4257cd8ba1243c35631fcf526283804721b2d8a4 SHA512 b7ad507bcb4691a2b25efefecea21f0bb539807b3300e91e68842a19bcd1a1cc0b606d1ab34e0e879a76702fbf4285ca23760a27f47aa356c8fe1d53f3883845
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/apwal/apwal-0.4.5-r2.ebuild b/x11-misc/apwal/apwal-0.4.5-r2.ebuild
index 90f5f0196d25..766c3ed8f76c 100644
--- a/x11-misc/apwal/apwal-0.4.5-r2.ebuild
+++ b/x11-misc/apwal/apwal-0.4.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,22 +8,27 @@ inherit toolchain-funcs
 DESCRIPTION="A simple application launcher and combined editor"
 HOMEPAGE="http://apwal.free.fr/"
 SRC_URI="http://apwal.free.fr/download/${P}.tar.gz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf
+RDEPEND="
 	dev-libs/libxml2
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-S=${WORKDIR}/${PN}
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+)
 
 src_configure() {
-	tc-export CC
+	tc-export CC PKG_CONFIG
 }
diff --git a/x11-misc/apwal/files/apwal-0.4.5-makefile.patch b/x11-misc/apwal/files/apwal-0.4.5-makefile.patch
index 2c278b278a03..0925087c0c1f 100644
--- a/x11-misc/apwal/files/apwal-0.4.5-makefile.patch
+++ b/x11-misc/apwal/files/apwal-0.4.5-makefile.patch
@@ -27,8 +27,8 @@
  else
 -CFLAGS=-O2 `pkg-config --cflags gtk+-2.0 gthread-2.0`
 -LDFLAGS=-O2 `pkg-config --libs gtk+-2.0 gthread-2.0` `xml2-config --libs`
-+CPPFLAGS=`pkg-config --cflags gtk+-2.0 gthread-2.0`
-+LIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` `xml2-config --libs`
++CPPFLAGS=`${PKG_CONFIG} --cflags gtk+-2.0 gthread-2.0`
++LIBS=`${PKG_CONFIG} --libs gtk+-2.0 gthread-2.0` `xml2-config --libs`
  endif
  
  OBJS=main.o app.o launcher.o editor.o property.o \
-- 
cgit v1.2.3