Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/sg: ChangeLog sg-1.4.ebuild
Date: Tue, 02 Nov 2010 08:59:16
Message-Id: 20101102085907.614AE20051@flycatcher.gentoo.org
1 jlec 10/11/02 08:59:07
2
3 Modified: ChangeLog sg-1.4.ebuild
4 Log:
5 Fixed automagic doxygen usage
6
7 (Portage version: 2.1.9.24/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 media-libs/sg/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sg/ChangeLog?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sg/ChangeLog?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sg/ChangeLog?r1=1.1&r2=1.2
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-libs/sg/ChangeLog,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- ChangeLog 1 Nov 2010 13:59:49 -0000 1.1
23 +++ ChangeLog 2 Nov 2010 08:59:07 -0000 1.2
24 @@ -1,6 +1,10 @@
25 # ChangeLog for media-libs/sg
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-libs/sg/ChangeLog,v 1.1 2010/11/01 13:59:49 jlec Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-libs/sg/ChangeLog,v 1.2 2010/11/02 08:59:07 jlec Exp $
29 +
30 + 02 Nov 2010; Justin Lecher <jlec@g.o> +files/1.4-doc.patch,
31 + sg-1.4.ebuild:
32 + Fixed automagic doxygen usage
33
34 *sg-1.4 (01 Nov 2010)
35
36
37
38
39 1.2 media-libs/sg/sg-1.4.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sg/sg-1.4.ebuild?rev=1.2&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sg/sg-1.4.ebuild?rev=1.2&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sg/sg-1.4.ebuild?r1=1.1&r2=1.2
44
45 Index: sg-1.4.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/media-libs/sg/sg-1.4.ebuild,v
48 retrieving revision 1.1
49 retrieving revision 1.2
50 diff -u -r1.1 -r1.2
51 --- sg-1.4.ebuild 1 Nov 2010 13:59:49 -0000 1.1
52 +++ sg-1.4.ebuild 2 Nov 2010 08:59:07 -0000 1.2
53 @@ -1,6 +1,6 @@
54 # Copyright 1999-2010 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/media-libs/sg/sg-1.4.ebuild,v 1.1 2010/11/01 13:59:49 jlec Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/media-libs/sg/sg-1.4.ebuild,v 1.2 2010/11/02 08:59:07 jlec Exp $
58
59 EAPI="3"
60
61 @@ -13,7 +13,7 @@
62 SLOT="0"
63 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
64 LICENSE="GPL-2"
65 -IUSE="opengl"
66 +IUSE="doc opengl"
67
68 RDEPEND="
69 dev-libs/maloc
70 @@ -22,13 +22,19 @@
71 virtual/glu
72 virtual/opengl
73 )"
74 -DEPEND="${RDEPEND}"
75 +DEPEND="
76 + ${RDEPEND}
77 + doc? (
78 + media-gfx/graphviz
79 + app-doc/doxygen )"
80
81 S="${WORKDIR}"/${PN}
82
83 src_prepare() {
84 rm src/{gl,glu,glw} -rf
85 - epatch "${FILESDIR}"/${PV}-opengl.patch
86 + epatch \
87 + "${FILESDIR}"/${PV}-opengl.patch \
88 + "${FILESDIR}"/${PV}-doc.patch
89 eautoreconf
90 }
91
92 @@ -50,12 +56,15 @@
93 export FETK_GL_INCLUDE="${sg_include}"/GL
94 export FETK_MOTIF_INCLUDE="${sg_include}"
95
96 + use doc || myconf="${myconf} --with-doxygen= --with-dot="
97 +
98 use opengl && myconf="${myconf} --enable-glforce --enable-gluforce --enable-glwforce"
99
100 econf \
101 - ${myconf} \
102 + --docdir="${EPREFIX}"/usr/share/doc/${PF} \
103 + --disable-triplet \
104 --enable-shared \
105 - --disable-triplet
106 + ${myconf}
107 }
108
109 src_install() {