gentoo resync : 05.12.2021

3 files changed, 141 insertions, 0 deletions

diff --git a/net-p2p/classified-ads/Manifest b/net-p2p/classified-ads/Manifest
index 3521dcf74faa..d16ff2acb89d 100644
--- a/net-p2p/classified-ads/Manifest
+++ b/net-p2p/classified-ads/Manifest
@@ -1,4 +1,6 @@
+AUX classified-ads-0.13-examples-install-dir.patch 2415 BLAKE2B 2f10693e7fc338a36cbd331bb53952a6983e2675bcbbc2561209f023f216b789bbbcfde9002f56d87ac79cb5a45ed754752ac2bb375637f82757de2bf7ded2c9 SHA512 e42d7b04a4fc7bf3b447ed46350b5c2cd6ca7ca7c72bad3f63f918ce19577d9236fd75a368a7007fed62e5c5bb3e1a23450f6ca6870489ae958a5affd8e5f79e
 DIST classified-ads-0.13.tar.gz 2656104 BLAKE2B d02f723d7371abc2a8c0a6bfde300c8a4f16e5fcc43a17c5d8b8cce4ab21371df82b734e5813ebded6672e8448b7e8ee19c68836926dcc7af1824bfa173de0ef SHA512 7b6114705ac5867223e4e74c13aad47a4a38c24cd5e062e50dd7c0a5829ff011151a93562b1a5ab37f04fe3d6a93258e9ca4845748bbb02db882818284fe4a3a
 DIST classified-ads-graphics-0.13.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d
 EBUILD classified-ads-0.13-r1.ebuild 1742 BLAKE2B 998d6fc77825a194e771ca27663a258e8f67c81bcf39bfbcbec7f4f9d5680cd6a0c47cc5655d52e291c68b2395e0f36b02bc13226a60a1c914615a8f562a65da SHA512 c8b6ce10ada05c40fcb11cf1860229614e6e3214e3117f87e37602539be5746c18f0343cf22d8b21cf49e134303acc402d4e16c5627fc78a23657ce3cb421f19
+EBUILD classified-ads-0.13-r2.ebuild 1836 BLAKE2B e51d12db27e9984b394bd2e6ac1391815ee0a239ca0cadae34f5b3409afc5da506e33f289af4d3016713c2a3aa490132dc6d426640d5a8acb920332109f8e724 SHA512 23daf3661c245e22c15ed75a07fa9129a778f6fb0143c6a2b01941bf81f5f83f571f8b7d3a6d6e7322397ff5d34cbb37e96c3786692c66151088f2c0a013b011
 MISC metadata.xml 1810 BLAKE2B 84d8b3c4131a1b631798549fb2278485f33089fa6473c61e0174c33db5ed7223b0d408a80d50b64336183265d6c908e305a6d5a34359f328f2e016b6f095354c SHA512 55d8a50a3054cf23e5ca92377b448df83ce6c0c98f65c3044262f67b6928ce2d44b35771987a5524ecbf625848fb6ba10085462eeea0fef76ce2567ddaa7df0f
