Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/classified-ads/, net-p2p/classified-ads/files/
Date: Tue, 11 Feb 2020 12:27:25
Message-Id: 1581424013.213bb2948ca4863fe61c0b21f79e5d1e79e917d7.soap@gentoo
1 commit: 213bb2948ca4863fe61c0b21f79e5d1e79e917d7
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 11 12:26:53 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 11 12:26:53 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=213bb294
7
8 net-p2p/classified-ads: Remove old
9
10 Package-Manager: Portage-2.3.88, Repoman-2.3.20
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 net-p2p/classified-ads/Manifest | 4 -
14 net-p2p/classified-ads/classified-ads-0.11.ebuild | 82 --------------------
15 net-p2p/classified-ads/classified-ads-0.12.ebuild | 89 ----------------------
16 .../files/classified-ads-0.12-unit-tests.patch | 48 ------------
17 4 files changed, 223 deletions(-)
18
19 diff --git a/net-p2p/classified-ads/Manifest b/net-p2p/classified-ads/Manifest
20 index 63de332de30..b5e187ba600 100644
21 --- a/net-p2p/classified-ads/Manifest
22 +++ b/net-p2p/classified-ads/Manifest
23 @@ -1,6 +1,2 @@
24 -DIST classified-ads-0.11.tar.gz 2528877 BLAKE2B a2e9bfe2acdf9e95cd6e7246ca50525fdfbaf8b11b8fac41faa7c8fe01db7a4cf1055a69b4cf9168bbce7e7e25438b44d57a50669c3c406015df357c20e9106d SHA512 29e1af0eac079201354364959af8dc606f4d7595fe4e8013212c4e5b30622d095e2beaeeadce350974ef32680329664ad37aae575c103fa052345acf0a49ed04
25 -DIST classified-ads-0.12.tar.gz 2639300 BLAKE2B 09822a4908e3a34fbd00af60effa53c437e1e32cb1821c0041ca0cb87f4deb74ba79603c5d5aa5fe37384f2bc32f2ccd2979711c2de1e2864361904e62e2de26 SHA512 cbcd3f40cd9003b840b1305361f93c901b073c653f610e46154e8ff1db92167ce77aafe5179168d7403fed7b22fab60cadfc8c1fc95ebe37a4f7ffc616b66929
26 DIST classified-ads-0.13.tar.gz 2656104 BLAKE2B d02f723d7371abc2a8c0a6bfde300c8a4f16e5fcc43a17c5d8b8cce4ab21371df82b734e5813ebded6672e8448b7e8ee19c68836926dcc7af1824bfa173de0ef SHA512 7b6114705ac5867223e4e74c13aad47a4a38c24cd5e062e50dd7c0a5829ff011151a93562b1a5ab37f04fe3d6a93258e9ca4845748bbb02db882818284fe4a3a
27 -DIST classified-ads-graphics-0.11.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d
28 -DIST classified-ads-graphics-0.12.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d
29 DIST classified-ads-graphics-0.13.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d
30
31 diff --git a/net-p2p/classified-ads/classified-ads-0.11.ebuild b/net-p2p/classified-ads/classified-ads-0.11.ebuild
32 deleted file mode 100644
33 index 6db06105c77..00000000000
34 --- a/net-p2p/classified-ads/classified-ads-0.11.ebuild
35 +++ /dev/null
36 @@ -1,82 +0,0 @@
37 -# Copyright 1999-2019 Gentoo Authors
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI=6
41 -
42 -inherit qmake-utils virtualx
43 -
44 -DESCRIPTION="Program for displaying classified advertisement items"
45 -HOMEPAGE="http://katiska.org/classified-ads/"
46 -SRC_URI="https://github.com/operatornormal/classified-ads/archive/${PV}.tar.gz \
47 - -> classified-ads-${PV}.tar.gz \
48 - https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true \
49 - -> classified-ads-graphics-${PV}.tar.gz"
50 -
51 -LICENSE="LGPL-2.1"
52 -SLOT="0"
53 -KEYWORDS="~amd64 ~x86"
54 -
55 -IUSE="doc test"
56 -RESTRICT="!test? ( test )"
57 -
58 -RDEPEND="dev-libs/openssl:0
59 - >=net-libs/libnatpmp-20130911
60 - <=net-libs/libnatpmp-20140401-r1
61 - >=net-libs/miniupnpc-1.8
62 - sys-apps/file
63 - dev-qt/qtcore:5
64 - dev-qt/qtgui:5
65 - dev-qt/qtnetwork:5[ssl]
66 - dev-qt/qtwidgets:5
67 - dev-qt/qtsql:5[sqlite]
68 - dev-qt/qtmultimedia:5[widgets]
69 - dev-qt/qtprintsupport:5
70 - media-libs/opus
71 - virtual/libintl"
72 -
73 -DEPEND="${RDEPEND}
74 - sys-devel/gettext
75 - doc? ( app-doc/doxygen[dot] )
76 - test? ( dev-libs/libgcrypt:0
77 - dev-qt/qttest:5
78 - sys-devel/gdb:0 )"
79 -
80 -src_prepare() {
81 - # preprocessed graphics are unpacked into wrong directory
82 - # so lets move them into correct location:
83 - mv ../ui/* ui/ || die
84 - # possible patches
85 - eapply_user
86 -}
87 -
88 -src_configure() {
89 - eqmake5
90 - if use test; then
91 - cd test || die
92 - eqmake5
93 - fi
94 -}
95 -
96 -src_compile() {
97 - emake
98 - if use doc; then
99 - pushd doc > /dev/null || die
100 - doxygen || die
101 - popd > /dev/null || die
102 - fi
103 - if use test; then
104 - pushd test > /dev/null || die
105 - emake
106 - popd > /dev/null || die
107 - fi
108 -}
109 -
110 -src_test() {
111 - # testca will return 0 if all unit tests pass
112 - virtx ./test/testca
113 -}
114 -
115 -src_install() {
116 - emake install INSTALL_ROOT="${D}" DESTDIR="${D}"
117 - use doc && dodoc -r doc/doxygen.generated/html/
118 -}
119
120 diff --git a/net-p2p/classified-ads/classified-ads-0.12.ebuild b/net-p2p/classified-ads/classified-ads-0.12.ebuild
121 deleted file mode 100644
122 index 097ecec21e5..00000000000
123 --- a/net-p2p/classified-ads/classified-ads-0.12.ebuild
124 +++ /dev/null
125 @@ -1,89 +0,0 @@
126 -# Copyright 1999-2019 Gentoo Authors
127 -# Distributed under the terms of the GNU General Public License v2
128 -
129 -EAPI=6
130 -PLOCALES="en fi sv da uk es"
131 -PLOCALE_BACKUP="en"
132 -inherit qmake-utils virtualx l10n
133 -
134 -DESCRIPTION="Program for displaying classified advertisement items"
135 -HOMEPAGE="http://katiska.org/classified-ads/"
136 -SRC_URI="https://github.com/operatornormal/classified-ads/archive/${PV}.tar.gz \
137 - -> classified-ads-${PV}.tar.gz \
138 - https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true \
139 - -> classified-ads-graphics-${PV}.tar.gz"
140 -
141 -LICENSE="LGPL-2.1"
142 -SLOT="0"
143 -KEYWORDS="~amd64 ~x86"
144 -
145 -IUSE="doc test"
146 -RESTRICT="!test? ( test )"
147 -
148 -RDEPEND="dev-libs/openssl:0
149 - >=net-libs/libnatpmp-20130911
150 - <=net-libs/libnatpmp-20140401-r1
151 - >=net-libs/miniupnpc-1.8
152 - sys-apps/file
153 - dev-qt/qtcore:5
154 - dev-qt/qtgui:5
155 - dev-qt/qtnetwork:5[ssl]
156 - dev-qt/qtwidgets:5
157 - dev-qt/qtsql:5[sqlite]
158 - dev-qt/qtmultimedia:5[widgets]
159 - dev-qt/qtprintsupport:5
160 - media-libs/opus
161 - virtual/libintl
162 - dev-lang/tcl:=
163 - dev-lang/tk:=
164 - sys-libs/zlib"
165 -
166 -DEPEND="${RDEPEND}
167 - sys-devel/gettext
168 - doc? ( app-doc/doxygen[dot] )
169 - test? ( dev-libs/libgcrypt:0
170 - dev-qt/qttest:5
171 - sys-devel/gdb:0 )"
172 -
173 -src_prepare() {
174 - # preprocessed graphics are unpacked into wrong directory
175 - # so lets move them into correct location:
176 - mv ../ui/* ui/ || die
177 - # unit-test patch
178 - eapply "${FILESDIR}/${P}-unit-tests.patch"
179 - # possible patches
180 - eapply_user
181 -}
182 -
183 -src_configure() {
184 - eqmake5
185 - if use test; then
186 - cd test || die
187 - eqmake5
188 - fi
189 -}
190 -
191 -src_compile() {
192 - emake
193 - if use doc; then
194 - pushd doc > /dev/null || die
195 - doxygen || die
196 - popd > /dev/null || die
197 - fi
198 - if use test; then
199 - pushd test > /dev/null || die
200 - emake
201 - popd > /dev/null || die
202 - fi
203 -}
204 -
205 -src_test() {
206 - # testca will return 0 if all unit tests pass
207 - virtx ./test/testca
208 -}
209 -
210 -src_install() {
211 - docompress -x /usr/share/doc/
212 - emake install INSTALL_ROOT="${D}" DESTDIR="${D}"
213 - use doc && dodoc -r doc/doxygen.generated/html/
214 -}
215
216 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
217 deleted file mode 100644
218 index 1a1ec45f130..00000000000
219 --- a/net-p2p/classified-ads/files/classified-ads-0.12-unit-tests.patch
220 +++ /dev/null
221 @@ -1,48 +0,0 @@
222 -Patch-by: Antti Järvinen <antti.jarvinen@×××××××.org>
223 -Fixes unit-tests that are in non-compiling condition in released source code.
224 -
225 ---- a/test/testca.pro 2017-11-17 18:30:27.000000000 +0300
226 -+++ b/test/testca.pro 2017-11-21 21:55:00.000000000 +0300
227 -@@ -1,5 +1,5 @@
228 - #
229 --# Classified Ads is Copyright (c) Antti Järvinen 2013-2016.
230 -+# Classified Ads is Copyright (c) Antti Järvinen 2013-2017.
231 - #
232 - # This file is part of Classified Ads.
233 - #
234 -@@ -42,7 +42,8 @@ SOURCES = testca.cpp ../util/hash.cpp mockup_controller.cpp \
235 - ../datamodel/voicecall.cpp ../datamodel/cadbrecord.cpp \
236 - ../datamodel/cadbrecordmodel.cpp ../tcl/tclWrapper.cpp \
237 - ../datamodel/tclprogram.cpp ../datamodel/tclmodel.cpp \
238 -- ../tcl/tclCallbacks.cpp ../tcl/tclUtil.cpp ../ui/tclConsole.cpp
239 -+ ../tcl/tclCallbacks.cpp ../tcl/tclUtil.cpp ../ui/tclConsole.cpp \
240 -+ ../util/ungzip.cpp
241 - HEADERS = ../util/hash.h ../mcontroller.h mockup_controller.h \
242 - ../datamodel/model.h ../datamodel/nodemodel.h \
243 - ../datamodel/contentencryptionmodel.h ../net/networklistener.h \
244 -@@ -68,13 +69,13 @@ HEADERS = ../util/hash.h ../mcontroller.h mockup_controller.h \
245 - ../net/mvoicecallengine.h ../datamodel/voicecall.h ../datamodel/cadbrecord.h \
246 - ../datamodel/cadbrecordmodel.h ../tcl/tclWrapper.h \
247 - ../datamodel/tclprogram.h ../datamodel/tclmodel.h ../tcl/tclCallbacks.h \
248 -- ../tcl/tclUtil.h ../ui/tclConsole.h
249 -+ ../tcl/tclUtil.h ../ui/tclConsole.h ../util/ungzip.h
250 - CONFIG += debug qtestlib
251 - QT += core network sql
252 - greaterThan(QT_MAJOR_VERSION, 4) {
253 - QT += widgets
254 - }
255 --LIBS = -lssl -lcrypto -lgcrypt -lnatpmp -lgcov -lminiupnpc -ltcl -ltk
256 -+LIBS = -lssl -lcrypto -lgcrypt -lnatpmp -lgcov -lminiupnpc -ltcl -ltk -lz
257 - lessThan(QT_MAJOR_VERSION, 5) {
258 - LIBS += -lqjson
259 - }
260 ---- a/util/ungzip.cpp 2017-11-17 18:30:27.000000000 +0300
261 -+++ b/util/ungzip.cpp 2017-11-21 21:55:00.000000000 +0300
262 -@@ -23,6 +23,6 @@ static const unsigned KZLibBlockSize ( 1024 ) ;
263 -#include "ungzip.h"
264 -#include <zlib.h> // actual gzip functions and data-types
265 --#include "log.h"
266 -+#include "../log.h"
267 -
268 - UnGZip::UnGZip() {
269 - // not really used