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