From 38423c67c8a23f6a1bc42038193182e2da3116eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Apr 2020 11:37:10 +0100 Subject: gentoo resync : 25.04.2020 --- app-shells/fzy/Manifest | 6 ++--- app-shells/fzy/files/1.0-cflags.patch | 34 +++++++++++++++++++++++ app-shells/fzy/files/fzy-0.9-cflags.patch | 11 -------- app-shells/fzy/fzy-1.0-r1.ebuild | 45 +++++++++++++++++++++++++++++++ app-shells/fzy/fzy-1.0.ebuild | 45 ------------------------------- app-shells/fzy/fzy-9999.ebuild | 7 +++-- 6 files changed, 85 insertions(+), 63 deletions(-) create mode 100644 app-shells/fzy/files/1.0-cflags.patch delete mode 100644 app-shells/fzy/files/fzy-0.9-cflags.patch create mode 100644 app-shells/fzy/fzy-1.0-r1.ebuild delete mode 100644 app-shells/fzy/fzy-1.0.ebuild (limited to 'app-shells/fzy') diff --git a/app-shells/fzy/Manifest b/app-shells/fzy/Manifest index 31725a1bf31c..a5422642ea0a 100644 --- a/app-shells/fzy/Manifest +++ b/app-shells/fzy/Manifest @@ -1,5 +1,5 @@ -AUX fzy-0.9-cflags.patch 299 BLAKE2B 61685e7180741ec77449b5de6fa711b4939faedd94dfcfd84ec86be0ef963b13d5a5308e294f4f22e83682982671a528b64446979fe41e112aeb8c5d143e865e SHA512 f3ea9b90a75f0a013466ef00190dbca451b22015e0a3c3f7e823f61dc2e4ef7d64f90a9685fec311675fb6c5bc788bb7436da2fd89f4f6baade4dfbee8318635 +AUX 1.0-cflags.patch 882 BLAKE2B 451086d7f84b97fd78518838ac34541b961cdcc76e929153f1bdfbf0bf95e6ee50d923a33b70514314cb70b35dd48d3930a5f5281eb1d80588f3263cc5e6e972 SHA512 173dda551294d4ac83e286844e63af46e988d5ceaf812537e7300ade56a8d1ba5da4db2db9da49dce7ab491324888860692746e2ec47e8cf44dce16300b54dfe DIST fzy-1.0.tar.gz 47432 BLAKE2B 5fef7061c797e63dabc3f77daf3dbc8a58671c257430dc8ba4680363a9ace5722562fc7e0aba618d53820e703b261dbe0182638f16223d1202080450a6c21ec2 SHA512 de5ed1af035260f4ae550c53b08c4ff302c978350784cbfd2981d1691f55d9c0f26b9333c74adea939b3f4578dd47e66ee99112e10afc5497c64011827d19dbc -EBUILD fzy-1.0.ebuild 1140 BLAKE2B dd43a6af686eb670901b916b5f892ef81a770636f99f97c1b3828e34d0b25714eda200a0df6afd996011cd6cd8186eb00163ca2d1c7ca885777e132781422670 SHA512 23d2a7bfc89d4faed9217a15e71182c958f8c072c6d177744db60a2a2e5611cfa34c0c56a825773989240ce58d08318e4d70553ed39bd3d39b24aae8bb6f175c -EBUILD fzy-9999.ebuild 1135 BLAKE2B 8dc3d18ffe57ebaff3e829499d2370d5a4a2f9098986178063846b5b1b81564c1e01d2e5ded7b1ec5485c40053b05c5aaa42c86e98730e26b38fba46fdc46ef0 SHA512 9b640390022027a82b034a61fa79993e10c02f41272c7a84d4a4094dca32183dab30820e93ede60a5dff47ff1944ebfb75abfc21fc39b32f8f35c11a24cb8d06 +EBUILD fzy-1.0-r1.ebuild 1136 BLAKE2B 7cb7b5534ad6ad7d612f084d5ca99ad823dd0907e870f5b887de7e797eb7cf4f91f0bf9830046f6ca44c83023eaeb06108b9d76eba1c56ce2def103a23364327 SHA512 f34088afe6520391e35addbd2d4b1d8a46989a852ab1adaf1262235c9b38a5335cb44fb0d860271bc421f75e5c8cbe2d724114a210c6872e1c8c809de0e2af91 +EBUILD fzy-9999.ebuild 1144 BLAKE2B b921ad2772abc770e3f263555ecbbb8403c37bb4678ebe57cd5f6bcbca1f7286bab86509fc44175d9cd3a177730d5df13b6285a5e0bea1f3d1038ffbaab7cb68 SHA512 8817316a9f1c35d39fbedaef6abfbcdb382779156b8f379e2de04c3748f15a0f5ab23cbb03f7553032393919337d29aa00c73699049e090f12bd1b0b1e23de22 MISC metadata.xml 892 BLAKE2B 3182bda5d04463762d724265d2ff3644eef1615dfbd2db92ad7ab5e1bf3b9e5f0f727dc55939e0c0902ed16ac78d4a39ae331d22902ec7f7f10d53a7e65a59ba SHA512 202ff3dc44543bf072b32addfc5e1ad627ec6fa16585d9ff9ddbe68bfaa784aa0319ed152621215cd60f1c2a688bb0e3ca227b78fc6b62f5dca4f39b2ad8a55b diff --git a/app-shells/fzy/files/1.0-cflags.patch b/app-shells/fzy/files/1.0-cflags.patch new file mode 100644 index 000000000000..4805b4814a45 --- /dev/null +++ b/app-shells/fzy/files/1.0-cflags.patch @@ -0,0 +1,34 @@ +From 89b4a0437dce6f99de80482d484b3e0346067889 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev +Date: Fri, 24 Apr 2020 19:12:16 -0700 +Subject: [PATCH] cflags + +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 2d23118..713daad 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + VERSION=1.0 + + CPPFLAGS=-DVERSION=\"${VERSION}\" -D_GNU_SOURCE +-CFLAGS+=-Wall -Wextra -g -std=c99 -O3 -pedantic -Ideps ++CFLAGS+=-Wall -Wextra -std=c99 -pedantic -Ideps + PREFIX?=/usr/local + MANDIR?=$(PREFIX)/share/man + BINDIR?=$(PREFIX)/bin +@@ -29,7 +29,7 @@ check: test/fzytest + $(DEBUGGER) ./test/fzytest + + fzy: $(OBJECTS) +- $(CC) $(CFLAGS) $(CCFLAGS) -o $@ $(OBJECTS) $(LIBS) ++ $(CC) $(CFLAGS) $(CCFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS) + + %.o: %.c config.h + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< +-- +2.26.2 + diff --git a/app-shells/fzy/files/fzy-0.9-cflags.patch b/app-shells/fzy/files/fzy-0.9-cflags.patch deleted file mode 100644 index 328abc9c6fe7..000000000000 --- a/app-shells/fzy/files/fzy-0.9-cflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- fzy-0.9/Makefile -+++ fzy-0.9/Makefile -@@ -1,7 +1,7 @@ - VERSION=0.9 - - CPPFLAGS=-DVERSION=\"${VERSION}\" -D_GNU_SOURCE --CFLAGS+=-Wall -Wextra -g -std=c99 -O3 -pedantic -Ideps -+CFLAGS+=-Wall -Wextra -std=c99 -pedantic -Ideps - PREFIX?=/usr/local - MANDIR?=$(PREFIX)/share/man - BINDIR?=$(PREFIX)/bin diff --git a/app-shells/fzy/fzy-1.0-r1.ebuild b/app-shells/fzy/fzy-1.0-r1.ebuild new file mode 100644 index 000000000000..660ca21138e7 --- /dev/null +++ b/app-shells/fzy/fzy-1.0-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils savedconfig toolchain-funcs + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git" +else + SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz" + KEYWORDS="amd64 arm arm64 ~ppc64 x86" +fi + +DESCRIPTION="Fuzzy text selector (interactive grep) for console" +HOMEPAGE="https://github.com/jhawthorn/fzy" + +LICENSE="MIT" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +PATCHES=( "${FILESDIR}"/1.0-cflags.patch ) + +src_prepare() { + default + restore_config config.h + tc-export CC +} + +src_install() { + local DOCS=( ALGORITHM.md CHANGELOG.md README.md ) + emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install + dobin contrib/fzy-tmux + dobin contrib/fzy-dvtm + einstalldocs + save_config config.h +} + +pkg_postinst() { + savedconfig_pkg_postinst + optfeature "opening search results in dvtm pane with provided ${EPREFIX}/usr/bin/fzy-dvtm" app-misc/dvtm + optfeature "opening search results in tmux pane with provided ${EPREFIX}/usr/bin/fzy-tmux" app-misc/tmux +} diff --git a/app-shells/fzy/fzy-1.0.ebuild b/app-shells/fzy/fzy-1.0.ebuild deleted file mode 100644 index 38f54c0bf9d7..000000000000 --- a/app-shells/fzy/fzy-1.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils savedconfig toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git" -else - SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~ppc64 x86" -fi - -DESCRIPTION="Fuzzy text selector (interactive grep) for console" -HOMEPAGE="https://github.com/jhawthorn/fzy" - -LICENSE="MIT" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -PATCHES=( "${FILESDIR}"/fzy-0.9-cflags.patch ) - -src_prepare() { - default - restore_config config.h - tc-export CC -} - -src_install() { - local DOCS=( ALGORITHM.md CHANGELOG.md README.md ) - emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install - dobin contrib/fzy-tmux - dobin contrib/fzy-dvtm - einstalldocs - save_config config.h -} - -pkg_postinst() { - savedconfig_pkg_postinst - optfeature "opening search results in dvtm pane with provided ${EPREFIX}/usr/bin/fzy-dvtm" app-misc/dvtm - optfeature "opening search results in tmux pane with provided ${EPREFIX}/usr/bin/fzy-tmux" app-misc/tmux -} diff --git a/app-shells/fzy/fzy-9999.ebuild b/app-shells/fzy/fzy-9999.ebuild index 8fb7bb35ba12..98dfd31e607d 100644 --- a/app-shells/fzy/fzy-9999.ebuild +++ b/app-shells/fzy/fzy-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 eutils savedconfig toolchain-funcs @@ -21,12 +21,11 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -PATCHES=( "${FILESDIR}"/fzy-0.9-cflags.patch ) - src_prepare() { default restore_config config.h tc-export CC + sed -i 's/$(LIBS)/$(LIBS) $(LDFLAGS)/g' Makefile || die } src_install() { -- cgit v1.2.3