gentoo resync : 27.01.2018

11 files changed, 182 insertions, 39 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index de471c4892eb..7b69b4b681af 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/bitcoin-cli/Manifest b/net-p2p/bitcoin-cli/Manifest
index 3f222509f7f0..61bf3a3ce84c 100644
--- a/net-p2p/bitcoin-cli/Manifest
+++ b/net-p2p/bitcoin-cli/Manifest
@@ -9,5 +9,5 @@ DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b
 EBUILD bitcoin-cli-0.13.0.ebuild 845 BLAKE2B 4b8c3ed24ff36bcedd3ac20074844e9704bd77a8d21d33f973836ef32dc2127ac8aec56321a28edb8db1857acbb239c909360b436669743ccb9a85002f685ba6 SHA512 6e506aca05ad2dc9e4218117911c82130815bdf559b8c66a906be161187e4d3f8f4a51d3eafe3ecfad91e32a18e6363ad1b16701bece15776998bda4106c40ba
 EBUILD bitcoin-cli-0.13.1.ebuild 842 BLAKE2B 423aadcd0b341bd0c54a08a08fef112d6a33a8b432e3ca444b6a9e3d06fa38637dd42d6d17a2a36149a3597f38bc2ab63bf00268f382ab9cc86842554a86ab2b SHA512 f9d27641b2c952c5de81e950e8c8ce279ae60cdfd13d0ae28bf01ddc1011b597551f353b3bbdc33f0f1e50f4db8cac11b40422833d916a559558ebcda9b9d432
 EBUILD bitcoin-cli-0.13.2.ebuild 846 BLAKE2B 688ea6c2ae9b01e2e538eaa183f3c9b88a3217acf341d9bc12b65caa99efa0d45257b75345253a3c9f646137799f7ab2f2220598257ef852da33be7f98bd759e SHA512 d4274818fef2a1ccc78813be7ecee1aa2fc490b9d13126cbfbf352b2d45520d40e2493e42f49ce28a8d4f0d0951d6d6aa671e156a811d608fd5f150a5de0219a
-EBUILD bitcoin-cli-0.15.1.ebuild 2443 BLAKE2B 1fafb537902d0d76d92ca4dd1feaaf8cf9d291f871a92b2826cd2bd7d4f1ce5197c60a65e3a58a943aafaa8f2c64eb11c725752f78457d83248b786715bf2f44 SHA512 5b5323387d760589b909ab620829e6f1ef5d812344049cf86f6692c37674db0c63d956bfea105249c4c115811c3b85a9007b78f08ad917ecd7bfe4494fcc21f6
+EBUILD bitcoin-cli-0.15.1.ebuild 2442 BLAKE2B 2b302ae86d0d3fe1a05fb5b8e6f64339ef6825fdd58597cecceb757815a7b0ff2ad05239d251db2301fb4290343ac69fbf2e6ec0fab07dddc16f6ed36536456a SHA512 677c5e3cfc7cb9309fa3a64fd6f427247bd2c8a103658881bd1035d18ac0cfd5a54a4f0ab85d2ae4a0b99821497ac925fb11193e4a521671162709d11efa9382
 MISC metadata.xml 675 BLAKE2B 7b92bc182ba751e03f1c39d2c03ff0d585f9bbca06f73056cb033d449b492baa521e41f2aba0cd333f91769c859f0ce0c8060c5147f1cb7a33dffd60201ef13e SHA512 88cc1fd8dbecc4c30c96680e2d38a8f870ff9ff3ab21003fc00bf159ed105ab606d5abd5242456c3776f2d3af6c860f9f622c117afd6f0d79bdc0b80931863b4
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild
index a63af598ca66..e143f8a4489f 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2017 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with bitc
 HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
 
 SRC_URI="
 	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index 10bcad168222..8a504e138505 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -12,5 +12,5 @@ DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b
 EBUILD bitcoin-qt-0.13.0.ebuild 3357 BLAKE2B 059d39373790811281935c9c334ecbbce1482b151671fcf38ee725b5015d0a3e40b2b308441b516854e2a8e0de322a3dd0246058186f27fcfe7b7a6167a6caa3 SHA512 e497fedd35c0f5fd8658b0d66e02eb7ef465a5243c41623094905e63f58e2d3c553313602242d67a9b3c1810f588c6aae7cdc0aafa98ee7a48248e1f960c7b1b
 EBUILD bitcoin-qt-0.13.1-r1.ebuild 3439 BLAKE2B e515048dcd52c352a363c8aa6eb17373e95fc0f238ea7d11c482f1571fbb1cedd232a52985f2111508b87fb94a0561710187cca3056c3bc6696402b2337282df SHA512 3532a46a44b4cd323968b1ca3984c752b89ea4f728003ccd709218bcc55a8f9aa9efdfcda2de8dd82f5047833aa9c4bffa182f8b56f0af85802da6dea5085b1b
 EBUILD bitcoin-qt-0.13.2.ebuild 3513 BLAKE2B 2cd862f6138b273d3db66ecafaaa43e2984dc05a6826d39b81c45d9982f33c65f00b26912c4161f383576aa9aad7b41dc003b1f22343b4cdd250568285efdd64 SHA512 067c72153669280b7d62f908cc911df53e86e14c165fd3a3af5a93f3e496cf2f334e534bffa1e07be9af466db1b5e82bb8a5c892fd9317e88228205e5a22f5bf
