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

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

[Andreas Sturmlechner]

commit:     9095779a003795e6224e6bef8ee4d6b5e3c17456
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  9 11:04:51 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 11:05:46 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9095779a

dev-util/xxdiff: Fine-tune metadata, ebuild

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-util/xxdiff/metadata.xml                | 4 +++-
 dev-util/xxdiff/xxdiff-5.1_p20241118.ebuild | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-util/xxdiff/metadata.xml b/dev-util/xxdiff/metadata.xml
index 62e3acc1e120..b694e7a29a1f 100644
--- a/dev-util/xxdiff/metadata.xml
+++ b/dev-util/xxdiff/metadata.xml
@@ -2,7 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<use><flag name="scripts">Python scripts that is provided around xxdiff</flag></use>
+	<use>
+		<flag name="scripts">Install python helper scripts</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">blais/xxdiff</remote-id>
 	</upstream>

diff --git a/dev-util/xxdiff/xxdiff-5.1_p20241118.ebuild b/dev-util/xxdiff/xxdiff-5.1_p20241118.ebuild
index 606cdcd7240b..fbb160217c71 100644
--- a/dev-util/xxdiff/xxdiff-5.1_p20241118.ebuild
+++ b/dev-util/xxdiff/xxdiff-5.1_p20241118.ebuild
@@ -63,7 +63,7 @@ src_compile() {
 
 src_install() {
 	local DOCS=( CHANGES README* TODO doc/*.txt src/doc.txt tools )
-	local HTML_DOCS+=( doc/*.{png,html} src/doc.html )
+	local HTML_DOCS=( doc/*.{png,html} src/doc.html )
 
 	dobin bin/xxdiff
 	doman "${S}"/src/xxdiff.1

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

[Andreas Sturmlechner]

commit:     25e3563e8e4cd698261e91a81d46fa12dc2cc238
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Fri Feb  7 00:29:28 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 11:05:46 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25e3563e

dev-util/xxdiff: add 5.1_p20241118

update repo to gh
update EAPI 7 -> 8
port qt6
add useflag scripts to install python scripts

Closes: https://bugs.gentoo.org/941199
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Closes: https://github.com/gentoo/gentoo/pull/40474
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-util/xxdiff/Manifest                    |  1 +
 dev-util/xxdiff/metadata.xml                |  3 +-
 dev-util/xxdiff/xxdiff-5.1_p20241118.ebuild | 78 +++++++++++++++++++++++++++++
 3 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index 78775a12eb44..a292f45a1e29 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1 +1,2 @@
 DIST xxdiff-4.0.1_p20170622.tar.bz2 1983188 BLAKE2B b604c68902defca4caaa342123df165ca5ed4757254e7e696e637ff347298cdfd53324de6c21f65de4e0229ad7adb02434eb59e047590d2c71fb1f7e87e508d6 SHA512 a1b4cb26331b0bcc7ccdf3090ca4f1cf821c6819a189e4148cde0ef40e4377bf2b82627571ff05c066c3796e06cadc7c5ad040af0446c8f5bf48c25547564511
+DIST xxdiff-5.1_p20241118.tar.gz 2057170 BLAKE2B f4d4baff11482a161e74b7722222e5653fe0f9a8be006469e50dff818c59b1bb64811e0cc73e07c4d6a4601dc323604b31ec48ebc250f3061340281044f8f874 SHA512 6518fcc0bd568783f4c3929e9bd1f484372267714046da671a328ab5206d04551123d8d9d26c64ff20187fe383e44b6f18943212204ceb9d0cc164fcec0a995b

diff --git a/dev-util/xxdiff/metadata.xml b/dev-util/xxdiff/metadata.xml
index dd2645f2b213..62e3acc1e120 100644
--- a/dev-util/xxdiff/metadata.xml
+++ b/dev-util/xxdiff/metadata.xml
@@ -2,7 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<use><flag name="scripts">Python scripts that is provided around xxdiff</flag></use>
 	<upstream>
-		<remote-id type="sourceforge">xxdiff</remote-id>
+		<remote-id type="github">blais/xxdiff</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-util/xxdiff/xxdiff-5.1_p20241118.ebuild b/dev-util/xxdiff/xxdiff-5.1_p20241118.ebuild
new file mode 100644
index 000000000000..606cdcd7240b
--- /dev/null
+++ b/dev-util/xxdiff/xxdiff-5.1_p20241118.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 qmake-utils
+
+DESCRIPTION="Graphical file and directories comparator and merge tool"
+HOMEPAGE="https://furius.ca/xxdiff/ https://github.com/blais/xxdiff"
+COMMIT="a13d80f3339c5ec39d26b5155f33d0f2907a5629"
+SRC_URI="https://github.com/blais/xxdiff/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="scripts"
+REQUIRED_USE="scripts? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-qt/qtbase:6[gui,widgets]
+	scripts? ( ${PYTHON_DEPS} )
+"
+DEPEND="
+	${RDEPEND}
+	app-alternatives/yacc
+"
+BDEPEND="
+	scripts? (
+		${DISTUTILS_DEPS}
+		${PYTHON_DEPS}
+	)
+"
+
+pkg_setup() {
+	use scripts && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	use scripts && distutils-r1_src_prepare
+}
+
+src_configure() {
+	pushd src >/dev/null || die
+		# mimic src/Makefile.bootstrap
+		eqmake6
+		cat Makefile.extra >> Makefile || die
+	popd || die
+}
+
+src_compile() {
+	emake -C src MAKEDIR=.
+
+	use scripts && distutils-r1_src_compile
+}
+
+src_install() {
+	local DOCS=( CHANGES README* TODO doc/*.txt src/doc.txt tools )
+	local HTML_DOCS+=( doc/*.{png,html} src/doc.html )
+
+	dobin bin/xxdiff
+	doman "${S}"/src/xxdiff.1
+
+	if use scripts; then
+		distutils-r1_src_install
+		# no port to py3
+		rm "${ED}"/usr/bin/termdiff || die
+	fi
+
+	einstalldocs
+}

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

[Sam James]

commit:     35023d5c1329cc6b61453978b387b5d14e80bb1a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  1 07:12:02 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct  1 07:12:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35023d5c

dev-util/xxdiff: update SRC_URI

slyfox@ has retired and I've archived the distfiles
in my devspace.

Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild b/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
index 963f344ebfa..9d0e1dfeac1 100644
--- a/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
+++ b/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="http://furius.ca/xxdiff/"
 # generated as 'hg archive xxdiff-${P}.tar'
 # from https://bitbucket.org/blais/xxdiff tree
 #SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"

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

[Sergei Trofimovich]

commit:     041ce57e5df7039ac324606b69f1ccbd0860e293
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 23 07:30:19 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jul 23 07:33:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=041ce57e

dev-util/xxdiff: drop slyfox@ from maintainers

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/xxdiff/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dev-util/xxdiff/metadata.xml b/dev-util/xxdiff/metadata.xml
index 95131383c5a..7d0909db104 100644
--- a/dev-util/xxdiff/metadata.xml
+++ b/dev-util/xxdiff/metadata.xml
@@ -5,10 +5,6 @@
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xxdiff</remote-id>
 	</upstream>

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

[Sergei Trofimovich]

commit:     04e2ba6168d858065a598e80ef88a0dc58bba9c1
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 16 08:54:02 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Jun 16 08:54:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04e2ba61

dev-util/xxdiff: drop old

Bug: https://bugs.gentoo.org/725004
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild | 66 ---------------------------
 1 file changed, 66 deletions(-)

diff --git a/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild b/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
deleted file mode 100644
index f2679539487..00000000000
--- a/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 qmake-utils
-
-DESCRIPTION="A graphical file and directories comparator and merge tool"
-HOMEPAGE="http://furius.ca/xxdiff/"
-# generated as 'hg archive xxdiff-${P}.tar'
-# from https://bitbucket.org/blais/xxdiff tree
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="
-	${RDEPEND}
-	virtual/yacc
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.1-no-throw-in-dtor.patch
-	"${FILESDIR}"/${P}-cxx11.patch
-)
-
-src_configure() {
-	pushd src >/dev/null || die
-		# mimic src/Makefile.bootstrap
-		eqmake5
-		cat Makefile.extra >> Makefile || die
-	popd
-
-	distutils-r1_src_configure
-}
-
-src_compile() {
-	emake -C src MAKEDIR=.
-
-	distutils-r1_src_compile
-	HTML_DOCS+=(
-		doc/*.{png,html}
-		src/doc.html
-	)
-}
-
-src_install() {
-	dobin bin/xxdiff
-
-	distutils-r1_src_install
-
-	dodoc CHANGES README* TODO doc/*.txt src/doc.txt
-
-	# example tools, use these to build your own ones
-	dodoc -r tools
-}

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

[Agostino Sarubbo]

commit:     c3404a6173413f4a71fe3b4d7b773481871d8429
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri May 29 07:37:26 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri May 29 07:37:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3404a61

dev-util/xxdiff: amd64 stable wrt bug #725004

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild b/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
index f7102a96610..8429410821b 100644
--- a/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
+++ b/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="

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

[Sergei Trofimovich]

commit:     f66dd86475def556af1f7eef01889d80c3ee1a0d
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  2 07:37:49 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Apr  2 07:38:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f66dd864

dev-util/xxdiff: drop python code

Python libraries and scripts were never ported from python2.
Let's keep only 'xxdiff' binary itself.

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild | 59 ++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild b/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
new file mode 100644
index 00000000000..f7102a96610
--- /dev/null
+++ b/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="A graphical file and directories comparator and merge tool"
+HOMEPAGE="http://furius.ca/xxdiff/"
+# generated as 'hg archive xxdiff-${P}.tar'
+# from https://bitbucket.org/blais/xxdiff tree
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="
+	${RDEPEND}
+	virtual/yacc
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.1-no-throw-in-dtor.patch
+	"${FILESDIR}"/${P}-cxx11.patch
+)
+
+src_configure() {
+	pushd src >/dev/null || die
+		# mimic src/Makefile.bootstrap
+		eqmake5
+		cat Makefile.extra >> Makefile || die
+	popd
+}
+
+src_compile() {
+	emake -C src MAKEDIR=.
+
+	HTML_DOCS+=(
+		doc/*.{png,html}
+		src/doc.html
+	)
+}
+
+src_install() {
+	dobin bin/xxdiff
+
+	dodoc CHANGES README* TODO doc/*.txt src/doc.txt
+
+	# example tools, use these to build your own ones
+	dodoc -r tools
+}

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

[Sergei Trofimovich]

commit:     e8c959f73d1e7251b8bb2323ff188e75af52f452
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 21:13:29 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 21:13:29 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8c959f7

dev-util/xxdiff: use 'dodoc'

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild b/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
index fc8ccfa8156..f2679539487 100644
--- a/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
+++ b/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -62,6 +62,5 @@ src_install() {
 	dodoc CHANGES README* TODO doc/*.txt src/doc.txt
 
 	# example tools, use these to build your own ones
-	insinto /usr/share/doc/${PF}
-	doins -r tools
+	dodoc -r tools
 }

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

[Thomas Deutschmann]

commit:     f99900a841db890c06c7f4f431071c57898fb987
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 12 20:52:28 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 12 20:54:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f99900a8

dev-util/xxdiff: x86 stable (bug #644380)

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild b/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
index c522c9c842f..fc8ccfa8156 100644
--- a/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
+++ b/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="

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

[Agostino Sarubbo]

commit:     770a318121ce47ed369b90c8eb938b9809107178
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 20 10:01:29 2018 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Mar 20 10:01:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=770a3181

dev-util/xxdiff: amd64 stable wrt bug #644380

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="amd64"

 dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild b/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
index 2a1d15e737b..c522c9c842f 100644
--- a/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
+++ b/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="

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

[Sergei Trofimovich]

commit:     1ff8be3dbc4c2e3e3b5687f26bbb9150a6a22429
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 10 11:05:53 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Mar 10 11:05:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ff8be3d

dev-util/xxdiff: drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-util/xxdiff/xxdiff-4.0.1.ebuild | 61 -------------------------------------
 1 file changed, 61 deletions(-)

diff --git a/dev-util/xxdiff/xxdiff-4.0.1.ebuild b/dev-util/xxdiff/xxdiff-4.0.1.ebuild
deleted file mode 100644
index 9ba26ac0ea3..00000000000
--- a/dev-util/xxdiff/xxdiff-4.0.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils qt4-r2
-
-DESCRIPTION="A graphical file and directories comparator and merge tool"
-HOMEPAGE="http://furius.ca/xxdiff/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	virtual/yacc"
-
-src_prepare() {
-	pushd src >/dev/null
-	sed -i -e '/qPixmapFromMimeSource/d' *.ui || die #365019
-	qt4-r2_src_prepare
-	popd
-
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	pushd src >/dev/null
-	qt4-r2_src_configure
-	cat Makefile.extra >> Makefile
-	popd
-
-	distutils-r1_src_configure
-}
-
-src_compile() {
-	pushd src >/dev/null
-	qt4-r2_src_compile
-	popd
-
-	distutils-r1_src_compile
-}
-
-src_install() {
-	dobin bin/xxdiff
-
-	distutils-r1_src_install
-
-	dodoc CHANGES README* TODO doc/*.txt src/doc.txt
-
-	dohtml doc/*.{png,html} src/doc.html
-
-	# example tools, use these to build your own ones
-	insinto /usr/share/doc/${PF}
-	doins -r tools
-}

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

[Michael Palimaka]

commit:     81ab9f84595a267f08a825eb62d599eec30a41e9
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 17:15:14 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 17:19:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81ab9f84

dev-util/xxdiff: remove old

Package-Manager: portage-2.3.0

 dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild | 65 -----------------------
 1 file changed, 65 deletions(-)

diff --git a/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild
deleted file mode 100644
index 0128e52..0000000
--- a/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils qt4-r2
-
-DESCRIPTION="A graphical file and directories comparator and merge tool"
-HOMEPAGE="http://furius.ca/xxdiff/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtgui:4
-	!>=sys-devel/bison-3"
-DEPEND="${RDEPEND}
-	virtual/yacc"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc47.patch
-
-	pushd src >/dev/null
-	sed -i -e '/qPixmapFromMimeSource/d' *.ui || die #365019
-	qt4-r2_src_prepare
-	popd
-
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	pushd src >/dev/null
-	qt4-r2_src_configure
-	cat Makefile.extra >> Makefile
-	popd
-
-	distutils-r1_src_configure
-}
-
-src_compile() {
-	pushd src >/dev/null
-	qt4-r2_src_compile
-	popd
-
-	distutils-r1_src_compile
-}
-
-src_install() {
-	dobin bin/xxdiff
-
-	distutils-r1_src_install
-
-	dodoc CHANGES README* TODO doc/*.txt src/doc.txt
-
-	dohtml doc/*.{png,html} src/doc.html
-
-	# example tools, use these to build your own ones
-	insinto /usr/share/doc/${PF}
-	doins -r tools
-}

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

[Sergei Trofimovich]

commit:     a41a598515da2b82f23a1e62442d64a55316d00c
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 19:05:10 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 19:05:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a41a5985

dev-util/xxdiff: bump up to 4.0.1

Adds support for bison-3 and fixes crashes
on files with string lengths longer than 64K.

Package-Manager: portage-2.3.0

 dev-util/xxdiff/Manifest            |  1 +
 dev-util/xxdiff/metadata.xml        | 15 ++++++---
 dev-util/xxdiff/xxdiff-4.0.1.ebuild | 62 +++++++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index a866cc9..1b71ce1 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1 +1,2 @@
+DIST xxdiff-4.0.1.tar.bz2 1981869 SHA256 bf58ddda9d7a887f4f5cae20070ed5f2e0d65f575af20860738c6e2742c3a000 SHA512 bcc2b528a0ebf273677d74aa3a971feb9052a01a8187a5d8abe3bce744520a3fa61bd842a9d4ba465abbf00f6da62868a1f18adeb7d8eccee6f76df4a1e4db3a WHIRLPOOL f85bc19e982744194d2c3eab726adb9865a805e00fae9c6d286ad8025f23334da33fbafb87b149f1b3723c7511b49322ba04cbe6292be9948b65670db3fc1dcb
 DIST xxdiff-4.0_beta1_p20110426.tar.bz2 1770035 SHA256 70718eeb26e8880e2cda06d7ff6fe2e3fa9ea407086086f70ec1eb0e32301afe SHA512 d0be7a5775ed90aa1ac73320144aa24947c1bcc305bbb8f95c64009990dc44b96fd05abd7dc3f69c3a74fb93632099f4a40c76029ed29949854c5f3d7a890097 WHIRLPOOL 05048f3594d042f0130f0da20951bb124867ebfea55902bcabead5c8ba097fa4eb1f834b1f19b1ba7d36536f53240942414d143b3c4b6e0678909a5c4a5c6855

diff --git a/dev-util/xxdiff/metadata.xml b/dev-util/xxdiff/metadata.xml
index 32fe129..9513138 100644
--- a/dev-util/xxdiff/metadata.xml
+++ b/dev-util/xxdiff/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>qt@gentoo.org</email>
-	<name>Gentoo Qt Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">xxdiff</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-util/xxdiff/xxdiff-4.0.1.ebuild b/dev-util/xxdiff/xxdiff-4.0.1.ebuild
new file mode 100644
index 0000000..85ea7c9
--- /dev/null
+++ b/dev-util/xxdiff/xxdiff-4.0.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils qt4-r2
+
+DESCRIPTION="A graphical file and directories comparator and merge tool"
+HOMEPAGE="http://furius.ca/xxdiff/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-qt/qtgui:4"
+DEPEND="${RDEPEND}
+	virtual/yacc"
+
+src_prepare() {
+	pushd src >/dev/null
+	sed -i -e '/qPixmapFromMimeSource/d' *.ui || die #365019
+	qt4-r2_src_prepare
+	popd
+
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	pushd src >/dev/null
+	qt4-r2_src_configure
+	cat Makefile.extra >> Makefile
+	popd
+
+	distutils-r1_src_configure
+}
+
+src_compile() {
+	pushd src >/dev/null
+	qt4-r2_src_compile
+	popd
+
+	distutils-r1_src_compile
+}
+
+src_install() {
+	dobin bin/xxdiff
+
+	distutils-r1_src_install
+
+	dodoc CHANGES README* TODO doc/*.txt src/doc.txt
+
+	dohtml doc/*.{png,html} src/doc.html
+
+	# example tools, use these to build your own ones
+	insinto /usr/share/doc/${PF}
+	doins -r tools
+}

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

[Agostino Sarubbo]

commit:     2aa3e0dbb4d08230ef89e151bad0f4a18fdb502a
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  2 13:44:02 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 13:44:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aa3e0db

dev-util/xxdiff: amd64 stable wrt bug #578514

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild
index e1dfd32..37c3d5e 100644
--- a/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild
+++ b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-qt/qtgui:4"