[gentoo-commits] repo/gentoo:master commit in: dev-util/wiggle/

[gentoo-commits] repo/gentoo:master commit in: dev-util/wiggle/

[Sam James]

commit:     aff25076580ac7f5afda423947ad5b263379dab7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 21:02:16 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 21:02:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aff25076

dev-util/wiggle: Stabilize 1.2 amd64, #785676

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/wiggle/wiggle-1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/wiggle/wiggle-1.2.ebuild b/dev-util/wiggle/wiggle-1.2.ebuild
index b002ffebcbd..80c9b915321 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 )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/wiggle/

[Sam James]

commit:     d5b8ce3ea395fad40214bcd25baed288008eb775
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 03:52:55 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 03:52:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5b8ce3e

dev-util/wiggle: add github upstream metadata

Noticed after seeing github merge commits at
https://git.neil.brown.name/?p=wiggle.git (and after
hitting - for the second time - that 1.3 isn't
in the normal location).

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/wiggle/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-util/wiggle/metadata.xml b/dev-util/wiggle/metadata.xml
index eff24a7cd606..c6fb547af3aa 100644
--- a/dev-util/wiggle/metadata.xml
+++ b/dev-util/wiggle/metadata.xml
@@ -5,4 +5,7 @@
     <email>robbat2@gentoo.org</email>
     <name>Robin H. Johnson</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">neilbrown/wiggle</remote-id>
+  </upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: dev-util/wiggle/

[Sam James]

commit:     0daeb876a9e89b3b06a7d1b820c678811e20f0fc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 26 10:33:34 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 26 10:33:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0daeb876

dev-util/wiggle: Stabilize 1.2 x86, #785676

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/wiggle/wiggle-1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/wiggle/wiggle-1.2.ebuild b/dev-util/wiggle/wiggle-1.2.ebuild
index 02b62197a0c..0f7322c3e7d 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 )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/wiggle/

[Sam James]

commit:     03e47c5bed4417a076774b8a1317b75647d89fa9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 21:03:59 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 21:03:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03e47c5b

dev-util/wiggle: Stabilize 1.2 ppc, #785676

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/wiggle/wiggle-1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/wiggle/wiggle-1.2.ebuild b/dev-util/wiggle/wiggle-1.2.ebuild
index 80c9b915321..02b62197a0c 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 )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/wiggle/

[Sam James]

commit:     a7c669a5eb2f71a5c143d756f88889d1a5966f1a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 19:25:13 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 19:25:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7c669a5

dev-util/wiggle: drop 0.9-r1

Closes: https://bugs.gentoo.org/757420
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/wiggle/Manifest             |  1 -
 dev-util/wiggle/wiggle-0.9-r1.ebuild | 72 ------------------------------------
 2 files changed, 73 deletions(-)

diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest
index 7b41a18e622..4cfc2c6c7b8 100644
--- a/dev-util/wiggle/Manifest
+++ b/dev-util/wiggle/Manifest
@@ -1,3 +1,2 @@
-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

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 e0f496b157a..00000000000
--- a/dev-util/wiggle/wiggle-0.9-r1.ebuild
+++ /dev/null
@@ -1,72 +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
-	virtual/pkgconfig
-	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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/wiggle/

[Sam James]

commit:     2795fa49ed50808673e1e8c91ba4caee55d5fd90
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 19:23:31 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 19:23:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2795fa49

dev-util/wiggle: Stabilize 1.0 ppc, #757420

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/wiggle/wiggle-1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild
index 371ab4e892f..2a259f966e5 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 )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/wiggle/

[Sam James]

commit:     2a894e9a3ce5a8c9140d72b56dc8b13380618ae7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 15:54:43 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 15:54:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a894e9a

dev-util/wiggle: add PKG_CONFIG export

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/wiggle/wiggle-1.0.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild
index 670adede2e0..371ab4e892f 100644
--- a/dev-util/wiggle/wiggle-1.0.ebuild
+++ b/dev-util/wiggle/wiggle-1.0.ebuild
@@ -50,6 +50,8 @@ src_prepare() {
 }
 
 src_compile() {
+	tc-export PKG_CONFIG
+
 	emake CC="$(tc-getCC)" ${PN}
 }
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/wiggle/

