1 |
commit: 2c1b2991bfd7c7fe686836d0f3c1a968b626a8da |
2 |
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 3 06:22:29 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=2c1b2991 |
7 |
|
8 |
Revert "net-p2p/classified-ads: Classified ads v0.10 version bump. - changed way how test suite is run and fixed 2 unit tests." |
9 |
|
10 |
This reverts commit a7a6d00357859094ff31fcbaf4eba09de9360022. |
11 |
|
12 |
net-p2p/classified-ads/classified-ads-0.10.ebuild | 35 ++++++++--------------- |
13 |
1 file changed, 12 insertions(+), 23 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 a792705..9ff04f5 100644 |
17 |
--- a/net-p2p/classified-ads/classified-ads-0.10.ebuild |
18 |
+++ b/net-p2p/classified-ads/classified-ads-0.10.ebuild |
19 |
@@ -5,12 +5,11 @@ |
20 |
EAPI=5 |
21 |
PLOCALES="en fi sv da uk" |
22 |
PLOCALE_BACKUP="en" |
23 |
-inherit qt4-r2 qmake-utils virtualx vcs-snapshot |
24 |
+inherit qt4-r2 qmake-utils |
25 |
|
26 |
-COMMIT_ID="cd0652c52f86f6284b793f26e5362bc8fb8a7118" |
27 |
DESCRIPTION="Program for displaying classified advertisement items" |
28 |
HOMEPAGE="http://katiska.org/classified-ads/" |
29 |
-SRC_URI="https://github.com/operatornormal/classified-ads/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz \ |
30 |
+SRC_URI="https://github.com/operatornormal/classified-ads/archive/${PV}.tar.gz -> classified-ads-${PV}.tar.gz \ |
31 |
https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true \ |
32 |
-> classified-ads-graphics-${PV}.tar.gz" |
33 |
|
34 |
@@ -38,14 +37,13 @@ DEPEND="${RDEPEND} |
35 |
dev-qt/qttest:4 |
36 |
sys-devel/gdb:0 |
37 |
doc? ( app-doc/doxygen[dot] ) |
38 |
- test? ( dev-libs/libgcrypt:0 |
39 |
- ${VIRTUALX_DEPEND} ) |
40 |
+ test? ( dev-libs/libgcrypt:0 ) |
41 |
" |
42 |
|
43 |
src_prepare() { |
44 |
# preprocessed graphics are unpacked into wrong directory |
45 |
# so lets move them into correct location: |
46 |
- mv ../classified-ads-graphics-${PV}/* ui/ || die |
47 |
+ mv ../ui/* ui/ || die |
48 |
# then just run qmake |
49 |
qt4-r2_src_prepare |
50 |
} |
51 |
@@ -59,19 +57,8 @@ src_compile() { |
52 |
} |
53 |
|
54 |
src_test() { |
55 |
- virtx test_suite |
56 |
-} |
57 |
- |
58 |
-src_install() { |
59 |
- emake install INSTALL_ROOT="${D}" DESTDIR="${D}" |
60 |
- use doc && dodoc -r doc/doxygen.generated/html/ |
61 |
-} |
62 |
- |
63 |
-# virtualx requires a command that returns number, and does not just die: |
64 |
-test_suite() { |
65 |
- cd test || return -1 |
66 |
- echo qmake |
67 |
- "$(qt4_get_bindir)"/qmake || return -2 |
68 |
+ cd test || die "test suite missing" |
69 |
+ "$(qt4_get_bindir)"/qmake || die "test suite configure failed" |
70 |
emake |
71 |
# test suite will create files under $HOME, set $HOME to point to |
72 |
# safe location, ideas stolen from |
73 |
@@ -83,9 +70,11 @@ test_suite() { |
74 |
result=$? |
75 |
export HOME=$BACKUP_HOME |
76 |
if [ $result != "0" ]; then |
77 |
- echo "test suite failed with error code " `echo $result` |
78 |
- return $result |
79 |
- else |
80 |
- return 0 |
81 |
+ die "test suite failed with error code " `echo $result` |
82 |
fi |
83 |
} |
84 |
+ |
85 |
+src_install() { |
86 |
+ emake install INSTALL_ROOT="${D}" DESTDIR="${D}" |
87 |
+ use doc && dodoc -r doc/doxygen.generated/html/ |
88 |
+} |