Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-chemistry/avogadro: avogadro-1.0.3.ebuild ChangeLog
Date: Thu, 28 Apr 2011 14:22:46
Message-Id: 20110428142235.DB03520054@flycatcher.gentoo.org
1 scarabeus 11/04/28 14:22:35
2
3 Modified: avogadro-1.0.3.ebuild ChangeLog
4 Log:
5 Cleanup the cmake-utils usage.
6
7 (Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.3 sci-chemistry/avogadro/avogadro-1.0.3.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/avogadro/avogadro-1.0.3.ebuild?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/avogadro/avogadro-1.0.3.ebuild?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/avogadro/avogadro-1.0.3.ebuild?r1=1.2&r2=1.3
15
16 Index: avogadro-1.0.3.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-1.0.3.ebuild,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- avogadro-1.0.3.ebuild 27 Apr 2011 07:26:04 -0000 1.2
23 +++ avogadro-1.0.3.ebuild 28 Apr 2011 14:22:35 -0000 1.3
24 @@ -1,15 +1,15 @@
25 # Copyright 1999-2011 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-1.0.3.ebuild,v 1.2 2011/04/27 07:26:04 jlec Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-1.0.3.ebuild,v 1.3 2011/04/28 14:22:35 scarabeus Exp $
29
30 -EAPI=2
31 +EAPI=3
32
33 PYTHON_DEPEND="python? 2:2.5"
34
35 -inherit cmake-utils eutils python
36 +inherit base cmake-utils eutils python
37
38 DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL"
39 -HOMEPAGE="http://avogadro.sourceforge.net/"
40 +HOMEPAGE="http://avogadro.openmolecules.net/"
41 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
42
43 LICENSE="GPL-2"
44 @@ -22,7 +22,7 @@
45 >=x11-libs/qt-gui-4.5.3:4
46 >=x11-libs/qt-opengl-4.5.3:4
47 x11-libs/gl2ps
48 - glsl? ( >=media-libs/glew-1.5.0 )
49 + glsl? ( >=media-libs/glew-1.5.0 )
50 python? (
51 >=dev-libs/boost-1.35
52 >=dev-libs/boost-1.35.0-r5[python]
53 @@ -30,27 +30,25 @@
54 dev-python/sip
55 )"
56 DEPEND="${RDEPEND}
57 - dev-cpp/eigen:2
58 - >=dev-util/cmake-2.6.2"
59 + dev-cpp/eigen:2"
60 +
61 +PATCHES=(
62 + "${FILESDIR}"/1.0.1-gl2ps.patch
63 +)
64
65 pkg_setup() {
66 python_set_active_version 2
67 }
68
69 -src_prepare() {
70 - epatch \
71 - "${FILESDIR}"/1.0.1-gl2ps.patch
72 -}
73 -
74 src_configure() {
75 - local mycmakeargs
76 - mycmakeargs="${mycmakeargs}
77 - -DENABLE_THREADGL=FALSE
78 - -DENABLE_RPATH=OFF
79 - -DENABLE_UPDATE_CHECKER=OFF
80 - $(cmake-utils_use_enable glsl GLSL)
81 + local mycmakeargs=(
82 + "-DENABLE_THREADGL=FALSE"
83 + "-DENABLE_RPATH=OFF"
84 + "-DENABLE_UPDATE_CHECKER=OFF"
85 + $(cmake-utils_use_enable glsl)
86 $(cmake-utils_use_with sse2 SSE2)
87 - $(cmake-utils_use_enable python PYTHON)"
88 + $(cmake-utils_use_enable python)
89 + )
90
91 cmake-utils_src_configure
92 }
93
94
95
96 1.38 sci-chemistry/avogadro/ChangeLog
97
98 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/avogadro/ChangeLog?rev=1.38&view=markup
99 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/avogadro/ChangeLog?rev=1.38&content-type=text/plain
100 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/avogadro/ChangeLog?r1=1.37&r2=1.38
101
102 Index: ChangeLog
103 ===================================================================
104 RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v
105 retrieving revision 1.37
106 retrieving revision 1.38
107 diff -u -r1.37 -r1.38
108 --- ChangeLog 27 Apr 2011 07:26:04 -0000 1.37
109 +++ ChangeLog 28 Apr 2011 14:22:35 -0000 1.38
110 @@ -1,6 +1,9 @@
111 # ChangeLog for sci-chemistry/avogadro
112 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
113 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.37 2011/04/27 07:26:04 jlec Exp $
114 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.38 2011/04/28 14:22:35 scarabeus Exp $
115 +
116 + 28 Apr 2011; Tomáš Chvátal <scarabeus@g.o> avogadro-1.0.3.ebuild:
117 + Cleanup the cmake-utils usage.
118
119 27 Apr 2011; Justin Lecher <jlec@g.o> avogadro-1.0.0.ebuild,
120 avogadro-1.0.1.ebuild, avogadro-1.0.3.ebuild: