1 |
jlec 12/04/02 06:06:42 |
2 |
|
3 |
Modified: metadata.xml ChangeLog gopenmol-3.00-r2.ebuild |
4 |
Log: |
5 |
Drop tk version restriction, move to EAPI=4 |
6 |
|
7 |
(Portage version: 2.2.0_alpha96/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.5 sci-chemistry/gopenmol/metadata.xml |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gopenmol/metadata.xml?rev=1.5&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gopenmol/metadata.xml?rev=1.5&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gopenmol/metadata.xml?r1=1.4&r2=1.5 |
15 |
|
16 |
Index: metadata.xml |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/metadata.xml,v |
19 |
retrieving revision 1.4 |
20 |
retrieving revision 1.5 |
21 |
diff -u -r1.4 -r1.5 |
22 |
--- metadata.xml 20 Sep 2006 05:09:00 -0000 1.4 |
23 |
+++ metadata.xml 2 Apr 2012 06:06:41 -0000 1.5 |
24 |
@@ -1,5 +1,5 @@ |
25 |
<?xml version="1.0" encoding="UTF-8"?> |
26 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
27 |
<pkgmetadata> |
28 |
-<herd>sci-chemistry</herd> |
29 |
+ <herd>sci-chemistry</herd> |
30 |
</pkgmetadata> |
31 |
|
32 |
|
33 |
|
34 |
1.12 sci-chemistry/gopenmol/ChangeLog |
35 |
|
36 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gopenmol/ChangeLog?rev=1.12&view=markup |
37 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gopenmol/ChangeLog?rev=1.12&content-type=text/plain |
38 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gopenmol/ChangeLog?r1=1.11&r2=1.12 |
39 |
|
40 |
Index: ChangeLog |
41 |
=================================================================== |
42 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/ChangeLog,v |
43 |
retrieving revision 1.11 |
44 |
retrieving revision 1.12 |
45 |
diff -u -r1.11 -r1.12 |
46 |
--- ChangeLog 8 Nov 2010 17:12:40 -0000 1.11 |
47 |
+++ ChangeLog 2 Apr 2012 06:06:41 -0000 1.12 |
48 |
@@ -1,6 +1,10 @@ |
49 |
# ChangeLog for sci-chemistry/gopenmol |
50 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
51 |
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/ChangeLog,v 1.11 2010/11/08 17:12:40 xarthisius Exp $ |
52 |
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
53 |
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/ChangeLog,v 1.12 2012/04/02 06:06:41 jlec Exp $ |
54 |
+ |
55 |
+ 02 Apr 2012; Justin Lecher <jlec@g.o> gopenmol-3.00-r2.ebuild, |
56 |
+ metadata.xml: |
57 |
+ Drop tk version restriction, move to EAPI=4 |
58 |
|
59 |
08 Nov 2010; Kacper Kowalik <xarthisius@g.o> |
60 |
-gopenmol-3.00-r1.ebuild, gopenmol-3.00-r2.ebuild: |
61 |
|
62 |
|
63 |
|
64 |
1.5 sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild |
65 |
|
66 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild?rev=1.5&view=markup |
67 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild?rev=1.5&content-type=text/plain |
68 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild?r1=1.4&r2=1.5 |
69 |
|
70 |
Index: gopenmol-3.00-r2.ebuild |
71 |
=================================================================== |
72 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild,v |
73 |
retrieving revision 1.4 |
74 |
retrieving revision 1.5 |
75 |
diff -u -r1.4 -r1.5 |
76 |
--- gopenmol-3.00-r2.ebuild 8 Nov 2010 17:12:40 -0000 1.4 |
77 |
+++ gopenmol-3.00-r2.ebuild 2 Apr 2012 06:06:41 -0000 1.5 |
78 |
@@ -1,27 +1,27 @@ |
79 |
-# Copyright 1999-2010 Gentoo Foundation |
80 |
+# Copyright 1999-2012 Gentoo Foundation |
81 |
# Distributed under the terms of the GNU General Public License v2 |
82 |
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild,v 1.4 2010/11/08 17:12:40 xarthisius Exp $ |
83 |
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild,v 1.5 2012/04/02 06:06:41 jlec Exp $ |
84 |
|
85 |
-EAPI="3" |
86 |
+EAPI=4 |
87 |
|
88 |
PYTHON_DEPEND="2" |
89 |
|
90 |
inherit eutils multilib prefix python |
91 |
|
92 |
DESCRIPTION="Tool for the visualization and analysis of molecular structures" |
93 |
-HOMEPAGE="http://www.csc.fi/gopenmol" |
94 |
+HOMEPAGE="http://www.csc.fi/gopenmol/" |
95 |
SRC_URI="${HOMEPAGE}/distribute/${P}-linux.tar.gz" |
96 |
|
97 |
LICENSE="as-is" |
98 |
SLOT="0" |
99 |
-KEYWORDS="~amd64 ~x86" |
100 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
101 |
IUSE="" |
102 |
|
103 |
RDEPEND=" |
104 |
- =dev-lang/tk-8.4* |
105 |
+ dev-lang/tk |
106 |
dev-tcltk/bwidget |
107 |
- virtual/jpeg |
108 |
media-libs/freeglut |
109 |
+ virtual/jpeg |
110 |
virtual/opengl |
111 |
x11-libs/libICE |
112 |
x11-libs/libXau |
113 |
@@ -29,47 +29,39 @@ |
114 |
x11-libs/libXi |
115 |
x11-libs/libXmu |
116 |
x11-libs/libXxf86vm" |
117 |
- |
118 |
DEPEND="${RDEPEND}" |
119 |
|
120 |
S="${WORKDIR}/gOpenMol-${PV}/src" |
121 |
|
122 |
pkg_setup() { |
123 |
python_set_active_version 2 |
124 |
+ python_pkg_setup |
125 |
} |
126 |
|
127 |
src_prepare() { |
128 |
- epatch "${FILESDIR}"/${PV}-include-config-for-plugins.patch |
129 |
- epatch "${FILESDIR}"/${PV}-multilib.patch |
130 |
+ epatch \ |
131 |
+ "${FILESDIR}"/${PV}-include-config-for-plugins.patch \ |
132 |
+ "${FILESDIR}"/${PV}-multilib.patch |
133 |
|
134 |
sed \ |
135 |
-e "s:GENTOOLIBDIR:$(get_libdir):g" \ |
136 |
- -i config.mk.ac plugins/config.mk.ac |
137 |
+ -i config.mk.ac plugins/config.mk.ac || die |
138 |
sed "/GOM_TEMP/s:^.*$:GOM_TEMP=\"${EPREFIX}/tmp/:g" -i ../environment.txt || die |
139 |
} |
140 |
|
141 |
src_compile() { |
142 |
- emake || die "emake failed" |
143 |
+ default |
144 |
|
145 |
- # Plugins are not built by default |
146 |
- cd "${S}"/plugins |
147 |
- emake || die "emake plugins failed" |
148 |
- |
149 |
- # Utilities are not built by default |
150 |
- cd "${S}"/utility |
151 |
- emake || die "emake utility failed" |
152 |
+ # Plugins and Utilities are not built by default |
153 |
+ cd "${S}"/plugins && emake |
154 |
+ cd "${S}"/utility && emake |
155 |
} |
156 |
|
157 |
src_install() { |
158 |
- einstall || die "einstall failed" |
159 |
- |
160 |
- cd "${S}"/plugins |
161 |
- einstall || die "einstall plugins failed" |
162 |
- |
163 |
- cd "${S}"/utility |
164 |
- einstall || die "einstall utility failed" |
165 |
+ einstall |
166 |
|
167 |
- dosed /usr/bin/rungOpenMol |
168 |
+ cd "${S}"/plugins && einstall |
169 |
+ cd "${S}"/utility && einstall |
170 |
|
171 |
dosym ../$(get_libdir)/gOpenMol-${PV}/bin/${PN} /usr/bin/${PN} |