net-p2p/classified-ads: Fix bug 568874 - use correct qmake version

Modifies so ebuild so that it uses same version of qmake with test suite
as it used with rest of the software. This includes also fix for bug
563606 where miniupnpc version bumb changed the API making classified-ads
to not compile any more.

Reported-By: Michael Palimaka <kensington@gentoo.org>

Package-Manager: portage-2.2.20.1

2 files changed, 87 insertions, 0 deletions

diff --git a/net-p2p/classified-ads/Manifest b/net-p2p/classified-ads/Manifest
index 72b768392c9f..355c7689887c 100644
--- a/net-p2p/classified-ads/Manifest
+++ b/net-p2p/classified-ads/Manifest
@@ -1,6 +1,8 @@
 DIST classified-ads-0.07.tar.gz 2194177 SHA256 882874da2d1610d64c952969222b9295bab59b519de8a7da69790805fecca394 SHA512 a42e9604ce922968b0d7f345d623b250dae39fad2f43648b996ab10f3e7941ec3de95e89d94f4ec28bba882cf2bd38ea28aac88885522a7375926aee3c5d0843 WHIRLPOOL a797387e0f8537ab5366c55554c8909d656436122c3cbf2b35c7c8cc989a8cf76c3f0d6d39a99ac54e0b7cbcd8063dd1a4ec3a99b320f243338081f665f3b933
 DIST classified-ads-0.07_p20150728.tar.gz 2197413 SHA256 e8d488b6c44b198bf1150c7a33ae698887cfb345cb4473d91a5949abeb846d95 SHA512 1cb42252ab695e90212d05144255a66b0d8dc63d8d010b5781e470a4c5e9cdf9c4dce1b9e44cba83d5fb2fef99e3d46fd5cc1b9880db69c9c163475b7e4349fc WHIRLPOOL 458d3947f00709c633d652b753b7801496479f610da0d249e8e2f5f7ddecb341fb885184c027b453aa2f9db7998a74fcbd60bbb9d0bb5765b7b7e45bcdcfc2c0
 DIST classified-ads-0.09.tar.gz 2288561 SHA256 c6c0809c269e7596386b612f0a43c705801bad71c64a23a81f763656b22db125 SHA512 3639854cb797830f71261097ba315426be74f0dbcb5190522d50f4507d488d309c0793d1cad5bbc29bc43bd06de16392afc82172cefa766458764b4ac5b90357 WHIRLPOOL 7149c2772ca61a5067722f6aa5066e4dee3aec758b1998633d129cd4704723e6c633522a241cc4332dca94cac0bb59ada9a5472c750d335a764e1ff2f09c9d8f
+DIST classified-ads-0.09_p20151220.tar.gz 2288916 SHA256 4703c8f0183248376c9a0ce220115f44940c8c82efb93082bf313f42c73e1a7f SHA512 2a167e0bf8fe74014ae797cebb6577e481d75afbfd9a4a49587e857777eadd71285f0431ca22fa0a83efde2192d792a4517fbdbfe37cbb2ae1e6ab19f6e89e1e WHIRLPOOL ee12913ae813631e711d33cc62deedc50a4e173dcb3d793757f042eae04ec63c6062e9543a42aac50164a2e68fac59030f3ac43c232fc787b9b2e7020c4c9c84
 DIST classified-ads-graphics-0.07.tar.gz 340476 SHA256 12bd4f581f82c4c805bbf19cc794f7462f9ec0e71358fbc1628fd872169295e2 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d WHIRLPOOL 2535170cdc4cc1d4ad2e204e85b546089b3aa404e4cee0e2ab9d094d6cda869043f24fba29d6f68b37f450ff947c13f02336e63b3236b404cbae528f801cc1ad
 DIST classified-ads-graphics-0.07_p20150728.tar.gz 340476 SHA256 12bd4f581f82c4c805bbf19cc794f7462f9ec0e71358fbc1628fd872169295e2 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d WHIRLPOOL 2535170cdc4cc1d4ad2e204e85b546089b3aa404e4cee0e2ab9d094d6cda869043f24fba29d6f68b37f450ff947c13f02336e63b3236b404cbae528f801cc1ad
 DIST classified-ads-graphics-0.09.tar.gz 340476 SHA256 12bd4f581f82c4c805bbf19cc794f7462f9ec0e71358fbc1628fd872169295e2 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d WHIRLPOOL 2535170cdc4cc1d4ad2e204e85b546089b3aa404e4cee0e2ab9d094d6cda869043f24fba29d6f68b37f450ff947c13f02336e63b3236b404cbae528f801cc1ad
