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

Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/dillo: ChangeLog dillo-3.0.1.ebuild dillo-3.0.2.ebuild
Date: Thu, 05 Jan 2012 18:07:43
Message-Id: 20120105180721.D9A792004B@flycatcher.gentoo.org
1 ssuominen 12/01/05 18:07:21
2
3 Modified: ChangeLog dillo-3.0.1.ebuild dillo-3.0.2.ebuild
4 Log:
5 amd64/x86 stable
6
7 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.101 www-client/dillo/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/dillo/ChangeLog?rev=1.101&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/dillo/ChangeLog?rev=1.101&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/dillo/ChangeLog?r1=1.100&r2=1.101
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v
19 retrieving revision 1.100
20 retrieving revision 1.101
21 diff -u -r1.100 -r1.101
22 --- ChangeLog 12 Dec 2011 00:31:59 -0000 1.100
23 +++ ChangeLog 5 Jan 2012 18:07:21 -0000 1.101
24 @@ -1,6 +1,9 @@
25 # ChangeLog for www-client/dillo
26 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.100 2011/12/12 00:31:59 jer Exp $
28 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
29 +# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.101 2012/01/05 18:07:21 ssuominen Exp $
30 +
31 + 05 Jan 2012; Samuli Suominen <ssuominen@g.o> dillo-3.0.1.ebuild:
32 + amd64/x86 stable wrt #395917
33
34 *dillo-3.0.2 (12 Dec 2011)
35
36
37
38
39 1.6 www-client/dillo/dillo-3.0.1.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/dillo/dillo-3.0.1.ebuild?rev=1.6&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/dillo/dillo-3.0.1.ebuild?rev=1.6&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/dillo/dillo-3.0.1.ebuild?r1=1.5&r2=1.6
44
45 Index: dillo-3.0.1.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-3.0.1.ebuild,v
48 retrieving revision 1.5
49 retrieving revision 1.6
50 diff -u -r1.5 -r1.6
51 --- dillo-3.0.1.ebuild 12 Oct 2011 15:47:41 -0000 1.5
52 +++ dillo-3.0.1.ebuild 5 Jan 2012 18:07:21 -0000 1.6
53 @@ -1,9 +1,8 @@
54 -# Copyright 1999-2011 Gentoo Foundation
55 +# Copyright 1999-2012 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-3.0.1.ebuild,v 1.5 2011/10/12 15:47:41 jer Exp $
58 -
59 -EAPI="4"
60 +# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-3.0.1.ebuild,v 1.6 2012/01/05 18:07:21 ssuominen Exp $
61
62 +EAPI=4
63 inherit eutils flag-o-matic multilib
64
65 DESCRIPTION="Lean FLTK based web browser"
66 @@ -13,14 +12,14 @@
67
68 LICENSE="GPL-3"
69 SLOT="0"
70 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
71 +KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
72 IUSE="doc +gif ipv6 +jpeg +png ssl"
73
74 -RDEPEND="=x11-libs/fltk-1.3*[-cairo]
75 - sys-libs/zlib
76 +RDEPEND="sys-libs/zlib
77 + >=x11-libs/fltk-1.3:1[-cairo]
78 jpeg? ( virtual/jpeg )
79 - png? ( media-libs/libpng )
80 - ssl? ( dev-libs/openssl )"
81 + png? ( >=media-libs/libpng-1.2:0 )
82 + ssl? ( dev-libs/openssl:0 )"
83 DEPEND="${RDEPEND}
84 doc? ( app-doc/doxygen )"
85
86 @@ -40,8 +39,8 @@
87
88 src_compile() {
89 default
90 - if use doc ; then
91 - doxygen Doxyfile || die "doxygen failed"
92 + if use doc; then
93 + doxygen Doxyfile || die
94 fi
95 }
96
97 @@ -49,15 +48,13 @@
98 dodir /etc
99 default
100
101 - if use doc; then
102 - dohtml html/*
103 - fi
104 + use doc && dohtml html/*
105 dodoc AUTHORS ChangeLog README NEWS
106 docinto doc
107 dodoc doc/*.txt doc/README
108
109 doicon "${DISTDIR}"/dillo.png
110 - make_desktop_entry dillo Dillo dillo
111 + make_desktop_entry ${PN} Dillo
112 }
113
114 pkg_postinst() {
115
116
117
118 1.2 www-client/dillo/dillo-3.0.2.ebuild
119
120 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/dillo/dillo-3.0.2.ebuild?rev=1.2&view=markup
121 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/dillo/dillo-3.0.2.ebuild?rev=1.2&content-type=text/plain
122 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/dillo/dillo-3.0.2.ebuild?r1=1.1&r2=1.2
123
124 Index: dillo-3.0.2.ebuild
125 ===================================================================
126 RCS file: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-3.0.2.ebuild,v
127 retrieving revision 1.1
128 retrieving revision 1.2
129 diff -u -r1.1 -r1.2
130 --- dillo-3.0.2.ebuild 12 Dec 2011 00:31:59 -0000 1.1
131 +++ dillo-3.0.2.ebuild 5 Jan 2012 18:07:21 -0000 1.2
132 @@ -1,35 +1,35 @@
133 # Copyright 1999-2011 Gentoo Foundation
134 # Distributed under the terms of the GNU General Public License v2
135 -# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-3.0.2.ebuild,v 1.1 2011/12/12 00:31:59 jer Exp $
136 -
137 -EAPI="4"
138 +# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-3.0.2.ebuild,v 1.2 2012/01/05 18:07:21 ssuominen Exp $
139
140 +EAPI=4
141 inherit eutils flag-o-matic multilib
142
143 DESCRIPTION="Lean FLTK based web browser"
144 HOMEPAGE="http://www.dillo.org/"
145 SRC_URI="http://www.dillo.org/download/${P}.tar.bz2
146 - mirror://gentoo/dillo.png"
147 + mirror://gentoo/${PN}.png"
148
149 LICENSE="GPL-3"
150 SLOT="0"
151 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
152 IUSE="doc +gif ipv6 +jpeg +png ssl"
153
154 -RDEPEND="=x11-libs/fltk-1.3*[-cairo]
155 - sys-libs/zlib
156 +RDEPEND="sys-libs/zlib
157 + >=x11-libs/fltk-1.3:1[-cairo]
158 jpeg? ( virtual/jpeg )
159 - png? ( media-libs/libpng )
160 - ssl? ( dev-libs/openssl )"
161 + png? ( >=media-libs/libpng-1.2:0 )
162 + ssl? ( dev-libs/openssl:0 )"
163 DEPEND="${RDEPEND}
164 doc? ( app-doc/doxygen )"
165
166 src_prepare() {
167 - epatch "${FILESDIR}"/dillo2-inbuf.patch
168 + epatch "${FILESDIR}"/${PN}2-inbuf.patch
169 }
170
171 src_configure() {
172 append-ldflags "-L/usr/$(get_libdir)/fltk"
173 +
174 econf \
175 $(use_enable gif) \
176 $(use_enable ipv6) \
177 @@ -40,8 +40,8 @@
178
179 src_compile() {
180 default
181 - if use doc ; then
182 - doxygen Doxyfile || die "doxygen failed"
183 + if use doc; then
184 + doxygen Doxyfile || die
185 fi
186 }
187
188 @@ -49,15 +49,13 @@
189 dodir /etc
190 default
191
192 - if use doc; then
193 - dohtml html/*
194 - fi
195 + use doc && dohtml html/*
196 dodoc AUTHORS ChangeLog README NEWS
197 docinto doc
198 dodoc doc/*.txt doc/README
199
200 - doicon "${DISTDIR}"/dillo.png
201 - make_desktop_entry dillo Dillo dillo
202 + doicon "${DISTDIR}"/${PN}.png
203 + make_desktop_entry ${PN} Dillo
204 }
205
206 pkg_postinst() {
Report Message
Find on MARC Find on Google Groups