[Sam James]

commit:     0844057f40f51312ffc83172bce723f4ca113d32
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 22 03:01:47 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 22 03:29:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0844057f

dev-util/wiggle: fix git repo link in HOMEPAGE

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/wiggle/wiggle-0.9-r1.ebuild | 6 +++---
 dev-util/wiggle/wiggle-1.0.ebuild    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-util/wiggle/wiggle-0.9-r1.ebuild b/dev-util/wiggle/wiggle-0.9-r1.ebuild
index 64d1a7ad863..a4f8cb6cfd8 100644
--- a/dev-util/wiggle/wiggle-0.9-r1.ebuild
+++ b/dev-util/wiggle/wiggle-0.9-r1.ebuild
@@ -5,8 +5,8 @@ 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://neil.brown.name/git?p=wiggle"
+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"
@@ -16,7 +16,7 @@ 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 dependancy here due to
+# 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

diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild
index 7aeb69528db..670adede2e0 100644
--- a/dev-util/wiggle/wiggle-1.0.ebuild
+++ b/dev-util/wiggle/wiggle-1.0.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 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"
+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"
@@ -16,7 +16,7 @@ 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 dependancy here due to
+# 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

[gentoo-commits] repo/gentoo:master commit in: dev-util/wiggle/

[Sam James]

commit:     8f6a3e1753874b736ba0838f5b25526f4caec094
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 22 03:00:23 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 22 03:29:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f6a3e17

dev-util/wiggle: port to EAPI 7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/wiggle/wiggle-0.9-r1.ebuild | 16 ++++++++++------
 dev-util/wiggle/wiggle-1.0.ebuild    | 12 +++++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/dev-util/wiggle/wiggle-0.9-r1.ebuild b/dev-util/wiggle/wiggle-0.9-r1.ebuild
index d21acc98e25..64d1a7ad863 100644
--- a/dev-util/wiggle/wiggle-0.9-r1.ebuild
+++ b/dev-util/wiggle/wiggle-0.9-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils fixheadtails flag-o-matic toolchain-funcs
+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://neil.brown.name/git?p=wiggle"
@@ -30,12 +30,16 @@ RDEPEND="
 	sys-apps/coreutils
 	sys-devel/patch
 	sys-libs/ncurses:0=
-	"
-DEPEND="${RDEPEND}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-apps/groff
-	test? ( sys-process/time )"
+	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"
 

diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild
index 2ae059f746e..7aeb69528db 100644
--- a/dev-util/wiggle/wiggle-1.0.ebuild
+++ b/dev-util/wiggle/wiggle-1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit fixheadtails toolchain-funcs
 
@@ -30,11 +30,13 @@ RDEPEND="
 	sys-apps/coreutils
 	sys-devel/patch
 	sys-libs/ncurses:0=
-	"
-DEPEND="${RDEPEND}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-apps/groff
 	virtual/pkgconfig
-	test? ( sys-process/time )"
+	test? ( sys-process/time )
+"
 
 PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/wiggle/

[Sam James]

commit:     d1b49d02f94f5e684061beaefa60c153a7aff5e3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 11:59:03 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 11:59:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1b49d02

dev-util/wiggle: Stabilize 1.0 amd64, #757420

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/wiggle/wiggle-1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild
index 33e321fa538..2ae059f746e 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 )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/wiggle/

[Thomas Deutschmann]

commit:     492a52ac49b518583345d353316d3fc658e29a9b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  3 02:00:00 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 02:01:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=492a52ac

