summaryrefslogtreecommitdiff
path: root/media-gfx/farbfeld
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/farbfeld')
-rw-r--r--media-gfx/farbfeld/Manifest5
-rw-r--r--media-gfx/farbfeld/farbfeld-3.ebuild44
-rw-r--r--media-gfx/farbfeld/farbfeld-9999.ebuild4
-rw-r--r--media-gfx/farbfeld/files/farbfeld-3-as-needed.patch11
4 files changed, 3 insertions, 61 deletions
diff --git a/media-gfx/farbfeld/Manifest b/media-gfx/farbfeld/Manifest
index f656b1c594b4..eb4bf01f2231 100644
--- a/media-gfx/farbfeld/Manifest
+++ b/media-gfx/farbfeld/Manifest
@@ -1,7 +1,4 @@
-AUX farbfeld-3-as-needed.patch 249 BLAKE2B cb6b8fa0dbdfdf7fb67c519d1d740f392b22eeb71a65eeb0db3ef63a39747996bf6da903681b78d897bee271749e87011e0c4922513621e33390789b382f346f SHA512 c00ad29d4c06777896b0915b8277b25eecf2d09312c2fbb2f0d5dbde9150ad3fb9d4f1d49fd6fdd742fdabeede128c9dd827c272604edcda017a959ca68ee738
-DIST farbfeld-3.tar.gz 10169 BLAKE2B 8d548cb33950d1b8f94f79ea5e8dbff445f2378f1c75cb4945f8f48ae9fec8075d38bc83a6bc99184182f3b1920b15454853c0a899de2e0756f2614bc3f684aa SHA512 4f1e44282810bd2724f78857bcde401b82945375c5472b31e39250d660efffd425e0a2da5aecf0133ad3d414c31214d073d00f519bc83960b5bbfd53df3b1c49
DIST farbfeld-4.tar.gz 10340 BLAKE2B 0ef13baabe70f0be485746602a77eb4002c8611d1ccb0468de512b687eb9a5c48dafb81c12274e29377697bc70d3586f4a71b47e82ffd3f6238398741565c1b9 SHA512 5139dd81cf1e3cb7a32108c0acad0e4ae0de13e86b997f1a759aa1b1f7be6c1ad2a93a69af7126e3512a7c9b1669a2a301ff60171b098b3450f1da0594e3b6ac
-EBUILD farbfeld-3.ebuild 837 BLAKE2B 82a4f748470f0ff236ba6729305106b9f0d99566094531d22f5ac4640c16f78a6dd1a034c16b977788bec02d0efcb5c972940ad30a2cc9b6df2d4d4bc0ccfafb SHA512 904f6887c170f56fd5e56e5af4bfde155049645172e0910f9e9f270e5ffb9b9463b9905b86fcea5bc0ca56a24c9b72d5eb9e38d70d19dde00ac7d02236b3b8e9
EBUILD farbfeld-4.ebuild 761 BLAKE2B e5746da38c2a34fe6cc9cff7764f19988d2aa15b28776835f7afb0e975d93b0faa970920b02f806aeba06447ced6ebe07bb8689fdec323ae5f0ccbf46911e8cb SHA512 d17a0f75ed5063c3a898c6eaab81031e3604364e1dfef5209ceb6523e25cd1c4df4efb421f738f64bbf2ee0fc703d9dcbaa70703907a5ca891b013232c2d807d
-EBUILD farbfeld-9999.ebuild 760 BLAKE2B 56fd29a6ba7c7627ff41fbfd44230dab08ccb3a742cf14120d7c92592fdea5c732dea0675bbb95e89b9a7b92b1584ca132a3fe1813da39ac543d56057f92d9f8 SHA512 dd41545e7f16f4700e3fc711297d66b41ce4697cc9e7acde2cb8cb97c257ea52e038756204c415abe782c7bf30e7075fe6da08f08141944a486aba7a0b896e84
+EBUILD farbfeld-9999.ebuild 757 BLAKE2B 11f98fef448e43c042811cce0d00a545ed79ec2ba0f732569b64d23bb0e08ebc534d5d60591d0a7aa297c01d5a7088ea076d09362cb0cd03c0aeb4b07c17a68b SHA512 38482a2850a26b59b87bd35179ac740d382e0b6f6b63ae7febb395717ee874627d0e45257915ba32e5e6e2e3c8782290f4090b411d5d9d031366d6ed338d6122
MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/media-gfx/farbfeld/farbfeld-3.ebuild b/media-gfx/farbfeld/farbfeld-3.ebuild
deleted file mode 100644
index b8bab18a1e31..000000000000
--- a/media-gfx/farbfeld/farbfeld-3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="farbfeld simple image format tools"
-HOMEPAGE="https://tools.suckless.org/farbfeld/"
-SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- media-libs/libjpeg-turbo
- media-libs/libpng:*
-"
-DEPEND="
- ${RDEPEND}
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-3-as-needed.patch
-)
-
-src_prepare() {
- 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' \
- config.mk || die
-}
-
-src_compile() {
- emake CC=$(tc-getCC)
-}
-
-src_install() {
- emake DESTDIR="${D}" install MANPREFIX=/usr/share/man
-}
diff --git a/media-gfx/farbfeld/farbfeld-9999.ebuild b/media-gfx/farbfeld/farbfeld-9999.ebuild
index 7633fe053abd..fb16c050f043 100644
--- a/media-gfx/farbfeld/farbfeld-9999.ebuild
+++ b/media-gfx/farbfeld/farbfeld-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="farbfeld simple image format tools"
diff --git a/media-gfx/farbfeld/files/farbfeld-3-as-needed.patch b/media-gfx/farbfeld/files/farbfeld-3-as-needed.patch
deleted file mode 100644
index 61502e55543f..000000000000
--- a/media-gfx/farbfeld/files/farbfeld-3-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)