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 D22BF138353 for ; Tue, 7 Apr 2020 15:57:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95239E0A4A; Tue, 7 Apr 2020 15:57:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 6A7ABE0A4A for ; Tue, 7 Apr 2020 15:57:45 +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 404D734F0E0 for ; Tue, 7 Apr 2020 15:57:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 780251C5 for ; Tue, 7 Apr 2020 15:57:41 +0000 (UTC) From: "Bernard Cafarelli" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Bernard Cafarelli" Message-ID: <1586274507.ee77889271e873b45b9bafe53c82eaa9eca6922a.voyageur@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/windowmaker/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/windowmaker/windowmaker-9999.ebuild X-VCS-Directories: x11-wm/windowmaker/ X-VCS-Committer: voyageur X-VCS-Committer-Name: Bernard Cafarelli X-VCS-Revision: ee77889271e873b45b9bafe53c82eaa9eca6922a X-VCS-Branch: master Date: Tue, 7 Apr 2020 15:57:41 +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: f31180a2-d732-4365-8006-b76b951c8d70 X-Archives-Hash: fc7968bd9a87a93a78d6a39678506dd2 commit: ee77889271e873b45b9bafe53c82eaa9eca6922a Author: Bernard Cafarelli gentoo org> AuthorDate: Tue Apr 7 15:48:27 2020 +0000 Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Apr 7 15:48:27 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee778892 x11-wm/windowmaker: sync live ebuild Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Bernard Cafarelli gentoo.org> x11-wm/windowmaker/windowmaker-9999.ebuild | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild index 18bfa9f85a4..7078f87e042 100644 --- a/x11-wm/windowmaker/windowmaker-9999.ebuild +++ b/x11-wm/windowmaker/windowmaker-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools eutils git-r3 DESCRIPTION="The fast and light GNUstep window manager" @@ -32,6 +32,9 @@ DEPEND="media-libs/fontconfig RDEPEND="${DEPEND} nls? ( >=sys-devel/gettext-0.10.39 )" +DOCS=( AUTHORS BUGFORM BUGS ChangeLog INSTALL INSTALL-WMAKER FAQ + NEWS README README.definable-cursor README.i18n TODO ) + src_unpack() { # wm-extras unpack ${A} @@ -43,9 +46,9 @@ src_prepare() { # Fix some paths for file in WindowMaker/*menu* util/wmgenmenu.c; do if [[ -r $file ]] ; then - sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die - sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die - sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die + sed -i -e "s|/usr/local/GNUstep/Applications/WPrefs.app|${EPREFIX}/usr/bin/|g;" "$file" || die + sed -i -e "s|/usr/local/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die + sed -i -e "s|/opt/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die fi; done; @@ -77,7 +80,7 @@ src_configure() { --localedir="${EPREFIX}"/usr/share/locale \ ${myconf} - cd ../WindowMaker-extra-0.1 + pushd ../WindowMaker-extra-0.1 || die econf } @@ -85,18 +88,15 @@ src_compile() { emake # WindowMaker Extra Package (themes and icons) - cd ../WindowMaker-extra-0.1 + pushd ../WindowMaker-extra-0.1 || die emake } src_install() { - emake DESTDIR="${D}" install - - dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \ - README* NEWS TODO + default # WindowMaker Extra - cd ../WindowMaker-extra-0.1 + pushd ../WindowMaker-extra-0.1 || die emake DESTDIR="${D}" install newdoc README README.extra