From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DE7E313835B for ; Fri, 12 Feb 2021 13:45:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F959E09C0; Fri, 12 Feb 2021 13:45:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2C1D0E09C0 for ; Fri, 12 Feb 2021 13:45:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F623335DA5 for ; Fri, 12 Feb 2021 13:45:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1ECC94C9 for ; Fri, 12 Feb 2021 13:45:04 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1613137482.22274c58b1d3b2ccebe72a40e99ec8d90f2fd7d0.bkohler@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/wmii/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/wmii/wmii-3.9.2-r5.ebuild X-VCS-Directories: x11-wm/wmii/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: 22274c58b1d3b2ccebe72a40e99ec8d90f2fd7d0 X-VCS-Branch: master Date: Fri, 12 Feb 2021 13:45:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c00511ca-591a-44f9-8b5d-4587557c1db3 X-Archives-Hash: f74119974a705ec5d08b552e7054db24 commit: 22274c58b1d3b2ccebe72a40e99ec8d90f2fd7d0 Author: Jakov Smolic sartura hr> AuthorDate: Thu Feb 11 19:14:25 2021 +0000 Commit: Ben Kohler gentoo org> CommitDate: Fri Feb 12 13:44:42 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22274c58 x11-wm/wmii: Port to EAPI 7 * Apply gcc-10 workaround (dead upstream) Closes: https://bugs.gentoo.org/706962 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: Ben Kohler gentoo.org> x11-wm/wmii/wmii-3.9.2-r5.ebuild | 42 ++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/x11-wm/wmii/wmii-3.9.2-r5.ebuild b/x11-wm/wmii/wmii-3.9.2-r5.ebuild index ce878f3d1cc..1199ba5c7ca 100644 --- a/x11-wm/wmii/wmii-3.9.2-r5.ebuild +++ b/x11-wm/wmii/wmii-3.9.2-r5.ebuild @@ -1,43 +1,34 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit flag-o-matic multilib toolchain-funcs MY_P="wmii+ixp-${PV}" DESCRIPTION="A dynamic window manager for X11" -HOMEPAGE="http://wmii.suckless.org/" +HOMEPAGE="https://github.com/0intro/wmii" SRC_URI="http://dl.suckless.org/wmii/${MY_P}.tbz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="" -CDEPEND=" +DEPEND=" + media-libs/freetype >=sys-libs/libixp-0.5_p20110208-r3 - x11-libs/libXft x11-libs/libXext + x11-libs/libXft + x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender - x11-libs/libX11 - x11-libs/libXinerama - >=media-libs/freetype-2 -" - -RDEPEND=" - ${CDEPEND} - x11-apps/xmessage - x11-apps/xsetroot + x11-libs/libX11" +RDEPEND="${DEPEND} media-fonts/font-misc-misc -" - -DEPEND=" - ${CDEPEND} - virtual/pkgconfig -" + x11-apps/xmessage + x11-apps/xsetroot" +BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${MY_P}" @@ -61,13 +52,18 @@ src_prepare() { ) # punt internal copy of sys-libs/libixp #323037 - rm -f include/ixp{,_srvutil}.h || die + rm include/ixp{,_srvutil}.h || die sed -i -e '/libixp/d' Makefile || die sed -i -e "/BINSH \!=/d" mk/hdr.mk || die #335083 sed -i -e 's/-lXext/& -lXrender -lX11/' cmd/Makefile || die #369115 } +src_configure() { + append-flags -fcommon + default +} + src_compile() { append-flags -I/usr/include/freetype2 emake "${mywmiiconf[@]}" @@ -81,5 +77,5 @@ src_install() { doexe "${T}/${PN}" insinto /usr/share/xsessions - doins "${FILESDIR}/${PN}.desktop" + doins "${FILESDIR}"/${PN}.desktop }