-EBUILD bitcoin-qt-0.15.1.ebuild 7202 BLAKE2B 9a65506221f561f06813ce42461eb2ac22346a3638b666de75637dc53ad8e0efb9c72673e1bbfc44b314066d433083bc2e3e69a722c81440ded40993eb8182e4 SHA512 5ebade519185819820de91e3611f3352b6b24b1348e9cdb02b6a76f50f78cc8b358faa2bc0e93abc8c9c02c42f4001bee9b22caa0bccaef18390288d24f688d5
+EBUILD bitcoin-qt-0.15.1.ebuild 7201 BLAKE2B 18103d2d308b40e6b67649bfea95a60d8230d6ffb0b1fc89dbb0892f7c0d09178c394941548c3459a3d10cddf4801a05fe7221257cb0691faf483339cde34e6e SHA512 bd48066a57f93718e53154c13f2dfb1d8c8a53580df342fa5ffca05dacb373bde21dc366ac619784c6c22908ef8a68b51df6ea0afb54f27a9a8bea604c3fb200
 MISC metadata.xml 6592 BLAKE2B 1674ae2f00b2b07a14167db1225de76b811502edd43dd9a2254de519893e389e82804e86ebaa565ae6891f1deff0bf7af68aa6b7783854d20454cffb5b172af2 SHA512 96c2b6c1b6d04706746e2ac8f7272bb08bc7176c016c66e37d6b0b59b0192c8f51d999a00693418b70c90be8ae076a9a9b50e9d050a5d77c5e02d5192db69709
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
index 75bc2d1f74f2..864deba6ffd4 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
 HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
 
 SRC_URI="
 	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index 4d56a77f8f2f..60c9645da660 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -16,5 +16,5 @@ DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b
 EBUILD bitcoind-0.13.0.ebuild 1922 BLAKE2B 4dbcdb8ace05ce867da8cce4f74f561639376ddc9a2b70d057af2766b7e7f2f2e3f1a11594e4c9d204ce4bbaf287175912dc3353cf0e20aadf3c30ed2cda6912 SHA512 231f04e06fe2a9820f66147ba971c96901f506bb74878006c36bb5f459a41387fbd5df328f36c447235af8f81a28e62ab6280a4eeea88bf7261c57d3f2660549
 EBUILD bitcoind-0.13.1.ebuild 1919 BLAKE2B edbfe9ccb5f7d3f5526f531b51ff117bbb85f3b7bdf651badc7fcacbc5ba29e8ffb2f4ffff1f56f015fd0a5383b74f811e91dc6a214264f431edc25527548efd SHA512 da9c7226dcc905263be4f82330217e8680e5917b7d15620d89ecd0e13e6328fa4d5c8a282950e9824d3c0c6d6e1677c5baaf3c87515aa7c6515afa2d4e921098
 EBUILD bitcoind-0.13.2.ebuild 1924 BLAKE2B 5c1ce54380441d7e082772510f6b03d2c8983566ee662af7601e9abf0cfd5c981f183be12a9d87e0b0daf0b07943f3c1c18ff1d079f2ffe00c3912068e3a37a2 SHA512 cfdff039da31701c29cdefc2f66c47a3715468c4e5da90d2bfb30bca8d4ec778b498b671df2a28820f4017a32e0f5d8f4d5b78174c0e7bcf92cfbbbc48d5238b
