From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- dev-util/wiggle/Manifest | 8 ++- dev-util/wiggle/files/wiggle-1.0-cflags.patch | 6 +-- dev-util/wiggle/wiggle-0.9-r1.ebuild | 71 --------------------------- dev-util/wiggle/wiggle-1.0.ebuild | 4 +- dev-util/wiggle/wiggle-1.2.ebuild | 2 +- 5 files changed, 10 insertions(+), 81 deletions(-) delete mode 100644 dev-util/wiggle/wiggle-0.9-r1.ebuild (limited to 'dev-util/wiggle') diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest index 951cda216797..10ee5dc543f5 100644 --- a/dev-util/wiggle/Manifest +++ b/dev-util/wiggle/Manifest @@ -1,9 +1,7 @@ -AUX wiggle-1.0-cflags.patch 576 BLAKE2B 25b065a28bb88f3163c063a90a9dc60ec9171e4ab43732faf0c493682b05ff37cbc1e99777bfb2fd03894c79bc30713067b3378c02556199fd847f0cf9d4d0bb SHA512 a6bbcbe8307212416ed66f17e5b5dfe2ef2c369f15351623ff1c47c8364da463aeb05241379de28b554a749ce8a66f6f3c0898c8607eabc44797fd2c36bf17d5 +AUX wiggle-1.0-cflags.patch 561 BLAKE2B b2daf7fe766800733dd8b22f8e56dd97d9ffabecb5f291b731a10572adb66f91ee05f3d47eddfd4a2dd81d89e52f2896364af0f64029a14aff9ef49f1124eb72 SHA512 59244df8a37594a575ac4e7dc124a193af20d21a5800ba845d611e1cc73d11ea242529d44d88c8032f77607fcc37a57baca88bd1e5f45ff0b8a146a961570ccd AUX wiggle-1.2-cflags.patch 1104 BLAKE2B 6ce9fbf3a78516b0302dc19d281a8c295867954302c50d011def60568791c7507d35ad3502d8782a2e37fc4e1e99785f0f0c6e705f78699c862a414ad85457ce SHA512 a314dff5ce1610103366a5ad243df29a73f7a4efaaa1eba654ca6d6b2df7ec55d667350bca56c088efb24e5fc4d6bae35fced5d26dfcdf23dabbee72d6a4a0cb -DIST wiggle-0.9.tar.gz 809756 BLAKE2B 62fd35c721c4d54204984fd196686decff54c1613ceabf5c727b6383500158a04110c4fa2e63d6456452ac79fb811aac611876528fd2503c1acb7e0eb000e49f SHA512 2e3a4977704231f3bd6aa96ffaba8bc733acde425773b86a9649312676b44360c5b85cb48bf944cd383d8e4d0a541d88755f23be7d7a8884213f68a6320c62d9 DIST wiggle-1.0.tar.gz 868216 BLAKE2B 7241cbbde488b5cbf8970feb1cc258deb04c935347d793796f34993feba3e82870c9ac2aa7d5039f4739308cd0b20b4b104fb50c5ce64a5c66381ff3f6c545d4 SHA512 e9bd6e794ba0cff70db96a648c53aa21b427967758375b843fccf409dd17faf59468c11bafb1e0a7af8bfa657551da8bc1903b9ccf8def1ed9acc84f50c7e0b3 DIST wiggle-1.2.tar.gz 847391 BLAKE2B 5e2e3d76e8d5a0ee25cb0957fed1faf0f41bf14a7e7ced9a4547c300154a835df3ade2a94c1d28eb7878e608bf0f48fcd827387d87fe614a95bfea4261b3df01 SHA512 655525a05c0ebc08cb2e4dc33c0b40f893814976e493ea4bcf87cf703738310af2e71c43a15a6e56c948472bf0bd981a5b95f6d9a91a3a377d580928a86bcd58 -EBUILD wiggle-0.9-r1.ebuild 1733 BLAKE2B 5fdb519d69bac701f1f74786e67e9a76eea367a5090b47705ac612479af09482a61efe0cdd90fca0869371445a19f3cdc513288d64153a31a314ff798bde4b6a SHA512 80185097808b6e0454a089fd1b999f1ca3205112804a5d76cda389aa61ca0e7934e94360cf872e3c7cc38fd35405cb047f5f2f241bdff18a099cfaad9f15f632 -EBUILD wiggle-1.0.ebuild 1506 BLAKE2B 2143500527975dadbf3c6bf2fa15b22780b33821984209993a4b85dc7ed3549bae66e0aac5138267e67f272e0a1d9c3698e7c59c50245c8a517f889028008b94 SHA512 849f41b929156897bf13b66d6f0e934f4807b4c94f40c7914c05ef36b42cc6119c9c7110ca398736a9d85631da0be789ff4bb237c91f1a28b0d7da337ee9341f -EBUILD wiggle-1.2.ebuild 1532 BLAKE2B 67564d2638a38934184b84db1329f991c1cad5104a437f29095452a7e24a114f13496efcb713bd85ca463a8b7e263d38466a681398916041a70189bc45ec47fd SHA512 92596100205857d5dba23759e82425393b2ac4904526bca874784dda0b777f1ca407691dea2ee97ab4e1612703e7e8512745db78e46a8d1cdaf0b5431f698f44 +EBUILD wiggle-1.0.ebuild 1528 BLAKE2B 84da92153a66c06105451c5d46261d0dc5dd52633506b8ab26ebed2ad8b25337c350c3a60ff2136f9e650028b71ce74322238ae02e24e8ac138af0dc70f0f91a SHA512 7c1286f62a60d97033defab7aa6e19a0cc07134c7d9a757774a12ef077684d3e83d6a8b28a29dc120d354258075bfc599e6e24f57795e2c39b18a70ed23b1b74 +EBUILD wiggle-1.2.ebuild 1529 BLAKE2B f6da44432392b049812905f67051baf80b00c23d7f951957532f066c09d9e626bcc25fba6b3b158586c80f5a1ea4e25af8878b1774a212f76bbab365385186c3 SHA512 582217676c539d6f008bd7ec33cdde11e0d4f0dd4e9d8f34cffdecfd2f2d4e14c4f23c2310ce33808ea018657108bf95ad5235c611013f060a72c34aae5e41c9 MISC metadata.xml 256 BLAKE2B 7380eb4443aa7d04fc02d228edb72f675580a9f36244c083c4bbdcbc492a4c5169fb3121158d4a613f25f7c0464042bba7951fb92cf9f11c5208a2d9699e195e SHA512 574345bb2730bbc2d0190a03b16703d10441ccd589623c5e8bdddf84d7ce86226da7e079d7b2135e4c724d0813973c551143cdd0f525a58efdd37716dd83edfd diff --git a/dev-util/wiggle/files/wiggle-1.0-cflags.patch b/dev-util/wiggle/files/wiggle-1.0-cflags.patch index ce5defb7bb89..d9bc8c713b86 100644 --- a/dev-util/wiggle/files/wiggle-1.0-cflags.patch +++ b/dev-util/wiggle/files/wiggle-1.0-cflags.patch @@ -1,7 +1,7 @@ Respect user CFLAGS and use pkg-config to get ncurses libs. ---- wiggle-1.0/Makefile -+++ wiggle-1.0/Makefile +--- a/Makefile ++++ b/Makefile @@ -3,7 +3,7 @@ #OptDbg=-O3 #OptDbg=-O3 -march=pentium2 @@ -16,7 +16,7 @@ Respect user CFLAGS and use pkg-config to get ncurses libs. MAN1DIR = $(MANDIR)/man1 MAN5DIR = $(MANDIR)/man5 -LDLIBS = -lncurses -+LDLIBS = $(shell pkg-config --libs ncurses) ++LDLIBS = $(shell ${PKG_CONFIG} --libs ncurses) all: wiggle wiggle.man test diff --git a/dev-util/wiggle/wiggle-0.9-r1.ebuild b/dev-util/wiggle/wiggle-0.9-r1.ebuild deleted file mode 100644 index a4f8cb6cfd8b..000000000000 --- a/dev-util/wiggle/wiggle-0.9-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit fixheadtails flag-o-matic toolchain-funcs - -DESCRIPTION="Tool for applying patches that patch cannot apply because of conflicting changes" -HOMEPAGE="https://neil.brown.name/wiggle https://git.neil.brown.name/?p=wiggle.git" -SRC_URI="https://neil.brown.name/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -# The 'p' tool does support bitkeeper, but I'm against just dumping it in here -# due to it's size. I've explictly listed every other dependency here due to -# the nature of the shell program 'p' -RDEPEND=" - dev-util/diffstat - dev-util/patchutils - sys-apps/diffutils - sys-apps/findutils - virtual/awk - sys-apps/grep - sys-apps/less - sys-apps/sed - sys-apps/coreutils - sys-devel/patch - sys-libs/ncurses:0= -" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-apps/groff - test? ( sys-process/time ) -" - -src_prepare() { - default - - # Fix the reference to the help file so `p help' works - sed -i "s:\$0.help:${EPREFIX}/usr/share/wiggle/p.help:" p || die "sed failed on p" - - # Don't add Neil Brown's default sign off line to every patch - sed -i '/$CERT/,+4s,^,#,' p || die "sed failed on p" - - # Use prefixed time binary - sed -i "s:/usr/bin/time:${EPREFIX}/usr/bin/time:" dotest || die "sed failed on dotest" - - sed \ - -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \ - -i Makefile || die - - ht_fix_file p - - append-cppflags -I. -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall" ${PN} -} - -src_install() { - dobin wiggle p - doman wiggle.1 - dodoc ANNOUNCE INSTALL TODO DOC/diff.ps notes - insinto /usr/share/wiggle - doins p.help -} diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild index 670adede2e08..2a259f966e52 100644 --- a/dev-util/wiggle/wiggle-1.0.ebuild +++ b/dev-util/wiggle/wiggle-1.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://neil.brown.name/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" IUSE="test" RESTRICT="!test? ( test )" @@ -50,6 +50,8 @@ src_prepare() { } src_compile() { + tc-export PKG_CONFIG + emake CC="$(tc-getCC)" ${PN} } diff --git a/dev-util/wiggle/wiggle-1.2.ebuild b/dev-util/wiggle/wiggle-1.2.ebuild index b002ffebcbda..0f7322c3e7de 100644 --- a/dev-util/wiggle/wiggle-1.2.ebuild +++ b/dev-util/wiggle/wiggle-1.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://neil.brown.name/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" IUSE="test" RESTRICT="!test? ( test )" -- cgit v1.2.3