dev-util/wiggle: x86 stable (bug #757420)

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 dev-util/wiggle/wiggle-1.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild
index 11a76e00ddf..33e321fa538 100644
--- a/dev-util/wiggle/wiggle-1.0.ebuild
+++ b/dev-util/wiggle/wiggle-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/wiggle/

[Aaron Bauman]

commit:     84ab761355491fe853da8f01925c0780ea81fbd6
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun May 27 13:15:30 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun May 27 16:08:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84ab7613

dev-util/wiggle: use HTTPs

Closes: https://github.com/gentoo/gentoo/pull/8618

 dev-util/wiggle/wiggle-0.9-r1.ebuild | 6 +++---
 dev-util/wiggle/wiggle-1.0.ebuild    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-util/wiggle/wiggle-0.9-r1.ebuild b/dev-util/wiggle/wiggle-0.9-r1.ebuild
index 27cef589a4d..4c583165574 100644
--- a/dev-util/wiggle/wiggle-0.9-r1.ebuild
+++ b/dev-util/wiggle/wiggle-0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit eutils fixheadtails flag-o-matic 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"
+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"

diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild
index 2a949ba271d..22f8dc34ed8 100644
--- a/dev-util/wiggle/wiggle-1.0.ebuild
+++ b/dev-util/wiggle/wiggle-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ 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"
+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"

[gentoo-commits] repo/gentoo:master commit in: dev-util/wiggle/

[David Seifert]

commit:     c35f7b429fed3a7a5a50f254dda18d2b0146262a
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  2 12:51:55 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec  2 12:51:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c35f7b42

dev-util/wiggle: [QA] Fix DESCRIPTION.toolong

 dev-util/wiggle/wiggle-0.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/wiggle/wiggle-0.9-r1.ebuild b/dev-util/wiggle/wiggle-0.9-r1.ebuild
index 65b4804e13c..27cef589a4d 100644
--- a/dev-util/wiggle/wiggle-0.9-r1.ebuild
+++ b/dev-util/wiggle/wiggle-0.9-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils fixheadtails flag-o-matic toolchain-funcs
 
-DESCRIPTION="program for applying patches that patch cannot apply because of conflicting changes"
+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"
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/wiggle/

[Tim Harder]

commit:     815ac6f7b90e523fa725c1f80a6ca7fa504545e2
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  1 02:52:28 2017 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Sep  1 02:53:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=815ac6f7

dev-util/wiggle: add missing bdep for pkgconfig

 dev-util/wiggle/wiggle-1.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild
index 667dd287bf3..2a949ba271d 100644
--- a/dev-util/wiggle/wiggle-1.0.ebuild
+++ b/dev-util/wiggle/wiggle-1.0.ebuild
@@ -32,6 +32,7 @@ RDEPEND="
 	"
 DEPEND="${RDEPEND}
 	sys-apps/groff
+	virtual/pkgconfig
 	test? ( sys-process/time )"
 
 PATCHES=( "${FILESDIR}"/${P}-cflags.patch )

[gentoo-commits] repo/gentoo:master commit in: dev-util/wiggle/

[Justin Lecher]

commit:     bab7be93dcd0d04118100bc7d305d3aedc100eec
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 10:37:47 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 10:37:47 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bab7be93

dev-util/wiggle: Clean old

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-util/wiggle/wiggle-0.9.ebuild | 65 ---------------------------------------
 1 file changed, 65 deletions(-)

diff --git a/dev-util/wiggle/wiggle-0.9.ebuild b/dev-util/wiggle/wiggle-0.9.ebuild
deleted file mode 100644
index 58f69bd..0000000
--- a/dev-util/wiggle/wiggle-0.9.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-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"
-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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/wiggle/

[Agostino Sarubbo]

commit:     9631bed95b05e427116b7fb88545d88a27ddf93b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  6 13:23:59 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 13:23:59 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9631bed9

dev-util/wiggle: ppc stable wrt bug #557916

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc"

 dev-util/wiggle/wiggle-0.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/wiggle/wiggle-0.9-r1.ebuild b/dev-util/wiggle/wiggle-0.9-r1.ebuild
index 17806ef..ff6e24a 100644
--- a/dev-util/wiggle/wiggle-0.9-r1.ebuild
+++ b/dev-util/wiggle/wiggle-0.9-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://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"
 
 # The 'p' tool does support bitkeeper, but I'm against just dumping it in here

[gentoo-commits] repo/gentoo:master commit in: dev-util/wiggle/

[Agostino Sarubbo]

commit:     c0101928d8442b5cc7773d2fe085bec997b34418
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 10:43:33 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 10:43:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0101928

dev-util/wiggle: amd64 stable wrt bug #557916

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 dev-util/wiggle/wiggle-0.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/wiggle/wiggle-0.9-r1.ebuild b/dev-util/wiggle/wiggle-0.9-r1.ebuild
index c9e9582..17806ef 100644
--- a/dev-util/wiggle/wiggle-0.9-r1.ebuild
+++ b/dev-util/wiggle/wiggle-0.9-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://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"
 
 # The 'p' tool does support bitkeeper, but I'm against just dumping it in here

[gentoo-commits] repo/gentoo:master commit in: dev-util/wiggle/

[Justin Lecher]

commit:     73a564f2cc923daeda69f555399c9ef9f9a96cfc
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 11:20:16 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 11:30:24 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73a564f2

dev-util/wiggle: Use slot operators for ncurses; bump EAPI; drop old

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-util/wiggle/Manifest                           |  1 -
 .../{wiggle-0.8-r1.ebuild => wiggle-0.9-r1.ebuild} | 34 +++++++++++++---------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest
index 247d26d..46f6739 100644
--- a/dev-util/wiggle/Manifest
+++ b/dev-util/wiggle/Manifest
@@ -1,2 +1 @@
-DIST wiggle-0.8.tar.gz 2097175 SHA256 f8bf7981f5e5811dcf6c519c5e335031a1c9b7833c919a2c5707ac8d5524b94a SHA512 536bfd8ed09decdefcba7ecf49eaa8085b9a88c163079b4a256c6796dc373f25c9947353c28f225b6c25c21b6684acbf973504838fc200e8acf746bb8e16632f WHIRLPOOL c5bc6e06079a8e856ab29e9aad4e2a36a48b618e3fb3277949eedf462668ce7afb3916d849f192cfe8bdd5d324aa7f34241c4269cb3ae5a4538f2aa0bb9fc5a6
 DIST wiggle-0.9.tar.gz 809756 SHA256 fe3dcf05a2cda07f42db2099ae8407acdb4d58bb9cfdc58c72395b7ae4a4e6b5 SHA512 2e3a4977704231f3bd6aa96ffaba8bc733acde425773b86a9649312676b44360c5b85cb48bf944cd383d8e4d0a541d88755f23be7d7a8884213f68a6320c62d9 WHIRLPOOL 95a12f73458abdb999681de7af08c407d9f7c4762c71287eb6e80e38a322459c6e1767f2bec72199cf7d8cb33912981b9fd48fbe95957f854b43e4c148c04c14

diff --git a/dev-util/wiggle/wiggle-0.8-r1.ebuild b/dev-util/wiggle/wiggle-0.9-r1.ebuild
similarity index 68%
rename from dev-util/wiggle/wiggle-0.8-r1.ebuild
rename to dev-util/wiggle/wiggle-0.9-r1.ebuild
index ed270e3..acb936d 100644
--- a/dev-util/wiggle/wiggle-0.8-r1.ebuild
+++ b/dev-util/wiggle/wiggle-0.9-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=3
+EAPI=5
 
-inherit eutils fixheadtails toolchain-funcs
+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"
@@ -12,13 +12,14 @@ SRC_URI="http://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"
 
 # 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
+RDEPEND="
+	dev-util/diffstat
 	dev-util/patchutils
 	sys-apps/diffutils
 	sys-apps/findutils
@@ -27,14 +28,14 @@ RDEPEND="dev-util/diffstat
 	sys-apps/less
 	sys-apps/sed
 	sys-apps/coreutils
-	sys-devel/patch"
+	sys-devel/patch
+	sys-libs/ncurses:5=
+	"
 DEPEND="${RDEPEND}
 	sys-apps/groff
 	test? ( sys-process/time )"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-buffer-overflow.patch"
-
 	# 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"
 
@@ -44,18 +45,23 @@ src_prepare() {
 	# 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" \
-		wiggle || die "emake wiggle failed."
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall" ${PN}
 }
 
 src_install() {
-	dobin wiggle p || die "failed to install binaries"
-	doman wiggle.1 || die "failed to install man page"
-	dodoc ANNOUNCE INSTALL TODO DOC/diff.ps notes || die "failed to install docs"
+	dobin wiggle p
+	doman wiggle.1
+	dodoc ANNOUNCE INSTALL TODO DOC/diff.ps notes
 	insinto /usr/share/wiggle
-	doins p.help || die "failed to install help file"
+	doins p.help
 }