[dev-libs/Ice] sync up
This commit is contained in:
		| @@ -14,7 +14,7 @@ PHP_EXT_ZENDEXT="no" | ||||
|  | ||||
| PHP_EXT_OPTIONAL_USE=php | ||||
|  | ||||
| USE_PHP="php7-2" | ||||
| USE_PHP="php7-3" | ||||
|  | ||||
| EGIT_REPO_URI="https://github.com/zeroc-ice/ice.git" | ||||
| EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}" | ||||
| @@ -130,10 +130,10 @@ src_configure() { | ||||
| 	} | ||||
|  | ||||
| 	MAKE_RULES=( | ||||
| 		"prefix=\"${ED%/}/usr\"" | ||||
| 		"install_docdir=\"${ED%/}/usr/share/doc/${PF}\"" | ||||
| 		"install_configdir=\"${ED%/}/usr/share/${P}/config\"" | ||||
| 		"install_mandir=\"${ED%/}/usr/share/man/man1\"" | ||||
| 		"prefix=\"${ED}/usr\"" | ||||
| 		"install_docdir=\"${ED}/usr/share/doc/${PF}\"" | ||||
| 		"install_configdir=\"${ED}/usr/share/${P}/config\"" | ||||
| 		"install_mandir=\"${ED}/usr/share/man/man1\"" | ||||
| 		"embedded_runpath_prefix=\"${EPREFIX}/usr\"" | ||||
| 		"LP64=yes" | ||||
| 		"new_dtags=yes" | ||||
| @@ -161,8 +161,8 @@ src_configure() { | ||||
| 		SITERUBY="$(ruby25 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')" | ||||
| 		SITERUBYARCH="$(ruby25 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')" | ||||
| 		MAKE_RULES_RUBY=( | ||||
| 			"install_rubydir=\"${ED%/}/${SITERUBY}\"" | ||||
| 			"install_libdir=\"${ED%/}/${SITERUBYARCH}\"" | ||||
| 			"install_rubydir=\"${ED}/${SITERUBY}\"" | ||||
| 			"install_libdir=\"${ED}/${SITERUBYARCH}\"" | ||||
| 		) | ||||
|  | ||||
| 		# make it use ruby25 only | ||||
| @@ -182,10 +182,10 @@ src_configure() { | ||||
|  | ||||
| 	MAKE_RULES_MONO=( | ||||
| 		"GACINSTALL=yes" | ||||
| 		"GAC_ROOT=\"${ED%/}/usr/$(get_libdir)\"" | ||||
| 		"GAC_ROOT=\"${ED}/usr/$(get_libdir)\"" | ||||
| 		"GAC_DIR=\"${EPREFIX}/usr/$(get_libdir)\"" | ||||
| 		"install_libdir=\"${ED%/}/usr/$(get_libdir)\"" | ||||
| 		"install_pkgconfigdir=\"${ED%/}/usr/$(get_libdir)/pkgconfig\"" | ||||
| 		"install_libdir=\"${ED}/usr/$(get_libdir)\"" | ||||
| 		"install_pkgconfigdir=\"${ED}/usr/$(get_libdir)/pkgconfig\"" | ||||
| 	) | ||||
|  | ||||
| 	if has_version ">dev-lang/mono-4"; then | ||||
| @@ -246,8 +246,8 @@ src_test() { | ||||
| 			PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \ | ||||
| 				"${MAKE_RULES[@]}" \ | ||||
| 				PYTHON="${EPYTHON}" \ | ||||
| 				install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \ | ||||
| 				install_libdir="\"${D%/}/$(python_get_sitedir)\"" test | ||||
| 				install_pythondir="\"${D}/$(python_get_sitedir)\"" \ | ||||
| 				install_libdir="\"${D}/$(python_get_sitedir)\"" test | ||||
| 		} | ||||
| 		local S="${S}/python" | ||||
| 		python_foreach_impl testing | ||||
| @@ -287,15 +287,15 @@ src_install() { | ||||
| 			doins "${i}" | ||||
| 		done < <(find "${S}/php/lib/" -name '*.php' -print0) | ||||
|  | ||||
| 		pushd "${ED%/}/usr/share/${P}/slice" >/dev/null || die | ||||
| 		pushd "${ED}/usr/share/${P}/slice" >/dev/null || die | ||||
|  | ||||
| 		local -x LD_LIBRARY_PATH="${ED%/}/usr/$(get_libdir):${LD_LIBRARY_PATH}" | ||||
| 		local -x LD_LIBRARY_PATH="${ED}/usr/$(get_libdir):${LD_LIBRARY_PATH}" | ||||
| 		for i in *; do | ||||
| 			mkdir -p "${ED%/}/usr/share/php/${i}" || die | ||||
| 			"${ED%/}"/usr/bin/slice2php \ | ||||
| 				-I"${ED%/}/usr/share/${P}/slice/" --all \ | ||||
| 				--output-dir "${ED%/}/usr/share/php/${i}" \ | ||||
| 				--ice "${ED%/}/usr/share/${P}/slice/${i}"/* | ||||
| 			mkdir -p "${ED}/usr/share/php/${i}" || die | ||||
| 			"${ED}"/usr/bin/slice2php \ | ||||
| 				-I"${ED}/usr/share/${P}/slice/" --all \ | ||||
| 				--output-dir "${ED}/usr/share/php/${i}" \ | ||||
| 				--ice "${ED}/usr/share/${P}/slice/${i}"/* | ||||
| 		done | ||||
|  | ||||
| 		for i in $(php_get_slots); do | ||||
| @@ -310,12 +310,12 @@ src_install() { | ||||
|  | ||||
| 	if use python; then | ||||
| 		installation() { | ||||
| 			mkdir -p "${D%/}/$(python_get_sitedir)" || die | ||||
| 			mkdir -p "${D}/$(python_get_sitedir)" || die | ||||
|  | ||||
| 			emake -C "${BUILD_DIR}" \ | ||||
| 				"${MAKE_RULES[@]}" \ | ||||
| 				install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \ | ||||
| 				install_libdir="\"${D%/}/$(python_get_sitedir)\"" \ | ||||
| 				install_pythondir="\"${D}/$(python_get_sitedir)\"" \ | ||||
| 				install_libdir="\"${D}/$(python_get_sitedir)\"" \ | ||||
| 				install | ||||
| 		} | ||||
| 		local S="${S}/python" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user