1 |
scarabeus 11/04/28 20:25:58 |
2 |
|
3 |
Modified: ChangeLog herqq-1.0.0-r1.ebuild |
4 |
Removed: herqq-0.8.0-r1.ebuild |
5 |
Log: |
6 |
QA: Obey the multilib, do not nedlessly die, etc, etc. |
7 |
|
8 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.5 media-libs/herqq/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/herqq/ChangeLog?rev=1.5&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/herqq/ChangeLog?rev=1.5&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/herqq/ChangeLog?r1=1.4&r2=1.5 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/herqq/ChangeLog,v |
20 |
retrieving revision 1.4 |
21 |
retrieving revision 1.5 |
22 |
diff -u -r1.4 -r1.5 |
23 |
--- ChangeLog 28 Apr 2011 20:00:37 -0000 1.4 |
24 |
+++ ChangeLog 28 Apr 2011 20:25:58 -0000 1.5 |
25 |
@@ -1,6 +1,10 @@ |
26 |
# ChangeLog for media-libs/herqq |
27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/herqq/ChangeLog,v 1.4 2011/04/28 20:00:37 ottxor Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/herqq/ChangeLog,v 1.5 2011/04/28 20:25:58 scarabeus Exp $ |
30 |
+ |
31 |
+ 28 Apr 2011; Tomáš Chvátal <scarabeus@g.o> -herqq-0.8.0-r1.ebuild, |
32 |
+ herqq-1.0.0-r1.ebuild: |
33 |
+ QA: Obey the multilib, do not nedlessly die, etc, etc. |
34 |
|
35 |
*herqq-1.0.0-r1 (28 Apr 2011) |
36 |
*herqq-0.8.0-r1 (28 Apr 2011) |
37 |
|
38 |
|
39 |
|
40 |
1.2 media-libs/herqq/herqq-1.0.0-r1.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/herqq/herqq-1.0.0-r1.ebuild?rev=1.2&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/herqq/herqq-1.0.0-r1.ebuild?rev=1.2&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/herqq/herqq-1.0.0-r1.ebuild?r1=1.1&r2=1.2 |
45 |
|
46 |
Index: herqq-1.0.0-r1.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/herqq/herqq-1.0.0-r1.ebuild,v |
49 |
retrieving revision 1.1 |
50 |
retrieving revision 1.2 |
51 |
diff -u -r1.1 -r1.2 |
52 |
--- herqq-1.0.0-r1.ebuild 28 Apr 2011 20:00:37 -0000 1.1 |
53 |
+++ herqq-1.0.0-r1.ebuild 28 Apr 2011 20:25:58 -0000 1.2 |
54 |
@@ -1,10 +1,10 @@ |
55 |
# Copyright 1999-2011 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/herqq/herqq-1.0.0-r1.ebuild,v 1.1 2011/04/28 20:00:37 ottxor Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/herqq/herqq-1.0.0-r1.ebuild,v 1.2 2011/04/28 20:25:58 scarabeus Exp $ |
59 |
|
60 |
-EAPI="3" |
61 |
+EAPI=4 |
62 |
|
63 |
-inherit base multilib qt4-r2 |
64 |
+inherit multilib base qt4-r2 |
65 |
|
66 |
DESCRIPTION="A software library for building UPnP devices" |
67 |
HOMEPAGE="http://www.herqq.org" |
68 |
@@ -15,24 +15,30 @@ |
69 |
KEYWORDS="~amd64 ~x86" |
70 |
IUSE="doc" |
71 |
|
72 |
-#no release of QtSolutions using bundled libQtSolutions_SOAP |
73 |
-RDEPEND="x11-libs/qt-core" |
74 |
+# no release of QtSolutions using bundled libQtSolutions_SOAP |
75 |
+RDEPEND=" |
76 |
+ x11-libs/qt-core:4 |
77 |
+ x11-libs/qt-xmlpatterns:4 |
78 |
+" |
79 |
DEPEND="${RDEPEND}" |
80 |
|
81 |
DOCS=( hupnp/ChangeLog ) |
82 |
HTML_DOCS=( hupnp/docs/html/ ) |
83 |
|
84 |
src_prepare() { |
85 |
- find . -name "*.pro" -exec sed -i "s@PREFIX/lib@PREFIX/$(get_libdir)@" {} \; || die |
86 |
+ # fix the .pro file for multilib issues |
87 |
+ sed \ |
88 |
+ -e "s:PREFIX/lib:PREFIX/$(get_libdir):" \ |
89 |
+ -i "${S}/hupnp/src.pro" \ |
90 |
+ -i "${S}/hupnp/lib/qtsoap-2.7-opensource/buildlib/buildlib.pro" || die |
91 |
+ qt4-r2_src_prepare |
92 |
} |
93 |
|
94 |
src_configure() { |
95 |
- eqmake4 herqq.pro PREFIX="${EPREFIX}/usr" || die |
96 |
+ eqmake4 PREFIX="${EPREFIX}/usr/" |
97 |
} |
98 |
|
99 |
src_install() { |
100 |
- qt4-r2_src_install || die |
101 |
- if use doc; then |
102 |
- base_src_install_docs || die |
103 |
- fi |
104 |
+ qt4-r2_src_install |
105 |
+ use doc && base_src_install_docs |
106 |
} |