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 5391F139694 for ; Sat, 15 Apr 2017 13:04:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56E3AE0BCB; Sat, 15 Apr 2017 13:03:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 230D6E0BC5 for ; Sat, 15 Apr 2017 13:03:54 +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 A03B534071C for ; Sat, 15 Apr 2017 13:03:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1003969BC for ; Sat, 15 Apr 2017 13:03:51 +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: <1492261241.3fc00f135e66dc82d84bf4b03da12846a934016e.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/farbfeld/, media-gfx/farbfeld/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/farbfeld/Manifest media-gfx/farbfeld/farbfeld-3.ebuild media-gfx/farbfeld/farbfeld-9999.ebuild media-gfx/farbfeld/files/farbfeld-3-as-needed.patch X-VCS-Directories: media-gfx/farbfeld/ media-gfx/farbfeld/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 3fc00f135e66dc82d84bf4b03da12846a934016e X-VCS-Branch: master Date: Sat, 15 Apr 2017 13:03:51 +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-Archives-Salt: 63eaecda-5146-4948-a0c4-7818732525e4 X-Archives-Hash: 7db63623393c131caddbb36da3d450f3 commit: 3fc00f135e66dc82d84bf4b03da12846a934016e Author: Jeroen Roovers gentoo org> AuthorDate: Sat Apr 15 13:00:41 2017 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sat Apr 15 13:00:41 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fc00f13 media-gfx/farbfeld: Version bump. Package-Manager: Portage-2.3.5, Repoman-2.3.2 media-gfx/farbfeld/Manifest | 1 + .../{farbfeld-9999.ebuild => farbfeld-3.ebuild} | 27 ++++++++++++---------- media-gfx/farbfeld/farbfeld-9999.ebuild | 21 +++++++++-------- .../farbfeld/files/farbfeld-3-as-needed.patch | 11 +++++++++ 4 files changed, 39 insertions(+), 21 deletions(-) diff --git a/media-gfx/farbfeld/Manifest b/media-gfx/farbfeld/Manifest index fe8dd7099ce..1e731e5d635 100644 --- a/media-gfx/farbfeld/Manifest +++ b/media-gfx/farbfeld/Manifest @@ -1,2 +1,3 @@ DIST farbfeld-1.tar.gz 6770 SHA256 34faf878ee9bf20a690604b2e09f97ce517b20bb7b5e37433997941825c0b46e SHA512 cbd977175412ad7b143415643a3767b041e87d441f3bf9783872ffb48ed987f60156d6e2d7eff715071eb0349a3a131188487a1c9645dffa78966f0102b8405e WHIRLPOOL 6a6a489fcffda4b7c337097d51b181f7533a97a948af0c781cb035dba05b2b3ad892a1cde6f0dab05d3db893ddddfbf5666621144f4b8ed7e4a6981df3821343 DIST farbfeld-2.tar.gz 6646 SHA256 a366e7628274fb9b4dc9508a7340a32b5e7557d99895b7ed7b5165241d613f58 SHA512 04471f0d6092433083b1441c17fb80db27fcedea6a12ddab3b08eaf9731da06f48560cf49124b56e1e27d7de2b69109b0ce38513ee90c735ac966dc2132e000f WHIRLPOOL 3d125bac271db2e8ab6411abc1c809cb2de4c6401a4c978f6a34fad97387136225b8d93dae5f89aa2bc303f4e8498350193f74a7f156b9bd65ec8dcac05a2341 +DIST farbfeld-3.tar.gz 10169 SHA256 5b953b86a72d3feaedf62698532c8888e5f6e2f6363193a4cc8cee0e38c378ad SHA512 4f1e44282810bd2724f78857bcde401b82945375c5472b31e39250d660efffd425e0a2da5aecf0133ad3d414c31214d073d00f519bc83960b5bbfd53df3b1c49 WHIRLPOOL f7105f1ea59366159a9b350d862e356eeb373685287a25827a72360ce917a6a23b4473286b82a081afea8b9dd60ec5b7ea37450084a54f615c00186753c70cbf diff --git a/media-gfx/farbfeld/farbfeld-9999.ebuild b/media-gfx/farbfeld/farbfeld-3.ebuild similarity index 67% copy from media-gfx/farbfeld/farbfeld-9999.ebuild copy to media-gfx/farbfeld/farbfeld-3.ebuild index a0cf3c93adb..6ff7acb7cee 100644 --- a/media-gfx/farbfeld/farbfeld-9999.ebuild +++ b/media-gfx/farbfeld/farbfeld-3.ebuild @@ -1,39 +1,42 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit git-r3 toolchain-funcs +EAPI=6 +inherit toolchain-funcs DESCRIPTION="farbfeld simple image format tools" HOMEPAGE="http://tools.suckless.org/farbfeld/" -EGIT_REPO_URI="git://git.suckless.org/farbfeld" +SRC_URI="http://dl.suckless.org/${PN}/${P}.tar.gz" LICENSE="ISC" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64" RDEPEND=" media-libs/libjpeg-turbo media-libs/libpng:* - media-libs/lcms:2 " DEPEND=" ${RDEPEND} " +PATCHES=( + "${FILESDIR}"/${PN}-3-as-needed.patch +) src_prepare() { - sed config.mk \ + default + + sed -i \ -e '/^CC/d' \ -e 's|/usr/local|/usr|g' \ -e 's|^CFLAGS.*|CFLAGS += -std=c99 -pedantic -Wall -Wextra $(INCS) $(CPPFLAGS)|g' \ -e 's|^LDFLAGS.*|LDFLAGS += $(LIBS)|g' \ -e 's|{|(|g;s|}|)|g' \ - -i || die + config.mk || die - sed Makefile \ - -e 's|{|(|g;s|}|)|g' \ - -e 's|^ @| |g' \ - -i || die + sed -i \ + -e '/[a-z]-LDFLAGS/s| = | += |g' \ + Makefile || die } src_compile() { diff --git a/media-gfx/farbfeld/farbfeld-9999.ebuild b/media-gfx/farbfeld/farbfeld-9999.ebuild index a0cf3c93adb..1d283868c3a 100644 --- a/media-gfx/farbfeld/farbfeld-9999.ebuild +++ b/media-gfx/farbfeld/farbfeld-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 inherit git-r3 toolchain-funcs DESCRIPTION="farbfeld simple image format tools" @@ -15,25 +15,28 @@ KEYWORDS="" RDEPEND=" media-libs/libjpeg-turbo media-libs/libpng:* - media-libs/lcms:2 " DEPEND=" ${RDEPEND} " +PATCHES=( + "${FILESDIR}"/${PN}-3-as-needed.patch +) src_prepare() { - sed config.mk \ + default + + sed -i \ -e '/^CC/d' \ -e 's|/usr/local|/usr|g' \ -e 's|^CFLAGS.*|CFLAGS += -std=c99 -pedantic -Wall -Wextra $(INCS) $(CPPFLAGS)|g' \ -e 's|^LDFLAGS.*|LDFLAGS += $(LIBS)|g' \ -e 's|{|(|g;s|}|)|g' \ - -i || die + config.mk || die - sed Makefile \ - -e 's|{|(|g;s|}|)|g' \ - -e 's|^ @| |g' \ - -i || die + sed -i \ + -e '/[a-z]-LDFLAGS/s| = | += |g' \ + Makefile || die } src_compile() { diff --git a/media-gfx/farbfeld/files/farbfeld-3-as-needed.patch b/media-gfx/farbfeld/files/farbfeld-3-as-needed.patch new file mode 100644 index 00000000000..61502e55543 --- /dev/null +++ b/media-gfx/farbfeld/files/farbfeld-3-as-needed.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -23,7 +23,7 @@ + $(BIN:=.o): config.mk $(HDR) $(REQ:=.h) + + .o: +- $(CC) $(LDFLAGS) $($*-LDFLAGS) -o $@ $< $(REQ:=.o) ++ $(CC) $(LDFLAGS) -o $@ $< $(REQ:=.o) $($*-LDFLAGS) + + clean: + rm -f $(BIN) $(BIN:=.o) $(REQ:=.o)