| 1 |
commit: 0bbae9c59e3c60db46516fb1d1f75a42e30d0335 |
| 2 |
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 3 06:22:16 2016 +0000 |
| 4 |
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 3 06:45:22 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bbae9c5 |
| 7 |
|
| 8 |
Revert "net-p2p/classified-ads: v0.10 version bump. Changes dependency qt4->qt5, has EAPI=6." |
| 9 |
|
| 10 |
This reverts commit 37e876bc29f2c811383c3d0fdc8d7478ecab9578. |
| 11 |
|
| 12 |
net-p2p/classified-ads/classified-ads-0.10.ebuild | 30 +++++++++++------------ |
| 13 |
1 file changed, 14 insertions(+), 16 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-p2p/classified-ads/classified-ads-0.10.ebuild b/net-p2p/classified-ads/classified-ads-0.10.ebuild |
| 16 |
index d7f75da..a792705 100644 |
| 17 |
--- a/net-p2p/classified-ads/classified-ads-0.10.ebuild |
| 18 |
+++ b/net-p2p/classified-ads/classified-ads-0.10.ebuild |
| 19 |
@@ -2,10 +2,10 @@ |
| 20 |
# Distributed under the terms of the GNU General Public License v2 |
| 21 |
# $Id$ |
| 22 |
|
| 23 |
-EAPI=6 |
| 24 |
+EAPI=5 |
| 25 |
PLOCALES="en fi sv da uk" |
| 26 |
PLOCALE_BACKUP="en" |
| 27 |
-inherit qmake-utils virtualx vcs-snapshot |
| 28 |
+inherit qt4-r2 qmake-utils virtualx vcs-snapshot |
| 29 |
|
| 30 |
COMMIT_ID="cd0652c52f86f6284b793f26e5362bc8fb8a7118" |
| 31 |
DESCRIPTION="Program for displaying classified advertisement items" |
| 32 |
@@ -21,40 +21,37 @@ KEYWORDS="~amd64 ~x86" |
| 33 |
IUSE="debug doc test" |
| 34 |
|
| 35 |
RDEPEND="dev-libs/openssl:0 |
| 36 |
+ dev-libs/qjson |
| 37 |
>=net-libs/libnatpmp-20130911 |
| 38 |
<=net-libs/libnatpmp-20140401-r1 |
| 39 |
>=net-libs/miniupnpc-1.8 |
| 40 |
sys-apps/file |
| 41 |
sys-devel/gettext |
| 42 |
- dev-qt/qtcore:5 |
| 43 |
- dev-qt/qtgui:5 |
| 44 |
- dev-qt/qtnetwork:5[ssl] |
| 45 |
- dev-qt/qtwidgets:5 |
| 46 |
- dev-qt/qtsql:5[sqlite] |
| 47 |
- dev-qt/qtmultimedia:5[widgets] |
| 48 |
+ dev-qt/qtcore:4[ssl] |
| 49 |
+ dev-qt/qtsql:4[sqlite] |
| 50 |
+ dev-qt/qtgui:4[debug?] |
| 51 |
dev-qt/qt-mobility[multimedia] |
| 52 |
- dev-qt/qtprintsupport:5 |
| 53 |
+ dev-qt/qtmultimedia:4 |
| 54 |
media-libs/opus" |
| 55 |
|
| 56 |
DEPEND="${RDEPEND} |
| 57 |
- dev-qt/qttest:5 |
| 58 |
+ dev-qt/qttest:4 |
| 59 |
sys-devel/gdb:0 |
| 60 |
doc? ( app-doc/doxygen[dot] ) |
| 61 |
test? ( dev-libs/libgcrypt:0 |
| 62 |
- ${VIRTUALX_DEPEND} )" |
| 63 |
+ ${VIRTUALX_DEPEND} ) |
| 64 |
+ " |
| 65 |
|
| 66 |
src_prepare() { |
| 67 |
# preprocessed graphics are unpacked into wrong directory |
| 68 |
# so lets move them into correct location: |
| 69 |
mv ../classified-ads-graphics-${PV}/* ui/ || die |
| 70 |
- # possible patches |
| 71 |
- eapply_user |
| 72 |
# then just run qmake |
| 73 |
- eqmake5 |
| 74 |
+ qt4-r2_src_prepare |
| 75 |
} |
| 76 |
|
| 77 |
src_compile() { |
| 78 |
- emake |
| 79 |
+ qt4-r2_src_compile |
| 80 |
if use doc; then |
| 81 |
cd doc || die |
| 82 |
doxygen || die |
| 83 |
@@ -73,7 +70,8 @@ src_install() { |
| 84 |
# virtualx requires a command that returns number, and does not just die: |
| 85 |
test_suite() { |
| 86 |
cd test || return -1 |
| 87 |
- eqmake5 || return -2 |
| 88 |
+ echo qmake |
| 89 |
+ "$(qt4_get_bindir)"/qmake || return -2 |
| 90 |
emake |
| 91 |
# test suite will create files under $HOME, set $HOME to point to |
| 92 |
# safe location, ideas stolen from |
Archives