diff options
Diffstat (limited to 'dev-util/xxdiff')
| -rw-r--r-- | dev-util/xxdiff/Manifest | 5 | ||||
| -rw-r--r-- | dev-util/xxdiff/files/xxdiff-4.0.1-no-throw-in-dtor.patch | 16 | ||||
| -rw-r--r-- | dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch | 11 | ||||
| -rw-r--r-- | dev-util/xxdiff/metadata.xml | 15 | ||||
| -rw-r--r-- | dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild | 67 |
5 files changed, 0 insertions, 114 deletions
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest deleted file mode 100644 index 4f45b318764b..000000000000 --- a/dev-util/xxdiff/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX xxdiff-4.0.1-no-throw-in-dtor.patch 667 BLAKE2B 9543b6dbd0cfffd309298a100717477303b4d8342156896bba54fc6b9de70f37209aaa4d20c990d2353ab89a7c399078741f76ccb72cb8c2c2ac9855ac6f3486 SHA512 254961c7a3baced5f9dafdb71583145de4d8fccbc49ffb13568bf7414326ee3811389f38b1ac290f67867eebf0b724f5cdd776deab8b3f850847e1783bbf085f -AUX xxdiff-4.0.1_p20170622-cxx11.patch 361 BLAKE2B e8f55fcd8f1564449cedc14df4339e1787391b8b3b6b7594b763d4c8189d858e0a9e41e5881ce2959e643480e6eee9cff348b83ee3968ee2fd9a751cdcb6088b SHA512 ef69f4a84a1a3f57f5ff435e0e863152c949a5faf9010c56bfd3b8455caac98fed1373f8a36d199eef6632d4a9e75ea58b965b9b5cd74ac4386a05a2cb9838a0 -DIST xxdiff-4.0.1_p20170622.tar.bz2 1983188 BLAKE2B b604c68902defca4caaa342123df165ca5ed4757254e7e696e637ff347298cdfd53324de6c21f65de4e0229ad7adb02434eb59e047590d2c71fb1f7e87e508d6 SHA512 a1b4cb26331b0bcc7ccdf3090ca4f1cf821c6819a189e4148cde0ef40e4377bf2b82627571ff05c066c3796e06cadc7c5ad040af0446c8f5bf48c25547564511 -EBUILD xxdiff-4.0.1_p20170622.ebuild 1249 BLAKE2B 90dbc2261d04e017fcf4a251c2964483da5e31cb2215ffb43b9971a0c377eeca3b62460d67521ba0594a78af98bd9106e358c4af9c6af5ed370d7d28993482dc SHA512 9b68deff4c16d1b76c1161a23a656dea72b0622bc9fd7b0679e751e1efcdf10748d41cfb3eb27df3c872123b082947fb4dc290c2f3653244a108a9f4ce88757d -MISC metadata.xml 435 BLAKE2B e8dcecbe49cd65c7b3ca119b141b7ac1d971be54d9a2b5fa63d25affaa2eb06f5eac261b004e33808e1ae6c735b131b37eee9380746d192a2aacfb81e49b132f SHA512 2ed2dc743bf4787b8a10c379ec52d84b8b76305f1b80b85da3b7c44ad5e3642673e34f9159d7804bb0780ef8a31d49d121c04c885d524253ab0e8ebde04136ed diff --git a/dev-util/xxdiff/files/xxdiff-4.0.1-no-throw-in-dtor.patch b/dev-util/xxdiff/files/xxdiff-4.0.1-no-throw-in-dtor.patch deleted file mode 100644 index 93162cc615b4..000000000000 --- a/dev-util/xxdiff/files/xxdiff-4.0.1-no-throw-in-dtor.patch +++ /dev/null @@ -1,16 +0,0 @@ -Build failure triggers on CXXFLAGS=-Werror=terminate - - cmdline.cpp: In destructor ‘virtual XxCmdline::~XxCmdline()’: - ./defs.h:121:43: error: throw will always call terminate() [-Werror=terminate] - { throw XxInternalError( XX_EXC_PARAMS ); } ^ - cmdline.cpp:369:7: note: in expansion of macro ‘XX_ASSERT’ - -https://bugs.gentoo.org/601018 -diff --git a/src/cmdline.cpp b/src/cmdline.cpp -index 8cb0ac9..174b9a4 100644 ---- a/src/cmdline.cpp -+++ b/src/cmdline.cpp -@@ -368,3 +368,2 @@ XxCmdline::~XxCmdline() - for ( int ii = 0; ii < _nbQtOptions; ++ii ) { -- XX_ASSERT( _qtOptions[ii] != 0 ); - #ifndef WINDOWS diff --git a/dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch b/dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch deleted file mode 100644 index b16a7c4072f9..000000000000 --- a/dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch +++ /dev/null @@ -1,11 +0,0 @@ -In gentoo qt5 already requires c++11 features: - -diff --git a/src/xxdiff.pro b/src/xxdiff.pro -index 32b106b..16fcd1f 100644 ---- a/src/xxdiff.pro -+++ b/src/xxdiff.pro -@@ -113,3 +113,3 @@ irix-n32:QMAKE_CFLAGS_RELEASE += -OPT:Olimit=4000 - # auto_ptr deprecated in C++11, removed in C++17 --linux: QMAKE_CXXFLAGS += -std=c++03 -+linux: QMAKE_CXXFLAGS += -std=c++11 - diff --git a/dev-util/xxdiff/metadata.xml b/dev-util/xxdiff/metadata.xml deleted file mode 100644 index 95131383c5a8..000000000000 --- a/dev-util/xxdiff/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?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="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_p20170622.ebuild b/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild deleted file mode 100644 index fc8ccfa8156b..000000000000 --- a/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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 - insinto /usr/share/doc/${PF} - doins -r tools -} |