commit: 09c2e0fc23c6f98951547f84d3549638ff6881fe Author: Tim Harder <radhermit <AT> gentoo <DOT> org> AuthorDate: Fri Sep 1 02:49:12 2017 +0000 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> CommitDate: Fri Sep 1 02:51:03 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09c2e0fc
dev-util/wiggle: version bump to 1.0 dev-util/wiggle/Manifest | 1 + dev-util/wiggle/files/wiggle-1.0-cflags.patch | 22 ++++++++++ dev-util/wiggle/wiggle-1.0.ebuild | 63 +++++++++++++++++++++++++++ 3 files changed, 86 insertions(+) diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest index 46f67395588..eeda16bc317 100644 --- a/dev-util/wiggle/Manifest +++ b/dev-util/wiggle/Manifest @@ -1 +1,2 @@ DIST wiggle-0.9.tar.gz 809756 SHA256 fe3dcf05a2cda07f42db2099ae8407acdb4d58bb9cfdc58c72395b7ae4a4e6b5 SHA512 2e3a4977704231f3bd6aa96ffaba8bc733acde425773b86a9649312676b44360c5b85cb48bf944cd383d8e4d0a541d88755f23be7d7a8884213f68a6320c62d9 WHIRLPOOL 95a12f73458abdb999681de7af08c407d9f7c4762c71287eb6e80e38a322459c6e1767f2bec72199cf7d8cb33912981b9fd48fbe95957f854b43e4c148c04c14 +DIST wiggle-1.0.tar.gz 868216 SHA256 44c97b2d47a109c709cdd4181d9ba941fee50dbb64448018b91d4a2fffe69cf2 SHA512 e9bd6e794ba0cff70db96a648c53aa21b427967758375b843fccf409dd17faf59468c11bafb1e0a7af8bfa657551da8bc1903b9ccf8def1ed9acc84f50c7e0b3 WHIRLPOOL 26674ff2ac280ee2f6db916518c85799fda5d71bb0e056e414c82576a75a28db35460a0ca76a42854dd3a6b8e30a16b2b8f20649d4da604d2d3838297552e6f8 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 00000000000..ce5defb7bb8 --- /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/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild new file mode 100644 index 00000000000..667dd287bf3 --- /dev/null +++ b/dev-util/wiggle/wiggle-1.0.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2017 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="http://neil.brown.name/wiggle http://neil.brown.name/git?p=wiggle"; +SRC_URI="http://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 )" + +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 +}
