Gentoo Archives: gentoo-commits

From: "Dominik Kapusta (ayoy)" <ayoy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-crypt/qca: ChangeLog qca-2.0.0-r2.ebuild
Date: Mon, 05 Oct 2009 19:08:52
Message-Id: E1MusvR-0008OJ-6c@stork.gentoo.org
1 ayoy 09/10/05 19:08:49
2
3 Modified: ChangeLog qca-2.0.0-r2.ebuild
4 Log:
5 Removed alternative dependency and references to Qt metapackage, converted to EAPI=2
6 (Portage version: 2.2_rc43/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.76 app-crypt/qca/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/qca/ChangeLog?rev=1.76&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/qca/ChangeLog?rev=1.76&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/qca/ChangeLog?r1=1.75&r2=1.76
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v
18 retrieving revision 1.75
19 retrieving revision 1.76
20 diff -u -r1.75 -r1.76
21 --- ChangeLog 29 Aug 2009 17:55:30 -0000 1.75
22 +++ ChangeLog 5 Oct 2009 19:08:48 -0000 1.76
23 @@ -1,6 +1,10 @@
24 # ChangeLog for app-crypt/qca
25 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.75 2009/08/29 17:55:30 nixnut Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.76 2009/10/05 19:08:48 ayoy Exp $
28 +
29 + 05 Oct 2009; Dominik Kapusta <ayoy@g.o> qca-2.0.0-r2.ebuild:
30 + Removed alternative dependency and references to Qt metapackage, converted
31 + to EAPI=2
32
33 29 Aug 2009; nixnut <nixnut@g.o> qca-2.0.2-r2.ebuild:
34 ppc stable #272865
35
36
37
38 1.19 app-crypt/qca/qca-2.0.0-r2.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/qca/qca-2.0.0-r2.ebuild?rev=1.19&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/qca/qca-2.0.0-r2.ebuild?rev=1.19&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/qca/qca-2.0.0-r2.ebuild?r1=1.18&r2=1.19
43
44 Index: qca-2.0.0-r2.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.0-r2.ebuild,v
47 retrieving revision 1.18
48 retrieving revision 1.19
49 diff -u -r1.18 -r1.19
50 --- qca-2.0.0-r2.ebuild 26 Apr 2009 15:32:25 -0000 1.18
51 +++ qca-2.0.0-r2.ebuild 5 Oct 2009 19:08:48 -0000 1.19
52 @@ -1,8 +1,8 @@
53 # Copyright 1999-2009 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.0-r2.ebuild,v 1.18 2009/04/26 15:32:25 yngwin Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.0-r2.ebuild,v 1.19 2009/10/05 19:08:48 ayoy Exp $
57
58 -EAPI="1"
59 +EAPI="2"
60
61 inherit eutils multilib qt4
62
63 @@ -17,31 +17,12 @@
64 RESTRICT="test"
65
66 DEPEND="!<app-crypt/qca-1.0-r3
67 - x11-libs/qt-core:4"
68 + x11-libs/qt-core:4[debug?]"
69 RDEPEND="${DEPEND}"
70
71 -pkg_setup() {
72 - if use debug; then
73 - if has_version "<x11-libs/qt-4.4.0_alpha1:4" && ! built_with_use x11-libs/qt:4 debug; then
74 - eerror "You are trying to compile ${PN} with USE=\"debug\""
75 - eerror "while x11-libs/qt:4 is built without this particular flag."
76 - die "Rebuild x11-libs/qt:4 with USE=\"debug\"."
77 - elif has_version "x11-libs/qt-core:4" && ! built_with_use x11-libs/qt-core:4 debug; then
78 - eerror "You are trying to compile ${PN} with USE=\"debug\""
79 - eerror "while x11-libs/qt-core:4 is built without this particular flag."
80 - die "Rebuild x11-libs/qt-core:4 with USE=\"debug\"."
81 - fi
82 - fi
83 -}
84 -
85 -src_unpack() {
86 - unpack ${A}
87 - cd "${S}"
88 -
89 - epatch "${FILESDIR}/${P}-debug-same-pkgconfig-file.patch"
90 -}
91 +PATCHES=( "${FILESDIR}/${P}-debug-same-pkgconfig-file.patch" )
92
93 -src_compile() {
94 +src_configure() {
95 _libdir=$(get_libdir)
96 local myconf
97 if use debug; then
98 @@ -65,7 +46,6 @@
99 || die "configure failed"
100
101 eqmake4 ${PN}.pro
102 - emake || die "emake failed"
103 }
104
105 src_install() {