Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-text/highlight: ChangeLog highlight-3.4.ebuild highlight-3.3.ebuild
Date: Thu, 02 Jun 2011 19:18:40
Message-Id: 20110602191745.712A320054@flycatcher.gentoo.org
1 radhermit 11/06/02 19:17:45
2
3 Modified: ChangeLog highlight-3.4.ebuild highlight-3.3.ebuild
4 Log:
5 Use eqmake4 and remove redundant flags.
6
7 (Portage version: 2.2.0_alpha37/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.38 app-text/highlight/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/ChangeLog?rev=1.38&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/ChangeLog?rev=1.38&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/ChangeLog?r1=1.37&r2=1.38
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v
19 retrieving revision 1.37
20 retrieving revision 1.38
21 diff -u -r1.37 -r1.38
22 --- ChangeLog 2 Jun 2011 11:38:20 -0000 1.37
23 +++ ChangeLog 2 Jun 2011 19:17:45 -0000 1.38
24 @@ -1,6 +1,10 @@
25 # ChangeLog for app-text/highlight
26 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.37 2011/06/02 11:38:20 radhermit Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.38 2011/06/02 19:17:45 radhermit Exp $
29 +
30 + 02 Jun 2011; Tim Harder <radhermit@g.o> highlight-3.3.ebuild,
31 + highlight-3.4.ebuild:
32 + Use eqmake4 and remove redundant flags.
33
34 02 Jun 2011; Tim Harder <radhermit@g.o> highlight-3.3.ebuild,
35 highlight-3.4.ebuild:
36
37
38
39 1.3 app-text/highlight/highlight-3.4.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/highlight-3.4.ebuild?rev=1.3&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/highlight-3.4.ebuild?rev=1.3&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/highlight-3.4.ebuild?r1=1.2&r2=1.3
44
45 Index: highlight-3.4.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.4.ebuild,v
48 retrieving revision 1.2
49 retrieving revision 1.3
50 diff -u -r1.2 -r1.3
51 --- highlight-3.4.ebuild 2 Jun 2011 11:38:20 -0000 1.2
52 +++ highlight-3.4.ebuild 2 Jun 2011 19:17:45 -0000 1.3
53 @@ -1,10 +1,10 @@
54 # Copyright 1999-2011 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.4.ebuild,v 1.2 2011/06/02 11:38:20 radhermit Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.4.ebuild,v 1.3 2011/06/02 19:17:45 radhermit Exp $
58
59 EAPI=4
60
61 -inherit toolchain-funcs
62 +inherit toolchain-funcs qt4-r2
63
64 DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) with syntax highlight"
65 HOMEPAGE="http://www.andre-simon.de/"
66 @@ -24,11 +24,8 @@
67 pkg_setup() {
68 myhlopts=(
69 "CXX=$(tc-getCXX)"
70 - "LINK=$(tc-getCXX)"
71 "AR=$(tc-getAR)"
72 "LDFLAGS=${LDFLAGS}"
73 - "LFLAGS=${LDFLAGS}"
74 - "CXXFLAGS=${CXXFLAGS}"
75 "CFLAGS=${CXXFLAGS}"
76 "DESTDIR=${ED}"
77 "PREFIX=${EPREFIX}/usr"
78 @@ -44,7 +41,11 @@
79
80 src_compile() {
81 emake -f makefile "${myhlopts[@]}"
82 - use qt4 && emake -f makefile "${myhlopts[@]}" gui
83 + if use qt4 ; then
84 + cd src/gui-qt
85 + eqmake4 'DEFINES+=DATA_DIR=\\\"/usr/share/${PN}/\\\" CONFIG_DIR=\\\"/etc/${PN}/\\\" DOC_DIR=\\\"/usr/share/doc/${PF}/\\\"'
86 + emake
87 + fi
88 }
89
90 src_install() {
91
92
93
94 1.4 app-text/highlight/highlight-3.3.ebuild
95
96 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/highlight-3.3.ebuild?rev=1.4&view=markup
97 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/highlight-3.3.ebuild?rev=1.4&content-type=text/plain
98 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/highlight-3.3.ebuild?r1=1.3&r2=1.4
99
100 Index: highlight-3.3.ebuild
101 ===================================================================
102 RCS file: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.3.ebuild,v
103 retrieving revision 1.3
104 retrieving revision 1.4
105 diff -u -r1.3 -r1.4
106 --- highlight-3.3.ebuild 2 Jun 2011 11:38:20 -0000 1.3
107 +++ highlight-3.3.ebuild 2 Jun 2011 19:17:45 -0000 1.4
108 @@ -1,10 +1,10 @@
109 # Copyright 1999-2011 Gentoo Foundation
110 # Distributed under the terms of the GNU General Public License v2
111 -# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.3.ebuild,v 1.3 2011/06/02 11:38:20 radhermit Exp $
112 +# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.3.ebuild,v 1.4 2011/06/02 19:17:45 radhermit Exp $
113
114 EAPI=4
115
116 -inherit toolchain-funcs eutils
117 +inherit toolchain-funcs eutils qt4-r2
118
119 DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) with syntax highlight"
120 HOMEPAGE="http://www.andre-simon.de/"
121 @@ -24,11 +24,8 @@
122 pkg_setup() {
123 myhlopts=(
124 "CXX=$(tc-getCXX)"
125 - "LINK=$(tc-getCXX)"
126 "AR=$(tc-getAR)"
127 "LDFLAGS=${LDFLAGS}"
128 - "LFLAGS=${LDFLAGS}"
129 - "CXXFLAGS=${CXXFLAGS}"
130 "CFLAGS=${CXXFLAGS}"
131 "DESTDIR=${ED}"
132 "PREFIX=${EPREFIX}/usr"
133 @@ -46,7 +43,11 @@
134
135 src_compile() {
136 emake -f makefile "${myhlopts[@]}"
137 - use qt4 && emake -f makefile "${myhlopts[@]}" gui
138 + if use qt4 ; then
139 + cd src/gui-qt
140 + eqmake4 'DEFINES+=DATA_DIR=\\\"/usr/share/${PN}/\\\" CONFIG_DIR=\\\"/etc/${PN}/\\\" DOC_DIR=\\\"/usr/share/doc/${PF}/\\\"'
141 + emake
142 + fi
143 }
144
145 src_install() {
Report Message
Find on MARC Find on Google Groups