Gentoo Archives: gentoo-commits

From: "Ben de Groot (yngwin)" <yngwin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/qtjambi: ChangeLog qtjambi-4.5.2_p1.ebuild qtjambi-4.5.0_p1.ebuild qtjambi-4.4.3.ebuild
Date: Sun, 03 Jan 2010 01:56:55
Message-Id: E1NRFHE-0007F2-Q4@stork.gentoo.org
1 yngwin 10/01/03 01:29:04
2
3 Modified: ChangeLog qtjambi-4.5.2_p1.ebuild
4 Removed: qtjambi-4.5.0_p1.ebuild qtjambi-4.4.3.ebuild
5 Log:
6 Pin Qt deps on 4.5, bug 298269. Remove obsolete versions.
7 (Portage version: 2.2_rc61/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.23 dev-java/qtjambi/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/qtjambi/ChangeLog?rev=1.23&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/qtjambi/ChangeLog?rev=1.23&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/qtjambi/ChangeLog?r1=1.22&r2=1.23
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v
19 retrieving revision 1.22
20 retrieving revision 1.23
21 diff -u -r1.22 -r1.23
22 --- ChangeLog 18 Dec 2009 16:07:51 -0000 1.22
23 +++ ChangeLog 3 Jan 2010 01:29:04 -0000 1.23
24 @@ -1,6 +1,10 @@
25 # ChangeLog for dev-java/qtjambi
26 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.22 2009/12/18 16:07:51 hwoarang Exp $
28 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
29 +# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.23 2010/01/03 01:29:04 yngwin Exp $
30 +
31 + 03 Jan 2010; Ben de Groot <yngwin@g.o> -qtjambi-4.4.3.ebuild,
32 + -qtjambi-4.5.0_p1.ebuild, qtjambi-4.5.2_p1.ebuild:
33 + Pin Qt deps on 4.5, bug 298269. Remove obsolete versions.
34
35 *qtjambi-4.5.2_p1 (18 Dec 2009)
36
37 @@ -32,7 +36,7 @@
38 07 Mar 2009; Petteri Räty <betelgeuse@g.o>
39 -qtjambi-4.3.3_p1.ebuild:
40 Remove old version.
41 -
42 +
43 04 Mar 2009; Alistair Bush <ali_bush@g.o>
44 files/configuration-4.4.3.patch:
45 Update to correct configuration patch. Old patch must have been applied
46
47
48
49 1.2 dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild
50
51 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild?rev=1.2&view=markup
52 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild?rev=1.2&content-type=text/plain
53 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild?r1=1.1&r2=1.2
54
55 Index: qtjambi-4.5.2_p1.ebuild
56 ===================================================================
57 RCS file: /var/cvsroot/gentoo-x86/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild,v
58 retrieving revision 1.1
59 retrieving revision 1.2
60 diff -u -r1.1 -r1.2
61 --- qtjambi-4.5.2_p1.ebuild 18 Dec 2009 16:07:51 -0000 1.1
62 +++ qtjambi-4.5.2_p1.ebuild 3 Jan 2010 01:29:04 -0000 1.2
63 @@ -1,15 +1,15 @@
64 -# Copyright 1999-2009 Gentoo Foundation
65 +# Copyright 1999-2010 Gentoo Foundation
66 # Distributed under the terms of the GNU General Public License v2
67 -# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild,v 1.1 2009/12/18 16:07:51 hwoarang Exp $
68 +# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild,v 1.2 2010/01/03 01:29:04 yngwin Exp $
69
70 EAPI="2"
71
72 JAVA_PKG_IUSE="doc source"
73 WANT_ANT_TASKS="ant-trax"
74
75 -inherit eutils multilib qt4 java-pkg-2 java-ant-2
76 +inherit multilib qt4-r2 java-pkg-2 java-ant-2
77
78 -QTVER="${PV%%_p*}"
79 +QTVER="${PV%.*}*"
80 MY_PV="${PV/p/0}"
81 MY_P="${PN}-src-lgpl-${MY_PV}"
82
83 @@ -22,16 +22,16 @@
84 KEYWORDS="~amd64 ~x86"
85 IUSE="debug examples opengl phonon webkit xmlpatterns"
86
87 -COMMON_DEPS=">=x11-libs/qt-gui-${QTVER}:${SLOT}
88 - >=x11-libs/qt-sql-${QTVER}:${SLOT}
89 - >=x11-libs/qt-svg-${QTVER}:${SLOT}
90 - opengl? ( >=x11-libs/qt-opengl-${QTVER}:${SLOT} )
91 - phonon? ( >=x11-libs/qt-phonon-${QTVER}:${SLOT} )
92 +COMMON_DEPS="=x11-libs/qt-gui-${QTVER}:${SLOT}
93 + =x11-libs/qt-sql-${QTVER}:${SLOT}
94 + =x11-libs/qt-svg-${QTVER}:${SLOT}
95 + opengl? ( =x11-libs/qt-opengl-${QTVER}:${SLOT} )
96 + phonon? ( =x11-libs/qt-phonon-${QTVER}:${SLOT} )
97 webkit? (
98 - >=x11-libs/qt-phonon-${QTVER}:${SLOT}
99 - >=x11-libs/qt-webkit-${QTVER}:${SLOT}
100 + =x11-libs/qt-phonon-${QTVER}:${SLOT}
101 + =x11-libs/qt-webkit-${QTVER}:${SLOT}
102 )
103 - xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QTVER}:${SLOT} )"
104 + xmlpatterns? ( =x11-libs/qt-xmlpatterns-${QTVER}:${SLOT} )"
105 DEPEND="${COMMON_DEPS}
106 >=virtual/jdk-1.6"
107 RDEPEND="${COMMON_DEPS}