Gentoo Archives: gentoo-commits

From: "Markus Ullmann (jokey)" <jokey@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/qtjambi: ChangeLog qtjambi-4.3.3_p1.ebuild
Date: Sun, 30 Dec 2007 17:24:40
Message-Id: E1J91tl-00051g-PV@stork.gentoo.org
1 jokey 07/12/30 17:24:29
2
3 Modified: ChangeLog qtjambi-4.3.3_p1.ebuild
4 Log:
5 Fix quoting
6 (Portage version: 2.1.4_rc11)
7
8 Revision Changes Path
9 1.12 dev-java/qtjambi/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/qtjambi/ChangeLog?rev=1.12&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/qtjambi/ChangeLog?rev=1.12&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/qtjambi/ChangeLog?r1=1.11&r2=1.12
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v
18 retrieving revision 1.11
19 retrieving revision 1.12
20 diff -u -r1.11 -r1.12
21 --- ChangeLog 19 Dec 2007 15:26:00 -0000 1.11
22 +++ ChangeLog 30 Dec 2007 17:24:29 -0000 1.12
23 @@ -1,6 +1,9 @@
24 # ChangeLog for dev-java/qtjambi
25 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.11 2007/12/19 15:26:00 caleb Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.12 2007/12/30 17:24:29 jokey Exp $
28 +
29 + 30 Dec 2007; Markus Ullmann <jokey@g.o> qtjambi-4.3.3_p1.ebuild:
30 + Fix quoting
31
32 *qtjambi-4.3.3_p1 (19 Dec 2007)
33
34
35
36
37 1.2 dev-java/qtjambi/qtjambi-4.3.3_p1.ebuild
38
39 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/qtjambi/qtjambi-4.3.3_p1.ebuild?rev=1.2&view=markup
40 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/qtjambi/qtjambi-4.3.3_p1.ebuild?rev=1.2&content-type=text/plain
41 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/qtjambi/qtjambi-4.3.3_p1.ebuild?r1=1.1&r2=1.2
42
43 Index: qtjambi-4.3.3_p1.ebuild
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/dev-java/qtjambi/qtjambi-4.3.3_p1.ebuild,v
46 retrieving revision 1.1
47 retrieving revision 1.2
48 diff -u -r1.1 -r1.2
49 --- qtjambi-4.3.3_p1.ebuild 19 Dec 2007 15:26:00 -0000 1.1
50 +++ qtjambi-4.3.3_p1.ebuild 30 Dec 2007 17:24:29 -0000 1.2
51 @@ -1,6 +1,6 @@
52 # Copyright 1999-2007 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 -# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/qtjambi-4.3.3_p1.ebuild,v 1.1 2007/12/19 15:26:00 caleb Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/qtjambi-4.3.3_p1.ebuild,v 1.2 2007/12/30 17:24:29 jokey Exp $
56
57 inherit eutils java-pkg-2
58
59 @@ -30,17 +30,17 @@
60 src_unpack() {
61 unpack ${A}
62 cd "${S}"
63 - epatch ${FILESDIR}/generator-4.3.3.patch
64 - epatch ${FILESDIR}/qtjambi_base.pri.diff
65 - epatch ${FILESDIR}/jambi.pri.diff
66 + epatch "${FILESDIR}"/generator-4.3.3.patch
67 + epatch "${FILESDIR}"/qtjambi_base.pri.diff
68 + epatch "${FILESDIR}"/jambi.pri.diff
69
70 # If Qt wasn't built with accessibility use flag, then we needto remove some files from
71 # the list.
72 if ! built_with_use =x11-libs/qt-4* accessibility; then
73 - epatch ${FILESDIR}/java_files_remove_accessibility.diff
74 + epatch "${FILESDIR}"/java_files_remove_accessibility.diff
75 fi
76 if ! built_with_use =x11-libs/qt-4* ssl; then
77 - epatch ${FILESDIR}/java_files_remove_ssl.diff
78 + epatch "${FILESDIR}"/java_files_remove_ssl.diff
79 fi
80 }
81
82 @@ -48,7 +48,7 @@
83
84 # Step 1, build the source generator
85 einfo "Building the source generator"
86 - cd ${S}/generator
87 + cd "${S}"/generator
88 /usr/bin/qmake && make || die "Error building generator"
89
90 # Step 2, run the generator
91 @@ -66,11 +66,11 @@
92
93 # Step 5, compiling java files
94 einfo "Compiling java files"
95 - mkdir -p ${S}/class
96 + mkdir -p "${S}"/class
97 cd "${S}" && ejavac -d class @java_files
98
99 # Step 6, build the jar file
100 - cd ${S}/class && jar cf ../qtjambi.jar com/trolltech/qt com/trolltech/tools
101 + cd "${S}"/class && jar cf ../qtjambi.jar com/trolltech/qt com/trolltech/tools
102 # copy built classes for demos and examples
103 cd "${S}/class" && cp -r com/trolltech/demos com/trolltech/examples com/trolltech/launcher ../com/trolltech
104 cd "${S}" && jar cf qtjambi-src.jar com
105
106
107
108 --
109 gentoo-commits@g.o mailing list