Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 312133 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-12 / +26 lines)
Line  Link Here
0
-- Ice-3.4.0.ebuild
0
++ Ice-3.4.0.ebuild
Lines 5-10 Link Here
5
EAPI="2"
5
EAPI="2"
6
6
7
PYTHON_DEPEND="python? 2"
7
PYTHON_DEPEND="python? 2"
8
SUPPORT_PYTHON_ABIS="1"
8
RESTRICT_PYTHON_ABIS="3.*"
9
RESTRICT_PYTHON_ABIS="3.*"
9
RUBY_OPTIONAL="yes"
10
RUBY_OPTIONAL="yes"
10
USE_RUBY="ruby18"
11
USE_RUBY="ruby18"
Lines 31-40 Link Here
31
	!dev-ruby/IceRuby"
32
	!dev-ruby/IceRuby"
32
DEPEND="${RDEPEND}
33
DEPEND="${RDEPEND}
33
	ncurses? ( sys-libs/ncurses sys-libs/readline )
34
	ncurses? ( sys-libs/ncurses sys-libs/readline )
34
	test? ( >=dev-lang/python-2.4 )"
35
	test? ( =dev-lang/python-2* )"
35
36
36
pkg_setup() {
37
pkg_setup() {
37
	use python && python_pkg_setup
38
	if use python || use test; then
39
		python_pkg_setup
40
	fi
38
}
41
}
39
42
40
src_unpack() {
43
src_unpack() {
Lines 104-111 Link Here
104
		cpp/config/Make.rules{,.Linux} py/config/Make.rules || die "sed failed"
107
		cpp/config/Make.rules{,.Linux} py/config/Make.rules || die "sed failed"
105
108
106
	if use python ; then
109
	if use python ; then
107
		MAKE_RULES_PY="install_pythondir=\"${D}/$(python_get_sitedir)\"
110
		python_copy_sources py
108
			install_libdir=\"${D}/$(python_get_sitedir)\""
111
		rm -fr py
109
	fi
112
	fi
110
113
111
	if use ruby ; then
114
	if use ruby ; then
Lines 135-141 Link Here
135
	fi
138
	fi
136
139
137
	if use python ; then
140
	if use python ; then
138
		emake -C py ${MAKE_RULES} ${MAKE_RULES_PY} || die "emake py failed"
141
		building() {
142
			emake ${MAKE_RULES}
143
		}
144
		python_execute_function -s --source-dir py building
139
	fi
145
	fi
140
146
141
	if use ruby ; then
147
	if use ruby ; then
Lines 170-177 Link Here
170
	fi
176
	fi
171
177
172
	if use python ; then
178
	if use python ; then
173
		dodir $(python_get_sitedir)
179
		installation() {
174
		emake -C py ${MAKE_RULES} ${MAKE_RULES_PY} install || die "emake py install failed"
180
			dodir $(python_get_sitedir)
181
			emake ${MAKE_RULES} install_pythondir="\"${D}/$(python_get_sitedir)\"" install_libdir="\"${D}/$(python_get_sitedir)\"" install
182
		}
183
		python_execute_function -s --source-dir py installation
175
184
176
		docinto py
185
		docinto py
177
		dodoc py/CHANGES py/README
186
		dodoc py/CHANGES py/README
Lines 181-187 Link Here
181
			doins -r py/demo/*
190
			doins -r py/demo/*
182
		fi
191
		fi
183
192
184
		cd "${D}/$(python_get_sitedir)"
193
		cd "${D}/$(python_get_sitedir -f)"
185
		PYTHON_MODULES=(*.py)
194
		PYTHON_MODULES=(*.py)
186
		PYTHON_MODULES+=(Glacier2 IceBox IceGrid IcePatch2 IceStorm)
195
		PYTHON_MODULES+=(Glacier2 IceBox IceGrid IcePatch2 IceStorm)
187
		cd "${S}"
196
		cd "${S}"
Lines 220-226 Link Here
220
	emake -C cpp ${MAKE_RULES} test || die "emake test failed"
229
	emake -C cpp ${MAKE_RULES} test || die "emake test failed"
221
230
222
	if use python ; then
231
	if use python ; then
223
		emake -C py ${MAKE_RULES} ${MAKE_RULES_PY} test || die "emake py test failed"
232
		testing() {
233
			rm -f ../py
234
			ln -s py-${PYTHON_ABI} ../py
235
			emake ${MAKE_RULES} test
236
		}
237
		python_execute_function -s --source-dir py testing
224
	fi
238
	fi
225
239
226
	if use ruby ; then
240
	if use ruby ; then
Lines 234-242 Link Here
234
}
248
}
235
249
236
pkg_postinst() {
250
pkg_postinst() {
237
	use python && EAPI="3" python_mod_optimize "${PYTHON_MODULES[@]}"
251
	use python && python_mod_optimize "${PYTHON_MODULES[@]}"
238
}
252
}
239
253
240
pkg_postrm() {
254
pkg_postrm() {
241
	use python && EAPI="3" python_mod_cleanup "${PYTHON_MODULES[@]}"
255
	use python && python_mod_cleanup "${PYTHON_MODULES[@]}"
242
}
256
}

Return to bug 312133