From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DFF2E138222 for ; Tue, 3 May 2016 06:45:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6381721C001; Tue, 3 May 2016 06:45:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A225821C001 for ; Tue, 3 May 2016 06:45:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BB1003409ED for ; Tue, 3 May 2016 06:45:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E6322331 for ; Tue, 3 May 2016 06:45:42 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1462257922.0bbae9c59e3c60db46516fb1d1f75a42e30d0335.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/classified-ads/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/classified-ads/classified-ads-0.10.ebuild X-VCS-Directories: net-p2p/classified-ads/ X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: 0bbae9c59e3c60db46516fb1d1f75a42e30d0335 X-VCS-Branch: master Date: Tue, 3 May 2016 06:45:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e5666058-1a9b-47cb-a8cf-a07ed1b516ff X-Archives-Hash: 817f6f99060fcd9042d91ce5d78d6ded commit: 0bbae9c59e3c60db46516fb1d1f75a42e30d0335 Author: Ian Delaney gentoo org> AuthorDate: Tue May 3 06:22:16 2016 +0000 Commit: Ian Delaney gentoo org> CommitDate: Tue May 3 06:45:22 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bbae9c5 Revert "net-p2p/classified-ads: v0.10 version bump. Changes dependency qt4->qt5, has EAPI=6." This reverts commit 37e876bc29f2c811383c3d0fdc8d7478ecab9578. net-p2p/classified-ads/classified-ads-0.10.ebuild | 30 +++++++++++------------ 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/net-p2p/classified-ads/classified-ads-0.10.ebuild b/net-p2p/classified-ads/classified-ads-0.10.ebuild index d7f75da..a792705 100644 --- a/net-p2p/classified-ads/classified-ads-0.10.ebuild +++ b/net-p2p/classified-ads/classified-ads-0.10.ebuild @@ -2,10 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=6 +EAPI=5 PLOCALES="en fi sv da uk" PLOCALE_BACKUP="en" -inherit qmake-utils virtualx vcs-snapshot +inherit qt4-r2 qmake-utils virtualx vcs-snapshot COMMIT_ID="cd0652c52f86f6284b793f26e5362bc8fb8a7118" DESCRIPTION="Program for displaying classified advertisement items" @@ -21,40 +21,37 @@ 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: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/qtcore:4[ssl] + dev-qt/qtsql:4[sqlite] + dev-qt/qtgui:4[debug?] dev-qt/qt-mobility[multimedia] - dev-qt/qtprintsupport:5 + dev-qt/qtmultimedia:4 media-libs/opus" DEPEND="${RDEPEND} - dev-qt/qttest:5 + dev-qt/qttest:4 sys-devel/gdb:0 doc? ( app-doc/doxygen[dot] ) test? ( dev-libs/libgcrypt:0 - ${VIRTUALX_DEPEND} )" + ${VIRTUALX_DEPEND} ) + " src_prepare() { # preprocessed graphics are unpacked into wrong directory # so lets move them into correct location: mv ../classified-ads-graphics-${PV}/* ui/ || die - # possible patches - eapply_user # then just run qmake - eqmake5 + qt4-r2_src_prepare } src_compile() { - emake + qt4-r2_src_compile if use doc; then cd doc || die doxygen || die @@ -73,7 +70,8 @@ src_install() { # virtualx requires a command that returns number, and does not just die: test_suite() { cd test || return -1 - eqmake5 || return -2 + echo qmake + "$(qt4_get_bindir)"/qmake || return -2 emake # test suite will create files under $HOME, set $HOME to point to # safe location, ideas stolen from