| 1 |
commit: c9208248b95f31db0bde5c147eb019692c81f867 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 17 17:25:51 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 17 17:25:51 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9208248 |
| 7 |
|
| 8 |
x11-plugins/wmswallow: Port to EAPI 7 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
|
| 13 |
x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild | 29 +++++++++++++++++-------- |
| 14 |
1 file changed, 20 insertions(+), 9 deletions(-) |
| 15 |
|
| 16 |
diff --git a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild |
| 17 |
index c5256efc410..5821727229a 100644 |
| 18 |
--- a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild |
| 19 |
+++ b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild |
| 20 |
@@ -1,8 +1,9 @@ |
| 21 |
# Copyright 1999-2019 Gentoo Authors |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
-EAPI=5 |
| 25 |
-inherit eutils toolchain-funcs |
| 26 |
+EAPI=7 |
| 27 |
+ |
| 28 |
+inherit flag-o-matic toolchain-funcs |
| 29 |
|
| 30 |
DESCRIPTION="A dock applet to make any application dockable" |
| 31 |
HOMEPAGE="https://www.dockapps.net/wmswallow" |
| 32 |
@@ -13,22 +14,32 @@ SLOT="0" |
| 33 |
KEYWORDS="amd64 x86" |
| 34 |
IUSE="" |
| 35 |
|
| 36 |
-RDEPEND="x11-libs/libX11 |
| 37 |
+RDEPEND=" |
| 38 |
+ x11-libs/libX11 |
| 39 |
x11-libs/libXext" |
| 40 |
DEPEND="${RDEPEND} |
| 41 |
x11-base/xorg-proto" |
| 42 |
+BDEPEND="virtual/pkgconfig" |
| 43 |
|
| 44 |
-S=${WORKDIR}/wmswallow |
| 45 |
+S="${WORKDIR}/${PN}" |
| 46 |
+PATCHES=( "${FILESDIR}"/${P}-format-security.patch ) |
| 47 |
|
| 48 |
src_prepare() { |
| 49 |
- epatch "${FILESDIR}"/${P}-format-security.patch |
| 50 |
- sed -e "s:\${OBJS} -o:\${OBJS} \${LDFLAGS} -o:" \ |
| 51 |
- -e "/LIBS/s/-lXext/-lX11 \0/"\ |
| 52 |
- -i Makefile || die |
| 53 |
+ default |
| 54 |
+ |
| 55 |
+ # the Makefile is a mess, just |
| 56 |
+ # rely on implicit rules instead |
| 57 |
+ rm Makefile || die |
| 58 |
+} |
| 59 |
+ |
| 60 |
+src_configure() { |
| 61 |
+ tc-export CC |
| 62 |
+ append-cppflags $($(tc-getPKG_CONFIG) --cflags x11 xext) |
| 63 |
+ export LDLIBS="$($(tc-getPKG_CONFIG) --libs x11 xext)" |
| 64 |
} |
| 65 |
|
| 66 |
src_compile() { |
| 67 |
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" xfree |
| 68 |
+ emake wmswallow |
| 69 |
} |
| 70 |
|
| 71 |
src_install() { |
Archives