-EBUILD bitcoind-0.15.1.ebuild 5040 BLAKE2B dd9c35a79d762e2efb6923c70f885727e549a10740f887c37dce320c34d4260092d0025390ed7095c84d47bc3c5730e847924607a1cdb97f7b9c1abd41773569 SHA512 9bc238b9f958668c90dd5d396fce7a391acf033490712718b67e06750f3a9be1c900da057e2f05018231ef8c8c65f48a857d9bfd46fa645e90a80374f88e1d62
+EBUILD bitcoind-0.15.1.ebuild 5039 BLAKE2B e299b271ffed0f152a243f0daee1214edea8c0a456a9c877e9d8bc8002664c12e20b69117770eb243602f74dfec2102da8958a2afe0160bc4abac167e42705f8 SHA512 b7a1235ea7df287ea8ec03282afe42244646ced80dad8c5482758b8041a3a51858fe06058569e7c131ac6373a8113918cdab6a7a102ab501fd31a5e1d2be4256
 MISC metadata.xml 1218 BLAKE2B e01b34ede70163c5a9793bd1d2109ec21b9aaed014d22e4c1f8d16800d6ffe65e37a67c6697ae04fa64e6a540d034a553e332866dd3e0f086a4dd90c527d48f7 SHA512 02bf23ba23c56f439491c168f8801e1d325aff4f98113b9be486a2e6289135f0fa650c135af4a2967cc634a6a85a15f145d1ea6e05e959c4e4f6a5ddbac1399e
diff --git a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild b/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
index 3d8c5eb306c1..0d8788ad457a 100644
--- a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
 HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
 
 SRC_URI="
 	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
diff --git a/net-p2p/classified-ads/Manifest b/net-p2p/classified-ads/Manifest
index 3eaf99e1e98c..d8768ce100c1 100644
--- a/net-p2p/classified-ads/Manifest
+++ b/net-p2p/classified-ads/Manifest
@@ -1,4 +1,8 @@
+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-graphics-0.11.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d
+DIST classified-ads-graphics-0.12.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d
 EBUILD classified-ads-0.11.ebuild 1735 BLAKE2B 24ae015cd8d3e808269bb7b162b4078e2d3848ff7cb8b0a0eae8769c0c11ac62e89ad30d1c3c7b8aa5892983605ddd9028291ff19baaba1649dfbd784be26443 SHA512 86392db458ae8b0341e08e50753b59db1c8cbb3313481e110ed9da4a4818e8cdced4fba2cf08448c842786dfb156ce34d7a58b594955f896d829969f5f9f78b7
