commit: c9208248b95f31db0bde5c147eb019692c81f867 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Aug 17 17:25:51 2019 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Aug 17 17:25:51 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9208248
x11-plugins/wmswallow: Port to EAPI 7 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: David Seifert <soap <AT> gentoo.org> x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild | 29 +++++++++++++++++-------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild index c5256efc410..5821727229a 100644 --- a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild +++ b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit flag-o-matic toolchain-funcs DESCRIPTION="A dock applet to make any application dockable" HOMEPAGE="https://www.dockapps.net/wmswallow"; @@ -13,22 +14,32 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="" -RDEPEND="x11-libs/libX11 +RDEPEND=" + x11-libs/libX11 x11-libs/libXext" DEPEND="${RDEPEND} x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" -S=${WORKDIR}/wmswallow +S="${WORKDIR}/${PN}" +PATCHES=( "${FILESDIR}"/${P}-format-security.patch ) src_prepare() { - epatch "${FILESDIR}"/${P}-format-security.patch - sed -e "s:\${OBJS} -o:\${OBJS} \${LDFLAGS} -o:" \ - -e "/LIBS/s/-lXext/-lX11 \0/"\ - -i Makefile || die + default + + # the Makefile is a mess, just + # rely on implicit rules instead + rm Makefile || die +} + +src_configure() { + tc-export CC + append-cppflags $($(tc-getPKG_CONFIG) --cflags x11 xext) + export LDLIBS="$($(tc-getPKG_CONFIG) --libs x11 xext)" } src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" xfree + emake wmswallow } src_install() {
