[gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2024-03-16 11:53 Conrad Kostecki
  0 siblings, 0 replies; 40+ messages in thread
From: Conrad Kostecki @ 2024-03-16 11:53 UTC (permalink / raw
  To: gentoo-commits

commit:     4af926673d04287d7471056d9d32333a92c650ba
Author:     Robert Förster <Dessa <AT> gmake <DOT> de>
AuthorDate: Sun Feb 18 23:36:05 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 11:52:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4af92667

dev-libs/Ice: version bump

Bug: https://bugs.gentoo.org/905874
Bug: https://bugs.gentoo.org/903121
Closes: https://bugs.gentoo.org/908387

Signed-off-by: Robert Förster <Dessa <AT> gmake.de>
Closes: https://github.com/gentoo/gentoo/pull/35417
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-libs/Ice/Ice-3.7.10-r1.ebuild | 258 ++++++++++++++++++++++++++++++++++++++
 dev-libs/Ice/Ice-3.7.10-r2.ebuild | 258 ++++++++++++++++++++++++++++++++++++++
 dev-libs/Ice/Ice-3.7.10.ebuild    | 258 ++++++++++++++++++++++++++++++++++++++
 dev-libs/Ice/Manifest             |   1 +
 4 files changed, 775 insertions(+)

diff --git a/dev-libs/Ice/Ice-3.7.10-r1.ebuild b/dev-libs/Ice/Ice-3.7.10-r1.ebuild
new file mode 100644
index 000000000000..ea12a33d8738
--- /dev/null
+++ b/dev-libs/Ice/Ice-3.7.10-r1.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby32"
+
+PHP_EXT_NAME="IcePHP"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+PHP_EXT_OPTIONAL_USE=php
+
+USE_PHP="php8-1 php8-2 php8-3"
+
+inherit php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
+
+DESCRIPTION="ICE middleware C++ library and generator tools"
+HOMEPAGE="https://zeroc.com/products/ice"
+SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.7.1.pdf )"
+LICENSE="GPL-2"
+SLOT="0/37"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug doc examples php python ruby test"
+RESTRICT="test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=app-arch/bzip2-1.0.5
+	>=dev-libs/expat-2.0.1
+	dev-libs/libedit
+	dev-cpp/libmcpp
+	dev-db/lmdb:=
+	dev-libs/openssl:0=
+	virtual/libcrypt:=
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( $(ruby_implementation_depend ruby32) )"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		dev-python/passlib[${PYTHON_USEDEP}]
+	)"
+
+# Maintainer notes:
+# TODO: java bindings
+
+S="${WORKDIR}/${P,}"
+PHP_EXT_S="${S}/php"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.7.8-fix-musl-build.patch"
+)
+
+pkg_setup() {
+	# prevent ruby-ng.eclass from messing with pkg_setup
+	return
+}
+
+src_unpack() {
+	# prevent ruby-ng.eclass from messing with src_unpack
+	default
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|-Werror ||g' \
+		config/Make.rules.Linux || die
+
+	# fix for x86 IceBox test
+	sed -i \
+		-e 's|"32"|""|' \
+		scripts/IceBoxUtil.py || die
+
+	if use !test; then
+		# Disable building tests
+		sed -i \
+			-e 's|include \$(top_srcdir)/config/Make.tests.rules||' \
+			config/Make.rules || die
+	fi
+}
+
+src_configure() {
+	MAKE_RULES=(
+		"CONFIGS=shared cpp11-shared"
+		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
+		"OPTIMIZE=$(usex !debug)"
+		"V=1"
+	)
+
+	if use python; then
+		local S="${S}/python"
+		python_copy_sources
+	fi
+
+	if use ruby; then
+		SITERUBY="$(ruby32 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
+		SITERUBYARCH="$(ruby32 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
+		MAKE_RULES_RUBY=(
+			"install_rubydir=\"${EPREFIX}/${SITERUBY}\""
+			"install_rubylibdir=\"${EPREFIX}/${SITERUBYARCH}\""
+		)
+
+		# make it use ruby32 only
+		sed -i \
+			-e 's|RUBY ?= ruby|\032|' \
+			ruby/config/Make.rules || die
+		sed -i \
+			-e 's|env ruby|\032|' \
+			ruby/config/s2rb.rb || die
+		sed -i \
+			-e 's|env ruby|\032|' \
+			ruby/scripts/slice2rb || die
+	fi
+
+	use test && python_setup
+}
+
+src_compile() {
+	# Do not remove this export or build will break!
+	tc-export CXX
+
+	emake -C cpp "${MAKE_RULES[@]}"
+
+	if use php; then
+		local i
+		for i in $(php_get_slots); do
+			mkdir -p "${WORKDIR}/${i}" || die
+			cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
+
+			pushd "${WORKDIR}/${i}" >/dev/null || die
+			ln -s "${S}/cpp" || die
+			ln -s "${S}/config" || die
+			ln -s "${S}/slice" || die
+			ln -s "${S}/Makefile" || die
+
+			emake -C php "${MAKE_RULES[@]}" "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
+			popd >/dev/null || die
+		done
+	fi
+
+	if use python; then
+		building() {
+			emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
+		}
+		local S="${S}/python"
+		python_foreach_impl building
+	fi
+
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
+	fi
+}
+
+src_test() {
+	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	emake -C cpp "${MAKE_RULES[@]}" test
+
+	# php tests require the extension loaded and are therefore skipped
+
+	if use python; then
+		testing() {
+			PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \
+				"${MAKE_RULES[@]}" \
+				PYTHON="${EPYTHON}" \
+				install_pythondir="\"$(python_get_sitedir)\"" \
+				install_libdir="\"$(python_get_sitedir)\"" test
+		}
+		local S="${S}/python"
+		python_foreach_impl testing
+	fi
+
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
+	fi
+}
+
+src_install() {
+	local DOCS=( CHANGELOG*.md README.md )
+	use doc && DOCS+=( "${DISTDIR}/${PN}-3.7.1.pdf" )
+	einstalldocs
+
+	MAKE_RULES_INSTALL=(
+		"prefix=\"${ED}/usr\""
+		"install_docdir=\"${ED}/usr/share/doc/${PF}\""
+		"install_configdir=\"${ED}/usr/share/${P}/config\""
+		"install_mandir=\"${ED}/usr/share/man/man1\""
+	)
+
+	insinto /usr/share/${P}
+	doins -r slice
+
+	emake -C cpp "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" install
+
+	if use examples; then
+		docinto examples-cpp
+		dodoc cpp/config/*.cfg
+		docompress -x /usr/share/doc/${PF}/examples-cpp
+	fi
+
+	if use php; then
+		insinto "/usr/share/php/${PN}"
+
+		local i
+		while IFS="" read -d $'\0' -r i; do
+			doins "${i}"
+		done < <(find "${S}/php/lib/" -name '*.php' -print0)
+
+		pushd "${ED}/usr/share/${P}/slice" >/dev/null || die
+
+		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}"/*
+		done
+
+		for i in $(php_get_slots); do
+			php_init_slot_env "${i}"
+			insinto "${EXT_DIR}"
+			newins "php/lib/ice.so" "${PHP_EXT_NAME}.so"
+		done
+		php-ext-source-r3_createinifiles
+
+		popd >/dev/null || die
+	fi
+
+	if use python; then
+		installation() {
+			mkdir -p "${D}/$(python_get_sitedir)" || die
+
+			emake -C "${BUILD_DIR}" \
+				"${MAKE_RULES[@]}" \
+				"${MAKE_RULES_INSTALL[@]}" \
+				install_pythondir="\"${D}/$(python_get_sitedir)\"" \
+				install_libdir="\"${D}/$(python_get_sitedir)\"" \
+				install
+			python_optimize
+		}
+		local S="${S}/python"
+		python_foreach_impl installation
+	fi
+
+	if use ruby; then
+		MAKE_RULES_RUBY=(
+			"install_rubydir=\"${ED}/${SITERUBY}\""
+			"install_rubylibdir=\"${ED}/${SITERUBYARCH}\""
+		)
+		dodir "${SITERUBY}"
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" "${MAKE_RULES_RUBY[@]}" install
+	fi
+}

diff --git a/dev-libs/Ice/Ice-3.7.10-r2.ebuild b/dev-libs/Ice/Ice-3.7.10-r2.ebuild
new file mode 100644
index 000000000000..4aba9b86d0f6
--- /dev/null
+++ b/dev-libs/Ice/Ice-3.7.10-r2.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby33"
+
+PHP_EXT_NAME="IcePHP"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+PHP_EXT_OPTIONAL_USE=php
+
+USE_PHP="php8-1 php8-2 php8-3"
+
+inherit php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
+
+DESCRIPTION="ICE middleware C++ library and generator tools"
+HOMEPAGE="https://zeroc.com/products/ice"
+SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.7.1.pdf )"
+LICENSE="GPL-2"
+SLOT="0/37"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug doc examples php python ruby test"
+RESTRICT="test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=app-arch/bzip2-1.0.5
+	>=dev-libs/expat-2.0.1
+	dev-libs/libedit
+	dev-cpp/libmcpp
+	dev-db/lmdb:=
+	dev-libs/openssl:0=
+	virtual/libcrypt:=
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( $(ruby_implementation_depend ruby33) )"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		dev-python/passlib[${PYTHON_USEDEP}]
+	)"
+
+# Maintainer notes:
+# TODO: java bindings
+
+S="${WORKDIR}/${P,}"
+PHP_EXT_S="${S}/php"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.7.8-fix-musl-build.patch"
+)
+
+pkg_setup() {
+	# prevent ruby-ng.eclass from messing with pkg_setup
+	return
+}
+
+src_unpack() {
+	# prevent ruby-ng.eclass from messing with src_unpack
+	default
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|-Werror ||g' \
+		config/Make.rules.Linux || die
+
+	# fix for x86 IceBox test
+	sed -i \
+		-e 's|"32"|""|' \
+		scripts/IceBoxUtil.py || die
+
+	if use !test; then
+		# Disable building tests
+		sed -i \
+			-e 's|include \$(top_srcdir)/config/Make.tests.rules||' \
+			config/Make.rules || die
+	fi
+}
+
+src_configure() {
+	MAKE_RULES=(
+		"CONFIGS=shared cpp11-shared"
+		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
+		"OPTIMIZE=$(usex !debug)"
+		"V=1"
+	)
+
+	if use python; then
+		local S="${S}/python"
+		python_copy_sources
+	fi
+
+	if use ruby; then
+		SITERUBY="$(ruby33 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
+		SITERUBYARCH="$(ruby33 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
+		MAKE_RULES_RUBY=(
+			"install_rubydir=\"${EPREFIX}/${SITERUBY}\""
+			"install_rubylibdir=\"${EPREFIX}/${SITERUBYARCH}\""
+		)
+
+		# make it use ruby33 only
+		sed -i \
+			-e 's|RUBY ?= ruby|\033|' \
+			ruby/config/Make.rules || die
+		sed -i \
+			-e 's|env ruby|\033|' \
+			ruby/config/s2rb.rb || die
+		sed -i \
+			-e 's|env ruby|\033|' \
+			ruby/scripts/slice2rb || die
+	fi
+
+	use test && python_setup
+}
+
+src_compile() {
+	# Do not remove this export or build will break!
+	tc-export CXX
+
+	emake -C cpp "${MAKE_RULES[@]}"
+
+	if use php; then
+		local i
+		for i in $(php_get_slots); do
+			mkdir -p "${WORKDIR}/${i}" || die
+			cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
+
+			pushd "${WORKDIR}/${i}" >/dev/null || die
+			ln -s "${S}/cpp" || die
+			ln -s "${S}/config" || die
+			ln -s "${S}/slice" || die
+			ln -s "${S}/Makefile" || die
+
+			emake -C php "${MAKE_RULES[@]}" "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
+			popd >/dev/null || die
+		done
+	fi
+
+	if use python; then
+		building() {
+			emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
+		}
+		local S="${S}/python"
+		python_foreach_impl building
+	fi
+
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
+	fi
+}
+
+src_test() {
+	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	emake -C cpp "${MAKE_RULES[@]}" test
+
+	# php tests require the extension loaded and are therefore skipped
+
+	if use python; then
+		testing() {
+			PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \
+				"${MAKE_RULES[@]}" \
+				PYTHON="${EPYTHON}" \
+				install_pythondir="\"$(python_get_sitedir)\"" \
+				install_libdir="\"$(python_get_sitedir)\"" test
+		}
+		local S="${S}/python"
+		python_foreach_impl testing
+	fi
+
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
+	fi
+}
+
+src_install() {
+	local DOCS=( CHANGELOG*.md README.md )
+	use doc && DOCS+=( "${DISTDIR}/${PN}-3.7.1.pdf" )
+	einstalldocs
+
+	MAKE_RULES_INSTALL=(
+		"prefix=\"${ED}/usr\""
+		"install_docdir=\"${ED}/usr/share/doc/${PF}\""
+		"install_configdir=\"${ED}/usr/share/${P}/config\""
+		"install_mandir=\"${ED}/usr/share/man/man1\""
+	)
+
+	insinto /usr/share/${P}
+	doins -r slice
+
+	emake -C cpp "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" install
+
+	if use examples; then
+		docinto examples-cpp
+		dodoc cpp/config/*.cfg
+		docompress -x /usr/share/doc/${PF}/examples-cpp
+	fi
+
+	if use php; then
+		insinto "/usr/share/php/${PN}"
+
+		local i
+		while IFS="" read -d $'\0' -r i; do
+			doins "${i}"
+		done < <(find "${S}/php/lib/" -name '*.php' -print0)
+
+		pushd "${ED}/usr/share/${P}/slice" >/dev/null || die
+
+		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}"/*
+		done
+
+		for i in $(php_get_slots); do
+			php_init_slot_env "${i}"
+			insinto "${EXT_DIR}"
+			newins "php/lib/ice.so" "${PHP_EXT_NAME}.so"
+		done
+		php-ext-source-r3_createinifiles
+
+		popd >/dev/null || die
+	fi
+
+	if use python; then
+		installation() {
+			mkdir -p "${D}/$(python_get_sitedir)" || die
+
+			emake -C "${BUILD_DIR}" \
+				"${MAKE_RULES[@]}" \
+				"${MAKE_RULES_INSTALL[@]}" \
+				install_pythondir="\"${D}/$(python_get_sitedir)\"" \
+				install_libdir="\"${D}/$(python_get_sitedir)\"" \
+				install
+			python_optimize
+		}
+		local S="${S}/python"
+		python_foreach_impl installation
+	fi
+
+	if use ruby; then
+		MAKE_RULES_RUBY=(
+			"install_rubydir=\"${ED}/${SITERUBY}\""
+			"install_rubylibdir=\"${ED}/${SITERUBYARCH}\""
+		)
+		dodir "${SITERUBY}"
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" "${MAKE_RULES_RUBY[@]}" install
+	fi
+}

diff --git a/dev-libs/Ice/Ice-3.7.10.ebuild b/dev-libs/Ice/Ice-3.7.10.ebuild
new file mode 100644
index 000000000000..8eee5f47692a
--- /dev/null
+++ b/dev-libs/Ice/Ice-3.7.10.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby31"
+
+PHP_EXT_NAME="IcePHP"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+PHP_EXT_OPTIONAL_USE=php
+
+USE_PHP="php8-1 php8-2 php8-3"
+
+inherit php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
+
+DESCRIPTION="ICE middleware C++ library and generator tools"
+HOMEPAGE="https://zeroc.com/products/ice"
+SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.7.1.pdf )"
+LICENSE="GPL-2"
+SLOT="0/37"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug doc examples php python ruby test"
+RESTRICT="test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=app-arch/bzip2-1.0.5
+	>=dev-libs/expat-2.0.1
+	dev-libs/libedit
+	dev-cpp/libmcpp
+	dev-db/lmdb:=
+	dev-libs/openssl:0=
+	virtual/libcrypt:=
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( $(ruby_implementation_depend ruby31) )"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		dev-python/passlib[${PYTHON_USEDEP}]
+	)"
+
+# Maintainer notes:
+# TODO: java bindings
+
+S="${WORKDIR}/${P,}"
+PHP_EXT_S="${S}/php"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.7.8-fix-musl-build.patch"
+)
+
+pkg_setup() {
+	# prevent ruby-ng.eclass from messing with pkg_setup
+	return
+}
+
+src_unpack() {
+	# prevent ruby-ng.eclass from messing with src_unpack
+	default
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|-Werror ||g' \
+		config/Make.rules.Linux || die
+
+	# fix for x86 IceBox test
+	sed -i \
+		-e 's|"32"|""|' \
+		scripts/IceBoxUtil.py || die
+
+	if use !test; then
+		# Disable building tests
+		sed -i \
+			-e 's|include \$(top_srcdir)/config/Make.tests.rules||' \
+			config/Make.rules || die
+	fi
+}
+
+src_configure() {
+	MAKE_RULES=(
+		"CONFIGS=shared cpp11-shared"
+		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
+		"OPTIMIZE=$(usex !debug)"
+		"V=1"
+	)
+
+	if use python; then
+		local S="${S}/python"
+		python_copy_sources
+	fi
+
+	if use ruby; then
+		SITERUBY="$(ruby31 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
+		SITERUBYARCH="$(ruby31 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
+		MAKE_RULES_RUBY=(
+			"install_rubydir=\"${EPREFIX}/${SITERUBY}\""
+			"install_rubylibdir=\"${EPREFIX}/${SITERUBYARCH}\""
+		)
+
+		# make it use ruby31 only
+		sed -i \
+			-e 's|RUBY ?= ruby|\031|' \
+			ruby/config/Make.rules || die
+		sed -i \
+			-e 's|env ruby|\031|' \
+			ruby/config/s2rb.rb || die
+		sed -i \
+			-e 's|env ruby|\031|' \
+			ruby/scripts/slice2rb || die
+	fi
+
+	use test && python_setup
+}
+
+src_compile() {
+	# Do not remove this export or build will break!
+	tc-export CXX
+
+	emake -C cpp "${MAKE_RULES[@]}"
+
+	if use php; then
+		local i
+		for i in $(php_get_slots); do
+			mkdir -p "${WORKDIR}/${i}" || die
+			cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
+
+			pushd "${WORKDIR}/${i}" >/dev/null || die
+			ln -s "${S}/cpp" || die
+			ln -s "${S}/config" || die
+			ln -s "${S}/slice" || die
+			ln -s "${S}/Makefile" || die
+
+			emake -C php "${MAKE_RULES[@]}" "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
+			popd >/dev/null || die
+		done
+	fi
+
+	if use python; then
+		building() {
+			emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
+		}
+		local S="${S}/python"
+		python_foreach_impl building
+	fi
+
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
+	fi
+}
+
+src_test() {
+	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	emake -C cpp "${MAKE_RULES[@]}" test
+
+	# php tests require the extension loaded and are therefore skipped
+
+	if use python; then
+		testing() {
+			PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \
+				"${MAKE_RULES[@]}" \
+				PYTHON="${EPYTHON}" \
+				install_pythondir="\"$(python_get_sitedir)\"" \
+				install_libdir="\"$(python_get_sitedir)\"" test
+		}
+		local S="${S}/python"
+		python_foreach_impl testing
+	fi
+
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
+	fi
+}
+
+src_install() {
+	local DOCS=( CHANGELOG*.md README.md )
+	use doc && DOCS+=( "${DISTDIR}/${PN}-3.7.1.pdf" )
+	einstalldocs
+
+	MAKE_RULES_INSTALL=(
+		"prefix=\"${ED}/usr\""
+		"install_docdir=\"${ED}/usr/share/doc/${PF}\""
+		"install_configdir=\"${ED}/usr/share/${P}/config\""
+		"install_mandir=\"${ED}/usr/share/man/man1\""
+	)
+
+	insinto /usr/share/${P}
+	doins -r slice
+
+	emake -C cpp "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" install
+
+	if use examples; then
+		docinto examples-cpp
+		dodoc cpp/config/*.cfg
+		docompress -x /usr/share/doc/${PF}/examples-cpp
+	fi
+
+	if use php; then
+		insinto "/usr/share/php/${PN}"
+
+		local i
+		while IFS="" read -d $'\0' -r i; do
+			doins "${i}"
+		done < <(find "${S}/php/lib/" -name '*.php' -print0)
+
+		pushd "${ED}/usr/share/${P}/slice" >/dev/null || die
+
+		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}"/*
+		done
+
+		for i in $(php_get_slots); do
+			php_init_slot_env "${i}"
+			insinto "${EXT_DIR}"
+			newins "php/lib/ice.so" "${PHP_EXT_NAME}.so"
+		done
+		php-ext-source-r3_createinifiles
+
+		popd >/dev/null || die
+	fi
+
+	if use python; then
+		installation() {
+			mkdir -p "${D}/$(python_get_sitedir)" || die
+
+			emake -C "${BUILD_DIR}" \
+				"${MAKE_RULES[@]}" \
+				"${MAKE_RULES_INSTALL[@]}" \
+				install_pythondir="\"${D}/$(python_get_sitedir)\"" \
+				install_libdir="\"${D}/$(python_get_sitedir)\"" \
+				install
+			python_optimize
+		}
+		local S="${S}/python"
+		python_foreach_impl installation
+	fi
+
+	if use ruby; then
+		MAKE_RULES_RUBY=(
+			"install_rubydir=\"${ED}/${SITERUBY}\""
+			"install_rubylibdir=\"${ED}/${SITERUBYARCH}\""
+		)
+		dodir "${SITERUBY}"
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" "${MAKE_RULES_RUBY[@]}" install
+	fi
+}

diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index 933d0fc9164c..28150860b9ca 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -1,2 +1,3 @@
 DIST Ice-3.7.1.pdf 9351739 BLAKE2B 527f2c37aea19aedbfc580efd93ce4fae2eb7264342bb485822593e2da6fb75a61eea2b1a46187898af07f138d10bf9a213d0b2a0685c18cd1d4c624709a935b SHA512 199b59f14b87b2896ba970bf5aa32f6fd858cbd3fed18eac93acafe4e296db1361ca2d2000ed49f3390ed66c1d4ff8c1fcd3f14ab8197d7804c87fce422c8486
+DIST Ice-3.7.10.tar.gz 10120858 BLAKE2B a39a693975c53b7d1b1431f211e9682e8b8ffea62c63005c5158354a54807fc6966cff83f94ed6f86de1e5a2104cee3ac43eb12b9e9f406b67f9e77ffc78a800 SHA512 638ca8721db1559aae80c43663a1210ba9c8f72d58003f2d9457048c9100bee74036910917d1d10bf5b998ba49f0878177e094b436c83d3deb63613f9075483d
 DIST Ice-3.7.8.tar.gz 11056950 BLAKE2B 66686d6e66a997badef53ee30782775047a2fa39d70fa8ed73c5e7a1bad3c3899efd8d68f557a416caacd65860a73834a6bdc3188730fa19a3f1e47f028c5e21 SHA512 eb5863cb5e83000199c27a5a505a19e5f1ec05e8575eb9cdc03f6db30447212e3b02e6adc70fb2ae6ddc63cfd93bc2b6b290f38919364ee9f08b238a0aa11e88


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2024-10-07 10:35 Sam James
  0 siblings, 0 replies; 40+ messages in thread
From: Sam James @ 2024-10-07 10:35 UTC (permalink / raw
  To: gentoo-commits

commit:     e53709535d458cc71393246d41650307ce0f75b4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  7 10:25:17 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct  7 10:34:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5370953

dev-libs/Ice: stabilize 3.7.10-r1 for amd64, x86

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/Ice/Ice-3.7.10-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/Ice/Ice-3.7.10-r1.ebuild b/dev-libs/Ice/Ice-3.7.10-r1.ebuild
index ea12a33d8738..364d462629c1 100644
--- a/dev-libs/Ice/Ice-3.7.10-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.7.10-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.7.1.pdf )"
 LICENSE="GPL-2"
 SLOT="0/37"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="debug doc examples php python ruby test"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2023-08-19  7:36 Hans de Graaff
  0 siblings, 0 replies; 40+ messages in thread
From: Hans de Graaff @ 2023-08-19  7:36 UTC (permalink / raw
  To: gentoo-commits

commit:     10dc7ae2a5e8f0122a6b96f0a756cc4bc32593e5
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 07:36:35 2023 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 07:36:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10dc7ae2

dev-libs/Ice: drop 3.7.8-r1

Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 dev-libs/Ice/Ice-3.7.8-r1.ebuild | 258 ---------------------------------------
 1 file changed, 258 deletions(-)

diff --git a/dev-libs/Ice/Ice-3.7.8-r1.ebuild b/dev-libs/Ice/Ice-3.7.8-r1.ebuild
deleted file mode 100644
index 4def5e25988d..000000000000
--- a/dev-libs/Ice/Ice-3.7.8-r1.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby30"
-
-PHP_EXT_NAME="IcePHP"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-PHP_EXT_OPTIONAL_USE=php
-
-USE_PHP="php8-0 php8-1 php8-2"
-
-inherit php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
-
-DESCRIPTION="ICE middleware C++ library and generator tools"
-HOMEPAGE="https://zeroc.com/products/ice"
-SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.7.1.pdf )"
-LICENSE="GPL-2"
-SLOT="0/37"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="debug doc examples php python ruby test"
-RESTRICT="test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=app-arch/bzip2-1.0.5
-	>=dev-libs/expat-2.0.1
-	dev-libs/libedit
-	dev-cpp/libmcpp
-	dev-db/lmdb:=
-	dev-libs/openssl:0=
-	virtual/libcrypt:=
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby30) )"
-DEPEND="${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		dev-python/passlib[${PYTHON_USEDEP}]
-	)"
-
-# Maintainer notes:
-# TODO: java bindings
-
-S="${WORKDIR}/${P,}"
-PHP_EXT_S="${S}/php"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-musl-build.patch"
-	"${FILESDIR}/${P}-py3k11.patch"
-)
-
-pkg_setup() {
-	# prevent ruby-ng.eclass from messing with pkg_setup
-	return
-}
-
-src_unpack() {
-	# prevent ruby-ng.eclass from messing with src_unpack
-	default
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|-Werror ||g' \
-		config/Make.rules.Linux || die
-
-	# fix for x86 IceBox test
-	sed -i \
-		-e 's|"32"|""|' \
-		scripts/IceBoxUtil.py || die
-
-	if use !test; then
-		# Disable building tests
-		sed -i \
-			-e 's|include \$(top_srcdir)/config/Make.tests.rules||' \
-			config/Make.rules || die
-	fi
-}
-
-src_configure() {
-	MAKE_RULES=(
-		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
-		"OPTIMIZE=$(usex !debug)"
-		"V=1"
-	)
-
-	if use python; then
-		local S="${S}/python"
-		python_copy_sources
-	fi
-
-	if use ruby; then
-		SITERUBY="$(ruby30 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
-		SITERUBYARCH="$(ruby30 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
-		MAKE_RULES_RUBY=(
-			"install_rubydir=\"${EPREFIX}/${SITERUBY}\""
-			"install_rubylibdir=\"${EPREFIX}/${SITERUBYARCH}\""
-		)
-
-		# make it use ruby30 only
-		sed -i \
-			-e 's|RUBY ?= ruby|\030|' \
-			ruby/config/Make.rules || die
-		sed -i \
-			-e 's|env ruby|\030|' \
-			ruby/config/s2rb.rb || die
-		sed -i \
-			-e 's|env ruby|\030|' \
-			ruby/scripts/slice2rb || die
-	fi
-
-	use test && python_setup
-}
-
-src_compile() {
-	# Do not remove this export or build will break!
-	tc-export CXX
-
-	emake -C cpp "${MAKE_RULES[@]}"
-
-	if use php; then
-		local i
-		for i in $(php_get_slots); do
-			mkdir -p "${WORKDIR}/${i}" || die
-			cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
-
-			pushd "${WORKDIR}/${i}" >/dev/null || die
-			ln -s "${S}/cpp" || die
-			ln -s "${S}/config" || die
-			ln -s "${S}/slice" || die
-			ln -s "${S}/Makefile" || die
-
-			emake -C php "${MAKE_RULES[@]}" "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
-			popd >/dev/null || die
-		done
-	fi
-
-	if use python; then
-		building() {
-			emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
-		}
-		local S="${S}/python"
-		python_foreach_impl building
-	fi
-
-	if use ruby; then
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
-	fi
-}
-
-src_test() {
-	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	emake -C cpp "${MAKE_RULES[@]}" test
-
-	# php tests require the extension loaded and are therefore skipped
-
-	if use python; then
-		testing() {
-			PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \
-				"${MAKE_RULES[@]}" \
-				PYTHON="${EPYTHON}" \
-				install_pythondir="\"$(python_get_sitedir)\"" \
-				install_libdir="\"$(python_get_sitedir)\"" test
-		}
-		local S="${S}/python"
-		python_foreach_impl testing
-	fi
-
-	if use ruby; then
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
-	fi
-}
-
-src_install() {
-	local DOCS=( CHANGELOG*.md README.md )
-	use doc && DOCS+=( "${DISTDIR}/${PN}-3.7.1.pdf" )
-	einstalldocs
-
-	MAKE_RULES_INSTALL=(
-		"prefix=\"${ED}/usr\""
-		"install_docdir=\"${ED}/usr/share/doc/${PF}\""
-		"install_configdir=\"${ED}/usr/share/${P}/config\""
-		"install_mandir=\"${ED}/usr/share/man/man1\""
-	)
-
-	insinto /usr/share/${P}
-	doins -r slice
-
-	emake -C cpp "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" install
-
-	if use examples; then
-		docinto examples-cpp
-		dodoc cpp/config/*.cfg
-		docompress -x /usr/share/doc/${PF}/examples-cpp
-	fi
-
-	if use php; then
-		insinto "/usr/share/php/${PN}"
-
-		local i
-		while IFS="" read -d $'\0' -r i; do
-			doins "${i}"
-		done < <(find "${S}/php/lib/" -name '*.php' -print0)
-
-		pushd "${ED}/usr/share/${P}/slice" >/dev/null || die
-
-		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}"/*
-		done
-
-		for i in $(php_get_slots); do
-			php_init_slot_env "${i}"
-			insinto "${EXT_DIR}"
-			newins "php/lib/ice.so" "${PHP_EXT_NAME}.so"
-		done
-		php-ext-source-r3_createinifiles
-
-		popd >/dev/null || die
-	fi
-
-	if use python; then
-		installation() {
-			mkdir -p "${D}/$(python_get_sitedir)" || die
-
-			emake -C "${BUILD_DIR}" \
-				"${MAKE_RULES[@]}" \
-				"${MAKE_RULES_INSTALL[@]}" \
-				install_pythondir="\"${D}/$(python_get_sitedir)\"" \
-				install_libdir="\"${D}/$(python_get_sitedir)\"" \
-				install
-			python_optimize
-		}
-		local S="${S}/python"
-		python_foreach_impl installation
-	fi
-
-	if use ruby; then
-		MAKE_RULES_RUBY=(
-			"install_rubydir=\"${ED}/${SITERUBY}\""
-			"install_rubylibdir=\"${ED}/${SITERUBYARCH}\""
-		)
-		dodir "${SITERUBY}"
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" "${MAKE_RULES_RUBY[@]}" install
-	fi
-}


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2023-06-12  4:41 Sam James
  0 siblings, 0 replies; 40+ messages in thread
From: Sam James @ 2023-06-12  4:41 UTC (permalink / raw
  To: gentoo-commits

commit:     b4948f8135e47f0877d9e837fdd6fdf8ff7c4a9f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 12 04:41:18 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 12 04:41:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4948f81

dev-libs/Ice: Stabilize 3.7.8-r2 x86, #908386

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/Ice/Ice-3.7.8-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/Ice/Ice-3.7.8-r2.ebuild b/dev-libs/Ice/Ice-3.7.8-r2.ebuild
index e3fdf719566d..856169e328a6 100644
--- a/dev-libs/Ice/Ice-3.7.8-r2.ebuild
+++ b/dev-libs/Ice/Ice-3.7.8-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.7.1.pdf )"
 LICENSE="GPL-2"
 SLOT="0/37"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="debug doc examples php python ruby test"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2023-06-12  4:39 Sam James
  0 siblings, 0 replies; 40+ messages in thread
From: Sam James @ 2023-06-12  4:39 UTC (permalink / raw
  To: gentoo-commits

commit:     416b296b101d9043e423d49a2aac0d9445a7d402
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 12 04:39:45 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 12 04:39:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=416b296b

dev-libs/Ice: Stabilize 3.7.8-r2 amd64, #908386

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/Ice/Ice-3.7.8-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/Ice/Ice-3.7.8-r2.ebuild b/dev-libs/Ice/Ice-3.7.8-r2.ebuild
index d5b02cf406ba..e3fdf719566d 100644
--- a/dev-libs/Ice/Ice-3.7.8-r2.ebuild
+++ b/dev-libs/Ice/Ice-3.7.8-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.7.1.pdf )"
 LICENSE="GPL-2"
 SLOT="0/37"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="debug doc examples php python ruby test"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2023-03-30  9:56 Sam James
  0 siblings, 0 replies; 40+ messages in thread
From: Sam James @ 2023-03-30  9:56 UTC (permalink / raw
  To: gentoo-commits

commit:     b1875ce49ae7cb7a55dc8443ab5396881b9ddea0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 09:56:10 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 09:56:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1875ce4

dev-libs/Ice: Stabilize 3.7.8-r1 amd64, #903570

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/Ice/Ice-3.7.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/Ice/Ice-3.7.8-r1.ebuild b/dev-libs/Ice/Ice-3.7.8-r1.ebuild
index 40345ee3fabd..eb0023df3b90 100644
--- a/dev-libs/Ice/Ice-3.7.8-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.7.8-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.7.1.pdf )"
 LICENSE="GPL-2"
 SLOT="0/37"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="debug doc examples php python ruby test"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2023-03-30  9:56 Sam James
  0 siblings, 0 replies; 40+ messages in thread
From: Sam James @ 2023-03-30  9:56 UTC (permalink / raw
  To: gentoo-commits

commit:     72ca7ea868e96c2280d64f56d5bdafc38a00e027
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 09:56:11 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 09:56:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72ca7ea8

dev-libs/Ice: Stabilize 3.7.8-r1 x86, #903570

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/Ice/Ice-3.7.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/Ice/Ice-3.7.8-r1.ebuild b/dev-libs/Ice/Ice-3.7.8-r1.ebuild
index eb0023df3b90..4def5e25988d 100644
--- a/dev-libs/Ice/Ice-3.7.8-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.7.8-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.7.1.pdf )"
 LICENSE="GPL-2"
 SLOT="0/37"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="debug doc examples php python ruby test"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2022-08-18 16:45 Arthur Zamarin
  0 siblings, 0 replies; 40+ messages in thread
From: Arthur Zamarin @ 2022-08-18 16:45 UTC (permalink / raw
  To: gentoo-commits

commit:     defb1e13fe86879e8b6bd75564cb297ac1300fee
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 18 16:45:34 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 16:45:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=defb1e13

dev-libs/Ice: Keyword 3.6.5-r2 arm64, #834851

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-libs/Ice/Ice-3.6.5-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/Ice/Ice-3.6.5-r2.ebuild b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
index 1d587cc3dcef..24cac8c57252 100644
--- a/dev-libs/Ice/Ice-3.6.5-r2.ebuild
+++ b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.6.4.pdf )"
 LICENSE="GPL-2"
 SLOT="0/36"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="debug doc examples +readline mono php python ruby test"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2022-07-09  6:33 Hans de Graaff
  0 siblings, 0 replies; 40+ messages in thread
From: Hans de Graaff @ 2022-07-09  6:33 UTC (permalink / raw
  To: gentoo-commits

commit:     7d1515622135338a281378a417e1cb35fdf66179
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  9 06:32:12 2022 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 06:33:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d151562

dev-libs/Ice: also update ruby dependency

Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 dev-libs/Ice/Ice-3.6.5-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/Ice/Ice-3.6.5-r2.ebuild b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
index c7ed15eb9628..1d587cc3dcef 100644
--- a/dev-libs/Ice/Ice-3.6.5-r2.ebuild
+++ b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
@@ -41,7 +41,7 @@ RDEPEND=">=dev-libs/expat-2.0.1
 	)
 	dev-cpp/libmcpp
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby26) )
+	ruby? ( $(ruby_implementation_depend ruby27) )
 	mono? ( dev-lang/mono )"
 DEPEND="${RDEPEND}
 	readline? ( sys-libs/readline:0= )


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2022-06-26  7:45 Hans de Graaff
  0 siblings, 0 replies; 40+ messages in thread
From: Hans de Graaff @ 2022-06-26  7:45 UTC (permalink / raw
  To: gentoo-commits

commit:     6c8af8790de123caf7fb2bdc996980ef6efca464
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 07:45:14 2022 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 07:45:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c8af879

dev-libs/Ice: update ruby target to ruby27

Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 dev-libs/Ice/Ice-3.6.5-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/Ice/Ice-3.6.5-r2.ebuild b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
index e42e4205502a..c7ed15eb9628 100644
--- a/dev-libs/Ice/Ice-3.6.5-r2.ebuild
+++ b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8..10} )
 
 RUBY_OPTIONAL="yes"
-USE_RUBY="ruby26"
+USE_RUBY="ruby27"
 
 PHP_EXT_NAME="IcePHP"
 PHP_EXT_INI="yes"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2022-06-10 17:54 Conrad Kostecki
  0 siblings, 0 replies; 40+ messages in thread
From: Conrad Kostecki @ 2022-06-10 17:54 UTC (permalink / raw
  To: gentoo-commits

commit:     f3489e8da4fc83b9254d6087fb0b500b7da08c26
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 17:53:15 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 17:53:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3489e8d

dev-libs/Ice: add python3_10 support

Closes: https://bugs.gentoo.org/845657
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-libs/Ice/Ice-3.6.5-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/Ice/Ice-3.6.5-r2.ebuild b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
index 7a584459e1ec..e42e4205502a 100644
--- a/dev-libs/Ice/Ice-3.6.5-r2.ebuild
+++ b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby26"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2021-07-14  4:10 Sam James
  0 siblings, 0 replies; 40+ messages in thread
From: Sam James @ 2021-07-14  4:10 UTC (permalink / raw
  To: gentoo-commits

commit:     89230846f8a73539b812bdff8898a395eeb30119
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 14 03:59:58 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 04:09:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89230846

dev-libs/Ice: add misisng libcrypt dependency

Closes: https://bugs.gentoo.org/801979
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/Ice/{Ice-3.6.5-r1.ebuild => Ice-3.6.5-r2.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-libs/Ice/Ice-3.6.5-r1.ebuild b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
similarity index 99%
rename from dev-libs/Ice/Ice-3.6.5-r1.ebuild
rename to dev-libs/Ice/Ice-3.6.5-r2.ebuild
index 56dd843d69f..7a584459e1e 100644
--- a/dev-libs/Ice/Ice-3.6.5-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
@@ -35,6 +35,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND=">=dev-libs/expat-2.0.1
 	>=app-arch/bzip2-1.0.5
 	dev-libs/openssl:0=
+	virtual/libcrypt:=
 	|| (
 		$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
 	)


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2021-06-06  7:21 Hans de Graaff
  0 siblings, 0 replies; 40+ messages in thread
From: Hans de Graaff @ 2021-06-06  7:21 UTC (permalink / raw
  To: gentoo-commits

commit:     ab7d5bc5fb39fa9fdea905af5b3df37817dc3085
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  6 07:20:30 2021 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Jun  6 07:21:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab7d5bc5

dev-libs/Ice: cleanup of ruby25-only ebuild

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 dev-libs/Ice/Ice-3.6.5.ebuild | 335 ------------------------------------------
 1 file changed, 335 deletions(-)

diff --git a/dev-libs/Ice/Ice-3.6.5.ebuild b/dev-libs/Ice/Ice-3.6.5.ebuild
deleted file mode 100644
index e9232fc67c0..00000000000
--- a/dev-libs/Ice/Ice-3.6.5.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby25"
-
-PHP_EXT_NAME="IcePHP"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-PHP_EXT_OPTIONAL_USE=php
-
-USE_PHP="php7-4"
-
-# This variable does not belong to any eclass. It is solely used in this ebuild
-BERKDB_SLOTS=( 6.2 6.1 5.3 5.1 4.8 )
-
-inherit db-use mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
-
-DESCRIPTION="ICE middleware C++ library and generator tools"
-HOMEPAGE="https://zeroc.com/products/ice"
-SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.6.4.pdf )"
-LICENSE="GPL-2"
-SLOT="0/36"
-KEYWORDS="amd64 ~arm x86"
-IUSE="debug doc examples +readline mono php python ruby test"
-RESTRICT="test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/expat-2.0.1
-	>=app-arch/bzip2-1.0.5
-	dev-libs/openssl:0=
-	|| (
-		$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
-	)
-	dev-cpp/libmcpp
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby25) )
-	mono? ( dev-lang/mono )"
-DEPEND="${RDEPEND}
-	readline? ( sys-libs/readline:0= )
-	test? (
-		${PYTHON_DEPS}
-		dev-python/passlib[${PYTHON_USEDEP}]
-	)"
-
-# Maintainer notes:
-# TODO: java bindings
-
-S="${WORKDIR}/${P,}"
-PHP_EXT_S="${S}/php"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.6.3-no-arch-opts.patch"
-	"${FILESDIR}/${P}-db6.patch"
-	"${FILESDIR}/${P}-csharp.patch"
-)
-
-pkg_setup() {
-	# prevent ruby-ng.eclass from messing with pkg_setup
-	return
-}
-
-src_unpack() {
-	# prevent ruby-ng.eclass from messing with src_unpack
-	default
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|-L\$\(libdir\)||' \
-		cpp/config/Make.rules || die
-
-	sed -i \
-		-e 's|-O2 ||g' \
-		-e 's|-Werror ||g' \
-		cpp/config/Make.rules.Linux || die
-
-	sed -i \
-		-e 's|install-common||' \
-		{cpp,csharp,php,python,ruby}/Makefile || die
-
-	sed -i \
-		-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
-		csharp/config/Make.rules.cs || die
-
-	# skip mono tests, bug #498484
-	sed -i \
-		-e '/SUBDIRS/s|\ test||' \
-		csharp/Makefile || die
-
-	# skip udp test due to multicast
-	# skip IceGrid/admin bug #649850
-	# skip IceSSL tests due to requirement of internet connection
-	# skip IceStorm/single bug #636834
-	# IceUtil/stacktrace and IceStorm/stress fail with USE=debug
-	# Glacier2/staticFiltering requires network access
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress --rfilter=IceUtil\/stacktrace --rfilter=Glacier2\/staticFiltering|' \
-		cpp/Makefile || die
-
-	# fails even on unicode locale
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
-		ruby/Makefile || die
-
-	# fix for x86 IceBox test
-	sed -i \
-		-e 's|"32"|""|' \
-		scripts/TestUtil.py || die
-}
-
-src_configure() {
-	suitable_db_version() {
-		local ver
-		for ver in "${BERKDB_SLOTS[@]}"; do
-			if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
-				echo "${ver}"
-				return 0
-			fi
-		done
-		die "No suitable BerkDB versions found, aborting"
-	}
-
-	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\""
-		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
-		"LP64=yes"
-		"new_dtags=yes"
-		"NOTEST=$(usex !test)"
-		"USE_READLINE=$(usex readline)"
-		"OPTIMIZE=$(usex !debug)"
-	)
-
-	local BERKDB_VERSION="$(suitable_db_version)"
-	MAKE_RULES+=("DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})")
-	sed -i \
-		-e "s|g++|$(tc-getCXX)|" \
-		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
-		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
-		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
-		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
-		cpp/config/Make.rules{,.Linux} python/config/Make.rules || die
-
-	if use python; then
-		local S="${S}/python"
-		python_copy_sources
-	fi
-
-	if use ruby; then
-		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}\""
-		)
-
-		# make it use ruby25 only
-		sed -i \
-			-e 's|RUBY = ruby|\025|' \
-			ruby/config/Make.rules || die
-		sed -i \
-			-e 's|env ruby|\025|' \
-			ruby/config/s2rb.rb || die
-		sed -i \
-			-e 's|env ruby|\025|' \
-			ruby/scripts/slice2rb || die
-		sed -i \
-			-e 's|output.write("ruby|\025|' \
-			scripts/TestUtil.py || die
-	fi
-
-	MAKE_RULES_MONO=(
-		"GACINSTALL=yes"
-		"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\""
-	)
-
-	if has_version ">dev-lang/mono-4"; then
-		MAKE_RULES_MONO+=("MCS=mcs")
-	fi
-
-	use test && python_setup
-}
-
-src_compile() {
-	# Do not remove this export or build will break!
-	tc-export CXX
-
-	emake -C cpp "${MAKE_RULES[@]}"
-
-	if use php; then
-		local i
-		for i in $(php_get_slots); do
-			mkdir -p "${WORKDIR}/${i}" || die
-			cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
-
-			pushd "${WORKDIR}/${i}" >/dev/null || die
-			ln -s "${S}/cpp" || die
-			ln -s "${S}/config" || die
-			ln -s "${S}/slice" || die
-			ln -s "${S}/Makefile" || die
-
-			emake -C php "${MAKE_RULES[@]}" USE_NAMESPACES=yes "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
-			popd >/dev/null || die
-		done
-	fi
-
-	if use python; then
-		building() {
-			emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
-		}
-		local S="${S}/python"
-		python_foreach_impl building
-	fi
-
-	if use ruby; then
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
-	fi
-
-	if use mono; then
-		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}"
-	fi
-}
-
-src_test() {
-	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	emake -C cpp "${MAKE_RULES[@]}" test
-
-	# php tests require the extension loaded and are therefore skipped
-
-	if use python; then
-		testing() {
-			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
-		}
-		local S="${S}/python"
-		python_foreach_impl testing
-	fi
-
-	if use ruby; then
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
-	fi
-
-	if use mono; then
-		# skip mono tests, bug #498484
-		ewarn "Tests for C# are currently disabled."
-		#emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" test
-	fi
-}
-
-src_install() {
-	local DOCS=( CHANGELOG*.md README.md )
-	use doc && DOCS+=( "${DISTDIR}/${PN}-3.6.4.pdf" )
-	einstalldocs
-
-	insinto /usr/share/${P}
-	doins -r slice
-
-	emake -C cpp "${MAKE_RULES[@]}" install
-
-	if use examples; then
-		docinto examples-cpp
-		dodoc cpp/config/*.cfg
-		docompress -x /usr/share/doc/${PF}/examples-cpp
-	fi
-
-	if use php; then
-		insinto "/usr/share/php/${PN}"
-
-		local i
-		while IFS="" read -d $'\0' -r i; do
-			doins "${i}"
-		done < <(find "${S}/php/lib/" -name '*.php' -print0)
-
-		pushd "${ED}/usr/share/${P}/slice" >/dev/null || die
-
-		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}"/*
-		done
-
-		for i in $(php_get_slots); do
-			php_init_slot_env "${i}"
-			insinto "${EXT_DIR}"
-			newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
-		done
-		php-ext-source-r3_createinifiles
-
-		popd >/dev/null || die
-	fi
-
-	if use python; then
-		installation() {
-			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
-			python_optimize
-		}
-		local S="${S}/python"
-		python_foreach_impl installation
-	fi
-
-	if use ruby; then
-		dodir "${SITERUBY}"
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install
-	fi
-
-	if use mono; then
-		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" install
-	fi
-}


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2021-06-06  7:16 Agostino Sarubbo
  0 siblings, 0 replies; 40+ messages in thread
From: Agostino Sarubbo @ 2021-06-06  7:16 UTC (permalink / raw
  To: gentoo-commits

commit:     45b88b3c01a46dc4fae19abd5f7915aff0bdcbd0
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  6 07:16:15 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jun  6 07:16:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45b88b3c

dev-libs/Ice: x86 stable wrt bug #794127

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-libs/Ice/Ice-3.6.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/Ice/Ice-3.6.5-r1.ebuild b/dev-libs/Ice/Ice-3.6.5-r1.ebuild
index 54958deb92d..56dd843d69f 100644
--- a/dev-libs/Ice/Ice-3.6.5-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.6.5-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.6.4.pdf )"
 LICENSE="GPL-2"
 SLOT="0/36"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug doc examples +readline mono php python ruby test"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2021-06-06  7:14 Agostino Sarubbo
  0 siblings, 0 replies; 40+ messages in thread
From: Agostino Sarubbo @ 2021-06-06  7:14 UTC (permalink / raw
  To: gentoo-commits

commit:     debc66faaaebebeab71a9decd3445f281dcc9326
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  6 07:14:13 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jun  6 07:14:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=debc66fa

dev-libs/Ice: amd64 stable wrt bug #794127

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-libs/Ice/Ice-3.6.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/Ice/Ice-3.6.5-r1.ebuild b/dev-libs/Ice/Ice-3.6.5-r1.ebuild
index 15dcb235df9..54958deb92d 100644
--- a/dev-libs/Ice/Ice-3.6.5-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.6.5-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.6.4.pdf )"
 LICENSE="GPL-2"
 SLOT="0/36"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="debug doc examples +readline mono php python ruby test"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2021-04-30 18:01 Mikle Kolyada
  0 siblings, 0 replies; 40+ messages in thread
From: Mikle Kolyada @ 2021-04-30 18:01 UTC (permalink / raw
  To: gentoo-commits

commit:     c296de99b0065e496926d7526feb216c6bbf2910
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 17:48:48 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 18:01:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c296de99

dev-libs/Ice: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 dev-libs/Ice/Ice-3.6.5-r1.ebuild | 7 +++----
 dev-libs/Ice/Ice-3.6.5.ebuild    | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/dev-libs/Ice/Ice-3.6.5-r1.ebuild b/dev-libs/Ice/Ice-3.6.5-r1.ebuild
index 2644b52cd8e..15dcb235df9 100644
--- a/dev-libs/Ice/Ice-3.6.5-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.6.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,14 +28,13 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/36"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug doc examples libressl +readline mono php python ruby test"
+IUSE="debug doc examples +readline mono php python ruby test"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=dev-libs/expat-2.0.1
 	>=app-arch/bzip2-1.0.5
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	|| (
 		$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
 	)

diff --git a/dev-libs/Ice/Ice-3.6.5.ebuild b/dev-libs/Ice/Ice-3.6.5.ebuild
index 160a2f0eebe..e9232fc67c0 100644
--- a/dev-libs/Ice/Ice-3.6.5.ebuild
+++ b/dev-libs/Ice/Ice-3.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,14 +28,13 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/36"
 KEYWORDS="amd64 ~arm x86"
-IUSE="debug doc examples libressl +readline mono php python ruby test"
+IUSE="debug doc examples +readline mono php python ruby test"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=dev-libs/expat-2.0.1
 	>=app-arch/bzip2-1.0.5
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	|| (
 		$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
 	)


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2020-07-22  9:01 Agostino Sarubbo
  0 siblings, 0 replies; 40+ messages in thread
From: Agostino Sarubbo @ 2020-07-22  9:01 UTC (permalink / raw
  To: gentoo-commits

commit:     a6053bdb9886a7aef20d257e71cd3f6bebc94efd
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 22 09:01:16 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jul 22 09:01:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6053bdb

dev-libs/Ice: amd64 stable wrt bug #733344

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-libs/Ice/Ice-3.6.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/Ice/Ice-3.6.5.ebuild b/dev-libs/Ice/Ice-3.6.5.ebuild
index 7154107b159..95a18a2c859 100644
--- a/dev-libs/Ice/Ice-3.6.5.ebuild
+++ b/dev-libs/Ice/Ice-3.6.5.ebuild
@@ -27,7 +27,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.6.4.pdf )"
 LICENSE="GPL-2"
 SLOT="0/36"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug doc examples libressl +readline mono php python ruby test"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2020-07-21 10:44 Agostino Sarubbo
  0 siblings, 0 replies; 40+ messages in thread
From: Agostino Sarubbo @ 2020-07-21 10:44 UTC (permalink / raw
  To: gentoo-commits

commit:     97e6b21b2c16cdf8738798225c7ea13679362948
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 21 10:44:31 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 10:44:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e6b21b

dev-libs/Ice: x86 stable wrt bug #733344

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-libs/Ice/Ice-3.6.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/Ice/Ice-3.6.5.ebuild b/dev-libs/Ice/Ice-3.6.5.ebuild
index eded3b0ee7c..7154107b159 100644
--- a/dev-libs/Ice/Ice-3.6.5.ebuild
+++ b/dev-libs/Ice/Ice-3.6.5.ebuild
@@ -27,7 +27,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.6.4.pdf )"
 LICENSE="GPL-2"
 SLOT="0/36"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE="debug doc examples libressl +readline mono php python ruby test"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2020-07-15 15:10 Lars Wendler
  0 siblings, 0 replies; 40+ messages in thread
From: Lars Wendler @ 2020-07-15 15:10 UTC (permalink / raw
  To: gentoo-commits

commit:     bbbaab01473a452dfa9dc9a4f99476d1e1b35226
Author:     Robert Förster <Dessa <AT> gmake <DOT> de>
AuthorDate: Fri Jun 12 10:38:53 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jul 15 15:10:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbbaab01

dev-libs/Ice: add ruby 2.6 revision

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Robert Förster <Dessa <AT> gmake.de>
Closes: https://github.com/gentoo/gentoo/pull/14198
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-libs/Ice/Ice-3.6.5-r1.ebuild | 336 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 336 insertions(+)

diff --git a/dev-libs/Ice/Ice-3.6.5-r1.ebuild b/dev-libs/Ice/Ice-3.6.5-r1.ebuild
new file mode 100644
index 00000000000..dee0d929265
--- /dev/null
+++ b/dev-libs/Ice/Ice-3.6.5-r1.ebuild
@@ -0,0 +1,336 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby26"
+
+PHP_EXT_NAME="IcePHP"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+PHP_EXT_OPTIONAL_USE=php
+
+USE_PHP="php7-4"
+
+# This variable does not belong to any eclass. It is solely used in this ebuild
+BERKDB_SLOTS=( 6.2 6.1 5.3 5.1 4.8 )
+
+inherit db-use mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
+
+DESCRIPTION="ICE middleware C++ library and generator tools"
+HOMEPAGE="https://zeroc.com/products/ice"
+SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.6.4.pdf )"
+LICENSE="GPL-2"
+SLOT="0/36"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug doc examples libressl +readline mono php python ruby test"
+RESTRICT="test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=dev-libs/expat-2.0.1
+	>=app-arch/bzip2-1.0.5
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	|| (
+		$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
+	)
+	dev-cpp/libmcpp
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( $(ruby_implementation_depend ruby26) )
+	mono? ( dev-lang/mono )"
+DEPEND="${RDEPEND}
+	readline? ( sys-libs/readline:0= )
+	test? (
+		${PYTHON_DEPS}
+		dev-python/passlib[${PYTHON_USEDEP}]
+	)"
+
+# Maintainer notes:
+# TODO: java bindings
+
+S="${WORKDIR}/${P,}"
+PHP_EXT_S="${S}/php"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.6.3-no-arch-opts.patch"
+	"${FILESDIR}/${P}-db6.patch"
+	"${FILESDIR}/${P}-csharp.patch"
+)
+
+pkg_setup() {
+	# prevent ruby-ng.eclass from messing with pkg_setup
+	return
+}
+
+src_unpack() {
+	# prevent ruby-ng.eclass from messing with src_unpack
+	default
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|-L\$\(libdir\)||' \
+		cpp/config/Make.rules || die
+
+	sed -i \
+		-e 's|-O2 ||g' \
+		-e 's|-Werror ||g' \
+		cpp/config/Make.rules.Linux || die
+
+	sed -i \
+		-e 's|install-common||' \
+		{cpp,csharp,php,python,ruby}/Makefile || die
+
+	sed -i \
+		-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
+		csharp/config/Make.rules.cs || die
+
+	# skip mono tests, bug #498484
+	sed -i \
+		-e '/SUBDIRS/s|\ test||' \
+		csharp/Makefile || die
+
+	# skip udp test due to multicast
+	# skip IceGrid/admin bug #649850
+	# skip IceSSL tests due to requirement of internet connection
+	# skip IceStorm/single bug #636834
+	# IceUtil/stacktrace and IceStorm/stress fail with USE=debug
+	# Glacier2/staticFiltering requires network access
+	sed -i \
+		-e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress --rfilter=IceUtil\/stacktrace --rfilter=Glacier2\/staticFiltering|' \
+		cpp/Makefile || die
+
+	# fails even on unicode locale
+	sed -i \
+		-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
+		ruby/Makefile || die
+
+	# fix for x86 IceBox test
+	sed -i \
+		-e 's|"32"|""|' \
+		scripts/TestUtil.py || die
+}
+
+src_configure() {
+	suitable_db_version() {
+		local ver
+		for ver in "${BERKDB_SLOTS[@]}"; do
+			if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
+				echo "${ver}"
+				return 0
+			fi
+		done
+		die "No suitable BerkDB versions found, aborting"
+	}
+
+	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\""
+		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
+		"LP64=yes"
+		"new_dtags=yes"
+		"NOTEST=$(usex !test)"
+		"USE_READLINE=$(usex readline)"
+		"OPTIMIZE=$(usex !debug)"
+	)
+
+	local BERKDB_VERSION="$(suitable_db_version)"
+	MAKE_RULES+=("DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})")
+	sed -i \
+		-e "s|g++|$(tc-getCXX)|" \
+		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
+		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
+		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
+		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
+		cpp/config/Make.rules{,.Linux} python/config/Make.rules || die
+
+	if use python; then
+		local S="${S}/python"
+		python_copy_sources
+	fi
+
+	if use ruby; then
+		SITERUBY="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
+		SITERUBYARCH="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
+		MAKE_RULES_RUBY=(
+			"install_rubydir=\"${ED}/${SITERUBY}\""
+			"install_libdir=\"${ED}/${SITERUBYARCH}\""
+		)
+
+		# make it use ruby26 only
+		sed -i \
+			-e 's|RUBY = ruby|\026|' \
+			ruby/config/Make.rules || die
+		sed -i \
+			-e 's|env ruby|\026|' \
+			ruby/config/s2rb.rb || die
+		sed -i \
+			-e 's|env ruby|\026|' \
+			ruby/scripts/slice2rb || die
+		sed -i \
+			-e 's|output.write("ruby|\026|' \
+			scripts/TestUtil.py || die
+	fi
+
+	MAKE_RULES_MONO=(
+		"GACINSTALL=yes"
+		"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\""
+	)
+
+	if has_version ">dev-lang/mono-4"; then
+		MAKE_RULES_MONO+=("MCS=mcs")
+	fi
+
+	use test && python_setup
+}
+
+src_compile() {
+	# Do not remove this export or build will break!
+	tc-export CXX
+
+	emake -C cpp "${MAKE_RULES[@]}"
+
+	if use php; then
+		local i
+		for i in $(php_get_slots); do
+			mkdir -p "${WORKDIR}/${i}" || die
+			cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
+
+			pushd "${WORKDIR}/${i}" >/dev/null || die
+			ln -s "${S}/cpp" || die
+			ln -s "${S}/config" || die
+			ln -s "${S}/slice" || die
+			ln -s "${S}/Makefile" || die
+
+			emake -C php "${MAKE_RULES[@]}" USE_NAMESPACES=yes "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
+			popd >/dev/null || die
+		done
+	fi
+
+	if use python; then
+		building() {
+			emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
+		}
+		local S="${S}/python"
+		python_foreach_impl building
+	fi
+
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
+	fi
+
+	if use mono; then
+		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}"
+	fi
+}
+
+src_test() {
+	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	emake -C cpp "${MAKE_RULES[@]}" test
+
+	# php tests require the extension loaded and are therefore skipped
+
+	if use python; then
+		testing() {
+			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
+		}
+		local S="${S}/python"
+		python_foreach_impl testing
+	fi
+
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
+	fi
+
+	if use mono; then
+		# skip mono tests, bug #498484
+		ewarn "Tests for C# are currently disabled."
+		#emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" test
+	fi
+}
+
+src_install() {
+	local DOCS=( CHANGELOG*.md README.md )
+	use doc && DOCS+=( "${DISTDIR}/${PN}-3.6.4.pdf" )
+	einstalldocs
+
+	insinto /usr/share/${P}
+	doins -r slice
+
+	emake -C cpp "${MAKE_RULES[@]}" install
+
+	if use examples; then
+		docinto examples-cpp
+		dodoc cpp/config/*.cfg
+		docompress -x /usr/share/doc/${PF}/examples-cpp
+	fi
+
+	if use php; then
+		insinto "/usr/share/php/${PN}"
+
+		local i
+		while IFS="" read -d $'\0' -r i; do
+			doins "${i}"
+		done < <(find "${S}/php/lib/" -name '*.php' -print0)
+
+		pushd "${ED}/usr/share/${P}/slice" >/dev/null || die
+
+		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}"/*
+		done
+
+		for i in $(php_get_slots); do
+			php_init_slot_env "${i}"
+			insinto "${EXT_DIR}"
+			newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
+		done
+		php-ext-source-r3_createinifiles
+
+		popd >/dev/null || die
+	fi
+
+	if use python; then
+		installation() {
+			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
+			python_optimize
+		}
+		local S="${S}/python"
+		python_foreach_impl installation
+	fi
+
+	if use ruby; then
+		dodir "${SITERUBY}"
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install
+	fi
+
+	if use mono; then
+		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" install
+	fi
+}


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2020-06-14  6:40 Hans de Graaff
  0 siblings, 0 replies; 40+ messages in thread
From: Hans de Graaff @ 2020-06-14  6:40 UTC (permalink / raw
  To: gentoo-commits

commit:     a6266a37bede46bb8e79e4b8de9c84562a8d7bb2
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 13 06:03:11 2020 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Jun 14 06:40:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6266a37

dev-libs/Ice: cleanup ruby24-only

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 dev-libs/Ice/Ice-3.6.4.ebuild | 357 ------------------------------------------
 1 file changed, 357 deletions(-)

diff --git a/dev-libs/Ice/Ice-3.6.4.ebuild b/dev-libs/Ice/Ice-3.6.4.ebuild
deleted file mode 100644
index e89fe01a3f0..00000000000
--- a/dev-libs/Ice/Ice-3.6.4.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby24"
-
-PHP_EXT_NAME="IcePHP"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-PHP_EXT_OPTIONAL_USE=php
-
-USE_PHP="php7-0"
-
-# This variable does not belong to any eclass. It is solely used in this ebuild
-# db:6.2 breaks the build process
-BERKDB_SLOTS=( 6.1 5.3 5.1 4.8 )
-
-inherit db-use mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs eapi7-ver
-
-DESCRIPTION="ICE middleware C++ library and generator tools"
-HOMEPAGE="https://zeroc.com/products/ice"
-SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( http://download.zeroc.com/Ice/$(ver_cut 1-2)/${P}.pdf )"
-LICENSE="GPL-2"
-SLOT="0/36"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc examples libressl +ncurses mono php python ruby test debug"
-RESTRICT="test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/expat-2.0.1
-	>=app-arch/bzip2-1.0.5
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	|| (
-		$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
-	)
-	dev-cpp/libmcpp
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby24) )
-	mono? ( dev-lang/mono )
-	php? ( dev-lang/php:7.0 )
-	!dev-python/IcePy
-	!dev-ruby/IceRuby"
-DEPEND="${RDEPEND}
-	ncurses? ( sys-libs/ncurses:0= sys-libs/readline:0= )
-	test? (
-		${PYTHON_DEPS}
-		dev-python/passlib[${PYTHON_USEDEP}]
-	)"
-
-# Maintainer notes:
-# TODO: java bindings, multiple ruby versions (supports 2.{1,2,3})
-
-S="${WORKDIR}/${P/I/i}"
-PHP_EXT_S="${S}/php"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.6.3-no-arch-opts.patch"
-	"${FILESDIR}/${PN}-3.6.3-csharp.patch"
-	#"${FILESDIR}/${PN}-3.6.3-libressl.patch"
-)
-
-pkg_setup() {
-	# prevent ruby-ng.eclass from messing with pkg_setup
-	return
-}
-
-src_unpack() {
-	# prevent ruby-ng.eclass from messing with src_unpack
-	default
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \
-		-e 's|-L\$\(libdir\)||' \
-		cpp/config/Make.rules || die "sed failed"
-
-	sed -i \
-		-e 's|\(install_phpdir[[:space:]]*\):=|\1?=|' \
-		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
-		php/config/Make.rules.php || die "sed failed"
-
-	sed -i \
-		-e 's|\(install_pythondir[[:space:]]*\)=|\1?=|' \
-		-e 's|\(install_rubydir[[:space:]]*\)=|\1?=|' \
-		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
-		{python,ruby}/config/Make.rules || die "sed failed"
-
-	sed -i \
-		-e 's|-O2 ||g' \
-		-e 's|-Werror ||g' \
-		cpp/config/Make.rules.Linux || die "sed failed"
-
-	sed -i \
-		-e 's|install-common||' \
-		{cpp,csharp,php,python,ruby}/Makefile || die "sed failed"
-
-	sed -i \
-		-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
-		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
-		-e 's|\(install_pkgconfigdir[[:space:]]*\):=|\1?=|' \
-		csharp/config/Make.rules.cs || die "sed failed"
-
-	# skip mono tests, bug #498484
-	sed -i \
-		-e '/SUBDIRS/s|\ test||' \
-		csharp/Makefile || die "sed failed"
-
-	# skip udp test due to multicast
-	# skip IceGrid/admin bug #649850
-	# skip IceSSL tests due to requirement of internet connection
-	# skip IceStorm/single bug #636834
-	# IceStorm/stress fails without USE=debug
-	# IceUtil/stacktrace fails with USE=debug
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress|' \
-		cpp/Makefile || die "sed failed"
-
-	# mainly broken .ice files
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=operations --rfilter=slicing\/objects|' \
-		python/Makefile || die "sed failed"
-
-	# fails even on unicode locale
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
-		ruby/Makefile || die "sed failed"
-
-	# fix for x86 IceBox test
-	sed -i \
-		-e 's|"32"|""|' \
-		scripts/TestUtil.py || die "sed failed"
-}
-
-src_configure() {
-	suitable_db_version() {
-		local ver
-		for ver in "${BERKDB_SLOTS[@]}"; do
-			if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
-				echo "${ver}"
-				return 0
-			fi
-		done
-		die "No suitable BerkDB versions found, aborting"
-	}
-
-	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\""
-		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
-		"LP64=yes"
-		"new_dtags=yes"
-		"NOTEST=$(usex !test)"
-		"USE_READLINE=$(usex ncurses)"
-		"OPTIMIZE=$(usex !debug)"
-	)
-
-	local BERKDB_VERSION="$(suitable_db_version)"
-	MAKE_RULES+=("DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})")
-	sed -i \
-		-e "s|g++|$(tc-getCXX)|" \
-		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
-		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
-		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
-		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
-		cpp/config/Make.rules{,.Linux} python/config/Make.rules || die "sed failed"
-
-	if use python; then
-		local S="${S}/python"
-		python_copy_sources
-	fi
-
-	if use ruby; then
-		SITERUBY="$(ruby24 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
-		MAKE_RULES_RUBY=(
-			"install_rubydir=\"${ED%/}/${SITERUBY}\""
-			"install_libdir=\"${ED%/}/${SITERUBY}\""
-		)
-
-		# make it use ruby24 only
-		sed -i \
-			-e 's|RUBY = ruby|\024|' \
-			ruby/config/Make.rules || die "sed failed"
-		sed -i \
-			-e 's|env ruby|\024|' \
-			ruby/config/s2rb.rb || die "sed failed"
-		sed -i \
-			-e 's|env ruby|\024|' \
-			ruby/scripts/slice2rb || die "sed failed"
-		sed -i \
-			-e 's|output.write("ruby|\024|' \
-			scripts/TestUtil.py || die "sed failed"
-	fi
-
-	MAKE_RULES_MONO=(
-		"GACINSTALL=yes"
-		"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\""
-	)
-
-	if has_version ">dev-lang/mono-4"; then
-		MAKE_RULES_MONO+=("MCS=mcs")
-	fi
-
-	use test && python_setup
-}
-
-src_compile() {
-	# Do not remove this export or build will break!
-	tc-export CXX
-
-	emake -C cpp "${MAKE_RULES[@]}"
-
-	if use php; then
-		local i
-		for i in $(php_get_slots); do
-			mkdir -p "${WORKDIR}/${i}" || die
-			cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
-
-			pushd "${WORKDIR}/${i}" >/dev/null || die
-			ln -s "${S}/cpp" || die
-			ln -s "${S}/config" || die
-			ln -s "${S}/slice" || die
-			ln -s "${S}/Makefile" || die
-
-			emake -C php "${MAKE_RULES[@]}" USE_NAMESPACES=yes "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
-			popd >/dev/null || die
-		done
-	fi
-
-	if use python; then
-		building() {
-			emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
-		}
-		local S="${S}/python"
-		python_foreach_impl building
-	fi
-
-	if use ruby; then
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
-	fi
-
-	if use mono; then
-		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}"
-	fi
-}
-
-src_test() {
-	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	emake -C cpp "${MAKE_RULES[@]}" test
-
-	# php tests require the extension loaded and are therefore skipped
-
-	if use python; then
-		testing() {
-			emake -C "${BUILD_DIR}" \
-				"${MAKE_RULES[@]}" \
-				PYTHON="${EPYTHON}" \
-				install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \
-				install_libdir="\"${D%/}/$(python_get_sitedir)\"" test
-		}
-		local S="${S}/python"
-		python_foreach_impl testing
-	fi
-
-	if use ruby; then
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
-	fi
-
-	if use mono; then
-		# skip mono tests, bug #498484
-		ewarn "Tests for C# are currently disabled."
-		#emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" test
-	fi
-}
-
-src_install() {
-	local DOCS=( CHANGELOG*.md README.md )
-	use doc && DOCS+=( "${DISTDIR}/${P}.pdf" )
-	einstalldocs
-
-	insinto /usr/share/${P}
-	doins -r slice
-
-	emake -C cpp "${MAKE_RULES[@]}" install
-
-	if use examples; then
-		docinto examples-cpp
-		dodoc cpp/config/*.cfg
-		docompress -x /usr/share/doc/${PF}/examples-cpp
-	fi
-
-	if use php; then
-		insinto "/usr/share/php/${PN}"
-
-		local i
-		while IFS="" read -d $'\0' -r i; do
-			doins "${i}"
-		done < <(find "${S}/php/lib/" -name '*.php' -print0)
-
-		pushd "${ED%/}/usr/share/${P}/slice" >/dev/null || die
-
-		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}"/*
-		done
-
-		for i in $(php_get_slots); do
-			php_init_slot_env "${i}"
-			insinto "${EXT_DIR}"
-			newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
-		done
-		php-ext-source-r2_createinifiles
-
-		popd >/dev/null || die
-	fi
-
-	if use python; then
-		installation() {
-			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
-		}
-		local S="${S}/python"
-		python_foreach_impl installation
-	fi
-
-	if use ruby; then
-		dodir "${SITERUBY}"
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install
-	fi
-
-	if use mono; then
-		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" install
-	fi
-}


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2020-04-28  9:42 Agostino Sarubbo
  0 siblings, 0 replies; 40+ messages in thread
From: Agostino Sarubbo @ 2020-04-28  9:42 UTC (permalink / raw
  To: gentoo-commits

commit:     5f5cd58c427815d03218b4c98680f109c6428fbd
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 28 09:42:12 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Apr 28 09:42:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5cd58c

dev-libs/Ice: x86 stable wrt bug #719756

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-libs/Ice/Ice-3.6.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/Ice/Ice-3.6.4-r1.ebuild b/dev-libs/Ice/Ice-3.6.4-r1.ebuild
index c6050912fb5..81c5905a9c1 100644
--- a/dev-libs/Ice/Ice-3.6.4-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.6.4-r1.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( http://download.zeroc.com/Ice/$(ver_cut 1-2)/${P}.pdf )"
 LICENSE="GPL-2"
 SLOT="0/36"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="doc examples libressl +ncurses mono php python ruby test debug"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2020-04-28  9:39 Agostino Sarubbo
  0 siblings, 0 replies; 40+ messages in thread
From: Agostino Sarubbo @ 2020-04-28  9:39 UTC (permalink / raw
  To: gentoo-commits

commit:     d8263dbaaa5769ee66c29ee65e22be379c8ca714
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 28 09:39:10 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Apr 28 09:39:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8263dba

dev-libs/Ice: amd64 stable wrt bug #719756

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-libs/Ice/Ice-3.6.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/Ice/Ice-3.6.4-r1.ebuild b/dev-libs/Ice/Ice-3.6.4-r1.ebuild
index 1f62f1c3f98..c6050912fb5 100644
--- a/dev-libs/Ice/Ice-3.6.4-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.6.4-r1.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( http://download.zeroc.com/Ice/$(ver_cut 1-2)/${P}.pdf )"
 LICENSE="GPL-2"
 SLOT="0/36"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc examples libressl +ncurses mono php python ruby test debug"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2020-03-30  5:39 Hans de Graaff
  0 siblings, 0 replies; 40+ messages in thread
From: Hans de Graaff @ 2020-03-30  5:39 UTC (permalink / raw
  To: gentoo-commits

commit:     1836a6cd1ae1ed8856e7a72ad7f2821607e72591
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 18:05:02 2020 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Mon Mar 30 05:38:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1836a6cd

dev-libs/Ice: use ruby25

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 dev-libs/Ice/Ice-3.6.4-r1.ebuild | 357 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 357 insertions(+)

diff --git a/dev-libs/Ice/Ice-3.6.4-r1.ebuild b/dev-libs/Ice/Ice-3.6.4-r1.ebuild
new file mode 100644
index 00000000000..1f62f1c3f98
--- /dev/null
+++ b/dev-libs/Ice/Ice-3.6.4-r1.ebuild
@@ -0,0 +1,357 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby25"
+
+PHP_EXT_NAME="IcePHP"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+PHP_EXT_OPTIONAL_USE=php
+
+USE_PHP="php7-0"
+
+# This variable does not belong to any eclass. It is solely used in this ebuild
+# db:6.2 breaks the build process
+BERKDB_SLOTS=( 6.1 5.3 5.1 4.8 )
+
+inherit db-use mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs eapi7-ver
+
+DESCRIPTION="ICE middleware C++ library and generator tools"
+HOMEPAGE="https://zeroc.com/products/ice"
+SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	doc? ( http://download.zeroc.com/Ice/$(ver_cut 1-2)/${P}.pdf )"
+LICENSE="GPL-2"
+SLOT="0/36"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples libressl +ncurses mono php python ruby test debug"
+RESTRICT="test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=dev-libs/expat-2.0.1
+	>=app-arch/bzip2-1.0.5
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	|| (
+		$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
+	)
+	dev-cpp/libmcpp
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( $(ruby_implementation_depend ruby25) )
+	mono? ( dev-lang/mono )
+	php? ( dev-lang/php:7.0 )
+	!dev-python/IcePy
+	!dev-ruby/IceRuby"
+DEPEND="${RDEPEND}
+	ncurses? ( sys-libs/ncurses:0= sys-libs/readline:0= )
+	test? (
+		${PYTHON_DEPS}
+		dev-python/passlib[${PYTHON_USEDEP}]
+	)"
+
+# Maintainer notes:
+# TODO: java bindings, multiple ruby versions (supports 2.{1,2,3})
+
+S="${WORKDIR}/${P/I/i}"
+PHP_EXT_S="${S}/php"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.6.3-no-arch-opts.patch"
+	"${FILESDIR}/${PN}-3.6.3-csharp.patch"
+	#"${FILESDIR}/${PN}-3.6.3-libressl.patch"
+)
+
+pkg_setup() {
+	# prevent ruby-ng.eclass from messing with pkg_setup
+	return
+}
+
+src_unpack() {
+	# prevent ruby-ng.eclass from messing with src_unpack
+	default
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \
+		-e 's|-L\$\(libdir\)||' \
+		cpp/config/Make.rules || die "sed failed"
+
+	sed -i \
+		-e 's|\(install_phpdir[[:space:]]*\):=|\1?=|' \
+		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
+		php/config/Make.rules.php || die "sed failed"
+
+	sed -i \
+		-e 's|\(install_pythondir[[:space:]]*\)=|\1?=|' \
+		-e 's|\(install_rubydir[[:space:]]*\)=|\1?=|' \
+		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
+		{python,ruby}/config/Make.rules || die "sed failed"
+
+	sed -i \
+		-e 's|-O2 ||g' \
+		-e 's|-Werror ||g' \
+		cpp/config/Make.rules.Linux || die "sed failed"
+
+	sed -i \
+		-e 's|install-common||' \
+		{cpp,csharp,php,python,ruby}/Makefile || die "sed failed"
+
+	sed -i \
+		-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
+		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
+		-e 's|\(install_pkgconfigdir[[:space:]]*\):=|\1?=|' \
+		csharp/config/Make.rules.cs || die "sed failed"
+
+	# skip mono tests, bug #498484
+	sed -i \
+		-e '/SUBDIRS/s|\ test||' \
+		csharp/Makefile || die "sed failed"
+
+	# skip udp test due to multicast
+	# skip IceGrid/admin bug #649850
+	# skip IceSSL tests due to requirement of internet connection
+	# skip IceStorm/single bug #636834
+	# IceStorm/stress fails without USE=debug
+	# IceUtil/stacktrace fails with USE=debug
+	sed -i \
+		-e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress|' \
+		cpp/Makefile || die "sed failed"
+
+	# mainly broken .ice files
+	sed -i \
+		-e 's|allTests.py|allTests.py --rfilter=operations --rfilter=slicing\/objects|' \
+		python/Makefile || die "sed failed"
+
+	# fails even on unicode locale
+	sed -i \
+		-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
+		ruby/Makefile || die "sed failed"
+
+	# fix for x86 IceBox test
+	sed -i \
+		-e 's|"32"|""|' \
+		scripts/TestUtil.py || die "sed failed"
+}
+
+src_configure() {
+	suitable_db_version() {
+		local ver
+		for ver in "${BERKDB_SLOTS[@]}"; do
+			if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
+				echo "${ver}"
+				return 0
+			fi
+		done
+		die "No suitable BerkDB versions found, aborting"
+	}
+
+	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\""
+		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
+		"LP64=yes"
+		"new_dtags=yes"
+		"NOTEST=$(usex !test)"
+		"USE_READLINE=$(usex ncurses)"
+		"OPTIMIZE=$(usex !debug)"
+	)
+
+	local BERKDB_VERSION="$(suitable_db_version)"
+	MAKE_RULES+=("DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})")
+	sed -i \
+		-e "s|g++|$(tc-getCXX)|" \
+		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
+		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
+		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
+		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
+		cpp/config/Make.rules{,.Linux} python/config/Make.rules || die "sed failed"
+
+	if use python; then
+		local S="${S}/python"
+		python_copy_sources
+	fi
+
+	if use ruby; then
+		SITERUBY="$(ruby25 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
+		MAKE_RULES_RUBY=(
+			"install_rubydir=\"${ED%/}/${SITERUBY}\""
+			"install_libdir=\"${ED%/}/${SITERUBY}\""
+		)
+
+		# make it use ruby25 only
+		sed -i \
+			-e 's|RUBY = ruby|\025|' \
+			ruby/config/Make.rules || die "sed failed"
+		sed -i \
+			-e 's|env ruby|\025|' \
+			ruby/config/s2rb.rb || die "sed failed"
+		sed -i \
+			-e 's|env ruby|\025|' \
+			ruby/scripts/slice2rb || die "sed failed"
+		sed -i \
+			-e 's|output.write("ruby|\025|' \
+			scripts/TestUtil.py || die "sed failed"
+	fi
+
+	MAKE_RULES_MONO=(
+		"GACINSTALL=yes"
+		"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\""
+	)
+
+	if has_version ">dev-lang/mono-4"; then
+		MAKE_RULES_MONO+=("MCS=mcs")
+	fi
+
+	use test && python_setup
+}
+
+src_compile() {
+	# Do not remove this export or build will break!
+	tc-export CXX
+
+	emake -C cpp "${MAKE_RULES[@]}"
+
+	if use php; then
+		local i
+		for i in $(php_get_slots); do
+			mkdir -p "${WORKDIR}/${i}" || die
+			cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
+
+			pushd "${WORKDIR}/${i}" >/dev/null || die
+			ln -s "${S}/cpp" || die
+			ln -s "${S}/config" || die
+			ln -s "${S}/slice" || die
+			ln -s "${S}/Makefile" || die
+
+			emake -C php "${MAKE_RULES[@]}" USE_NAMESPACES=yes "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
+			popd >/dev/null || die
+		done
+	fi
+
+	if use python; then
+		building() {
+			emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
+		}
+		local S="${S}/python"
+		python_foreach_impl building
+	fi
+
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
+	fi
+
+	if use mono; then
+		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}"
+	fi
+}
+
+src_test() {
+	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	emake -C cpp "${MAKE_RULES[@]}" test
+
+	# php tests require the extension loaded and are therefore skipped
+
+	if use python; then
+		testing() {
+			emake -C "${BUILD_DIR}" \
+				"${MAKE_RULES[@]}" \
+				PYTHON="${EPYTHON}" \
+				install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \
+				install_libdir="\"${D%/}/$(python_get_sitedir)\"" test
+		}
+		local S="${S}/python"
+		python_foreach_impl testing
+	fi
+
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
+	fi
+
+	if use mono; then
+		# skip mono tests, bug #498484
+		ewarn "Tests for C# are currently disabled."
+		#emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" test
+	fi
+}
+
+src_install() {
+	local DOCS=( CHANGELOG*.md README.md )
+	use doc && DOCS+=( "${DISTDIR}/${P}.pdf" )
+	einstalldocs
+
+	insinto /usr/share/${P}
+	doins -r slice
+
+	emake -C cpp "${MAKE_RULES[@]}" install
+
+	if use examples; then
+		docinto examples-cpp
+		dodoc cpp/config/*.cfg
+		docompress -x /usr/share/doc/${PF}/examples-cpp
+	fi
+
+	if use php; then
+		insinto "/usr/share/php/${PN}"
+
+		local i
+		while IFS="" read -d $'\0' -r i; do
+			doins "${i}"
+		done < <(find "${S}/php/lib/" -name '*.php' -print0)
+
+		pushd "${ED%/}/usr/share/${P}/slice" >/dev/null || die
+
+		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}"/*
+		done
+
+		for i in $(php_get_slots); do
+			php_init_slot_env "${i}"
+			insinto "${EXT_DIR}"
+			newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
+		done
+		php-ext-source-r2_createinifiles
+
+		popd >/dev/null || die
+	fi
+
+	if use python; then
+		installation() {
+			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
+		}
+		local S="${S}/python"
+		python_foreach_impl installation
+	fi
+
+	if use ruby; then
+		dodir "${SITERUBY}"
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install
+	fi
+
+	if use mono; then
+		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" install
+	fi
+}


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2020-02-10 21:00 Michał Górny
  0 siblings, 0 replies; 40+ messages in thread
From: Michał Górny @ 2020-02-10 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     138d55a97ff46c2916d741fbd77e8119c9fb8fdf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 10 20:44:11 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 21:00:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=138d55a9

dev-libs/Ice: Remove py2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-libs/Ice/Ice-3.6.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/Ice/Ice-3.6.4.ebuild b/dev-libs/Ice/Ice-3.6.4.ebuild
index 82e2bed1fb1..e89fe01a3f0 100644
--- a/dev-libs/Ice/Ice-3.6.4.ebuild
+++ b/dev-libs/Ice/Ice-3.6.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby24"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2019-09-17 11:34 Michał Górny
  0 siblings, 0 replies; 40+ messages in thread
From: Michał Górny @ 2019-09-17 11:34 UTC (permalink / raw
  To: gentoo-commits

commit:     54a4bb43ae86365eb19ac1346b66ff253c219f0f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 11:34:02 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 11:34:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54a4bb43

dev-libs/Ice: Add proxy-maint project

Closes: https://bugs.gentoo.org/687150
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-libs/Ice/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev-libs/Ice/metadata.xml b/dev-libs/Ice/metadata.xml
index 7e0482802dd..f365390e262 100644
--- a/dev-libs/Ice/metadata.xml
+++ b/dev-libs/Ice/metadata.xml
@@ -5,6 +5,10 @@
 		<email>Dessa@gmake.de</email>
 		<name>Robert Förster</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Ice is a C++ middleware technology with bindings for other languages.
 	</longdescription>


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2019-04-09  5:53 Hans de Graaff
  0 siblings, 0 replies; 40+ messages in thread
From: Hans de Graaff @ 2019-04-09  5:53 UTC (permalink / raw
  To: gentoo-commits

commit:     d8cb521bf96ae2ecab9c1f11a108d5429f5e3030
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 16 18:34:02 2019 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Tue Apr  9 05:52:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8cb521b

dev-libs/Ice: cleanup of ruby23-only version

Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-libs/Ice/Ice-3.6.3-r1.ebuild | 357 ---------------------------------------
 dev-libs/Ice/Manifest            |   2 -
 2 files changed, 359 deletions(-)

diff --git a/dev-libs/Ice/Ice-3.6.3-r1.ebuild b/dev-libs/Ice/Ice-3.6.3-r1.ebuild
deleted file mode 100644
index 33984c1d811..00000000000
--- a/dev-libs/Ice/Ice-3.6.3-r1.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby23"
-
-PHP_EXT_NAME="IcePHP"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-PHP_EXT_OPTIONAL_USE=php
-
-USE_PHP="php7-0"
-
-# This variable does not belong to any eclass. It is solely used in this ebuild
-# db:6.2 breaks the build process
-BERKDB_SLOTS=( 6.1 5.3 5.1 4.8 )
-
-inherit db-use eutils mono-env php-ext-source-r2 python-r1 ruby-ng toolchain-funcs versionator
-
-DESCRIPTION="ICE middleware C++ library and generator tools"
-HOMEPAGE="https://zeroc.com/products/ice"
-SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( http://download.zeroc.com/Ice/$(get_version_component_range 1-2)/${P}.pdf )"
-LICENSE="GPL-2"
-SLOT="0/36"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc examples libressl +ncurses mono php python ruby test debug"
-RESTRICT="test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/expat-2.0.1
-	>=app-arch/bzip2-1.0.5
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	|| (
-		$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
-	)
-	dev-cpp/libmcpp
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby23) )
-	mono? ( dev-lang/mono )
-	php? ( dev-lang/php:7.0 )
-	!dev-python/IcePy
-	!dev-ruby/IceRuby"
-DEPEND="${RDEPEND}
-	ncurses? ( sys-libs/ncurses:0= sys-libs/readline:0= )
-	test? (
-		${PYTHON_DEPS}
-		dev-python/passlib[${PYTHON_USEDEP}]
-	)"
-
-# Maintainer notes:
-# TODO: java bindings, multiple ruby versions (supports 2.{1,2,3})
-
-S="${WORKDIR}/${P/I/i}"
-PHP_EXT_S="${S}/php"
-
-PATCHES=(
-	"${FILESDIR}/${P}-no-arch-opts.patch"
-	"${FILESDIR}/${P}-csharp.patch"
-	"${FILESDIR}/${P}-libressl.patch"
-)
-
-pkg_setup() {
-	# prevent ruby-ng.eclass from messing with pkg_setup
-	return
-}
-
-src_unpack() {
-	# prevent ruby-ng.eclass from messing with src_unpack
-	default
-}
-
-src_prepare() {
-	epatch -p1 "${PATCHES[@]}"
-
-	sed -i \
-		-e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \
-		-e 's|-L\$\(libdir\)||' \
-		cpp/config/Make.rules || die "sed failed"
-
-	sed -i \
-		-e 's|\(install_phpdir[[:space:]]*\):=|\1?=|' \
-		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
-		php/config/Make.rules.php || die "sed failed"
-
-	sed -i \
-		-e 's|\(install_pythondir[[:space:]]*\)=|\1?=|' \
-		-e 's|\(install_rubydir[[:space:]]*\)=|\1?=|' \
-		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
-		{python,ruby}/config/Make.rules || die "sed failed"
-
-	sed -i \
-		-e 's|-O2 ||g' \
-		-e 's|-Werror ||g' \
-		cpp/config/Make.rules.Linux || die "sed failed"
-
-	sed -i \
-		-e 's|install-common||' \
-		{cpp,csharp,php,python,ruby}/Makefile || die "sed failed"
-
-	sed -i \
-		-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
-		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
-		-e 's|\(install_pkgconfigdir[[:space:]]*\):=|\1?=|' \
-		csharp/config/Make.rules.cs || die "sed failed"
-
-	# skip mono tests, bug #498484
-	sed -i \
-		-e '/SUBDIRS/s|\ test||' \
-		csharp/Makefile || die "sed failed"
-
-	# skip udp test due to multicast
-	# skip IceGrid/admin bug #649850
-	# skip IceSSL tests due to requirement of internet connection
-	# skip IceStorm/single bug #636834
-	# IceStorm/stress fails without USE=debug
-	# IceUtil/stacktrace fails with USE=debug
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress|' \
-		cpp/Makefile || die "sed failed"
-
-	# mainly broken .ice files
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=operations --rfilter=slicing\/objects|' \
-		python/Makefile || die "sed failed"
-
-	# fails even on unicode locale
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
-		ruby/Makefile || die "sed failed"
-
-	# fix for x86 IceBox test
-	sed -i \
-		-e 's|"32"|""|' \
-		scripts/TestUtil.py || die "sed failed"
-}
-
-src_configure() {
-	suitable_db_version() {
-		local ver
-		for ver in "${BERKDB_SLOTS[@]}"; do
-			if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
-				echo "${ver}"
-				return 0
-			fi
-		done
-		die "No suitable BerkDB versions found, aborting"
-	}
-
-	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\""
-		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
-		"LP64=yes"
-		"new_dtags=yes"
-		"NOTEST=$(usex !test)"
-		"USE_READLINE=$(usex ncurses)"
-		"OPTIMIZE=$(usex !debug)"
-	)
-
-	local BERKDB_VERSION="$(suitable_db_version)"
-	MAKE_RULES+=("DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})")
-	sed -i \
-		-e "s|g++|$(tc-getCXX)|" \
-		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
-		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
-		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
-		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
-		cpp/config/Make.rules{,.Linux} python/config/Make.rules || die "sed failed"
-
-	if use python; then
-		local S="${S}/python"
-		python_copy_sources
-	fi
-
-	if use ruby; then
-		SITERUBY="$(ruby23 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
-		MAKE_RULES_RUBY=(
-			"install_rubydir=\"${ED%/}/${SITERUBY}\""
-			"install_libdir=\"${ED%/}/${SITERUBY}\""
-		)
-
-		# make it use ruby23 only
-		sed -i \
-			-e 's|RUBY = ruby|\023|' \
-			ruby/config/Make.rules || die "sed failed"
-		sed -i \
-			-e 's|env ruby|\023|' \
-			ruby/config/s2rb.rb || die "sed failed"
-		sed -i \
-			-e 's|env ruby|\023|' \
-			ruby/scripts/slice2rb || die "sed failed"
-		sed -i \
-			-e 's|output.write("ruby|\023|' \
-			scripts/TestUtil.py || die "sed failed"
-	fi
-
-	MAKE_RULES_MONO=(
-		"GACINSTALL=yes"
-		"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\""
-	)
-
-	if has_version ">dev-lang/mono-4"; then
-		MAKE_RULES_MONO+=("MCS=mcs")
-	fi
-
-	use test && python_setup
-}
-
-src_compile() {
-	# Do not remove this export or build will break!
-	tc-export CXX
-
-	emake -C cpp "${MAKE_RULES[@]}"
-
-	if use php; then
-		local i
-		for i in $(php_get_slots); do
-			mkdir -p "${WORKDIR}/${i}" || die
-			cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
-
-			pushd "${WORKDIR}/${i}" >/dev/null || die
-			ln -s "${S}/cpp" || die
-			ln -s "${S}/config" || die
-			ln -s "${S}/slice" || die
-			ln -s "${S}/Makefile" || die
-
-			emake -C php "${MAKE_RULES[@]}" USE_NAMESPACES=yes "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
-			popd >/dev/null || die
-		done
-	fi
-
-	if use python; then
-		building() {
-			emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
-		}
-		local S="${S}/python"
-		python_foreach_impl building
-	fi
-
-	if use ruby; then
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
-	fi
-
-	if use mono; then
-		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}"
-	fi
-}
-
-src_test() {
-	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	emake -C cpp "${MAKE_RULES[@]}" test
-
-	# php tests require the extension loaded and are therefore skipped
-
-	if use python; then
-		testing() {
-			emake -C "${BUILD_DIR}" \
-				"${MAKE_RULES[@]}" \
-				PYTHON="${EPYTHON}" \
-				install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \
-				install_libdir="\"${D%/}/$(python_get_sitedir)\"" test
-		}
-		local S="${S}/python"
-		python_foreach_impl testing
-	fi
-
-	if use ruby; then
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
-	fi
-
-	if use mono; then
-		# skip mono tests, bug #498484
-		ewarn "Tests for C# are currently disabled."
-		#emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" test
-	fi
-}
-
-src_install() {
-	local DOCS=( CHANGELOG*.md README.md )
-	use doc && DOCS+=( "${DISTDIR}/${P}.pdf" )
-	einstalldocs
-
-	insinto /usr/share/${P}
-	doins -r slice
-
-	emake -C cpp "${MAKE_RULES[@]}" install
-
-	if use examples; then
-		docinto examples-cpp
-		dodoc cpp/config/*.cfg
-		docompress -x /usr/share/doc/${PF}/examples-cpp
-	fi
-
-	if use php; then
-		insinto "/usr/share/php/${PN}"
-
-		local i
-		while IFS="" read -d $'\0' -r i; do
-			doins "${i}"
-		done < <(find "${S}/php/lib/" -name '*.php' -print0)
-
-		pushd "${ED%/}/usr/share/${P}/slice" >/dev/null || die
-
-		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}"/*
-		done
-
-		for i in $(php_get_slots); do
-			php_init_slot_env "${i}"
-			insinto "${EXT_DIR}"
-			newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
-		done
-		php-ext-source-r2_createinifiles
-
-		popd >/dev/null || die
-	fi
-
-	if use python; then
-		installation() {
-			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
-		}
-		local S="${S}/python"
-		python_foreach_impl installation
-	fi
-
-	if use ruby; then
-		dodir "${SITERUBY}"
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install
-	fi
-
-	if use mono; then
-		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" install
-	fi
-}

diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index 918af29c33d..2f01fc407b0 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -1,4 +1,2 @@
-DIST Ice-3.6.3.pdf 8844957 BLAKE2B 137e3ce85885305931cbbb2c838ccc52175dffb7ad51264837b2db77eea05987ebecc5e3678e2f589bef1cc94c133f0f298ecce23031fcf2654621921c2bd541 SHA512 44638a315b0da9c26519c053c48ab8ee216c43410f53844465535a972ae01031f1603769e9b3169fdf9358de67e0d0c7e238b2918b5d5b1c4cb95cb922fa922a
-DIST Ice-3.6.3.tar.gz 5512741 BLAKE2B 7219cd263ccf6207c0d1e788358004744bd53717bba79a53be468b5e38ddbc81895ef078ba31c98d90ac9ccdd9e17123f4a7ab590fa354c28f6d82f09bf0301d SHA512 6e17d21f55a8504af87a64c498a0c4d2084ed96a85c7a66d00319324774f671ace6afa03108d8d4e9bedf5fcfc2f3dba247949a27deecacdd0d298bd0bfe0a45
 DIST Ice-3.6.4.pdf 8907736 BLAKE2B 5a631c1e2e147c8ed3b31a84192210c92bbe83e8644ec9d7d164d1b94a20069ce77f6baf54910ac00c7216cbc2979caac6fa78457e9292a84407e93000f9903a SHA512 9bd2d373eb83e08e563cab174a53063a490367dea3e4b910f93f0477c3817282c859f07e46e503006e9bd37678fb6da31a58b88bfabd217b5e371fff685321a0
 DIST Ice-3.6.4.tar.gz 5523841 BLAKE2B 4e50dcf0f004f14a38c173f181cabb97fdc201786c338800b9750dc0cf6ce9b1397ea26b4357de1f6e1ac6b4e69abbe2bf464a5f9c2926f6ae45abbf5a69803b SHA512 fdb412ce591bca7aede2ac7d70600184f3b67279e8ffdfee3649f517d5531d2dfee54b37d0cc6de2ef5de8ecd281c39d6c951781b68f9a36316a7607cefb9e57


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2019-01-16 15:46 Mikle Kolyada
  0 siblings, 0 replies; 40+ messages in thread
From: Mikle Kolyada @ 2019-01-16 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     8ab1f429e41dfe9c8f0bdac4dd6ab9c2aad78e69
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 16 15:46:15 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Jan 16 15:46:15 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ab1f429

dev-libs/Ice: amd64 stable wrt bug #672980

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-libs/Ice/Ice-3.6.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/Ice/Ice-3.6.4.ebuild b/dev-libs/Ice/Ice-3.6.4.ebuild
index d51d2860485..39a11bd852c 100644
--- a/dev-libs/Ice/Ice-3.6.4.ebuild
+++ b/dev-libs/Ice/Ice-3.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( http://download.zeroc.com/Ice/$(ver_cut 1-2)/${P}.pdf )"
 LICENSE="GPL-2"
 SLOT="0/36"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="doc examples libressl +ncurses mono php python ruby test debug"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2018-12-29 19:12 Thomas Deutschmann
  0 siblings, 0 replies; 40+ messages in thread
From: Thomas Deutschmann @ 2018-12-29 19:12 UTC (permalink / raw
  To: gentoo-commits

commit:     ddc138af539a01844728e428177eda656f3a2dc6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 18:45:26 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 19:11:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddc138af

dev-libs/Ice: x86 stable (bug #672980)

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 dev-libs/Ice/Ice-3.6.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/Ice/Ice-3.6.4.ebuild b/dev-libs/Ice/Ice-3.6.4.ebuild
index 0b2b1af24d1..d51d2860485 100644
--- a/dev-libs/Ice/Ice-3.6.4.ebuild
+++ b/dev-libs/Ice/Ice-3.6.4.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( http://download.zeroc.com/Ice/$(ver_cut 1-2)/${P}.pdf )"
 LICENSE="GPL-2"
 SLOT="0/36"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE="doc examples libressl +ncurses mono php python ruby test debug"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2018-11-13 15:02 Lars Wendler
  0 siblings, 0 replies; 40+ messages in thread
From: Lars Wendler @ 2018-11-13 15:02 UTC (permalink / raw
  To: gentoo-commits

commit:     6d2361dc8209f9a0993ce72d88c230f6b667598a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 13 15:01:54 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Nov 13 15:01:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d2361dc

dev-libs/Ice: Bump to version 3.6.4

Fixed installation path of man pages.
Non-maintainer commit due to maintainer timeout.

Closes: https://bugs.gentoo.org/656892
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-libs/Ice/Ice-3.6.4.ebuild | 357 ++++++++++++++++++++++++++++++++++++++++++
 dev-libs/Ice/Manifest         |   2 +
 2 files changed, 359 insertions(+)

diff --git a/dev-libs/Ice/Ice-3.6.4.ebuild b/dev-libs/Ice/Ice-3.6.4.ebuild
new file mode 100644
index 00000000000..0b2b1af24d1
--- /dev/null
+++ b/dev-libs/Ice/Ice-3.6.4.ebuild
@@ -0,0 +1,357 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby24"
+
+PHP_EXT_NAME="IcePHP"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+PHP_EXT_OPTIONAL_USE=php
+
+USE_PHP="php7-0"
+
+# This variable does not belong to any eclass. It is solely used in this ebuild
+# db:6.2 breaks the build process
+BERKDB_SLOTS=( 6.1 5.3 5.1 4.8 )
+
+inherit db-use mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs eapi7-ver
+
+DESCRIPTION="ICE middleware C++ library and generator tools"
+HOMEPAGE="https://zeroc.com/products/ice"
+SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	doc? ( http://download.zeroc.com/Ice/$(ver_cut 1-2)/${P}.pdf )"
+LICENSE="GPL-2"
+SLOT="0/36"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples libressl +ncurses mono php python ruby test debug"
+RESTRICT="test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=dev-libs/expat-2.0.1
+	>=app-arch/bzip2-1.0.5
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	|| (
+		$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
+	)
+	dev-cpp/libmcpp
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( $(ruby_implementation_depend ruby24) )
+	mono? ( dev-lang/mono )
+	php? ( dev-lang/php:7.0 )
+	!dev-python/IcePy
+	!dev-ruby/IceRuby"
+DEPEND="${RDEPEND}
+	ncurses? ( sys-libs/ncurses:0= sys-libs/readline:0= )
+	test? (
+		${PYTHON_DEPS}
+		dev-python/passlib[${PYTHON_USEDEP}]
+	)"
+
+# Maintainer notes:
+# TODO: java bindings, multiple ruby versions (supports 2.{1,2,3})
+
+S="${WORKDIR}/${P/I/i}"
+PHP_EXT_S="${S}/php"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.6.3-no-arch-opts.patch"
+	"${FILESDIR}/${PN}-3.6.3-csharp.patch"
+	#"${FILESDIR}/${PN}-3.6.3-libressl.patch"
+)
+
+pkg_setup() {
+	# prevent ruby-ng.eclass from messing with pkg_setup
+	return
+}
+
+src_unpack() {
+	# prevent ruby-ng.eclass from messing with src_unpack
+	default
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \
+		-e 's|-L\$\(libdir\)||' \
+		cpp/config/Make.rules || die "sed failed"
+
+	sed -i \
+		-e 's|\(install_phpdir[[:space:]]*\):=|\1?=|' \
+		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
+		php/config/Make.rules.php || die "sed failed"
+
+	sed -i \
+		-e 's|\(install_pythondir[[:space:]]*\)=|\1?=|' \
+		-e 's|\(install_rubydir[[:space:]]*\)=|\1?=|' \
+		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
+		{python,ruby}/config/Make.rules || die "sed failed"
+
+	sed -i \
+		-e 's|-O2 ||g' \
+		-e 's|-Werror ||g' \
+		cpp/config/Make.rules.Linux || die "sed failed"
+
+	sed -i \
+		-e 's|install-common||' \
+		{cpp,csharp,php,python,ruby}/Makefile || die "sed failed"
+
+	sed -i \
+		-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
+		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
+		-e 's|\(install_pkgconfigdir[[:space:]]*\):=|\1?=|' \
+		csharp/config/Make.rules.cs || die "sed failed"
+
+	# skip mono tests, bug #498484
+	sed -i \
+		-e '/SUBDIRS/s|\ test||' \
+		csharp/Makefile || die "sed failed"
+
+	# skip udp test due to multicast
+	# skip IceGrid/admin bug #649850
+	# skip IceSSL tests due to requirement of internet connection
+	# skip IceStorm/single bug #636834
+	# IceStorm/stress fails without USE=debug
+	# IceUtil/stacktrace fails with USE=debug
+	sed -i \
+		-e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress|' \
+		cpp/Makefile || die "sed failed"
+
+	# mainly broken .ice files
+	sed -i \
+		-e 's|allTests.py|allTests.py --rfilter=operations --rfilter=slicing\/objects|' \
+		python/Makefile || die "sed failed"
+
+	# fails even on unicode locale
+	sed -i \
+		-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
+		ruby/Makefile || die "sed failed"
+
+	# fix for x86 IceBox test
+	sed -i \
+		-e 's|"32"|""|' \
+		scripts/TestUtil.py || die "sed failed"
+}
+
+src_configure() {
+	suitable_db_version() {
+		local ver
+		for ver in "${BERKDB_SLOTS[@]}"; do
+			if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
+				echo "${ver}"
+				return 0
+			fi
+		done
+		die "No suitable BerkDB versions found, aborting"
+	}
+
+	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\""
+		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
+		"LP64=yes"
+		"new_dtags=yes"
+		"NOTEST=$(usex !test)"
+		"USE_READLINE=$(usex ncurses)"
+		"OPTIMIZE=$(usex !debug)"
+	)
+
+	local BERKDB_VERSION="$(suitable_db_version)"
+	MAKE_RULES+=("DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})")
+	sed -i \
+		-e "s|g++|$(tc-getCXX)|" \
+		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
+		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
+		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
+		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
+		cpp/config/Make.rules{,.Linux} python/config/Make.rules || die "sed failed"
+
+	if use python; then
+		local S="${S}/python"
+		python_copy_sources
+	fi
+
+	if use ruby; then
+		SITERUBY="$(ruby24 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
+		MAKE_RULES_RUBY=(
+			"install_rubydir=\"${ED%/}/${SITERUBY}\""
+			"install_libdir=\"${ED%/}/${SITERUBY}\""
+		)
+
+		# make it use ruby24 only
+		sed -i \
+			-e 's|RUBY = ruby|\024|' \
+			ruby/config/Make.rules || die "sed failed"
+		sed -i \
+			-e 's|env ruby|\024|' \
+			ruby/config/s2rb.rb || die "sed failed"
+		sed -i \
+			-e 's|env ruby|\024|' \
+			ruby/scripts/slice2rb || die "sed failed"
+		sed -i \
+			-e 's|output.write("ruby|\024|' \
+			scripts/TestUtil.py || die "sed failed"
+	fi
+
+	MAKE_RULES_MONO=(
+		"GACINSTALL=yes"
+		"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\""
+	)
+
+	if has_version ">dev-lang/mono-4"; then
+		MAKE_RULES_MONO+=("MCS=mcs")
+	fi
+
+	use test && python_setup
+}
+
+src_compile() {
+	# Do not remove this export or build will break!
+	tc-export CXX
+
+	emake -C cpp "${MAKE_RULES[@]}"
+
+	if use php; then
+		local i
+		for i in $(php_get_slots); do
+			mkdir -p "${WORKDIR}/${i}" || die
+			cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
+
+			pushd "${WORKDIR}/${i}" >/dev/null || die
+			ln -s "${S}/cpp" || die
+			ln -s "${S}/config" || die
+			ln -s "${S}/slice" || die
+			ln -s "${S}/Makefile" || die
+
+			emake -C php "${MAKE_RULES[@]}" USE_NAMESPACES=yes "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
+			popd >/dev/null || die
+		done
+	fi
+
+	if use python; then
+		building() {
+			emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
+		}
+		local S="${S}/python"
+		python_foreach_impl building
+	fi
+
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
+	fi
+
+	if use mono; then
+		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}"
+	fi
+}
+
+src_test() {
+	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	emake -C cpp "${MAKE_RULES[@]}" test
+
+	# php tests require the extension loaded and are therefore skipped
+
+	if use python; then
+		testing() {
+			emake -C "${BUILD_DIR}" \
+				"${MAKE_RULES[@]}" \
+				PYTHON="${EPYTHON}" \
+				install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \
+				install_libdir="\"${D%/}/$(python_get_sitedir)\"" test
+		}
+		local S="${S}/python"
+		python_foreach_impl testing
+	fi
+
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
+	fi
+
+	if use mono; then
+		# skip mono tests, bug #498484
+		ewarn "Tests for C# are currently disabled."
+		#emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" test
+	fi
+}
+
+src_install() {
+	local DOCS=( CHANGELOG*.md README.md )
+	use doc && DOCS+=( "${DISTDIR}/${P}.pdf" )
+	einstalldocs
+
+	insinto /usr/share/${P}
+	doins -r slice
+
+	emake -C cpp "${MAKE_RULES[@]}" install
+
+	if use examples; then
+		docinto examples-cpp
+		dodoc cpp/config/*.cfg
+		docompress -x /usr/share/doc/${PF}/examples-cpp
+	fi
+
+	if use php; then
+		insinto "/usr/share/php/${PN}"
+
+		local i
+		while IFS="" read -d $'\0' -r i; do
+			doins "${i}"
+		done < <(find "${S}/php/lib/" -name '*.php' -print0)
+
+		pushd "${ED%/}/usr/share/${P}/slice" >/dev/null || die
+
+		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}"/*
+		done
+
+		for i in $(php_get_slots); do
+			php_init_slot_env "${i}"
+			insinto "${EXT_DIR}"
+			newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
+		done
+		php-ext-source-r2_createinifiles
+
+		popd >/dev/null || die
+	fi
+
+	if use python; then
+		installation() {
+			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
+		}
+		local S="${S}/python"
+		python_foreach_impl installation
+	fi
+
+	if use ruby; then
+		dodir "${SITERUBY}"
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install
+	fi
+
+	if use mono; then
+		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" install
+	fi
+}

diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index 10bdff65b81..918af29c33d 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -1,2 +1,4 @@
 DIST Ice-3.6.3.pdf 8844957 BLAKE2B 137e3ce85885305931cbbb2c838ccc52175dffb7ad51264837b2db77eea05987ebecc5e3678e2f589bef1cc94c133f0f298ecce23031fcf2654621921c2bd541 SHA512 44638a315b0da9c26519c053c48ab8ee216c43410f53844465535a972ae01031f1603769e9b3169fdf9358de67e0d0c7e238b2918b5d5b1c4cb95cb922fa922a
 DIST Ice-3.6.3.tar.gz 5512741 BLAKE2B 7219cd263ccf6207c0d1e788358004744bd53717bba79a53be468b5e38ddbc81895ef078ba31c98d90ac9ccdd9e17123f4a7ab590fa354c28f6d82f09bf0301d SHA512 6e17d21f55a8504af87a64c498a0c4d2084ed96a85c7a66d00319324774f671ace6afa03108d8d4e9bedf5fcfc2f3dba247949a27deecacdd0d298bd0bfe0a45
+DIST Ice-3.6.4.pdf 8907736 BLAKE2B 5a631c1e2e147c8ed3b31a84192210c92bbe83e8644ec9d7d164d1b94a20069ce77f6baf54910ac00c7216cbc2979caac6fa78457e9292a84407e93000f9903a SHA512 9bd2d373eb83e08e563cab174a53063a490367dea3e4b910f93f0477c3817282c859f07e46e503006e9bd37678fb6da31a58b88bfabd217b5e371fff685321a0
+DIST Ice-3.6.4.tar.gz 5523841 BLAKE2B 4e50dcf0f004f14a38c173f181cabb97fdc201786c338800b9750dc0cf6ce9b1397ea26b4357de1f6e1ac6b4e69abbe2bf464a5f9c2926f6ae45abbf5a69803b SHA512 fdb412ce591bca7aede2ac7d70600184f3b67279e8ffdfee3649f517d5531d2dfee54b37d0cc6de2ef5de8ecd281c39d6c951781b68f9a36316a7607cefb9e57


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2018-06-27 20:32 Pacho Ramos
  0 siblings, 0 replies; 40+ messages in thread
From: Pacho Ramos @ 2018-06-27 20:32 UTC (permalink / raw
  To: gentoo-commits

commit:     2c766534cdbb57f8cf73f5b220e32e47f875e609
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 27 19:39:22 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Jun 27 20:32:17 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c766534

dev-libs/Ice: Support python3.6

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 dev-libs/Ice/Ice-3.6.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/Ice/Ice-3.6.3-r1.ebuild b/dev-libs/Ice/Ice-3.6.3-r1.ebuild
index 4955f0858ef..33984c1d811 100644
--- a/dev-libs/Ice/Ice-3.6.3-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.6.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby23"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2018-04-26 13:47 Thomas Deutschmann
  0 siblings, 0 replies; 40+ messages in thread
From: Thomas Deutschmann @ 2018-04-26 13:47 UTC (permalink / raw
  To: gentoo-commits

commit:     1b38c0a40ef72be143a2f769c2dbe820977650e6
Author:     Robert Förster <Dessa <AT> gmake <DOT> de>
AuthorDate: Thu Apr 26 13:15:56 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 13:45:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b38c0a4

dev-libs/Ice: remove old

Closes: https://github.com/gentoo/gentoo/pull/8014
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 dev-libs/Ice/Ice-3.5.1.ebuild | 284 ----------------------------------
 dev-libs/Ice/Ice-3.6.3.ebuild | 348 ------------------------------------------
 dev-libs/Ice/Manifest         |   2 -
 3 files changed, 634 deletions(-)

diff --git a/dev-libs/Ice/Ice-3.5.1.ebuild b/dev-libs/Ice/Ice-3.5.1.ebuild
deleted file mode 100644
index 1dd21cb31ad..00000000000
--- a/dev-libs/Ice/Ice-3.5.1.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby19"
-
-inherit toolchain-funcs versionator python-r1 mono-env ruby-ng db-use
-
-DESCRIPTION="ICE middleware C++ library and generator tools"
-HOMEPAGE="https://zeroc.com/products/ice"
-SRC_URI="http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${P}.tar.gz
-	doc? ( http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${P}.pdf )"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x86-linux ~x64-macos"
-IUSE="doc examples +ncurses mono python ruby test debug"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/expat-2.0.1
-	>=app-arch/bzip2-1.0.5
-	>=dev-libs/openssl-0.9.8o:0
-	|| (
-		sys-libs/db:5.3[cxx]
-		sys-libs/db:5.1[cxx]
-		sys-libs/db:4.8[cxx]
-	)
-	~dev-cpp/libmcpp-2.7.2
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby19) )
-	mono? ( dev-lang/mono )
-	!dev-python/IcePy
-	!dev-ruby/IceRuby"
-DEPEND="${RDEPEND}
-	ncurses? ( sys-libs/ncurses sys-libs/readline )
-	test? ( ${PYTHON_DEPS} )"
-
-# Maintainer notes:
-# - yes, we have to do the trickery with the move for the python functions
-#   since the build and test frameworks deduce various settings from the path
-#   and they can't be tricked by a symlink. And we also need
-#   SUPPORT_PYTHON_ABIS=1 otherwise we can't get pyc/pyo anymore the sane way.
-# TODO: php bindings
-# TODO: java bindings
-
-#overwrite ruby-ng.eclass default
-S="${WORKDIR}/${P}"
-
-pkg_setup() {
-	# prevent ruby-ng.eclass from messing with src_unpack
-	:;
-}
-
-src_unpack() {
-	# prevent ruby-ng.eclass from messing with src_unpack
-	default
-}
-
-src_prepare() {
-	sed -i \
-		-e 's|\(install_docdir[[:space:]]*\):=|\1?=|' \
-		-e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \
-		cpp/config/Make.rules || die "sed failed"
-
-	sed -i \
-		-e 's|\(install_pythondir[[:space:]]*\):=|\1?=|' \
-		-e 's|\(install_rubydir[[:space:]]*\):=|\1?=|' \
-		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
-		{py,rb}/config/Make.rules || die "sed failed"
-
-	sed -i \
-		-e 's|-O2 ||g' \
-		-e 's|-Werror ||g' \
-		cpp/config/Make.rules.Linux || die "sed failed"
-
-	sed -i \
-		-e 's|install-common||' \
-		-e 's|demo||' \
-		{cpp,cs,php,py,rb}/Makefile || die "sed failed"
-
-	sed -i \
-		-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
-		cs/config/Make.rules.cs || die "sed failed"
-
-	# skip mono tests, bug #498484
-	sed -i \
-		-e 's|^\(SUBDIRS.*\)test|\1|' \
-		cs/Makefile || die "sed failed"
-
-	if ! use test ; then
-		sed -i \
-			-e 's|^\(SUBDIRS.*\)test|\1|' \
-			{cpp,php,py,rb}/Makefile || die "sed failed"
-	fi
-}
-
-suitable_db_version() {
-	local tested_slots="5.3 5.1 4.8"
-	for ver in ${tested_slots}; do
-		if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
-			echo ${ver}
-			return 0
-		fi
-	done
-	die "No suitable BerkDB versions found, aborting"
-}
-
-src_configure() {
-	MAKE_RULES="prefix=\"${ED}/usr\"
-		install_docdir=\"${ED}/usr/share/doc/${PF}\"
-		install_configdir=\"${ED}/usr/share/Ice-${PV}/config\"
-		install_mandir=\"${ED}/usr/share/man\"
-		embedded_runpath_prefix=\"${EPREFIX}/usr\"
-		LP64=yes"
-
-	use ncurses && OPTIONS="${MAKE_RULES} USE_READLINE=yes" || MAKE_RULES="${MAKE_RULES} USE_READLINE=no"
-	use debug && OPTIONS"${MAKE_RULES} OPTIMIZE=no" || MAKE_RULES="${MAKE_RULES} OPTIMIZE=yes"
-
-	local BERKDB_VERSION="$(suitable_db_version)"
-	MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})"
-	sed -i \
-		-e "s|g++|$(tc-getCXX)|" \
-		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
-		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
-		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
-		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
-		cpp/config/Make.rules{,.Linux} py/config/Make.rules || die "sed failed"
-
-	if use python ; then
-		S=${S}/py python_copy_sources
-
-		# make a place for the symlink
-		rm -r py/python || die
-	fi
-
-	if use ruby ; then
-		SITERUBY="$(ruby19 -r rbconfig -e 'print Config::CONFIG["sitedir"]')"
-		MAKE_RULES_RB="install_rubydir=\"${ED}/${SITERUBY}\"
-			install_libdir=\"${ED}/${SITERUBY}\""
-
-		# make it use ruby19 only
-		sed -i \
-			-e 's|RUBY = ruby|\019|' \
-			rb/config/Make.rules || die "sed failed"
-	fi
-
-	MAKE_RULES_CS="GACINSTALL=yes GAC_ROOT=\"${ED}/usr/$(get_libdir)\" GAC_DIR=${EPREFIX}/usr/$(get_libdir)"
-
-	use test && python_export_best
-}
-
-src_compile() {
-	# Do not remove this export or build will break!
-	tc-export CXX
-
-	emake -C cpp ${MAKE_RULES} || die "emake failed"
-
-	if use doc ; then
-		emake -C cpp/doc || die "building docs failed"
-	fi
-
-	if use python ; then
-		building() {
-			emake -C "${BUILD_DIR}" ${MAKE_RULES} || die "emake py-${EPYTHON} failed"
-		}
-		BUILD_DIR=py python_foreach_impl building
-	fi
-
-	if use ruby ; then
-		emake -C rb ${MAKE_RULES} ${MAKE_RULES_RB} || die "emake rb failed"
-	fi
-
-	if use mono ; then
-		emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} || die "emake cs failed"
-	fi
-}
-
-src_install() {
-	dodoc CHANGES README
-
-	insinto /usr/share/${P}
-	doins -r slice
-
-	emake -C cpp ${MAKE_RULES} install || die "emake install failed"
-
-	docinto cpp
-	dodoc CHANGES README
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples-cpp
-		doins cpp/config/*.cfg
-		doins -r cpp/demo/*
-	fi
-
-	if use doc ; then
-		dohtml -r cpp/doc/reference/*
-		dodoc "${DISTDIR}/${P}.pdf"
-	fi
-
-	if use python ; then
-		installation() {
-			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 || die "emake py-${EPYTHON} install failed"
-		}
-		BUILD_DIR=py python_foreach_impl installation
-
-		docinto py
-		dodoc py/CHANGES py/README
-
-		if use examples ; then
-			insinto /usr/share/doc/${PF}/examples-py
-			doins -r py/demo/*
-		fi
-	fi
-
-	if use ruby ; then
-		dodir "${SITERUBY}"
-		emake -C rb ${MAKE_RULES} ${MAKE_RULES_RB} install || die "emake rb install failed"
-
-		docinto rb
-		dodoc rb/CHANGES rb/README
-
-		if use examples ; then
-			insinto /usr/share/doc/${PF}/examples-rb
-			doins -r rb/demo/*
-		fi
-	fi
-
-	if use mono ; then
-		emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} install || die "emake cs install failed"
-
-		# TODO: anyone has an idea what those are for?
-		rm "${ED}"/usr/bin/*.xml
-
-		docinto cs
-		dodoc cs/CHANGES cs/README
-
-		if use examples ; then
-			insinto /usr/share/doc/${PF}/examples-cs
-			doins -r cs/demo/*
-		fi
-	fi
-}
-
-run_tests() {
-	# Run tests through the script interface since Python test runner
-	# fails to exit with non-zero code for some reason.
-
-	pushd "${1}" >/dev/null || die
-	./allTests.py --script | sh
-	ret=${?}
-	popd >/dev/null || die
-
-	return ${ret}
-}
-
-src_test() {
-	run_tests cpp || die "emake cpp test failed"
-
-	if use python ; then
-		testing() {
-			# tests require that the directory is named 'py'
-			ln -f -s ../"${BUILD_DIR}"/python py/python || die
-			run_tests py || die "emake py-${EPYTHON} test failed"
-		}
-		BUILD_DIR=py python_foreach_impl testing
-	fi
-
-	if use ruby ; then
-		run_tests rb || die "emake rb test failed"
-	fi
-
-	if use mono ; then
-		# skip mono tests, bug #498484
-		ewarn "Tests for C# are currently disabled."
-#		run_tests cs || die "emake cs test failed"
-	fi
-}

diff --git a/dev-libs/Ice/Ice-3.6.3.ebuild b/dev-libs/Ice/Ice-3.6.3.ebuild
deleted file mode 100644
index a873c8bd3be..00000000000
--- a/dev-libs/Ice/Ice-3.6.3.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby23"
-
-PHP_EXT_NAME="IcePHP"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-PHP_EXT_OPTIONAL_USE=php
-
-USE_PHP="php7-0"
-
-# This variable does not belong to any eclass. It is solely used in this ebuild
-# db:6.2 breaks the build process
-BERKDB_SLOTS=( 6.1 5.3 5.1 4.8 )
-
-inherit db-use eutils mono-env php-ext-source-r2 python-r1 ruby-ng toolchain-funcs versionator
-
-DESCRIPTION="ICE middleware C++ library and generator tools"
-HOMEPAGE="https://zeroc.com/products/ice"
-SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( http://download.zeroc.com/Ice/$(get_version_component_range 1-2)/${P}.pdf )"
-LICENSE="GPL-2"
-SLOT="0/36"
-KEYWORDS="amd64 x86"
-IUSE="doc examples libressl +ncurses mono php python ruby test debug"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/expat-2.0.1
-	>=app-arch/bzip2-1.0.5
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	|| (
-		$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
-	)
-	dev-cpp/libmcpp
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby23) )
-	mono? ( dev-lang/mono )
-	php? ( dev-lang/php:7.0 )
-	!dev-python/IcePy
-	!dev-ruby/IceRuby"
-DEPEND="${RDEPEND}
-	ncurses? ( sys-libs/ncurses:0= sys-libs/readline:0= )
-	test? (
-		${PYTHON_DEPS}
-		dev-python/passlib[${PYTHON_USEDEP}]
-	)"
-
-# Maintainer notes:
-# TODO: java bindings, multiple ruby versions (supports 2.{1,2,3})
-
-S="${WORKDIR}/${P/I/i}"
-PHP_EXT_S="${S}/php"
-
-PATCHES=(
-	"${FILESDIR}/${P}-no-arch-opts.patch"
-	"${FILESDIR}/${P}-csharp.patch"
-)
-
-pkg_setup() {
-	# prevent ruby-ng.eclass from messing with pkg_setup
-	return
-}
-
-src_unpack() {
-	# prevent ruby-ng.eclass from messing with src_unpack
-	default
-}
-
-src_prepare() {
-	epatch -p1 "${PATCHES[@]}"
-
-	sed -i \
-		-e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \
-		-e 's|-L\$\(libdir\)||' \
-		cpp/config/Make.rules || die "sed failed"
-
-	sed -i \
-		-e 's|\(install_phpdir[[:space:]]*\):=|\1?=|' \
-		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
-		php/config/Make.rules.php || die "sed failed"
-
-	sed -i \
-		-e 's|\(install_pythondir[[:space:]]*\)=|\1?=|' \
-		-e 's|\(install_rubydir[[:space:]]*\)=|\1?=|' \
-		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
-		{python,ruby}/config/Make.rules || die "sed failed"
-
-	sed -i \
-		-e 's|-O2 ||g' \
-		-e 's|-Werror ||g' \
-		cpp/config/Make.rules.Linux || die "sed failed"
-
-	sed -i \
-		-e 's|install-common||' \
-		{cpp,csharp,php,python,ruby}/Makefile || die "sed failed"
-
-	sed -i \
-		-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
-		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
-		-e 's|\(install_pkgconfigdir[[:space:]]*\):=|\1?=|' \
-		csharp/config/Make.rules.cs || die "sed failed"
-
-	# skip mono tests, bug #498484
-	sed -i \
-		-e '/SUBDIRS/s|\ test||' \
-		csharp/Makefile || die "sed failed"
-
-	# IceUtil/stacktrace fails with USE=debug
-	# skip udp test due to multicast
-	# skip IceSSL tests due to requirement of internet connection
-	# IceStorm/stress fails without USE=debug
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceSSL --rfilter=IceStorm\/stress|' \
-		cpp/Makefile || die "sed failed"
-
-	# mainly broken .ice files
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=operations --rfilter=slicing\/objects|' \
-		python/Makefile || die "sed failed"
-
-	# fails even on unicode locale
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
-		ruby/Makefile || die "sed failed"
-}
-
-src_configure() {
-	suitable_db_version() {
-		local ver
-		for ver in "${BERKDB_SLOTS[@]}"; do
-			if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
-				echo "${ver}"
-				return 0
-			fi
-		done
-		die "No suitable BerkDB versions found, aborting"
-	}
-
-	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\""
-		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
-		"LP64=yes"
-		"new_dtags=yes"
-		"NOTEST=$(usex !test)"
-		"USE_READLINE=$(usex ncurses)"
-		"OPTIMIZE=$(usex !debug)"
-	)
-
-	local BERKDB_VERSION="$(suitable_db_version)"
-	MAKE_RULES+=("DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})")
-	sed -i \
-		-e "s|g++|$(tc-getCXX)|" \
-		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
-		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
-		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
-		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
-		cpp/config/Make.rules{,.Linux} python/config/Make.rules || die "sed failed"
-
-	if use python; then
-		local S="${S}/python"
-		python_copy_sources
-	fi
-
-	if use ruby; then
-		SITERUBY="$(ruby23 -r rbconfig -e 'print RbConfig::CONFIG[\"sitelibdir\"]')"
-		MAKE_RULES_RUBY=(
-			"install_rubydir=\"${ED%/}/${SITERUBY}\""
-			"install_libdir=\"${ED%/}/${SITERUBY}\""
-		)
-
-		# make it use ruby23 only
-		sed -i \
-			-e 's|RUBY = ruby|\022|' \
-			ruby/config/Make.rules || die "sed failed"
-		sed -i \
-			-e 's|env ruby|\022|' \
-			ruby/config/s2rb.rb || die "sed failed"
-		sed -i \
-			-e 's|env ruby|\022|' \
-			ruby/scripts/slice2rb || die "sed failed"
-		sed -i \
-			-e 's|output.write("ruby|\022|' \
-			scripts/TestUtil.py || die "sed failed"
-	fi
-
-	MAKE_RULES_MONO=(
-		"GACINSTALL=yes"
-		"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\""
-	)
-
-	if has_version ">dev-lang/mono-4"; then
-		MAKE_RULES_MONO+=("MCS=mcs")
-	fi
-
-	use test && python_setup
-}
-
-src_compile() {
-	# Do not remove this export or build will break!
-	tc-export CXX
-
-	emake -C cpp "${MAKE_RULES[@]}"
-
-	if use php; then
-		local i
-		for i in $(php_get_slots); do
-			mkdir -p "${WORKDIR}/${i}" || die
-			cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
-
-			pushd "${WORKDIR}/${i}" >/dev/null || die
-			ln -s "${S}/cpp" || die
-			ln -s "${S}/config" || die
-			ln -s "${S}/slice" || die
-			ln -s "${S}/Makefile" || die
-
-			emake -C php "${MAKE_RULES[@]}" USE_NAMESPACES=yes "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
-			popd >/dev/null || die
-		done
-	fi
-
-	if use python; then
-		building() {
-			emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
-		}
-		local S="${S}/python"
-		python_foreach_impl building
-	fi
-
-	if use ruby; then
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
-	fi
-
-	if use mono; then
-		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}"
-	fi
-}
-
-src_test() {
-	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	emake -C cpp "${MAKE_RULES[@]}" test
-
-	# php tests require the extension loaded and are therefore skipped
-
-	if use python; then
-		testing() {
-			emake -C "${BUILD_DIR}" \
-				"${MAKE_RULES[@]}" \
-				PYTHON="${EPYTHON}" \
-				install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \
-				install_libdir="\"${D%/}/$(python_get_sitedir)\"" test
-		}
-		local S="${S}/python"
-		python_foreach_impl testing
-	fi
-
-	if use ruby; then
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
-	fi
-
-	if use mono; then
-		# skip mono tests, bug #498484
-		ewarn "Tests for C# are currently disabled."
-		#emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" test
-	fi
-}
-
-src_install() {
-	local DOCS=( CHANGELOG*.md README.md )
-	use doc && DOCS+=( "${DISTDIR}/${P}.pdf" )
-	einstalldocs
-
-	insinto /usr/share/${P}
-	doins -r slice
-
-	emake -C cpp "${MAKE_RULES[@]}" install
-
-	if use examples; then
-		docinto examples-cpp
-		dodoc cpp/config/*.cfg
-		docompress -x /usr/share/doc/${PF}/examples-cpp
-	fi
-
-	if use php; then
-		insinto "/usr/share/php/${PN}"
-
-		local i
-		while IFS="" read -d $'\0' -r i; do
-			doins "${i}"
-		done < <(find "${S}/php/lib/" -name '*.php' -print0)
-
-		pushd "${ED%/}/usr/share/${P}/slice" >/dev/null || die
-
-		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}"/*
-		done
-
-		for i in $(php_get_slots); do
-			php_init_slot_env "${i}"
-			insinto "${EXT_DIR}"
-			newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
-		done
-		php-ext-source-r2_createinifiles
-
-		popd >/dev/null || die
-	fi
-
-	if use python; then
-		installation() {
-			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
-		}
-		local S="${S}/python"
-		python_foreach_impl installation
-	fi
-
-	if use ruby; then
-		dodir "${SITERUBY}"
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install
-	fi
-
-	if use mono; then
-		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" install
-	fi
-}

diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index aa42decdf1c..10bdff65b81 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -1,4 +1,2 @@
-DIST Ice-3.5.1.pdf 8279548 BLAKE2B 154c013ef5429ce27bc54805fdab6959e363731499e17be6d1b09bc0273fdd55dfc387f80852138d10dec337fe7f2f34efe522561fdf75903a82cb01535f0c14 SHA512 6fe78ed629de330c56cf260a0a78d650ad9e1507d737a8e58c616f1c61897487dae2f9fb942f1e878706dbc645cb9c672377eeef905f8764b57dd7e6f8d1c7f2
-DIST Ice-3.5.1.tar.gz 4799296 BLAKE2B 815f6fc40635b85eef85b7b3f1fcf0f7622bb1d3bc40e685f6a6a0de64e2a201bb3a92590231a4f278eac455c02d1f3943bf52bc69a8dbfd91c33ecb3f502ee7 SHA512 610fa317bd75e64802d1b5216db4747f86157d3246a2022397bafaefdd9b1b78d131733762003ee779065401c8a83120db65cf9b86fbf1914266309571baf58f
 DIST Ice-3.6.3.pdf 8844957 BLAKE2B 137e3ce85885305931cbbb2c838ccc52175dffb7ad51264837b2db77eea05987ebecc5e3678e2f589bef1cc94c133f0f298ecce23031fcf2654621921c2bd541 SHA512 44638a315b0da9c26519c053c48ab8ee216c43410f53844465535a972ae01031f1603769e9b3169fdf9358de67e0d0c7e238b2918b5d5b1c4cb95cb922fa922a
 DIST Ice-3.6.3.tar.gz 5512741 BLAKE2B 7219cd263ccf6207c0d1e788358004744bd53717bba79a53be468b5e38ddbc81895ef078ba31c98d90ac9ccdd9e17123f4a7ab590fa354c28f6d82f09bf0301d SHA512 6e17d21f55a8504af87a64c498a0c4d2084ed96a85c7a66d00319324774f671ace6afa03108d8d4e9bedf5fcfc2f3dba247949a27deecacdd0d298bd0bfe0a45


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2018-04-26 13:47 Thomas Deutschmann
  0 siblings, 0 replies; 40+ messages in thread
From: Thomas Deutschmann @ 2018-04-26 13:47 UTC (permalink / raw
  To: gentoo-commits

commit:     781388a6d8bc37beb41f60b0e3087b8ed2fe1b91
Author:     Robert Förster <Dessa <AT> gmake <DOT> de>
AuthorDate: Sun Apr 15 10:51:04 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 13:45:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=781388a6

dev-libs/Ice: fix USE=ruby, restrict tests for now

Closes: https://bugs.gentoo.org/636834
Closes: https://bugs.gentoo.org/649850
Closes: https://bugs.gentoo.org/654070
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-libs/Ice/Ice-3.6.3-r1.ebuild | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/dev-libs/Ice/Ice-3.6.3-r1.ebuild b/dev-libs/Ice/Ice-3.6.3-r1.ebuild
index a2eb14ae312..4955f0858ef 100644
--- a/dev-libs/Ice/Ice-3.6.3-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.6.3-r1.ebuild
@@ -30,6 +30,7 @@ LICENSE="GPL-2"
 SLOT="0/36"
 KEYWORDS="amd64 ~arm x86"
 IUSE="doc examples libressl +ncurses mono php python ruby test debug"
+RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=dev-libs/expat-2.0.1
@@ -114,12 +115,14 @@ src_prepare() {
 		-e '/SUBDIRS/s|\ test||' \
 		csharp/Makefile || die "sed failed"
 
-	# IceUtil/stacktrace fails with USE=debug
 	# skip udp test due to multicast
+	# skip IceGrid/admin bug #649850
 	# skip IceSSL tests due to requirement of internet connection
+	# skip IceStorm/single bug #636834
 	# IceStorm/stress fails without USE=debug
+	# IceUtil/stacktrace fails with USE=debug
 	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceSSL --rfilter=IceStorm\/stress|' \
+		-e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress|' \
 		cpp/Makefile || die "sed failed"
 
 	# mainly broken .ice files
@@ -131,6 +134,11 @@ src_prepare() {
 	sed -i \
 		-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
 		ruby/Makefile || die "sed failed"
+
+	# fix for x86 IceBox test
+	sed -i \
+		-e 's|"32"|""|' \
+		scripts/TestUtil.py || die "sed failed"
 }
 
 src_configure() {
@@ -182,16 +190,16 @@ src_configure() {
 
 		# make it use ruby23 only
 		sed -i \
-			-e 's|RUBY = ruby|\022|' \
+			-e 's|RUBY = ruby|\023|' \
 			ruby/config/Make.rules || die "sed failed"
 		sed -i \
-			-e 's|env ruby|\022|' \
+			-e 's|env ruby|\023|' \
 			ruby/config/s2rb.rb || die "sed failed"
 		sed -i \
-			-e 's|env ruby|\022|' \
+			-e 's|env ruby|\023|' \
 			ruby/scripts/slice2rb || die "sed failed"
 		sed -i \
-			-e 's|output.write("ruby|\022|' \
+			-e 's|output.write("ruby|\023|' \
 			scripts/TestUtil.py || die "sed failed"
 	fi
 


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2018-04-18 16:28 Mikle Kolyada
  0 siblings, 0 replies; 40+ messages in thread
From: Mikle Kolyada @ 2018-04-18 16:28 UTC (permalink / raw
  To: gentoo-commits

commit:     3b85e05bc7ddc707e0b2c6b1957c25f9401e4346
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 18 16:27:40 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Apr 18 16:27:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b85e05b

dev-libs/Ice: amd64 stable wrt bug #636788

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-libs/Ice/Ice-3.6.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/Ice/Ice-3.6.3-r1.ebuild b/dev-libs/Ice/Ice-3.6.3-r1.ebuild
index b4bee2e8a66..538503b9d2a 100644
--- a/dev-libs/Ice/Ice-3.6.3-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.6.3-r1.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( http://download.zeroc.com/Ice/$(get_version_component_range 1-2)/${P}.pdf )"
 LICENSE="GPL-2"
 SLOT="0/36"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc examples libressl +ncurses mono php python ruby test debug"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2018-04-15  5:23 Hans de Graaff
  0 siblings, 0 replies; 40+ messages in thread
From: Hans de Graaff @ 2018-04-15  5:23 UTC (permalink / raw
  To: gentoo-commits

commit:     d737f2e32a7dd5b8bd6c82f3010c201a9b29eb7a
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 05:19:24 2018 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 05:19:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d737f2e3

dev-libs/Ice: use ruby23

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-libs/Ice/Ice-3.6.3-r1.ebuild | 10 +++++-----
 dev-libs/Ice/Ice-3.6.3.ebuild    | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev-libs/Ice/Ice-3.6.3-r1.ebuild b/dev-libs/Ice/Ice-3.6.3-r1.ebuild
index 0b7d354a2ef..b4bee2e8a66 100644
--- a/dev-libs/Ice/Ice-3.6.3-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 
 RUBY_OPTIONAL="yes"
-USE_RUBY="ruby22"
+USE_RUBY="ruby23"
 
 PHP_EXT_NAME="IcePHP"
 PHP_EXT_INI="yes"
@@ -41,7 +41,7 @@ RDEPEND=">=dev-libs/expat-2.0.1
 	)
 	dev-cpp/libmcpp
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby22) )
+	ruby? ( $(ruby_implementation_depend ruby23) )
 	mono? ( dev-lang/mono )
 	php? ( dev-lang/php:7.0 )
 	!dev-python/IcePy
@@ -174,13 +174,13 @@ src_configure() {
 	fi
 
 	if use ruby; then
-		SITERUBY="$(ruby22 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
+		SITERUBY="$(ruby23 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
 		MAKE_RULES_RUBY=(
 			"install_rubydir=\"${ED%/}/${SITERUBY}\""
 			"install_libdir=\"${ED%/}/${SITERUBY}\""
 		)
 
-		# make it use ruby22 only
+		# make it use ruby23 only
 		sed -i \
 			-e 's|RUBY = ruby|\022|' \
 			ruby/config/Make.rules || die "sed failed"

diff --git a/dev-libs/Ice/Ice-3.6.3.ebuild b/dev-libs/Ice/Ice-3.6.3.ebuild
index 33bd9a462f9..a873c8bd3be 100644
--- a/dev-libs/Ice/Ice-3.6.3.ebuild
+++ b/dev-libs/Ice/Ice-3.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 
 RUBY_OPTIONAL="yes"
-USE_RUBY="ruby22"
+USE_RUBY="ruby23"
 
 PHP_EXT_NAME="IcePHP"
 PHP_EXT_INI="yes"
@@ -41,7 +41,7 @@ RDEPEND=">=dev-libs/expat-2.0.1
 	)
 	dev-cpp/libmcpp
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby22) )
+	ruby? ( $(ruby_implementation_depend ruby23) )
 	mono? ( dev-lang/mono )
 	php? ( dev-lang/php:7.0 )
 	!dev-python/IcePy
@@ -173,13 +173,13 @@ src_configure() {
 	fi
 
 	if use ruby; then
-		SITERUBY="$(ruby22 -r rbconfig -e 'print RbConfig::CONFIG[\"sitelibdir\"]')"
+		SITERUBY="$(ruby23 -r rbconfig -e 'print RbConfig::CONFIG[\"sitelibdir\"]')"
 		MAKE_RULES_RUBY=(
 			"install_rubydir=\"${ED%/}/${SITERUBY}\""
 			"install_libdir=\"${ED%/}/${SITERUBY}\""
 		)
 
-		# make it use ruby22 only
+		# make it use ruby23 only
 		sed -i \
 			-e 's|RUBY = ruby|\022|' \
 			ruby/config/Make.rules || die "sed failed"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2018-03-17  6:45 Matt Turner
  0 siblings, 0 replies; 40+ messages in thread
From: Matt Turner @ 2018-03-17  6:45 UTC (permalink / raw
  To: gentoo-commits

commit:     dae0bf720f7ea2da37607d3328da0e7b5c02b494
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 17 06:30:51 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 06:45:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dae0bf72

dev-libs/Ice: Drop ia64 keywords

 dev-libs/Ice/Ice-3.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/Ice/Ice-3.5.1.ebuild b/dev-libs/Ice/Ice-3.5.1.ebuild
index a3ebdc00bc3..1dd21cb31ad 100644
--- a/dev-libs/Ice/Ice-3.5.1.ebuild
+++ b/dev-libs/Ice/Ice-3.5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${
 	doc? ( http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${P}.pdf )"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm x86 ~x86-linux ~x64-macos"
 IUSE="doc examples +ncurses mono python ruby test debug"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2017-04-05 15:00 Lars Wendler
  0 siblings, 0 replies; 40+ messages in thread
From: Lars Wendler @ 2017-04-05 15:00 UTC (permalink / raw
  To: gentoo-commits

commit:     b60f30e08909c9e6144f4ddd60e6bb4001f7861c
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  5 14:59:54 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Apr  5 15:00:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b60f30e0

dev-libs/Ice: Fixed HOMEPAGE.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-libs/Ice/Ice-3.5.1.ebuild    | 4 ++--
 dev-libs/Ice/Ice-3.6.3-r1.ebuild | 2 +-
 dev-libs/Ice/Ice-3.6.3.ebuild    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-libs/Ice/Ice-3.5.1.ebuild b/dev-libs/Ice/Ice-3.5.1.ebuild
index 8527938c933..cb8be50354f 100644
--- a/dev-libs/Ice/Ice-3.5.1.ebuild
+++ b/dev-libs/Ice/Ice-3.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ USE_RUBY="ruby19"
 inherit toolchain-funcs versionator python-r1 mono-env ruby-ng db-use
 
 DESCRIPTION="ICE middleware C++ library and generator tools"
-HOMEPAGE="http://www.zeroc.com/"
+HOMEPAGE="https://zeroc.com/products/ice"
 SRC_URI="http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${P}.tar.gz
 	doc? ( http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${P}.pdf )"
 LICENSE="GPL-2"

diff --git a/dev-libs/Ice/Ice-3.6.3-r1.ebuild b/dev-libs/Ice/Ice-3.6.3-r1.ebuild
index c66fd5eac3d..0998ef0171e 100644
--- a/dev-libs/Ice/Ice-3.6.3-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.6.3-r1.ebuild
@@ -23,7 +23,7 @@ BERKDB_SLOTS=( 6.1 5.3 5.1 4.8 )
 inherit db-use eutils mono-env php-ext-source-r2 python-r1 ruby-ng toolchain-funcs versionator
 
 DESCRIPTION="ICE middleware C++ library and generator tools"
-HOMEPAGE="http://www.zeroc.com/"
+HOMEPAGE="https://zeroc.com/products/ice"
 SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( http://download.zeroc.com/Ice/$(get_version_component_range 1-2)/${P}.pdf )"
 LICENSE="GPL-2"

diff --git a/dev-libs/Ice/Ice-3.6.3.ebuild b/dev-libs/Ice/Ice-3.6.3.ebuild
index 6d73312b65f..e35acf103cd 100644
--- a/dev-libs/Ice/Ice-3.6.3.ebuild
+++ b/dev-libs/Ice/Ice-3.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,7 @@ BERKDB_SLOTS=( 6.1 5.3 5.1 4.8 )
 inherit db-use eutils mono-env php-ext-source-r2 python-r1 ruby-ng toolchain-funcs versionator
 
 DESCRIPTION="ICE middleware C++ library and generator tools"
-HOMEPAGE="http://www.zeroc.com/"
+HOMEPAGE="https://zeroc.com/products/ice"
 SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( http://download.zeroc.com/Ice/$(get_version_component_range 1-2)/${P}.pdf )"
 LICENSE="GPL-2"


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2017-02-23  9:40 Michael Weber
  0 siblings, 0 replies; 40+ messages in thread
From: Michael Weber @ 2017-02-23  9:40 UTC (permalink / raw
  To: gentoo-commits

commit:     3ce3c444261b5c2d7c3a8ee4012c5ea51c606153
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 09:40:11 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 09:40:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ce3c444

dev-libs/Ice: Add ~arm keyword (bug 392327).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/Ice/Ice-3.6.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/Ice/Ice-3.6.3-r1.ebuild b/dev-libs/Ice/Ice-3.6.3-r1.ebuild
index 50e7d8683c..26fb4e336c 100644
--- a/dev-libs/Ice/Ice-3.6.3-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.6.3-r1.ebuild
@@ -29,7 +29,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( http://download.zeroc.com/Ice/$(get_version_component_range 1-2)/${P}.pdf )"
 LICENSE="GPL-2"
 SLOT="0/36"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="doc examples libressl +ncurses mono php python ruby test debug"
 
 RDEPEND=">=dev-libs/expat-2.0.1


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2016-12-15 10:29 Lars Wendler
  0 siblings, 0 replies; 40+ messages in thread
From: Lars Wendler @ 2016-12-15 10:29 UTC (permalink / raw
  To: gentoo-commits

commit:     6565700bce8fe07c39274e49c56f7323d6c11077
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 10:25:20 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 10:29:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6565700b

dev-libs/Ice: Stable for amd64 and x86 (bug #596650).

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64,x86"

 dev-libs/Ice/Ice-3.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/Ice/Ice-3.6.3.ebuild b/dev-libs/Ice/Ice-3.6.3.ebuild
index b9b237d..49d51b3 100644
--- a/dev-libs/Ice/Ice-3.6.3.ebuild
+++ b/dev-libs/Ice/Ice-3.6.3.ebuild
@@ -29,7 +29,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( http://download.zeroc.com/Ice/$(get_version_component_range 1-2)/${P}.pdf )"
 LICENSE="GPL-2"
 SLOT="0/36"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples libressl +ncurses mono php python ruby test debug"
 
 RDEPEND=">=dev-libs/expat-2.0.1


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2016-10-25 13:45 Lars Wendler
  0 siblings, 0 replies; 40+ messages in thread
From: Lars Wendler @ 2016-10-25 13:45 UTC (permalink / raw
  To: gentoo-commits

commit:     a8a22ce242f1d1c389de6208b070c10d986cfa56
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 13:09:15 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 13:44:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8a22ce2

dev-libs/Ice: Better sys-libs/db support.

Package-Manager: portage-2.3.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-libs/Ice/Ice-3.6.3.ebuild | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev-libs/Ice/Ice-3.6.3.ebuild b/dev-libs/Ice/Ice-3.6.3.ebuild
index 4cd1ef9..b9b237d 100644
--- a/dev-libs/Ice/Ice-3.6.3.ebuild
+++ b/dev-libs/Ice/Ice-3.6.3.ebuild
@@ -17,6 +17,10 @@ PHP_EXT_OPTIONAL_USE=php
 
 USE_PHP="php7-0"
 
+# This variable does not belong to any eclass. It is solely used in this ebuild
+# db:6.2 breaks the build process
+BERKDB_SLOTS=( 6.1 5.3 5.1 4.8 )
+
 inherit db-use eutils mono-env php-ext-source-r2 python-r1 ruby-ng toolchain-funcs versionator
 
 DESCRIPTION="ICE middleware C++ library and generator tools"
@@ -33,8 +37,7 @@ RDEPEND=">=dev-libs/expat-2.0.1
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	|| (
-		sys-libs/db:5.3[cxx]
-		sys-libs/db:5.1[cxx]
+		$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
 	)
 	dev-cpp/libmcpp
 	python? ( ${PYTHON_DEPS} )
@@ -131,8 +134,8 @@ src_prepare() {
 
 src_configure() {
 	suitable_db_version() {
-		local ver tested_slots=(5.3 5.1)
-		for ver in "${tested_slots[@]}"; do
+		local ver
+		for ver in "${BERKDB_SLOTS[@]}"; do
 			if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
 				echo "${ver}"
 				return 0


^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/
@ 2016-10-22 11:24 David Seifert
  0 siblings, 0 replies; 40+ messages in thread
From: David Seifert @ 2016-10-22 11:24 UTC (permalink / raw
  To: gentoo-commits

commit:     c47dcb304342972059e0fbc0079e7dd485f02285
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 22 11:23:41 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct 22 11:24:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c47dcb30

dev-libs/Ice: Modernize ebuild, prepare for EAPI=6

Package-Manager: portage-2.3.2

 dev-libs/Ice/Ice-3.6.3.ebuild | 227 ++++++++++++++++++++++++------------------
 1 file changed, 128 insertions(+), 99 deletions(-)

diff --git a/dev-libs/Ice/Ice-3.6.3.ebuild b/dev-libs/Ice/Ice-3.6.3.ebuild
index f4cbd86..4cd1ef9 100644
--- a/dev-libs/Ice/Ice-3.6.3.ebuild
+++ b/dev-libs/Ice/Ice-3.6.3.ebuild
@@ -17,7 +17,7 @@ PHP_EXT_OPTIONAL_USE=php
 
 USE_PHP="php7-0"
 
-inherit toolchain-funcs versionator php-ext-source-r2 python-r1 mono-env ruby-ng db-use
+inherit db-use eutils mono-env php-ext-source-r2 python-r1 ruby-ng toolchain-funcs versionator
 
 DESCRIPTION="ICE middleware C++ library and generator tools"
 HOMEPAGE="http://www.zeroc.com/"
@@ -56,9 +56,14 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${P/I/i}"
 PHP_EXT_S="${S}/php"
 
+PATCHES=(
+	"${FILESDIR}/${P}-no-arch-opts.patch"
+	"${FILESDIR}/${P}-csharp.patch"
+)
+
 pkg_setup() {
 	# prevent ruby-ng.eclass from messing with pkg_setup
-	:;
+	return
 }
 
 src_unpack() {
@@ -67,8 +72,8 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-no-arch-opts.patch"
-	epatch "${FILESDIR}/${P}-csharp.patch"
+	epatch -p1 "${PATCHES[@]}"
+
 	sed -i \
 		-e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \
 		-e 's|-L\$\(libdir\)||' \
@@ -124,32 +129,33 @@ src_prepare() {
 		ruby/Makefile || die "sed failed"
 }
 
-suitable_db_version() {
-	local tested_slots="5.3 5.1"
-	for ver in ${tested_slots}; do
-		if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
-			echo ${ver}
-			return 0
-		fi
-	done
-	die "No suitable BerkDB versions found, aborting"
-}
-
 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\"
-		embedded_runpath_prefix=\"${EPREFIX}/usr\"
-		LP64=yes
-		new_dtags=yes
-		NOTEST=$(usex test no yes)"
-
-	use ncurses && OPTIONS="${MAKE_RULES} USE_READLINE=yes" || MAKE_RULES="${MAKE_RULES} USE_READLINE=no"
-	use debug && OPTIONS="${MAKE_RULES} OPTIMIZE=no" || MAKE_RULES="${MAKE_RULES} OPTIMIZE=yes"
+	suitable_db_version() {
+		local ver tested_slots=(5.3 5.1)
+		for ver in "${tested_slots[@]}"; do
+			if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
+				echo "${ver}"
+				return 0
+			fi
+		done
+		die "No suitable BerkDB versions found, aborting"
+	}
+
+	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\""
+		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
+		"LP64=yes"
+		"new_dtags=yes"
+		"NOTEST=$(usex !test)"
+		"USE_READLINE=$(usex ncurses)"
+		"OPTIMIZE=$(usex !debug)"
+	)
 
 	local BERKDB_VERSION="$(suitable_db_version)"
-	MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})"
+	MAKE_RULES+=("DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})")
 	sed -i \
 		-e "s|g++|$(tc-getCXX)|" \
 		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
@@ -158,14 +164,17 @@ src_configure() {
 		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
 		cpp/config/Make.rules{,.Linux} python/config/Make.rules || die "sed failed"
 
-	if use python ; then
-		S=${S}/python python_copy_sources
+	if use python; then
+		local S="${S}/python"
+		python_copy_sources
 	fi
 
-	if use ruby ; then
-		SITERUBY="$(ruby22 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
-		MAKE_RULES_RB="install_rubydir=\"${ED}/${SITERUBY}\"
-			install_libdir=\"${ED}/${SITERUBY}\""
+	if use ruby; then
+		SITERUBY="$(ruby22 -r rbconfig -e 'print RbConfig::CONFIG[\"sitelibdir\"]')"
+		MAKE_RULES_RUBY=(
+			"install_rubydir=\"${ED%/}/${SITERUBY}\""
+			"install_libdir=\"${ED%/}/${SITERUBY}\""
+		)
 
 		# make it use ruby22 only
 		sed -i \
@@ -182,11 +191,16 @@ src_configure() {
 			scripts/TestUtil.py || die "sed failed"
 	fi
 
-	MAKE_RULES_CS="GACINSTALL=yes 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\""
+	MAKE_RULES_MONO=(
+		"GACINSTALL=yes"
+		"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\""
+	)
+
 	if has_version ">dev-lang/mono-4"; then
-		MAKE_RULES_CS="${MAKE_RULES_CS} MCS=mcs"
+		MAKE_RULES_MONO+=("MCS=mcs")
 	fi
 
 	use test && python_setup
@@ -196,121 +210,136 @@ src_compile() {
 	# Do not remove this export or build will break!
 	tc-export CXX
 
-	emake -C cpp ${MAKE_RULES} || die "emake failed"
+	emake -C cpp "${MAKE_RULES[@]}"
 
 	if use php; then
-		local slot
-		for slot in $(php_get_slots); do
-			mkdir -p "${WORKDIR}/${slot}"
-			cp -r "${PHP_EXT_S}" "${WORKDIR}/${slot}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
-			cd "${WORKDIR}/${slot}"
-			ln -s "${S}/cpp"
-			ln -s "${S}/config"
-			ln -s "${S}/slice"
-			ln -s "${S}/Makefile"
-
-			emake -C php ${MAKE_RULES} USE_NAMESPACES=yes PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config" || die "emake php failed"
+		local i
+		for i in $(php_get_slots); do
+			mkdir -p "${WORKDIR}/${i}" || die
+			cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
+
+			pushd "${WORKDIR}/${i}" >/dev/null || die
+			ln -s "${S}/cpp" || die
+			ln -s "${S}/config" || die
+			ln -s "${S}/slice" || die
+			ln -s "${S}/Makefile" || die
+
+			emake -C php "${MAKE_RULES[@]}" USE_NAMESPACES=yes "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
+			popd >/dev/null || die
 		done
-		cd "${S}"
 	fi
 
-	if use python ; then
+	if use python; then
 		building() {
-			emake -C "${BUILD_DIR}" ${MAKE_RULES} PYTHON=${EPYTHON} || die "emake python-${EPYTHON} failed"
+			emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
 		}
-		S=${S}/python python_foreach_impl building
+		local S="${S}/python"
+		python_foreach_impl building
 	fi
 
-	if use ruby ; then
-		emake -C ruby ${MAKE_RULES} ${MAKE_RULES_RB} || die "emake rb failed"
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
 	fi
 
-	if use mono ; then
-		emake -C csharp ${MAKE_RULES} ${MAKE_RULES_CS} || die "emake csharp failed"
+	if use mono; then
+		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}"
 	fi
 }
 
 src_test() {
-	export LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	emake -C cpp ${MAKE_RULES} test || die "emake cpp test failed"
+	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	emake -C cpp "${MAKE_RULES[@]}" test
 
 	# php tests require the extension loaded and are therefore skipped
 
-	if use python ; then
+	if use python; then
 		testing() {
-			emake -C "${BUILD_DIR}" ${MAKE_RULES} PYTHON=${EPYTHON} \
-				install_pythondir="\"${D}/$(python_get_sitedir)\"" \
-				install_libdir="\"${D}/$(python_get_sitedir)\"" \
-				test || die "emake python-${EPYTHON} test failed"
+			emake -C "${BUILD_DIR}" \
+				"${MAKE_RULES[@]}" \
+				PYTHON="${EPYTHON}" \
+				install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \
+				install_libdir="\"${D%/}/$(python_get_sitedir)\"" test
 		}
-		S=${S}/python python_foreach_impl testing
+		local S="${S}/python"
+		python_foreach_impl testing
 	fi
 
-	if use ruby ; then
-		emake -C ruby ${MAKE_RULES} ${MAKE_RULES_RB} test || die "emake ruby test failed"
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
 	fi
 
-	if use mono ; then
+	if use mono; then
 		# skip mono tests, bug #498484
 		ewarn "Tests for C# are currently disabled."
-#		emake -C csharp ${MAKE_RULES} ${MAKE_RULES_CS} test || die "emake csharp test failed"
+		#emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" test
 	fi
 }
 
 src_install() {
-	dodoc CHANGELOG*.md README.md
+	local DOCS=( CHANGELOG*.md README.md )
+	use doc && DOCS+=( "${DISTDIR}/${P}.pdf" )
+	einstalldocs
 
 	insinto /usr/share/${P}
 	doins -r slice
 
-	emake -C cpp ${MAKE_RULES} install || die "emake install failed"
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples-cpp
-		doins cpp/config/*.cfg
-	fi
+	emake -C cpp "${MAKE_RULES[@]}" install
 
-	if use doc ; then
-		dodoc "${DISTDIR}/${P}.pdf"
+	if use examples; then
+		docinto examples-cpp
+		dodoc cpp/config/*.cfg
+		docompress -x /usr/share/doc/${PF}/examples-cpp
 	fi
 
-	if use php ; then
+	if use php; then
 		insinto "/usr/share/php/${PN}"
-		doins $(cd php/lib; find "${S}"/php/lib/ -name '*.php' -print)
-		for dir in $( cd "${D}/usr/share/${P}/slice" ; ls -1 ); do
-			mkdir -p "${D}/usr/share/php/${dir}"
-			LD_LIBRARY_PATH="${D}/usr/$(get_libdir):${LD_LIBRARY_PATH}" ${D}/usr/bin/slice2php -I${D}/usr/share/${P}/slice/ --all --output-dir ${D}/usr/share/php/${dir} --ice ${D}/usr/share/${P}/slice/${dir}/*
+
+		local i
+		while IFS="" read -d $'\0' -r i; do
+			doins "${i}"
+		done < <(find "${S}/php/lib/" -name '*.php' -print0)
+
+		pushd "${ED%/}/usr/share/${P}/slice" >/dev/null || die
+
+		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}"/*
 		done
 
-		local slot
-		for slot in $(php_get_slots); do
-			php_init_slot_env ${slot}
+		for i in $(php_get_slots); do
+			php_init_slot_env "${i}"
 			insinto "${EXT_DIR}"
-			newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
+			newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
 		done
 		php-ext-source-r2_createinifiles
 
-		cd "${S}"
+		popd >/dev/null || die
 	fi
 
-	if use python ; then
+	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 || die "emake python-${EPYTHON} install failed"
+			emake -C "${BUILD_DIR}" \
+				"${MAKE_RULES[@]}" \
+				install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \
+				install_libdir="\"${D%/}/$(python_get_sitedir)\"" \
+				install
 		}
-		S=${S}/python python_foreach_impl installation
+		local S="${S}/python"
+		python_foreach_impl installation
 	fi
 
-	if use ruby ; then
+	if use ruby; then
 		dodir "${SITERUBY}"
-		emake -C ruby ${MAKE_RULES} ${MAKE_RULES_RB} install || die "emake ruyb install failed"
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install
 	fi
 
-	if use mono ; then
-		emake -C csharp ${MAKE_RULES} ${MAKE_RULES_CS} install || die "emake csharp install failed"
+	if use mono; then
+		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" install
 	fi
 }


^ permalink raw reply related	[flat|nested] 40+ messages in thread

end of thread, other threads:[~2024-10-07 10:35 UTC | newest]

Thread overview: 40+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-16 11:53 [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/ Conrad Kostecki
  -- strict thread matches above, loose matches on Subject: below --
2024-10-07 10:35 Sam James
2023-08-19  7:36 Hans de Graaff
2023-06-12  4:41 Sam James
2023-06-12  4:39 Sam James
2023-03-30  9:56 Sam James
2023-03-30  9:56 Sam James
2022-08-18 16:45 Arthur Zamarin
2022-07-09  6:33 Hans de Graaff
2022-06-26  7:45 Hans de Graaff
2022-06-10 17:54 Conrad Kostecki
2021-07-14  4:10 Sam James
2021-06-06  7:21 Hans de Graaff
2021-06-06  7:16 Agostino Sarubbo
2021-06-06  7:14 Agostino Sarubbo
2021-04-30 18:01 Mikle Kolyada
2020-07-22  9:01 Agostino Sarubbo
2020-07-21 10:44 Agostino Sarubbo
2020-07-15 15:10 Lars Wendler
2020-06-14  6:40 Hans de Graaff
2020-04-28  9:42 Agostino Sarubbo
2020-04-28  9:39 Agostino Sarubbo
2020-03-30  5:39 Hans de Graaff
2020-02-10 21:00 Michał Górny
2019-09-17 11:34 Michał Górny
2019-04-09  5:53 Hans de Graaff
2019-01-16 15:46 Mikle Kolyada
2018-12-29 19:12 Thomas Deutschmann
2018-11-13 15:02 Lars Wendler
2018-06-27 20:32 Pacho Ramos
2018-04-26 13:47 Thomas Deutschmann
2018-04-26 13:47 Thomas Deutschmann
2018-04-18 16:28 Mikle Kolyada
2018-04-15  5:23 Hans de Graaff
2018-03-17  6:45 Matt Turner
2017-04-05 15:00 Lars Wendler
2017-02-23  9:40 Michael Weber
2016-12-15 10:29 Lars Wendler
2016-10-25 13:45 Lars Wendler
2016-10-22 11:24 David Seifert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox