Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/punc: ChangeLog punc-1.4.ebuild
Date: Tue, 02 Nov 2010 08:37:50
Message-Id: 20101102083742.05A1F20054@flycatcher.gentoo.org
1 jlec 10/11/02 08:37:42
2
3 Modified: ChangeLog punc-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.6 sci-libs/punc/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/punc/ChangeLog?rev=1.6&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/punc/ChangeLog?rev=1.6&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/punc/ChangeLog?r1=1.5&r2=1.6
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sci-libs/punc/ChangeLog,v
19 retrieving revision 1.5
20 retrieving revision 1.6
21 diff -u -r1.5 -r1.6
22 --- ChangeLog 31 Oct 2010 15:01:09 -0000 1.5
23 +++ ChangeLog 2 Nov 2010 08:37:41 -0000 1.6
24 @@ -1,6 +1,10 @@
25 # ChangeLog for sci-libs/punc
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/ChangeLog,v 1.5 2010/10/31 15:01:09 jlec Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/ChangeLog,v 1.6 2010/11/02 08:37:41 jlec Exp $
29 +
30 + 02 Nov 2010; Justin Lecher <jlec@g.o> +files/1.4-doc.patch,
31 + punc-1.4.ebuild:
32 + Fixed automagic doxygen usage
33
34 31 Oct 2010; Justin Lecher <jlec@g.o> files/1.4-linking.patch:
35 Added missing linking libs
36
37
38
39 1.2 sci-libs/punc/punc-1.4.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/punc/punc-1.4.ebuild?rev=1.2&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/punc/punc-1.4.ebuild?rev=1.2&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/punc/punc-1.4.ebuild?r1=1.1&r2=1.2
44
45 Index: punc-1.4.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/sci-libs/punc/punc-1.4.ebuild,v
48 retrieving revision 1.1
49 retrieving revision 1.2
50 diff -u -r1.1 -r1.2
51 --- punc-1.4.ebuild 31 Oct 2010 13:30:08 -0000 1.1
52 +++ punc-1.4.ebuild 2 Nov 2010 08:37:41 -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/sci-libs/punc/punc-1.4.ebuild,v 1.1 2010/10/31 13:30:08 jlec Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/punc-1.4.ebuild,v 1.2 2010/11/02 08:37:41 jlec Exp $
58
59 EAPI="3"
60
61 @@ -13,9 +13,9 @@
62 LICENSE="GPL-2"
63 SLOT="0"
64 KEYWORDS="~amd64 ~x86"
65 -IUSE="debug mpi static-libs"
66 +IUSE="debug doc mpi static-libs"
67
68 -DEPEND="
69 +RDEPEND="
70 dev-libs/maloc[mpi=]
71 dev-libs/libf2c
72 sci-libs/amd
73 @@ -25,14 +25,19 @@
74 sci-libs/umfpack
75 virtual/blas
76 mpi? ( virtual/mpi )"
77 -RDEPEND="${DEPEND}"
78 +DEPEND="
79 + ${RDEPEND}
80 + doc? (
81 + media-gfx/graphviz
82 + app-doc/doxygen )"
83
84 S="${WORKDIR}/${PN}"
85
86 src_prepare() {
87 rm -rf src/{amd,blas,lapack,arpack,superlu,umfpack}
88 epatch \
89 - "${FILESDIR}"/${PV}-linking.patch
90 + "${FILESDIR}"/${PV}-linking.patch \
91 + "${FILESDIR}"/${PV}-doc.patch
92
93 cp tools/tests/pmg/*.f src/pmg/ -f
94 cp tools/tests/pmg/*.c src/pmg/ -f
95 @@ -42,21 +47,31 @@
96 }
97
98 src_configure() {
99 - export FETK_INCLUDE="${EPREFIX}/usr/include"
100 - export FETK_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
101 + local fetk_include
102 + local fetk_lib
103 + local myconf
104 +
105 + use doc || myconf="${myconf} --with-doxygen= --with-dot="
106 +
107 + fetk_include="${EPREFIX}"/usr/include
108 + fetk_lib="${EPREFIX}"/usr/$(get_libdir)
109 + export FETK_INCLUDE="${fetk_include}"
110 + export FETK_LIBRARY="${fetk_lib}"
111 export FETK_LAPACK_LIBRARY="$(pkg-config --libs lapack)"
112 - export FETK_BLAS_LIBRARY="${FETK_LIBRARY}"
113 + export FETK_BLAS_LIBRARY="${fetk_lib}"
114 export FETK_SUPERLU_LIBRARY="-lsuperlu"
115 - export FETK_ARPACK_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
116 - export FETK_UMFPACK_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
117 - export FETK_CGCODE_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
118 - export FETK_AMD_LIBRARY="${EPREFIX}/usr/$(get_libdir)"
119 + export FETK_ARPACK_LIBRARY="${fetk_lib}"
120 + export FETK_UMFPACK_LIBRARY="${fetk_lib}"
121 + export FETK_CGCODE_LIBRARY="${fetk_lib}"
122 + export FETK_AMD_LIBRARY="${fetk_lib}"
123
124 econf \
125 $(use_enable static-libs static) \
126 $(use_enable debug vdebug) \
127 --enable-shared \
128 - --disable-triplet
129 + --docdir="${EPREFIX}"/usr/share/doc/${PF} \
130 + --disable-triplet \
131 + ${myconf}
132 }
133
134 src_install() {