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

Collapse All | Expand All

(-)science/eclass/octave-forge.eclass (-3 / +8 lines)
Lines 114-120 Link Here
114
	echo "new_package = struct();" >> "${OCT_TMP}"
114
	echo "new_package = struct();" >> "${OCT_TMP}"
115
115
116
	# add archprefix; needed for >=octave-2.9.15
116
	# add archprefix; needed for >=octave-2.9.15
117
	local libexec_dir="$(octave-config -p LIBEXECDIR)/octave/packages"
117
	local libexec_dir="$(octave-config -p LIBEXECDIR)/octave/packages/${OCT_PKG}"
118
118
119
	echo "new_package.archprefix = \"${libexec_dir}\";" \
119
	echo "new_package.archprefix = \"${libexec_dir}\";" \
120
		>> "${OCT_TMP}"
120
		>> "${OCT_TMP}"
Lines 125-130 Link Here
125
			echo "temp = struct(\"operator\",\"${operator}\",\"package\",\"${pkg_name}\",\"version\",\"${version}\");" >> "${OCT_TMP}"
125
			echo "temp = struct(\"operator\",\"${operator}\",\"package\",\"${pkg_name}\",\"version\",\"${version}\");" >> "${OCT_TMP}"
126
			echo "foo = {temp};" >> "${OCT_TMP}"
126
			echo "foo = {temp};" >> "${OCT_TMP}"
127
			echo "new_package.depends = foo;" >> "${OCT_TMP}"
127
			echo "new_package.depends = foo;" >> "${OCT_TMP}"
128
		elif [[ ${keys[count]} == "name" ]]; then
129
			# make name lower case
130
			echo "new_package.name = lower(\"${values[count]}\");" >> "${OCT_TMP}"
128
		else
131
		else
129
			echo "new_package.${keys[count]} = \"${values[count]}\";" >> "${OCT_TMP}"
132
			echo "new_package.${keys[count]} = \"${values[count]}\";" >> "${OCT_TMP}"
130
		fi
133
		fi
Lines 177-183 Link Here
177
old_packages = load ("${OCT_DATABASE}").global_packages; 
180
old_packages = load ("${OCT_DATABASE}").global_packages; 
178
global_packages = {};
181
global_packages = {};
179
for i=1:length(old_packages);
182
for i=1:length(old_packages);
180
if ( !strcmp(old_packages{i}.name,"${remove_name}"));
183
if ( !strcmpi(old_packages{i}.name,"${remove_name}"));
181
global_packages = {global_packages{:}, old_packages{i}}; endif; endfor;
184
global_packages = {global_packages{:}, old_packages{i}}; endif; endfor;
182
save ("${OCT_DATABASE}","global_packages");
185
save ("${OCT_DATABASE}","global_packages");
183
EOF
186
EOF
Lines 258-264 Link Here
258
261
259
	# install mex/oct files if present
262
	# install mex/oct files if present
260
	if [[ -n "${oct_files}" || -n "${mex_files}" ]]; then
263
	if [[ -n "${oct_files}" || -n "${mex_files}" ]]; then
261
		insinto "${OCT_INSTALL_PKG}/${octave_arch}"
264
		local libexec_dir="$(octave-config -p LIBEXECDIR)/octave/packages"
265
		insinto "${libexec_dir}/${OCT_PKG}/${octave_arch}"
262
		if [[ -n "${oct_files}" ]]; then
266
		if [[ -n "${oct_files}" ]]; then
263
			doins src/*.oct \
267
			doins src/*.oct \
264
				|| die "failed to install oct files"
268
				|| die "failed to install oct files"
Lines 272-277 Link Here
272
	# include PKG_ADD and PKG_DEL
276
	# include PKG_ADD and PKG_DEL
273
	# TODO: need to scan included *.m *.cc files for
277
	# TODO: need to scan included *.m *.cc files for
274
	# additional PKG_ADD/PKG_DEL commands for appending
278
	# additional PKG_ADD/PKG_DEL commands for appending
279
	insinto "${OCT_INSTALL_PKG}"
275
	if [[ -e "${S}/PKG_ADD" ]]; then
280
	if [[ -e "${S}/PKG_ADD" ]]; then
276
		doins "${S}/PKG_ADD" \
281
		doins "${S}/PKG_ADD" \
277
			|| die "failed to install PKG_ADD"
282
			|| die "failed to install PKG_ADD"

Return to bug 179885