diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2016-06-25 20:05:10 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2016-06-25 20:05:19 +0100 |
| commit | a41a598515da2b82f23a1e62442d64a55316d00c (patch) | |
| tree | a0db50ce24289013f491d64932724fd500b56513 | |
| parent | app-arch/file-roller: Move it to proper place (diff) | |
| download | gentoo-a41a5985.tar.gz gentoo-a41a5985.tar.bz2 gentoo-a41a5985.zip | |
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
| -rw-r--r-- | dev-util/xxdiff/Manifest | 1 | ||||
| -rw-r--r-- | dev-util/xxdiff/metadata.xml | 15 | ||||
| -rw-r--r-- | 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 a866cc983446..1b71ce1f7267 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 32fe1293e9a9..95131383c5a8 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 000000000000..85ea7c93924e --- /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 +} |