+DIST classified-ads-graphics-0.09_p20151220.tar.gz 340476 SHA256 12bd4f581f82c4c805bbf19cc794f7462f9ec0e71358fbc1628fd872169295e2 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d WHIRLPOOL 2535170cdc4cc1d4ad2e204e85b546089b3aa404e4cee0e2ab9d094d6cda869043f24fba29d6f68b37f450ff947c13f02336e63b3236b404cbae528f801cc1ad
diff --git a/net-p2p/classified-ads/classified-ads-0.09_p20151220.ebuild b/net-p2p/classified-ads/classified-ads-0.09_p20151220.ebuild
new file mode 100644
index 000000000000..876103093017
--- /dev/null
+++ b/net-p2p/classified-ads/classified-ads-0.09_p20151220.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PLOCALES="en fi sv da"
+PLOCALE_BACKUP="en"
+inherit qt4-r2 vcs-snapshot qmake-utils
+
+COMMIT_ID="c761d4e7124ebe9c76bc1529b27fe9c0aa1c2078"
+DESCRIPTION="Program for displaying classified advertisement items"
+HOMEPAGE="http://katiska.org/classified-ads/"
+SRC_URI="https://github.com/operatornormal/classified-ads/archive/${COMMIT_ID}.tar.gz -> ${P}.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="debug doc test"
+
+RDEPEND="dev-libs/openssl:0
+		dev-libs/qjson
+		>=net-libs/libnatpmp-20130911
+		<=net-libs/libnatpmp-20140401-r1
+		>=net-libs/miniupnpc-1.8
+		sys-apps/file
+		sys-devel/gettext
+		dev-qt/qtcore:4[ssl]
+		dev-qt/qtsql:4[sqlite]
+		dev-qt/qtgui:4[debug?]"
+
+DEPEND="${RDEPEND}
+	dev-qt/qttest:4
+		sys-devel/gdb:0
+	doc? ( app-doc/doxygen[dot] )
+	test? ( dev-libs/libgcrypt:0 )
+	"
+
+src_prepare() {
+	# preprocessed graphics are unpacked into wrong directory
+	# so lets move them into correct location:
+	mv ../classified-ads-graphics-${PV}/* ui/ || die
+	# then just run qmake
+	qt4-r2_src_prepare
+}
+
+src_compile() {
+	qt4-r2_src_compile
+	if use doc; then
+		cd doc || die
+		doxygen || die
+	fi
+}
+
+src_test() {
+	cd test || die "test suite missing"
+	$(qt4_get_bindir)/qmake || die "test suite configure failed"
+	emake
+
+	if [ -e $HOME/.classified_ads/sqlite_db ]; then
+		mv $HOME/.classified_ads/sqlite_db $HOME/.classified_ads/sqlite_db.backup \
+			|| die "datafile backup failed"
+	fi
+	./testca
+	result=$?
+	rm $HOME/.classified_ads/sqlite_db || true
+
+	if [ -e $HOME/.classified_ads/sqlite_db.backup ]; then
+		mv $HOME/.classified_ads/sqlite_db.backup $HOME/.classified_ads/sqlite_db \
+			|| die "datafile restore failed"
+	fi
+
+	if [ $result != "0" ]; then
+		die "test failed with code $result"
+	fi
+
+	return $result
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}" DESTDIR="${D}"
+	use doc && dodoc -r doc/doxygen.generated/html/
+}