reinit the tree, so we can have metadata

5 files changed, 168 insertions, 0 deletions

diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest
new file mode 100644
index 000000000000..bfbd5dc3271d
--- /dev/null
+++ b/dev-util/wiggle/Manifest
@@ -0,0 +1,8 @@
+AUX wiggle-1.0-cflags.patch 576 SHA256 dafd0e8ed07b3d07beb3a741313951c0485fc1ff697224e45e78087be862bd78 SHA512 a6bbcbe8307212416ed66f17e5b5dfe2ef2c369f15351623ff1c47c8364da463aeb05241379de28b554a749ce8a66f6f3c0898c8607eabc44797fd2c36bf17d5 WHIRLPOOL 2d3f7394baabaeb27fccf9a5749a8ff04944dbe066a44502f6186216152cec9c314f9760ef93d493fd3cf8e0fd8552880105c052dc048f6dec18bf37f160c633
+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
+EBUILD wiggle-0.9-r1.ebuild 1690 SHA256 17147437fb78071dd5c98841a7dead18b8fcf311e4cabf33e58bd00028d51b9b SHA512 e46d1f87710d9dba5fa70cf2a8778e36505ef2985ab9b9dd8f091474d9e25f45bd10055e0613bcd69124930e46f6d72fb36a1743db179b51849aee2cae805b4e WHIRLPOOL a09586b9e5cae7c084b94b0d4f2490f9692ca71bf0264c69457a063e34deca9242f3e172080416716991044073fe78081eb814812e9d9fc7fa5445715f6b4e2f
+EBUILD wiggle-1.0.ebuild 1465 SHA256 664bf7cfedfe9b45e812076c86caafcab633394203823dc0390f3fb377c3a3d6 SHA512 c0f51a7caf75b2534ead9e5c9da254434874ea4be217cf4f8517943cb195a9762132e5afe19dc5641d6a9e52ad1c48fd9659e0c95b58d560cda471467c63e30b WHIRLPOOL b2d7056d352c0382750c6aa315d540dbe1950de9d80c70a64c663594fe1da6d60b8373051463a57b294ff1a96c4d7215bfb463845a22b525b9406336bc5d8680
+MISC ChangeLog 3629 SHA256 917225c836200197df0579f43f5b00f8cdb19fd53fbd6910955d8bd2e7905a30 SHA512 b8d622628dcfaad45ca5d6e6da3535f7844631ea758a05df62ab72a2afe615b3eaa693fde05512d0e7b5f7d6aa2339ad31c6a7418640f478c161474fb14cdaa5 WHIRLPOOL 751714e445d6128ce3e2b042fb9259f0ad93f1d90c5a9c2769073e83058e1a82e591a9b1ca303bb3f021d8578f361c343d3bd66b58257f5d0218d0e7ba4be66f
+MISC ChangeLog-2015 3743 SHA256 9b2905a0b92afdb424d83ba9c638b719da9da5f159fced65ad9de44decdd4761 SHA512 b0dc3dfdcc35c61e2c2b48591e7a78cee328742b68a78b2d8bff1c885ef0edc8f71e4a2d5534d10cd3fb22b3d13d9b3a1da7cb8aa00359cefc7299a056607620 WHIRLPOOL b5f478d31a56638c992eaddc6aa7c846c36d2d5cff28124cbdaae69cc83577f713eb503852eed3d7b5c7d608d886cc3a23baf6a1252055a997791bba81ed4d9f
+MISC metadata.xml 256 SHA256 b81904dc627fa9bc6bf21b08552700b9a5fa50dda9373a3ccdc52186aa0a27c2 SHA512 574345bb2730bbc2d0190a03b16703d10441ccd589623c5e8bdddf84d7ce86226da7e079d7b2135e4c724d0813973c551143cdd0f525a58efdd37716dd83edfd WHIRLPOOL b8bf8d610f5442c2d7f2848cde768454a982126618b58927dead107d740105a028c6d953d4b3243d85d6ae127fc05eeb67626aba2ee007010fe051b9c91b6df3
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+    <name>Robin H. Johnson</name>
+  </maintainer>
+</pkgmetadata>
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..65b4804e13c1
--- /dev/null
+++ b/dev-util/wiggle/wiggle-0.9-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils fixheadtails flag-o-matic toolchain-funcs
+
+DESCRIPTION="program 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 )"
+
+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..2a949ba271dd
--- /dev/null
+++ b/dev-util/wiggle/wiggle-1.0.ebuild
@@ -0,0 +1,64 @@
+# 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
+	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
+}