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 68FE3138350 for ; Thu, 27 Feb 2020 03:22:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 72128E09C8; Thu, 27 Feb 2020 03:22:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 D2D13E09C8 for ; Thu, 27 Feb 2020 03:22:36 +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 3AA1634F29C for ; Thu, 27 Feb 2020 03:22:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CA41B144 for ; Thu, 27 Feb 2020 03:22:32 +0000 (UTC) From: "Joshua Kinard" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joshua Kinard" Message-ID: <1582773720.62c1c99f07ffef5001eb361c1614ca67b4f44b3f.kumba@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zerofree/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zerofree/Manifest sys-fs/zerofree/zerofree-1.0.4.ebuild sys-fs/zerofree/zerofree-1.1.1.ebuild X-VCS-Directories: sys-fs/zerofree/ X-VCS-Committer: kumba X-VCS-Committer-Name: Joshua Kinard X-VCS-Revision: 62c1c99f07ffef5001eb361c1614ca67b4f44b3f X-VCS-Branch: master Date: Thu, 27 Feb 2020 03:22:32 +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: 980e92b1-784e-442e-aa80-9869eb0b6863 X-Archives-Hash: 55d945f55ffa38e6dc7e41c0643af531 commit: 62c1c99f07ffef5001eb361c1614ca67b4f44b3f Author: Joshua Kinard gentoo org> AuthorDate: Thu Feb 27 03:22:00 2020 +0000 Commit: Joshua Kinard gentoo org> CommitDate: Thu Feb 27 03:22:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62c1c99f sys-fs/zerofree: Version bump, replace sed delimiter - Add ebuild for zerofree-1.1.1 - Replace colon sed delimiter w/ pipe to resolve #710818 - Bump to EAPI 7 - Remove useless src_compile and use the built-in default Signed-off-by: Joshua Kinard gentoo.org> Package-Manager: Portage-2.3.89, Repoman-2.3.20 sys-fs/zerofree/Manifest | 1 + sys-fs/zerofree/zerofree-1.0.4.ebuild | 18 ++++++++---------- .../{zerofree-1.0.4.ebuild => zerofree-1.1.1.ebuild} | 18 ++++++++---------- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/sys-fs/zerofree/Manifest b/sys-fs/zerofree/Manifest index df3f07d3c3d..7c5efcfddaa 100644 --- a/sys-fs/zerofree/Manifest +++ b/sys-fs/zerofree/Manifest @@ -1 +1,2 @@ DIST zerofree-1.0.4.tgz 8509 BLAKE2B d2d5872ad22e7c5f08e00083b0dadb5411023df9d129ec3bd08637e8a74f77f13a535e6f2c1a7cd4d390ed7a0d0b6e2433dacfa89336bb16ffb64c0d1c409929 SHA512 8172c8c43794eab1f751a700f847098343659ceabaf6ab78c3c902b34cf9b0db0dda75308b6bc80d22afccd11be25f35070ca6d715c3282c5c7c7106f598b42b +DIST zerofree-1.1.1.tgz 8710 BLAKE2B 76a84de7db60473c8824129a29515212acc74235e2139eb15fe7f41d1801c42c85378734fdf39a668f0a4eb285c55c49ce2281dda9444b2008557897428bc645 SHA512 2d7ee57a877bff2491c48054338a26d624ae75c238ac2b0568a75de88b6621c16cc1e7d65500879825d14d8ba44a5173587a061459072769c165bee47c3f9f1c diff --git a/sys-fs/zerofree/zerofree-1.0.4.ebuild b/sys-fs/zerofree/zerofree-1.0.4.ebuild index dfa87892784..6e360c833a1 100644 --- a/sys-fs/zerofree/zerofree-1.0.4.ebuild +++ b/sys-fs/zerofree/zerofree-1.0.4.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 inherit eutils toolchain-funcs -DESCRIPTION="Zero's out all free space on a filesystem" +DESCRIPTION="Zeroes out all free space on a filesystem" HOMEPAGE="http://frippery.org/uml/index.html" SRC_URI="http://frippery.org/uml/${P}.tgz" @@ -18,16 +18,14 @@ RDEPEND="${DEPEND}" src_prepare() { # Honor system CFLAGS. + # Use pipes for the sed delimiter to resolve #710818. sed -i \ - -e "s:CC=gcc:CC=$(tc-getCC)\nCFLAGS=${CFLAGS}\nLDFLAGS=${LDFLAGS}:g" \ - -e "s:-o zerofree:\$(CFLAGS) \$(LDFLAGS) -o zerofree:g" \ - -e "/-lext2fs/{ s:-lext2fs::g; s:$: -lext2fs:g; }" \ + -e "s|CC=gcc|CC=$(tc-getCC)\nCFLAGS=${CFLAGS}\nLDFLAGS=${LDFLAGS}|g" \ + -e "s|-o zerofree|\$(CFLAGS) \$(LDFLAGS) -o zerofree|g" \ + -e "/-lext2fs/{ s|-lext2fs||g; s|$| -lext2fs|g; }" \ Makefile || die "Failed to sed the Makefile" -} -src_compile() { - # Just a Makefile, nothing fancy. - make || die "Failed to compile ${PN}." + eapply_user } src_install() { diff --git a/sys-fs/zerofree/zerofree-1.0.4.ebuild b/sys-fs/zerofree/zerofree-1.1.1.ebuild similarity index 55% copy from sys-fs/zerofree/zerofree-1.0.4.ebuild copy to sys-fs/zerofree/zerofree-1.1.1.ebuild index dfa87892784..6e360c833a1 100644 --- a/sys-fs/zerofree/zerofree-1.0.4.ebuild +++ b/sys-fs/zerofree/zerofree-1.1.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 inherit eutils toolchain-funcs -DESCRIPTION="Zero's out all free space on a filesystem" +DESCRIPTION="Zeroes out all free space on a filesystem" HOMEPAGE="http://frippery.org/uml/index.html" SRC_URI="http://frippery.org/uml/${P}.tgz" @@ -18,16 +18,14 @@ RDEPEND="${DEPEND}" src_prepare() { # Honor system CFLAGS. + # Use pipes for the sed delimiter to resolve #710818. sed -i \ - -e "s:CC=gcc:CC=$(tc-getCC)\nCFLAGS=${CFLAGS}\nLDFLAGS=${LDFLAGS}:g" \ - -e "s:-o zerofree:\$(CFLAGS) \$(LDFLAGS) -o zerofree:g" \ - -e "/-lext2fs/{ s:-lext2fs::g; s:$: -lext2fs:g; }" \ + -e "s|CC=gcc|CC=$(tc-getCC)\nCFLAGS=${CFLAGS}\nLDFLAGS=${LDFLAGS}|g" \ + -e "s|-o zerofree|\$(CFLAGS) \$(LDFLAGS) -o zerofree|g" \ + -e "/-lext2fs/{ s|-lext2fs||g; s|$| -lext2fs|g; }" \ Makefile || die "Failed to sed the Makefile" -} -src_compile() { - # Just a Makefile, nothing fancy. - make || die "Failed to compile ${PN}." + eapply_user } src_install() {