From 53cba99042fa967e2a93da9f8db806fe2d035543 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 17 Feb 2020 01:16:38 +0000 Subject: gentoo resync : 17.02.2020 --- net-p2p/classified-ads/Manifest | 7 -- net-p2p/classified-ads/classified-ads-0.11.ebuild | 82 -------------------- net-p2p/classified-ads/classified-ads-0.12.ebuild | 89 ---------------------- .../files/classified-ads-0.12-unit-tests.patch | 48 ------------ 4 files changed, 226 deletions(-) delete mode 100644 net-p2p/classified-ads/classified-ads-0.11.ebuild delete mode 100644 net-p2p/classified-ads/classified-ads-0.12.ebuild delete mode 100644 net-p2p/classified-ads/files/classified-ads-0.12-unit-tests.patch (limited to 'net-p2p/classified-ads') diff --git a/net-p2p/classified-ads/Manifest b/net-p2p/classified-ads/Manifest index 996b1e1b90a9..7554f00351a1 100644 --- a/net-p2p/classified-ads/Manifest +++ b/net-p2p/classified-ads/Manifest @@ -1,11 +1,4 @@ -AUX classified-ads-0.12-unit-tests.patch 2200 BLAKE2B 7d8205798aab3bbc04c7b3feada407e347e74887a2ec7bba5fd230345c805d6ffc8110a4f378a4c782049d9d205aa957698eb5421134fb0049c28db42ee490ab SHA512 ffcb49fac566ca410f1b49092f6a799f08bedbb4288b58aa0b702e9456a6aa7d0d0739a0893c7e6072cc2d1bff36e681e43a7c5993bd0e834e9dd8e5545af3dc -DIST classified-ads-0.11.tar.gz 2528877 BLAKE2B a2e9bfe2acdf9e95cd6e7246ca50525fdfbaf8b11b8fac41faa7c8fe01db7a4cf1055a69b4cf9168bbce7e7e25438b44d57a50669c3c406015df357c20e9106d SHA512 29e1af0eac079201354364959af8dc606f4d7595fe4e8013212c4e5b30622d095e2beaeeadce350974ef32680329664ad37aae575c103fa052345acf0a49ed04 -DIST classified-ads-0.12.tar.gz 2639300 BLAKE2B 09822a4908e3a34fbd00af60effa53c437e1e32cb1821c0041ca0cb87f4deb74ba79603c5d5aa5fe37384f2bc32f2ccd2979711c2de1e2864361904e62e2de26 SHA512 cbcd3f40cd9003b840b1305361f93c901b073c653f610e46154e8ff1db92167ce77aafe5179168d7403fed7b22fab60cadfc8c1fc95ebe37a4f7ffc616b66929 DIST classified-ads-0.13.tar.gz 2656104 BLAKE2B d02f723d7371abc2a8c0a6bfde300c8a4f16e5fcc43a17c5d8b8cce4ab21371df82b734e5813ebded6672e8448b7e8ee19c68836926dcc7af1824bfa173de0ef SHA512 7b6114705ac5867223e4e74c13aad47a4a38c24cd5e062e50dd7c0a5829ff011151a93562b1a5ab37f04fe3d6a93258e9ca4845748bbb02db882818284fe4a3a -DIST classified-ads-graphics-0.11.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d -DIST classified-ads-graphics-0.12.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d DIST classified-ads-graphics-0.13.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d -EBUILD classified-ads-0.11.ebuild 1759 BLAKE2B 5146c6a7067df96b608b379a7fbc0b22ee77a0e0e97af8660a5bf1bedadd0e663bae5908880b82f43e87affa8cb776baf248c62aa0bfa340b2bc3bf91a9614a0 SHA512 a409d53f3f03935d46cc67023b15ebf83a57f86ea5bd65db293c4d1bbda71a37a1544924b7d964b76d33386277a7a839c4f59618a34169cf65c3be4d1f319284 -EBUILD classified-ads-0.12.ebuild 1955 BLAKE2B 820ded528b9caab07b73214760e7b8a265a3371ad59365836dc24434814f9bffed22d602bc512df1296304b23fc6f81f75af354a92391413809ce74558e74b1b SHA512 a71597e061efd58a1f7d1ec5f47f18548d4ae39a9e3c20831e0fcfd43db661968601a4a662a904a59b1aa447f1f43bc0a13e22dda3375f9b31bebe13dda64650 EBUILD classified-ads-0.13.ebuild 1737 BLAKE2B ba12d0fdf7d81549e1092ce3c3a03b69fdca8f9c20abf265ad957398bbda6334ecf31784950318732c94de9783cc9b2dbcd2bcf5684b3b0fe8ef8d8ab97db19f SHA512 b3aed44f0181f000838d0d7a21e795b28cf872ed97b549769cab15ebb1f59038b10c25f3987f85852db98dce94ca9abd9a2ecf730e3e73e0f700192597e6371f MISC metadata.xml 1779 BLAKE2B 3d4309e69e73ff9b36329f1d9b486f9dc7b0c1077c953e4e08294760fc5b03c28709b373b94e68d742ed3f3e0b9da40cb2d6aa0295165f33c6f492d7ed0cee5d SHA512 1211585a2baa83604cbfb4e4c4fbd2d30d95359bd9d7246a831c238254c2b57433c974307ac8188f73175c5110e80ac89eaa137a67c0613e5550338d70864b78 diff --git a/net-p2p/classified-ads/classified-ads-0.11.ebuild b/net-p2p/classified-ads/classified-ads-0.11.ebuild deleted file mode 100644 index 6db06105c774..000000000000 --- a/net-p2p/classified-ads/classified-ads-0.11.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit qmake-utils virtualx - -DESCRIPTION="Program for displaying classified advertisement items" -HOMEPAGE="http://katiska.org/classified-ads/" -SRC_URI="https://github.com/operatornormal/classified-ads/archive/${PV}.tar.gz \ - -> classified-ads-${PV}.tar.gz \ - https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true \ - -> classified-ads-graphics-${PV}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="doc test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/openssl:0 - >=net-libs/libnatpmp-20130911 - <=net-libs/libnatpmp-20140401-r1 - >=net-libs/miniupnpc-1.8 - sys-apps/file - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtwidgets:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtmultimedia:5[widgets] - dev-qt/qtprintsupport:5 - media-libs/opus - virtual/libintl" - -DEPEND="${RDEPEND} - sys-devel/gettext - doc? ( app-doc/doxygen[dot] ) - test? ( dev-libs/libgcrypt:0 - dev-qt/qttest:5 - sys-devel/gdb:0 )" - -src_prepare() { - # preprocessed graphics are unpacked into wrong directory - # so lets move them into correct location: - mv ../ui/* ui/ || die - # possible patches - eapply_user -} - -src_configure() { - eqmake5 - if use test; then - cd test || die - eqmake5 - fi -} - -src_compile() { - emake - if use doc; then - pushd doc > /dev/null || die - doxygen || die - popd > /dev/null || die - fi - if use test; then - pushd test > /dev/null || die - emake - popd > /dev/null || die - fi -} - -src_test() { - # testca will return 0 if all unit tests pass - virtx ./test/testca -} - -src_install() { - emake install INSTALL_ROOT="${D}" DESTDIR="${D}" - use doc && dodoc -r doc/doxygen.generated/html/ -} diff --git a/net-p2p/classified-ads/classified-ads-0.12.ebuild b/net-p2p/classified-ads/classified-ads-0.12.ebuild deleted file mode 100644 index 097ecec21e57..000000000000 --- a/net-p2p/classified-ads/classified-ads-0.12.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PLOCALES="en fi sv da uk es" -PLOCALE_BACKUP="en" -inherit qmake-utils virtualx l10n - -DESCRIPTION="Program for displaying classified advertisement items" -HOMEPAGE="http://katiska.org/classified-ads/" -SRC_URI="https://github.com/operatornormal/classified-ads/archive/${PV}.tar.gz \ - -> classified-ads-${PV}.tar.gz \ - https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true \ - -> classified-ads-graphics-${PV}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="doc test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/openssl:0 - >=net-libs/libnatpmp-20130911 - <=net-libs/libnatpmp-20140401-r1 - >=net-libs/miniupnpc-1.8 - sys-apps/file - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtwidgets:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtmultimedia:5[widgets] - dev-qt/qtprintsupport:5 - media-libs/opus - virtual/libintl - dev-lang/tcl:= - dev-lang/tk:= - sys-libs/zlib" - -DEPEND="${RDEPEND} - sys-devel/gettext - doc? ( app-doc/doxygen[dot] ) - test? ( dev-libs/libgcrypt:0 - dev-qt/qttest:5 - sys-devel/gdb:0 )" - -src_prepare() { - # preprocessed graphics are unpacked into wrong directory - # so lets move them into correct location: - mv ../ui/* ui/ || die - # unit-test patch - eapply "${FILESDIR}/${P}-unit-tests.patch" - # possible patches - eapply_user -} - -src_configure() { - eqmake5 - if use test; then - cd test || die - eqmake5 - fi -} - -src_compile() { - emake - if use doc; then - pushd doc > /dev/null || die - doxygen || die - popd > /dev/null || die - fi - if use test; then - pushd test > /dev/null || die - emake - popd > /dev/null || die - fi -} - -src_test() { - # testca will return 0 if all unit tests pass - virtx ./test/testca -} - -src_install() { - docompress -x /usr/share/doc/ - emake install INSTALL_ROOT="${D}" DESTDIR="${D}" - use doc && dodoc -r doc/doxygen.generated/html/ -} diff --git a/net-p2p/classified-ads/files/classified-ads-0.12-unit-tests.patch b/net-p2p/classified-ads/files/classified-ads-0.12-unit-tests.patch deleted file mode 100644 index 1a1ec45f130f..000000000000 --- a/net-p2p/classified-ads/files/classified-ads-0.12-unit-tests.patch +++ /dev/null @@ -1,48 +0,0 @@ -Patch-by: Antti Järvinen -Fixes unit-tests that are in non-compiling condition in released source code. - ---- a/test/testca.pro 2017-11-17 18:30:27.000000000 +0300 -+++ b/test/testca.pro 2017-11-21 21:55:00.000000000 +0300 -@@ -1,5 +1,5 @@ - # --# Classified Ads is Copyright (c) Antti Järvinen 2013-2016. -+# Classified Ads is Copyright (c) Antti Järvinen 2013-2017. - # - # This file is part of Classified Ads. - # -@@ -42,7 +42,8 @@ SOURCES = testca.cpp ../util/hash.cpp mockup_controller.cpp \ - ../datamodel/voicecall.cpp ../datamodel/cadbrecord.cpp \ - ../datamodel/cadbrecordmodel.cpp ../tcl/tclWrapper.cpp \ - ../datamodel/tclprogram.cpp ../datamodel/tclmodel.cpp \ -- ../tcl/tclCallbacks.cpp ../tcl/tclUtil.cpp ../ui/tclConsole.cpp -+ ../tcl/tclCallbacks.cpp ../tcl/tclUtil.cpp ../ui/tclConsole.cpp \ -+ ../util/ungzip.cpp - HEADERS = ../util/hash.h ../mcontroller.h mockup_controller.h \ - ../datamodel/model.h ../datamodel/nodemodel.h \ - ../datamodel/contentencryptionmodel.h ../net/networklistener.h \ -@@ -68,13 +69,13 @@ HEADERS = ../util/hash.h ../mcontroller.h mockup_controller.h \ - ../net/mvoicecallengine.h ../datamodel/voicecall.h ../datamodel/cadbrecord.h \ - ../datamodel/cadbrecordmodel.h ../tcl/tclWrapper.h \ - ../datamodel/tclprogram.h ../datamodel/tclmodel.h ../tcl/tclCallbacks.h \ -- ../tcl/tclUtil.h ../ui/tclConsole.h -+ ../tcl/tclUtil.h ../ui/tclConsole.h ../util/ungzip.h - CONFIG += debug qtestlib - QT += core network sql - greaterThan(QT_MAJOR_VERSION, 4) { - QT += widgets - } --LIBS = -lssl -lcrypto -lgcrypt -lnatpmp -lgcov -lminiupnpc -ltcl -ltk -+LIBS = -lssl -lcrypto -lgcrypt -lnatpmp -lgcov -lminiupnpc -ltcl -ltk -lz - lessThan(QT_MAJOR_VERSION, 5) { - LIBS += -lqjson - } ---- a/util/ungzip.cpp 2017-11-17 18:30:27.000000000 +0300 -+++ b/util/ungzip.cpp 2017-11-21 21:55:00.000000000 +0300 -@@ -23,6 +23,6 @@ static const unsigned KZLibBlockSize ( 1024 ) ; -#include "ungzip.h" -#include // actual gzip functions and data-types --#include "log.h" -+#include "../log.h" - - UnGZip::UnGZip() { - // not really used -- cgit v1.2.3