-MISC metadata.xml 1672 BLAKE2B 093c7ae44c9b112d96c25f9c9a6c3f1dca47b746d500dd709888864719c151f1465c0ee5a612dc37b15fdaceb37fbf1496d8a0e2bc21624a86e2e36bec0353ce SHA512 12ef46cd8e1e665c9cbea8926780669128c828866856c7fd445d85b3606396650655b9a07320aee1dec34dc41a6c2665804a48fd80945a76625b339d3246ace9
+EBUILD classified-ads-0.12.ebuild 1931 BLAKE2B 54589943a591f3f42906e62d8a98792e386dcfde98d6c02573c9d1cd01ca6a6375e2dbaaf198430014d7984013e1b493334261e632f60e7200f4d4efb19a1966 SHA512 4635643f7d607adba051a270137abe0bc71b48d582ae6df1071e86edc8d6f046ce62afd13d03583ed3c8cd51bf8b6e6fce1fef7003d06328a0a2604d154a8193
+MISC metadata.xml 1851 BLAKE2B b2560a2855eb1640c92300281804959d109859bbfd2ebcca7f2143a9c72a9f181e5b508a69f10b31d488714d1660ec79a4c3a5506230e6036443d67714f660c0 SHA512 56069de00ca8e4ef0480e1baa3699a1293d70a0bb6ef2654263f489f3911a4662ea3c8146b55435641ee17746b334c018298702a9a1004dd2733ab64a9a9f20f
diff --git a/net-p2p/classified-ads/classified-ads-0.12.ebuild b/net-p2p/classified-ads/classified-ads-0.12.ebuild
new file mode 100644
index 000000000000..083c75d23ab6
--- /dev/null
+++ b/net-p2p/classified-ads/classified-ads-0.12.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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"
+
+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
new file mode 100644
index 000000000000..1a1ec45f130f
--- /dev/null
+++ b/net-p2p/classified-ads/files/classified-ads-0.12-unit-tests.patch
@@ -0,0 +1,48 @@
+Patch-by: Antti Järvinen <antti.jarvinen@katiska.org>
+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 <zlib.h> // actual gzip functions and data-types
+-#include "log.h"
++#include "../log.h"
+ 
+ UnGZip::UnGZip() {
+     // not really used
diff --git a/net-p2p/classified-ads/metadata.xml b/net-p2p/classified-ads/metadata.xml
index 51fdc6e87f25..4546060675a0 100644
--- a/net-p2p/classified-ads/metadata.xml
+++ b/net-p2p/classified-ads/metadata.xml
@@ -1,36 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>antti.jarvinen@katiska.org</email>
-		<name>Antti Järvinen</name>
-		<description>proxy maintainer</description>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription lang="en">
-		Classified ads is an attempt to re-produce parts of the functionality
-		that went away when Usenet news ceased to exist. This attempt tries to
-		fix the problem of disappearing news-servers so that there is no servers
-		required and no service-providers needed for any operation ;
-		data storage is implemented inside client applications that
-		users are running. Features of the program currently include:
+    <maintainer type="person">
+        <email>antti.jarvinen@katiska.org</email>
+        <name>Antti Järvinen</name>
+        <description>proxy maintainer</description>
+    </maintainer>
+    <maintainer type="project">
+                <email>proxy-maint@gentoo.org</email>
+                <name>Proxy Maintainers</name>
+        </maintainer>
+    <longdescription lang="en">
+   Classified ads is an attempt to re-produce parts of the functionality
+   that went away when Usenet news ceased to exist. This attempt tries to
+   fix the problem of disappearing news-servers so that there is no servers
+   required and no service-providers needed for any operation;
+   data storage is implemented inside client applications that
+   users are running. Features of the program currently include:
 
-		* Posting of ads online. Ads have a category ; there are some pre-defined categories but more can be invented just by typing over the suggested categories.
-		* Replying to ads either in public or privately to operator.
-		* (Small-sized) binary attachments to posts.
-		* Providing basic data of operators - data that operator may enter himself, or leave blank.
-		* Basic searching of content based on words.
-	</longdescription>
-	<upstream>
-		<maintainer status="active">
-			<email>antti.jarvinen@katiska.org</email>
-			<name>Antti Järvinen</name>
-		</maintainer>
-		<changelog>https://github.com/operatornormal/classified-ads/commits/master</changelog>
-		<bugs-to>https://github.com/operatornormal/classified-ads/issues</bugs-to>
-		<remote-id type="github">operatornormal/classified-ads</remote-id>
-	</upstream>
+ * Posting of ads online. Ads have a category ; there are some
+   pre-defined categories but more can be invented just by typing
+   over the suggested categories.
+ * Replying to ads either in public or privately to operator.
+ * (Small-sized) binary attachments to posts.
+ * Providing basic data of operators - data that operator may enter
+   himself, or leave blank.
+ * Basic searching of content based on words.
+    </longdescription>
+    <upstream>
+                <maintainer status="active">
+                        <email>antti.jarvinen@katiska.org</email>
+                        <name>Antti Järvinen</name>
+                </maintainer>
+                <changelog>https://github.com/operatornormal/classified-ads/commits/master</changelog>
+        <bugs-to>https://github.com/operatornormal/classified-ads/issues</bugs-to>
+        <remote-id type="github">operatornormal/classified-ads</remote-id>
+    </upstream>
 </pkgmetadata>