From 26d32e54538ee0bc379ccdd5f8389f05e6bca464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Wed, 24 Jan 2018 16:40:07 +0100
Subject: [PATCH] [dev-libs/Ice] sync live, add 3.6.4 for testing

---
 dev-libs/Ice/Ice-3.6.4.ebuild                 | 329 ++++++++++++++++++
 dev-libs/Ice/Ice-3.6.9999.ebuild              |  26 +-
 dev-libs/Ice/Manifest                         |   2 +
 dev-libs/Ice/files/Ice-3.6.3-php71.patch      |  30 --
 ...ce-3.6.3-db6.patch => Ice-3.6.4-db6.patch} |   0
 5 files changed, 337 insertions(+), 50 deletions(-)
 create mode 100644 dev-libs/Ice/Ice-3.6.4.ebuild
 create mode 100644 dev-libs/Ice/Manifest
 delete mode 100644 dev-libs/Ice/files/Ice-3.6.3-php71.patch
 rename dev-libs/Ice/files/{Ice-3.6.3-db6.patch => Ice-3.6.4-db6.patch} (100%)

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 0000000..1ccf8e6
--- /dev/null
+++ b/dev-libs/Ice/Ice-3.6.4.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="ruby23"
+
+PHP_EXT_NAME="IcePHP"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+PHP_EXT_OPTIONAL_USE=php
+
+USE_PHP="php7-1 php7-2"
+
+# 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 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 +readline 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 )
+	!dev-python/IcePy
+	!dev-ruby/IceRuby"
+DEPEND="${RDEPEND}
+	readline? ( sys-libs/readline:0= )
+	test? (
+		${PYTHON_DEPS}
+		dev-python/passlib[${PYTHON_USEDEP}]
+	)"
+
+# Maintainer notes:
+# TODO: java bindings
+
+S="${WORKDIR}/${P/I/i}"
+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 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|' \
+		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
+	# IceGrid/admin fails, no idea why
+	# skip IceSSL tests due to requirement of internet connection
+	# IceUtil/stacktrace fails with USE=debug
+	sed -i \
+		-e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceUtil\/stacktrace|' \
+		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"
+}
+
+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 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 "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"]')"
+		SITERUBYARCH="$(ruby23 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
+		MAKE_RULES_RUBY=(
+			"install_rubydir=\"${ED%/}/${SITERUBY}\""
+			"install_libdir=\"${ED%/}/${SITERUBYARCH}\""
+		)
+
+		# 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() {
+			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}/${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-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
+		}
+		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/Ice-3.6.9999.ebuild b/dev-libs/Ice/Ice-3.6.9999.ebuild
index 35563a4..f89701a 100644
--- a/dev-libs/Ice/Ice-3.6.9999.ebuild
+++ b/dev-libs/Ice/Ice-3.6.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 
 RUBY_OPTIONAL="yes"
-USE_RUBY="ruby23"
+USE_RUBY="ruby24"
 
 PHP_EXT_NAME="IcePHP"
 PHP_EXT_INI="yes"
@@ -14,7 +14,7 @@ PHP_EXT_ZENDEXT="no"
 
 PHP_EXT_OPTIONAL_USE=php
 
-USE_PHP="php7-0 php7-1"
+USE_PHP="php7-1 php7-2"
 
 EGIT_REPO_URI="https://github.com/zeroc-ice/ice.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
@@ -82,21 +82,9 @@ 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' \
@@ -108,8 +96,6 @@ src_prepare() {
 
 	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
@@ -117,12 +103,12 @@ src_prepare() {
 		-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
 	# IceGrid/admin fails, no idea why
+	# skip IceSSL tests due to requirement of internet connection
+	# IceUtil/stacktrace fails with USE=debug
 	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceSSL --rfilter=IceGrid\/admin|' \
+		-e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceUtil\/stacktrace|' \
 		cpp/Makefile || die "sed failed"
 
 	# mainly broken .ice files
@@ -257,7 +243,7 @@ src_test() {
 
 	if use python; then
 		testing() {
-			emake -C "${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \
 				"${MAKE_RULES[@]}" \
 				PYTHON="${EPYTHON}" \
 				install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
new file mode 100644
index 0000000..2f01fc4
--- /dev/null
+++ b/dev-libs/Ice/Manifest
@@ -0,0 +1,2 @@
+DIST Ice-3.6.4.pdf 8907736 BLAKE2B 5a631c1e2e147c8ed3b31a84192210c92bbe83e8644ec9d7d164d1b94a20069ce77f6baf54910ac00c7216cbc2979caac6fa78457e9292a84407e93000f9903a SHA512 9bd2d373eb83e08e563cab174a53063a490367dea3e4b910f93f0477c3817282c859f07e46e503006e9bd37678fb6da31a58b88bfabd217b5e371fff685321a0
+DIST Ice-3.6.4.tar.gz 5523841 BLAKE2B 4e50dcf0f004f14a38c173f181cabb97fdc201786c338800b9750dc0cf6ce9b1397ea26b4357de1f6e1ac6b4e69abbe2bf464a5f9c2926f6ae45abbf5a69803b SHA512 fdb412ce591bca7aede2ac7d70600184f3b67279e8ffdfee3649f517d5531d2dfee54b37d0cc6de2ef5de8ecd281c39d6c951781b68f9a36316a7607cefb9e57
diff --git a/dev-libs/Ice/files/Ice-3.6.3-php71.patch b/dev-libs/Ice/files/Ice-3.6.3-php71.patch
deleted file mode 100644
index 324f562..0000000
--- a/dev-libs/Ice/files/Ice-3.6.3-php71.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- ice-3.6.3/php/src/php7/Types.cpp.orig	2016-10-05 16:59:08.000000000 +0200
-+++ ice-3.6.3/php/src/php7/Types.cpp	2017-06-30 20:05:36.233173124 +0200
-@@ -1166,26 +1166,7 @@
- {
-     assert(Z_TYPE_P(target) == IS_OBJECT);
- 
--    //
--    // The add_property_zval function fails if the data member has protected visibility.
--    // As a workaround, before calling the function we change the current scope to be that
--    // of the object.
--    //
--    zend_class_entry *oldScope = EG(scope);
--    EG(scope) = Z_OBJCE_P(target);
--
--    //
--    // add_property_zval increments the refcount of zv.
--    //
--    int status = add_property_zval(target, STRCAST(name.c_str()), zv);
--
--    EG(scope) = oldScope; // Restore the previous scope.
--
--    if(status == FAILURE)
--    {
--        runtimeError("unable to set member `%s'", name.c_str());
--        throw AbortMarshaling();
--    }
-+    zend_update_property(Z_OBJCE_P(target), target, STRCAST(name.c_str()), strlen(name.c_str()), zv);
- }
- 
- static void
diff --git a/dev-libs/Ice/files/Ice-3.6.3-db6.patch b/dev-libs/Ice/files/Ice-3.6.4-db6.patch
similarity index 100%
rename from dev-libs/Ice/files/Ice-3.6.3-db6.patch
rename to dev-libs/Ice/files/Ice-3.6.4-db6.patch