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: Wed, 07 Oct 2015 04:56:17
Message-Id: 1444193765.1491ec62e35fec5f91d173a69a5b2694fff6fa29.jer@gentoo
1 commit: 1491ec62e35fec5f91d173a69a5b2694fff6fa29
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 7 04:56:05 2015 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 7 04:56:05 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1491ec62
7
8 x11-libs/fltk: Drop USE=pdf (bug #536566).
9
10 Package-Manager: portage-2.2.22
11
12 x11-libs/fltk/fltk-1.3.3-r3.ebuild | 16 ++++------------
13 x11-libs/fltk/fltk-1.3.9999.ebuild | 16 ++++------------
14 2 files changed, 8 insertions(+), 24 deletions(-)
15
16 diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
17 index b55bc94..e4d4ae6 100644
18 --- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
19 +++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
20 @@ -13,7 +13,7 @@ SRC_URI="http://fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
21 SLOT="1"
22 LICENSE="FLTK LGPL-2"
23 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
24 -IUSE="cairo debug doc examples games +opengl pdf static-libs +threads +xft +xinerama"
25 +IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
26
27 RDEPEND="
28 >=media-libs/libpng-1.2:0
29 @@ -29,14 +29,7 @@ RDEPEND="
30 xft? ( x11-libs/libXft )"
31 DEPEND="${RDEPEND}
32 x11-proto/xextproto
33 - doc? (
34 - app-doc/doxygen
35 - pdf? (
36 - dev-texlive/texlive-fontutils
37 - dev-texlive/texlive-latex
38 - dev-texlive/texlive-latexextra
39 - )
40 - )
41 + doc? ( app-doc/doxygen )
42 xinerama? ( x11-proto/xineramaproto )"
43
44 FLTK_INCDIR=${EPREFIX}/usr/include/fltk
45 @@ -99,12 +92,11 @@ src_configure() {
46
47 src_compile() {
48 default
49 +
50 if use doc; then
51 emake -C documentation html
52 - if use pdf; then
53 - emake -C documentation pdf
54 - fi
55 fi
56 +
57 if use games; then
58 emake -C test blocks checkers sudoku
59 fi
60
61 diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
62 index ba25ae8..3c620a6 100644
63 --- a/x11-libs/fltk/fltk-1.3.9999.ebuild
64 +++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
65 @@ -15,7 +15,7 @@ ESVN_PASSWORD=""
66 SLOT="1"
67 LICENSE="FLTK LGPL-2"
68 KEYWORDS=""
69 -IUSE="cairo debug doc examples games +opengl pdf static-libs +threads +xft +xinerama"
70 +IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
71
72 RDEPEND="
73 >=media-libs/libpng-1.2:0
74 @@ -31,14 +31,7 @@ RDEPEND="
75 xft? ( x11-libs/libXft )"
76 DEPEND="${RDEPEND}
77 x11-proto/xextproto
78 - doc? (
79 - app-doc/doxygen
80 - pdf? (
81 - dev-texlive/texlive-fontutils
82 - dev-texlive/texlive-latex
83 - dev-texlive/texlive-latexextra
84 - )
85 - )
86 + doc? ( app-doc/doxygen )
87 xinerama? ( x11-proto/xineramaproto )"
88
89 FLTK_INCDIR=${EPREFIX}/usr/include/fltk
90 @@ -102,12 +95,11 @@ src_configure() {
91
92 src_compile() {
93 default
94 +
95 if use doc; then
96 emake -C documentation html
97 - if use pdf; then
98 - emake -C documentation pdf
99 - fi
100 fi
101 +
102 if use games; then
103 emake -C test blocks checkers sudoku
104 fi