From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-util/wiggle/Manifest | 6 +++ dev-util/wiggle/files/wiggle-1.0-cflags.patch | 22 +++++++++ dev-util/wiggle/metadata.xml | 8 ++++ dev-util/wiggle/wiggle-0.9-r1.ebuild | 66 +++++++++++++++++++++++++++ dev-util/wiggle/wiggle-1.0.ebuild | 64 ++++++++++++++++++++++++++ 5 files changed, 166 insertions(+) create mode 100644 dev-util/wiggle/Manifest create mode 100644 dev-util/wiggle/files/wiggle-1.0-cflags.patch create mode 100644 dev-util/wiggle/metadata.xml create mode 100644 dev-util/wiggle/wiggle-0.9-r1.ebuild create mode 100644 dev-util/wiggle/wiggle-1.0.ebuild (limited to 'dev-util/wiggle') diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest new file mode 100644 index 000000000000..16e0105d30da --- /dev/null +++ b/dev-util/wiggle/Manifest @@ -0,0 +1,6 @@ +AUX wiggle-1.0-cflags.patch 576 BLAKE2B 25b065a28bb88f3163c063a90a9dc60ec9171e4ab43732faf0c493682b05ff37cbc1e99777bfb2fd03894c79bc30713067b3378c02556199fd847f0cf9d4d0bb SHA512 a6bbcbe8307212416ed66f17e5b5dfe2ef2c369f15351623ff1c47c8364da463aeb05241379de28b554a749ce8a66f6f3c0898c8607eabc44797fd2c36bf17d5 +DIST wiggle-0.9.tar.gz 809756 BLAKE2B 62fd35c721c4d54204984fd196686decff54c1613ceabf5c727b6383500158a04110c4fa2e63d6456452ac79fb811aac611876528fd2503c1acb7e0eb000e49f SHA512 2e3a4977704231f3bd6aa96ffaba8bc733acde425773b86a9649312676b44360c5b85cb48bf944cd383d8e4d0a541d88755f23be7d7a8884213f68a6320c62d9 +DIST wiggle-1.0.tar.gz 868216 BLAKE2B 7241cbbde488b5cbf8970feb1cc258deb04c935347d793796f34993feba3e82870c9ac2aa7d5039f4739308cd0b20b4b104fb50c5ce64a5c66381ff3f6c545d4 SHA512 e9bd6e794ba0cff70db96a648c53aa21b427967758375b843fccf409dd17faf59468c11bafb1e0a7af8bfa657551da8bc1903b9ccf8def1ed9acc84f50c7e0b3 +EBUILD wiggle-0.9-r1.ebuild 1690 BLAKE2B f0e67336f89a41e05db5bf0d39d58a7bf57a83e80463fae544f19ea85673a1c9300a8f4fc2ed213b194fb12a198a68f7c00f0e565331a6328fbce68d7c0a258d SHA512 37d5bc901fbfa267d77f6a2eb5cdf32fc24b311c85166de17156f08d4b699e79e69d88ae49031a05efe32cf7b6235c25b0454904400f0390693614c2e27fb1cc +EBUILD wiggle-1.0.ebuild 1468 BLAKE2B bc428b50db001c2323daec804a317536c9fc63755a4da06135940fb69050e7fe65103f7ae3204d7f860550172ad4480a0ca284ebfe34467243edeb082f33b631 SHA512 9e7a0ebf4d70ce014b2c87dfb87e2d3f7c1766aa7bc67144115fb30c259f4537ffe324a990d6967bd951e28aea224d171ba4cf88af6724e491e248b5f8d21bd9 +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 new file mode 100644 index 000000000000..ce5defb7bb89 --- /dev/null +++ b/dev-util/wiggle/files/wiggle-1.0-cflags.patch @@ -0,0 +1,22 @@ +Respect user CFLAGS and use pkg-config to get ncurses libs. + +--- wiggle-1.0/Makefile ++++ wiggle-1.0/Makefile +@@ -3,7 +3,7 @@ + #OptDbg=-O3 + #OptDbg=-O3 -march=pentium2 + OptDbg=-ggdb +-CFLAGS=$(OptDbg) -I. -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter ++CFLAGS += -I. -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter + + # STRIP = -s + INSTALL = /usr/bin/install +@@ -12,7 +12,7 @@ + MANDIR = /usr/share/man + MAN1DIR = $(MANDIR)/man1 + MAN5DIR = $(MANDIR)/man5 +-LDLIBS = -lncurses ++LDLIBS = $(shell pkg-config --libs ncurses) + + all: wiggle wiggle.man test + diff --git a/dev-util/wiggle/metadata.xml b/dev-util/wiggle/metadata.xml new file mode 100644 index 000000000000..483ee9fe5899 --- /dev/null +++ b/dev-util/wiggle/metadata.xml @@ -0,0 +1,8 @@ + + + + + robbat2@gentoo.org + Robin H. Johnson + + diff --git a/dev-util/wiggle/wiggle-0.9-r1.ebuild b/dev-util/wiggle/wiggle-0.9-r1.ebuild new file mode 100644 index 000000000000..4c583165574c --- /dev/null +++ b/dev-util/wiggle/wiggle-0.9-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit eutils 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://neil.brown.name/git?p=wiggle" +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" + +# 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 dependancy 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} + sys-apps/groff + test? ( sys-process/time )" + +src_prepare() { + # 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 new file mode 100644 index 000000000000..22f8dc34ed81 --- /dev/null +++ b/dev-util/wiggle/wiggle-1.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit fixheadtails toolchain-funcs + +DESCRIPTION="tool for applying patches that patch cannot apply because of conflicting changes" +HOMEPAGE="https://neil.brown.name/wiggle https://neil.brown.name/git?p=wiggle" +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" + +# 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 dependancy 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} + sys-apps/groff + virtual/pkgconfig + test? ( sys-process/time )" + +PATCHES=( "${FILESDIR}"/${P}-cflags.patch ) + +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" + + ht_fix_file p +} + +src_compile() { + emake CC="$(tc-getCC)" ${PN} +} + +src_test() { + # Use prefixed time binary + emake TIME_CMD="${EPREFIX}/usr/bin/time" test +} + +src_install() { + dobin wiggle p + doman wiggle.1 + dodoc ANNOUNCE INSTALL TODO DOC/Algorithm notes + insinto /usr/share/wiggle + doins p.help +} -- cgit v1.2.3