1 |
commit: 09c2e0fc23c6f98951547f84d3549638ff6881fe |
2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 1 02:49:12 2017 +0000 |
4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 1 02:51:03 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09c2e0fc |
7 |
|
8 |
dev-util/wiggle: version bump to 1.0 |
9 |
|
10 |
dev-util/wiggle/Manifest | 1 + |
11 |
dev-util/wiggle/files/wiggle-1.0-cflags.patch | 22 ++++++++++ |
12 |
dev-util/wiggle/wiggle-1.0.ebuild | 63 +++++++++++++++++++++++++++ |
13 |
3 files changed, 86 insertions(+) |
14 |
|
15 |
diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest |
16 |
index 46f67395588..eeda16bc317 100644 |
17 |
--- a/dev-util/wiggle/Manifest |
18 |
+++ b/dev-util/wiggle/Manifest |
19 |
@@ -1 +1,2 @@ |
20 |
DIST wiggle-0.9.tar.gz 809756 SHA256 fe3dcf05a2cda07f42db2099ae8407acdb4d58bb9cfdc58c72395b7ae4a4e6b5 SHA512 2e3a4977704231f3bd6aa96ffaba8bc733acde425773b86a9649312676b44360c5b85cb48bf944cd383d8e4d0a541d88755f23be7d7a8884213f68a6320c62d9 WHIRLPOOL 95a12f73458abdb999681de7af08c407d9f7c4762c71287eb6e80e38a322459c6e1767f2bec72199cf7d8cb33912981b9fd48fbe95957f854b43e4c148c04c14 |
21 |
+DIST wiggle-1.0.tar.gz 868216 SHA256 44c97b2d47a109c709cdd4181d9ba941fee50dbb64448018b91d4a2fffe69cf2 SHA512 e9bd6e794ba0cff70db96a648c53aa21b427967758375b843fccf409dd17faf59468c11bafb1e0a7af8bfa657551da8bc1903b9ccf8def1ed9acc84f50c7e0b3 WHIRLPOOL 26674ff2ac280ee2f6db916518c85799fda5d71bb0e056e414c82576a75a28db35460a0ca76a42854dd3a6b8e30a16b2b8f20649d4da604d2d3838297552e6f8 |
22 |
|
23 |
diff --git a/dev-util/wiggle/files/wiggle-1.0-cflags.patch b/dev-util/wiggle/files/wiggle-1.0-cflags.patch |
24 |
new file mode 100644 |
25 |
index 00000000000..ce5defb7bb8 |
26 |
--- /dev/null |
27 |
+++ b/dev-util/wiggle/files/wiggle-1.0-cflags.patch |
28 |
@@ -0,0 +1,22 @@ |
29 |
+Respect user CFLAGS and use pkg-config to get ncurses libs. |
30 |
+ |
31 |
+--- wiggle-1.0/Makefile |
32 |
++++ wiggle-1.0/Makefile |
33 |
+@@ -3,7 +3,7 @@ |
34 |
+ #OptDbg=-O3 |
35 |
+ #OptDbg=-O3 -march=pentium2 |
36 |
+ OptDbg=-ggdb |
37 |
+-CFLAGS=$(OptDbg) -I. -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter |
38 |
++CFLAGS += -I. -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter |
39 |
+ |
40 |
+ # STRIP = -s |
41 |
+ INSTALL = /usr/bin/install |
42 |
+@@ -12,7 +12,7 @@ |
43 |
+ MANDIR = /usr/share/man |
44 |
+ MAN1DIR = $(MANDIR)/man1 |
45 |
+ MAN5DIR = $(MANDIR)/man5 |
46 |
+-LDLIBS = -lncurses |
47 |
++LDLIBS = $(shell pkg-config --libs ncurses) |
48 |
+ |
49 |
+ all: wiggle wiggle.man test |
50 |
+ |
51 |
|
52 |
diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild |
53 |
new file mode 100644 |
54 |
index 00000000000..667dd287bf3 |
55 |
--- /dev/null |
56 |
+++ b/dev-util/wiggle/wiggle-1.0.ebuild |
57 |
@@ -0,0 +1,63 @@ |
58 |
+# Copyright 1999-2017 Gentoo Foundation |
59 |
+# Distributed under the terms of the GNU General Public License v2 |
60 |
+ |
61 |
+EAPI=6 |
62 |
+ |
63 |
+inherit fixheadtails toolchain-funcs |
64 |
+ |
65 |
+DESCRIPTION="tool for applying patches that patch cannot apply because of conflicting changes" |
66 |
+HOMEPAGE="http://neil.brown.name/wiggle http://neil.brown.name/git?p=wiggle" |
67 |
+SRC_URI="http://neil.brown.name/${PN}/${P}.tar.gz" |
68 |
+ |
69 |
+LICENSE="GPL-2" |
70 |
+SLOT="0" |
71 |
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" |
72 |
+IUSE="test" |
73 |
+ |
74 |
+# The 'p' tool does support bitkeeper, but I'm against just dumping it in here |
75 |
+# due to it's size. I've explictly listed every other dependancy here due to |
76 |
+# the nature of the shell program 'p' |
77 |
+RDEPEND=" |
78 |
+ dev-util/diffstat |
79 |
+ dev-util/patchutils |
80 |
+ sys-apps/diffutils |
81 |
+ sys-apps/findutils |
82 |
+ virtual/awk |
83 |
+ sys-apps/grep |
84 |
+ sys-apps/less |
85 |
+ sys-apps/sed |
86 |
+ sys-apps/coreutils |
87 |
+ sys-devel/patch |
88 |
+ sys-libs/ncurses:0= |
89 |
+ " |
90 |
+DEPEND="${RDEPEND} |
91 |
+ sys-apps/groff |
92 |
+ test? ( sys-process/time )" |
93 |
+ |
94 |
+PATCHES=( "${FILESDIR}"/${P}-cflags.patch ) |
95 |
+ |
96 |
+src_prepare() { |
97 |
+ default |
98 |
+ |
99 |
+ # Fix the reference to the help file so `p help' works |
100 |
+ sed -i "s:\$0.help:${EPREFIX}/usr/share/wiggle/p.help:" p || die "sed failed on p" |
101 |
+ |
102 |
+ ht_fix_file p |
103 |
+} |
104 |
+ |
105 |
+src_compile() { |
106 |
+ emake CC="$(tc-getCC)" ${PN} |
107 |
+} |
108 |
+ |
109 |
+src_test() { |
110 |
+ # Use prefixed time binary |
111 |
+ emake TIME_CMD="${EPREFIX}/usr/bin/time" test |
112 |
+} |
113 |
+ |
114 |
+src_install() { |
115 |
+ dobin wiggle p |
116 |
+ doman wiggle.1 |
117 |
+ dodoc ANNOUNCE INSTALL TODO DOC/Algorithm notes |
118 |
+ insinto /usr/share/wiggle |
119 |
+ doins p.help |
120 |
+} |