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 88931138334 for ; Tue, 5 Feb 2019 15:35:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 829E4E09F8; Tue, 5 Feb 2019 15:35:53 +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 40823E09F8 for ; Tue, 5 Feb 2019 15:35:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 4D843335D75 for ; Tue, 5 Feb 2019 15:35:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A56ED4FF for ; Tue, 5 Feb 2019 15:35:49 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1549380946.a5f1156d2eaac56b8a9fc2216e6a7fe8e0f31d40.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/dwm/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/dwm/Manifest x11-wm/dwm/dwm-6.2.ebuild x11-wm/dwm/dwm-9999.ebuild X-VCS-Directories: x11-wm/dwm/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: a5f1156d2eaac56b8a9fc2216e6a7fe8e0f31d40 X-VCS-Branch: master Date: Tue, 5 Feb 2019 15:35:49 +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: 3a6e0f2c-0fe5-4084-a3fe-adbe4f7094c4 X-Archives-Hash: a64038ba527438c199e9afa09e9ddd7d commit: a5f1156d2eaac56b8a9fc2216e6a7fe8e0f31d40 Author: Jeroen Roovers gentoo org> AuthorDate: Tue Feb 5 15:35:31 2019 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Tue Feb 5 15:35:46 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f1156d x11-wm/dwm: Version 6.2 Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Jeroen Roovers gentoo.org> x11-wm/dwm/Manifest | 1 + x11-wm/dwm/{dwm-9999.ebuild => dwm-6.2.ebuild} | 28 ++++++++++---------------- x11-wm/dwm/dwm-9999.ebuild | 18 ++++------------- 3 files changed, 16 insertions(+), 31 deletions(-) diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest index 86858fc902f..43f0792e48a 100644 --- a/x11-wm/dwm/Manifest +++ b/x11-wm/dwm/Manifest @@ -1 +1,2 @@ DIST dwm-6.1.tar.gz 25887 BLAKE2B 36c3aa36b8371b993ac845faaebd738f8295d3bed34a1a97075d8449cb3a2febec746b21858071579e27021502c7e184fcb0750997eacce471b968bac0e555bf SHA512 875644bbc246088f2c87e50debbadd4bc179444b396b1b327149087e8bc5303325ebc9103a7e3c864266ee1ac683ea3cd8f0a08285c8e46fc4389d5b83a555f1 +DIST dwm-6.2.tar.gz 25273 BLAKE2B 2bb9e5b900a1d73f3eb94cb8454580ec98930dbacbabec1f2bbd394eb96696873434b6ddea4ac95eb9d171de2c09c5d4ca0b30649836f7e25f4769f44d25a6eb SHA512 01abcab954e5b7c20d011e6fd9c28025271fea2e85610c928812f7c6a09f99d7f9e93d11ffc2d6a7aca894b3fa7e507c6c2fe5f26ff5ddcfc650a9bbaaa41e06 diff --git a/x11-wm/dwm/dwm-9999.ebuild b/x11-wm/dwm/dwm-6.2.ebuild similarity index 55% copy from x11-wm/dwm/dwm-9999.ebuild copy to x11-wm/dwm/dwm-6.2.ebuild index 27c5d18fe7a..0344b44e716 100644 --- a/x11-wm/dwm/dwm-9999.ebuild +++ b/x11-wm/dwm/dwm-6.2.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit git-r3 toolchain-funcs +EAPI=7 +inherit savedconfig toolchain-funcs DESCRIPTION="a dynamic window manager for X11" HOMEPAGE="https://dwm.suckless.org/" -EGIT_REPO_URI="https://git.suckless.org/dwm" +SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd" IUSE="xinerama" RDEPEND=" @@ -28,19 +28,11 @@ src_prepare() { default sed -i \ - -e "s/CFLAGS = -std=c99 -pedantic -Wall -Os/CFLAGS += -std=c99 -pedantic -Wall/" \ - -e "/^LDFLAGS/{s|=|+=|g;s|-s ||g}" \ - -e "s/#XINERAMALIBS =/XINERAMALIBS ?=/" \ - -e "s/#XINERAMAFLAGS =/XINERAMAFLAGS ?=/" \ - -e "s@/usr/X11R6/include@${EPREFIX}/usr/include/X11@" \ - -e "s@/usr/X11R6/lib@${EPREFIX}/usr/lib@" \ - -e "s@-I/usr/include@@" -e "s@-L/usr/lib@@" \ - -e "s/\/freetype2/\ -I\/usr\/include\/freetype2/" \ + -e "s/ -Os / /" \ + -e "/^\(LDFLAGS\|CFLAGS\|CPPFLAGS\)/{s| = | += |g;s|-s ||g}" \ config.mk || die - sed -i \ - -e '/@echo CC/d' \ - -e 's|@${CC}|$(CC)|g' \ - Makefile || die + + restore_config config.h } src_compile() { @@ -61,4 +53,6 @@ src_install() { doins "${FILESDIR}"/dwm.desktop dodoc README + + save_config config.h } diff --git a/x11-wm/dwm/dwm-9999.ebuild b/x11-wm/dwm/dwm-9999.ebuild index 27c5d18fe7a..900dc238896 100644 --- a/x11-wm/dwm/dwm-9999.ebuild +++ b/x11-wm/dwm/dwm-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit git-r3 toolchain-funcs DESCRIPTION="a dynamic window manager for X11" @@ -28,19 +28,9 @@ src_prepare() { default sed -i \ - -e "s/CFLAGS = -std=c99 -pedantic -Wall -Os/CFLAGS += -std=c99 -pedantic -Wall/" \ - -e "/^LDFLAGS/{s|=|+=|g;s|-s ||g}" \ - -e "s/#XINERAMALIBS =/XINERAMALIBS ?=/" \ - -e "s/#XINERAMAFLAGS =/XINERAMAFLAGS ?=/" \ - -e "s@/usr/X11R6/include@${EPREFIX}/usr/include/X11@" \ - -e "s@/usr/X11R6/lib@${EPREFIX}/usr/lib@" \ - -e "s@-I/usr/include@@" -e "s@-L/usr/lib@@" \ - -e "s/\/freetype2/\ -I\/usr\/include\/freetype2/" \ + -e "s/ -Os / /" \ + -e "/^\(LDFLAGS\|CFLAGS\|CPPFLAGS\)/{s| = | += |g;s|-s ||g}" \ config.mk || die - sed -i \ - -e '/@echo CC/d' \ - -e 's|@${CC}|$(CC)|g' \ - Makefile || die } src_compile() {