diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-21 17:50:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-21 17:50:24 +0100 |
| commit | feb0daf81d888e9160f9f94502de09b66f2a63fd (patch) | |
| tree | b6e5c40ce2abef3da27ed50a023153f475e0ddef /dev-util/comparator | |
| parent | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff) | |
gentoo resync : 21.06.2020
Diffstat (limited to 'dev-util/comparator')
| -rw-r--r-- | dev-util/comparator/Manifest | 5 | ||||
| -rw-r--r-- | dev-util/comparator/comparator-2.12.ebuild | 21 | ||||
| -rw-r--r-- | dev-util/comparator/files/comparator-2.12-gcc10.patch | 26 | ||||
| -rw-r--r-- | dev-util/comparator/metadata.xml | 3 |
4 files changed, 43 insertions, 12 deletions
diff --git a/dev-util/comparator/Manifest b/dev-util/comparator/Manifest index ce4ad7dcb55e..ac57aa548506 100644 --- a/dev-util/comparator/Manifest +++ b/dev-util/comparator/Manifest @@ -1,5 +1,6 @@ +AUX comparator-2.12-gcc10.patch 793 BLAKE2B 0bab88fa6aeaf046ee4dc569aeb0d3344a2a9def5e2a67f1139fd59621dac0cb7f89468b04fd776b4a81f883c55fe5d311890409a0de22363ada166c3c20475a SHA512 c4e4c03f0dd8759e2fbd9421465b75254f4a02a56846347c4f1062c411c124f62e803854af389a527a8323f57daef563f7948eac5fbe25ff3e0529c7384a1287 DIST comparator-2.10.tar.gz 1463175 BLAKE2B 58d6bddc5f785de3768ed2c4845b75af03c1fd7f646fc15efaeec09878a72355c46c64f67866217994797193aaba6d4214685c7be89be9872620dce5930238e8 SHA512 b880f7a4a0fbfad44c53606c6d97509305d8485f0ab76b62bb0d1d1d6d4be9fb81e7a08326e78cabd1a9314e6efbf3a966eb6393e424f59dc657975a63ce2988 DIST comparator-2.12.tar.gz 1463333 BLAKE2B 081251a0a3cb2f99d5b74092a46a868741049d27c367fc9bc3445d35fe01eaaaee75f7afd3674ecdc2569c2ac1ef2d5acd838a546aa307b33c977c4c8a91db12 SHA512 dc5acf3d5900e293e3f0188c0809bc99f2f18edb55df882b2e12e66bc655e7faf030b8daffdd2d175234b398e6a8c125ca6af615933c998651d7f1579734b080 EBUILD comparator-2.10.ebuild 866 BLAKE2B d57e9166f9a0f14ad04c4c2f686198f866699f1ae0eae03a93e256c9d3195bd008844861000b4a45d4b30092be377110067152133d39d07195c3cce705f39682 SHA512 21ed08a933430f6044de705507a60b875786762f9ca413cef8f74814122aeac931676dedd04c3a1b32b7651f9a6f904e878aefe625d4b255d4e84c27d5da0570 -EBUILD comparator-2.12.ebuild 888 BLAKE2B 76ec12b1e1f46d85c301d8d72313a5284f3d137296906c7f0f7552f166450f3da3abaeb7a69fafaeccabb5bcfa6e8d958557e3c9ef8d4d7444bd2d84f216068e SHA512 6f34b242b1eff4e6a2880981bfc77920f04b37ff5e32da4cc33d6712f66c8d613addf50aeb0b8ff93305bc5ef24852bbabf2bc6285cb15494a4483276220b091 -MISC metadata.xml 355 BLAKE2B 012b8c0b8ac6bf274c4d9cdfd496e29e0c2549d98db030508cfb5e546d9e8aac2733cb39a6e7a3e36551472c699b3c7d5e4ad876e88a64397a06f889d5ecc824 SHA512 bfd1f38c1527a5e045c82f58b4f9dd253705e2eaa93bedad1e6c15c470de3ace37862211e647f0c79066c1cc1b0f68f211e26601099e6a802fda053e7ba48d26 +EBUILD comparator-2.12.ebuild 964 BLAKE2B c9d913a687d3a58f7e07da2ff568469fa7567a41caaed32b5e30d3af238fc59246161ae660a7bf2b4d69504dbe0d248f7fdfa4e2ebc4cf0a1fc2c6d36867626d SHA512 296ebc6e810726346ec62107016c64788bf5b8a62c64e3de055a263f3e3ebf1b194397d609ac8164316413f6a10649e4e7bbecb280c78852907c3919c1ff4875 +MISC metadata.xml 434 BLAKE2B 383d68cbb1192908d9a2dbf445852696f4f819564bb414516f8d15ed444ae0dba20ebd59ee6211be104e947dd1c78488c3abfc7a4a040d6fea0165cae853a287 SHA512 d499eae431272e1541f286cba5dc150442c12848469604ce6696ebc2f60f0b394c3376ebee5a5757e884f1372f732415bb169e7393f27c59a4d0faa57952d7e0 diff --git a/dev-util/comparator/comparator-2.12.ebuild b/dev-util/comparator/comparator-2.12.ebuild index 5e4ba126dbd0..8184007cd403 100644 --- a/dev-util/comparator/comparator-2.12.ebuild +++ b/dev-util/comparator/comparator-2.12.ebuild @@ -1,29 +1,30 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 PYTHON_COMPAT=( python{3_6,3_7} ) +DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 toolchain-funcs DESCRIPTION="ESR's utility for making fast comparisons among large source trees" -HOMEPAGE="http://www.catb.org/~esr/comparator/" +HOMEPAGE="http://www.catb.org/~esr/comparator/ https://gitlab.com/esr/comparator" SRC_URI="http://www.catb.org/~esr/comparator/${P}.tar.gz" -LICENSE="BSD" +LICENSE="BSD-2" SLOT="0" KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="" -RDEPEND="" DEPEND="=app-text/docbook-xml-dtd-4.1.2* app-text/xmlto" +PATCHES=( + "${FILESDIR}/${P}-gcc10.patch" +) + src_prepare() { - sed \ - -e '/python setup.py install/d' \ - -i Makefile || die "sed failed" - eapply_user + default + sed -e '/python setup.py install/d' -i Makefile || die "sed failed" } src_compile() { diff --git a/dev-util/comparator/files/comparator-2.12-gcc10.patch b/dev-util/comparator/files/comparator-2.12-gcc10.patch new file mode 100644 index 000000000000..8ba6914129f8 --- /dev/null +++ b/dev-util/comparator/files/comparator-2.12-gcc10.patch @@ -0,0 +1,26 @@ +From c7fdc67aefb67851a1210c7d5adfc7287c4b6572 Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com> +Date: Mon, 15 Jun 2020 01:14:24 +0300 +Subject: [PATCH] Fix compilation with GCC10 + +Fix compilation with -fno-common, which is enabled by default in GCC10. +--- + shred.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/shred.h b/shred.h +index d7eeb93..0e35b28 100644 +--- a/shred.h ++++ b/shred.h +@@ -100,7 +100,7 @@ extern int shredfile(struct filehdr_t *, + extern void sort_hashes(struct sorthash_t *hashlist, int hashcount); + + /* linebyline.c feature analyzer */ +-struct analyzer_t linebyline; ++extern struct analyzer_t linebyline; + + /* shredcompare.c functions */ + extern int merge_compare(struct sorthash_t *obarray, int hashcount); +-- +2.26.2 + diff --git a/dev-util/comparator/metadata.xml b/dev-util/comparator/metadata.xml index 6ed3edf95f59..ab8846bb689f 100644 --- a/dev-util/comparator/metadata.xml +++ b/dev-util/comparator/metadata.xml @@ -6,4 +6,7 @@ <name>Anthony G. Basile</name> </maintainer> <longdescription>ESR's utility for making fast comparisons among large source trees</longdescription> + <upstream> + <remote-id type="gitlab">esr/comparator</remote-id> + </upstream> </pkgmetadata> |