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

Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/
Date: Mon, 08 Apr 2019 19:23:11
Message-Id: 1554751384.d45d5260416bd71ef3b08dde2f4905be0b9ea243.jer@gentoo
1 commit: d45d5260416bd71ef3b08dde2f4905be0b9ea243
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 8 19:10:44 2019 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 8 19:23:04 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d45d5260
7
8 x11-libs/fltk: Update live ebuilds
9
10 Package-Manager: Portage-2.3.62, Repoman-2.3.12
11 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
12
13 x11-libs/fltk/fltk-1.3.9999.ebuild | 36 +++++++++++++++++------------
14 x11-libs/fltk/fltk-1.4.9999.ebuild | 47 +++++++++++++++++++++++---------------
15 2 files changed, 50 insertions(+), 33 deletions(-)
16
17 diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
18 index cf4958abf3d..4171029d334 100644
19 --- a/x11-libs/fltk/fltk-1.3.9999.ebuild
20 +++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
21 @@ -1,14 +1,13 @@
22 -# Copyright 1999-2018 Gentoo Foundation
23 +# Copyright 1999-2019 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 -EAPI=6
27 -inherit autotools fdo-mime flag-o-matic multilib-minimal subversion
28 +EAPI=7
29 +inherit autotools fdo-mime flag-o-matic git-r3 multilib-minimal
30
31 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
32 HOMEPAGE="http://www.fltk.org/"
33 -ESVN_REPO_URI="http://seriss.com/public/fltk/fltk/branches/branch-1.3/"
34 -ESVN_USER=""
35 -ESVN_PASSWORD=""
36 +EGIT_REPO_URI="https://github.com/fltk/fltk"
37 +EGIT_OVERRIDE_BRANCH_FLTK_FLTK="branch-1.3"
38
39 SLOT="1"
40 LICENSE="FLTK LGPL-2"
41 @@ -35,23 +34,29 @@ RDEPEND="
42 "
43 DEPEND="
44 ${RDEPEND}
45 + virtual/pkgconfig
46 x11-base/xorg-proto
47 doc? ( app-doc/doxygen )
48 "
49 -
50 DOCS=(
51 ANNOUNCEMENT
52 CHANGES
53 + CHANGES_1.0
54 + CHANGES_1.1
55 CREDITS
56 README
57 + README.abi-version.txt
58 + README.Cairo.txt
59 + README.CMake.txt
60 + README.MSWindows.txt
61 + README.OSX.txt
62 + README.Unix.txt
63 )
64 -
65 FLTK_GAMES="
66 blocks
67 checkers
68 sudoku
69 "
70 -
71 PATCHES=(
72 "${FILESDIR}"/${PN}-1.3.0-share.patch
73 "${FILESDIR}"/${PN}-1.3.9999-conf-tests.patch
74 @@ -144,22 +149,23 @@ multilib_src_install() {
75
76 if multilib_is_native_abi; then
77 emake -C fluid \
78 - DESTDIR="${D}" install-linux
79 + DESTDIR="${D}" install-linux
80
81 use doc &&
82 emake -C documentation \
83 - DESTDIR="${D}" install
84 + DESTDIR="${D}" install
85
86 use games &&
87 emake -C test \
88 - DESTDIR="${D}" install-linux
89 + DESTDIR="${D}" install-linux
90 fi
91 }
92
93 multilib_src_install_all() {
94 for app in fluid $(usex games "${FLTK_GAMES}" ''); do
95 - dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
96 - /usr/share/pixmaps/${app}.png
97 + dosym \
98 + /usr/share/icons/hicolor/32x32/apps/${app}.png \
99 + /usr/share/pixmaps/${app}.png
100 done
101
102 if use examples; then
103 @@ -180,7 +186,7 @@ multilib_src_install_all() {
104 rm "${ED}"/usr/lib*/fltk/*.a || die
105 fi
106
107 - prune_libtool_files
108 + find "${D}" -name '*.la' -delete || die
109 }
110
111 pkg_postinst() {
112
113 diff --git a/x11-libs/fltk/fltk-1.4.9999.ebuild b/x11-libs/fltk/fltk-1.4.9999.ebuild
114 index 97500930d11..708271c605b 100644
115 --- a/x11-libs/fltk/fltk-1.4.9999.ebuild
116 +++ b/x11-libs/fltk/fltk-1.4.9999.ebuild
117 @@ -1,14 +1,12 @@
118 -# Copyright 1999-2018 Gentoo Foundation
119 +# Copyright 1999-2019 Gentoo Authors
120 # Distributed under the terms of the GNU General Public License v2
121
122 -EAPI=6
123 -inherit autotools fdo-mime flag-o-matic multilib-minimal subversion
124 +EAPI=7
125 +inherit autotools fdo-mime flag-o-matic git-r3 multilib-minimal
126
127 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
128 HOMEPAGE="http://www.fltk.org/"
129 -ESVN_REPO_URI="http://seriss.com/public/fltk/fltk/branches/branch-1.4/"
130 -ESVN_USER=""
131 -ESVN_PASSWORD=""
132 +EGIT_REPO_URI="https://github.com/fltk/fltk"
133
134 SLOT="1"
135 LICENSE="FLTK LGPL-2"
136 @@ -35,23 +33,35 @@ RDEPEND="
137 "
138 DEPEND="
139 ${RDEPEND}
140 + virtual/pkgconfig
141 x11-base/xorg-proto
142 doc? ( app-doc/doxygen )
143 "
144 -
145 DOCS=(
146 ANNOUNCEMENT
147 - CHANGES
148 - CREDITS
149 - README
150 + CHANGES.txt
151 + CHANGES_1.0.txt
152 + CHANGES_1.1.txt
153 + CHANGES_1.3.txt
154 + CREDITS.txt
155 + README.Android.md
156 + README.CMake.txt
157 + README.Cairo.txt
158 + README.IDE.txt
159 + README.Pico.txt
160 + README.Unix.txt
161 + README.Windows.txt
162 + README.abi-version.txt
163 + README.bundled-libs.txt
164 + README.macOS.md
165 + README.md
166 + README.txt
167 )
168 -
169 FLTK_GAMES="
170 blocks
171 checkers
172 sudoku
173 "
174 -
175 PATCHES=(
176 "${FILESDIR}"/${PN}-1.3.0-share.patch
177 "${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
178 @@ -143,22 +153,23 @@ multilib_src_install() {
179
180 if multilib_is_native_abi; then
181 emake -C fluid \
182 - DESTDIR="${D}" install-linux
183 + DESTDIR="${D}" install-linux
184
185 use doc &&
186 emake -C documentation \
187 - DESTDIR="${D}" install
188 + DESTDIR="${D}" install
189
190 use games &&
191 emake -C test \
192 - DESTDIR="${D}" install-linux
193 + DESTDIR="${D}" install-linux
194 fi
195 }
196
197 multilib_src_install_all() {
198 for app in fluid $(usex games "${FLTK_GAMES}" ''); do
199 - dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
200 - /usr/share/pixmaps/${app}.png
201 + dosym \
202 + /usr/share/icons/hicolor/32x32/apps/${app}.png \
203 + /usr/share/pixmaps/${app}.png
204 done
205
206 if use examples; then
207 @@ -179,7 +190,7 @@ multilib_src_install_all() {
208 rm "${ED}"/usr/lib*/fltk/*.a || die
209 fi
210
211 - prune_libtool_files
212 + find "${D}" -name '*.la' -delete || die
213 }
214
215 pkg_postinst() {
Report Message
Find on MARC Find on Google Groups