diff --git a/net-p2p/classified-ads/classified-ads-0.13-r2.ebuild b/net-p2p/classified-ads/classified-ads-0.13-r2.ebuild
new file mode 100644
index 000000000000..2034c6a3dac5
--- /dev/null
+++ b/net-p2p/classified-ads/classified-ads-0.13-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit qmake-utils virtualx xdg
+
+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="app-arch/bzip2
+	dev-lang/tcl:=
+	dev-lang/tk:=
+	dev-libs/openssl:0=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	media-libs/opus
+	net-libs/libnatpmp
+	net-libs/miniupnpc
+	sys-apps/file
+	sys-libs/zlib
+	virtual/libintl"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[dot] )
+	test? ( dev-libs/libgcrypt:0
+		dev-qt/qttest:5
+		sys-devel/gdb:0 )"
+
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}/${P}-examples-install-dir.patch"
+)
+
+src_prepare() {
+	# preprocessed graphics are unpacked into wrong directory
+	# so lets move them into correct location:
+	mv ../ui/* ui/ || die
+	default
+}
+
+src_configure() {
+	eqmake5 examplefiles.path=/usr/share/doc/${PF}/examples
+	if use test; then
+		cd testca || 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
+		emake -C testca
+	fi
+}
+
+src_test() {
+	# testca will return 0 if all unit tests pass
+	virtx ./testca/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.13-examples-install-dir.patch b/net-p2p/classified-ads/files/classified-ads-0.13-examples-install-dir.patch
new file mode 100644
index 000000000000..e6b0b4bab362
--- /dev/null
+++ b/net-p2p/classified-ads/files/classified-ads-0.13-examples-install-dir.patch
@@ -0,0 +1,52 @@
+From: Antti Järvinen <antti.jarvinen@katiska.org>
+Bug: https://bugs.gentoo.org/809464
+
+Installs example TCL programs into correct path. Upon startup binary
+will check example files from path, this why this touches not only
+makefile but also the c++ code. Changes are possible to incorporate
+into next upstream release so this patch will become obsolete.
+
+diff -u -r classified-ads-0.13.orig/classified-ads.pro classified-ads-0.13/classified-ads.pro
+--- classified-ads-0.13.orig/classified-ads.pro	2018-07-03 17:16:11.000000000 +0300
++++ classified-ads-0.13/classified-ads.pro	2021-10-17 19:13:22.049743665 +0300
+@@ -186,7 +186,9 @@
+ manpages.path = /usr/share/man/man1
+ manpages.files = classified-ads.1
+ # note this example file path appears also in file tclmodel.cpp
+-examplefiles.path = /usr/share/doc/classified-ads/examples
++isEmpty(examplefiles.path){
++  examplefiles.path = /usr/share/doc/classified-ads/examples
++} 
+ examplefiles.files = doc/sysinfo.tcl doc/luikero.tcl doc/calendar.tcl
+ INSTALLS += target \
+         desktopfiles \
+diff -u -r classified-ads-0.13.orig/datamodel/tclmodel.cpp classified-ads-0.13/datamodel/tclmodel.cpp
+--- classified-ads-0.13.orig/datamodel/tclmodel.cpp	2018-07-03 17:16:11.000000000 +0300
++++ classified-ads-0.13/datamodel/tclmodel.cpp	2021-10-17 19:28:39.084875578 +0300
+@@ -292,7 +292,13 @@
+ #else
+         // in unix this path appears in classified-ads.pro and 
+         // is used by "make install" phase.
+-        QDir examplesDir ("/usr/share/doc/classified-ads/examples") ; 
++        QDir examplesDir ("/usr/share/doc/classified-ads/examples") ;
++        if ( !examplesDir.exists() ) {
++	  // some linux distributions want version number inside path:
++	  examplesDir.setPath("/usr/share/doc/classified-ads-"+
++			      QString(CLASSIFIED_ADS_VERSION)+
++			      "/examples") ;	  
++        }
+ #endif
+         if ( !examplesDir.exists() ) {
+             return ; // no examples, obviously
+diff -u -r classified-ads-0.13.orig/mcontroller.h classified-ads-0.13/mcontroller.h
+--- classified-ads-0.13.orig/mcontroller.h	2018-07-03 17:16:11.000000000 +0300
++++ classified-ads-0.13/mcontroller.h	2021-10-18 20:38:39.495032595 +0300
+@@ -25,7 +25,7 @@
+ #include "datamodel/netrequestexecutor.h"
+ #include "datamodel/cadbrecord.h" // for CaDbRecord::SearchTerms
+ 
+-#define CLASSIFIED_ADS_VERSION "0.13"
++#define CLASSIFIED_ADS_VERSION "0.13-r2"
+ 
+ class Node ;
+ class Model ;