Bugfix revision - patch bug in slice2cpp

4 files changed, 23 insertions, 351 deletions

diff --git a/dev-libs/Ice/Ice-3.6.3-r2.ebuild b/dev-libs/Ice/Ice-3.6.3-r2.ebuild
deleted file mode 100644
index a21ac07..0000000
--- a/dev-libs/Ice/Ice-3.6.3-r2.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby22"
-
-PHP_EXT_NAME="IcePHP"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-PHP_EXT_OPTIONAL_USE=php
-
-USE_PHP="php7-0"
-
-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/"
-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 c++0x test debug"
-
-RDEPEND=">=dev-libs/expat-2.0.1
-	>=app-arch/bzip2-1.0.5
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	|| (
-		sys-libs/db:5.3[cxx]
-		sys-libs/db:5.1[cxx]
-	)
-	dev-cpp/libmcpp
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby22) )
-	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}-dont-append-c++11-to-libs.patch"
-	"${FILESDIR}/${P}-dont-separate-c++11-libs.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 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)"
-		"CPP11=$(usex c++0x)"
-	)
-
-	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="$(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 \
-			-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/Ice-3.6.3-r3.ebuild b/dev-libs/Ice/Ice-3.6.3-r4.ebuild
index 31c80eb..690b430 100644
--- a/dev-libs/Ice/Ice-3.6.3-r3.ebuild
+++ b/dev-libs/Ice/Ice-3.6.3-r4.ebuild
@@ -65,6 +65,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-libressl.patch"
 	"${FILESDIR}/${P}-dont-append-c++11-to-libs.patch"
 	"${FILESDIR}/${P}-dont-separate-c++11-libs.patch"
+	"${FILESDIR}/${P}-slice.patch"
 )
 
 pkg_setup() {
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index 90b29dd..6fdba16 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -3,7 +3,7 @@ AUX Ice-3.6.3-dont-append-c++11-to-libs.patch 373 SHA256 33b841aba379a1077b48b0e
 AUX Ice-3.6.3-dont-separate-c++11-libs.patch 557 SHA256 bbb4d0162649c7df642d2a66e3b5bee88e896745642e9b35d23399cec12650a0 SHA512 44fc28e81a7ffde8e48f5b0fbaaba38e695bab749a7f0533a52816b088011641a341ed7d67fb439da0751b29e9f91fb17e54027c576b48a73e6208bee6d4f0b1 WHIRLPOOL e835c4da465973364735618488cfda8df70be95e92a044da047443ab66875e010b5b79dfa1433f44f57b696d3597367fc15797c3b33a556b33b9cdf51deff7d4
 AUX Ice-3.6.3-libressl.patch 6461 SHA256 39137ccea35a8b8d72d5d38bdf1503df4e1bfaa9dff2a0e66f8c644af3c9e278 SHA512 386ed4d666ea76a16255e7e5023be9880ac1f5e26ffec3d19560484eb6ace158f134c1d425586c1f654d7dc58732c17ed4b190eaf26f4aba0cd4bc319abe50cb WHIRLPOOL e41498ead25b41975172745b84a9be18f2fd0f8cca9d9d904f0dec1aea158e595719380f6b2957b01fe04f5521f8cb88a0b1075fc8a985536777053608dd75f0
 AUX Ice-3.6.3-no-arch-opts.patch 1462 SHA256 e84911ad11b435e559f0e3cd5d294fce1543c0237943641923d1c1303c796953 SHA512 236abce89a7bcf64d6a12db5a82d62db1effa2b5a105ae7c83910f02ca1ccd610193097a2c959d2a487f0d641af70ba8013bcfe570e2af40976d9a1017272e6e WHIRLPOOL 76899080b3965d01ff0c063ca72f17a609d34a7b60e750049932dcbad6b19a15e48d538b6b0ef1ac8a17bb387646f48f9cd0d1f7e8f40462b94681640a3a91d2
+AUX Ice-3.6.3-slice.patch 897 SHA256 ad9a2f1f7845febe13219ed9d6fb9ef2b7ba10bccab280c219d77ed6fae6700b SHA512 f2eabb30206183f96e81b1988787854e7602328373dba359197a3af4ec7aaefd69862b4e634fca6a5f6d27bd43bea61832d54d32153be19c064039b1d327bed4 WHIRLPOOL 361aca54557f7386079fbe74a60b2f0571c469910fbb723db5820b62113b3265b6494ecddeb9ee57bce723921a391a8b3eca3a9a63178f3cdb3e2c00216d4cc8
 DIST Ice-3.6.3.pdf 8844957 SHA256 bf6edd649d44dcac1951d7d62b112fb535b8f29f58973cfdcd5cabf8940bb3b9 SHA512 44638a315b0da9c26519c053c48ab8ee216c43410f53844465535a972ae01031f1603769e9b3169fdf9358de67e0d0c7e238b2918b5d5b1c4cb95cb922fa922a WHIRLPOOL 65087b4c643e2c7f2cf66b3b9fb433823f75c8b5a44b838d39077f2dab85c57ff4e022931ec8ba21cbc6deda2e55257f6c0d2d0a360d50e9b1a615253ad7ed0a
 DIST Ice-3.6.3.tar.gz 5512741 SHA256 82ff74e6d24d9fa396dbb4d9697dc183b17bc9c3f6f076fecdc05632be80a2dc SHA512 6e17d21f55a8504af87a64c498a0c4d2084ed96a85c7a66d00319324774f671ace6afa03108d8d4e9bedf5fcfc2f3dba247949a27deecacdd0d298bd0bfe0a45 WHIRLPOOL 4e2d50aaf62f805a0c5471ab907c7680607de5fe101c96a740a3bc1b8ddc7ea93d768ba5886b26772647eb173417195bd808399192b2d2c7d5adb40cf38fc95f
-EBUILD Ice-3.6.3-r2.ebuild 9072 SHA256 57791196aa8ee25906b9d9363f35b986c32128971023742e8540a6886f7a530c SHA512 1ec2bf4706e7e621efa0de33032b933053d8fee4a0d82b3cfebb3fcde93347ed808d7fb63ea6d4eaf5121db4ebc272e9e6b13b49f1a431f6d51ffcd4ad75e16c WHIRLPOOL 953a99c4afbba7d575411d230446c4b9cf1459022772ec3a465edb52f52c5a9f3790dd7d8f3ba4e33a8d99e8dc2a46815e55ebe2c28ab2666257100d73d5385a
-EBUILD Ice-3.6.3-r3.ebuild 9274 SHA256 1e8aa67bc3c260ec89fb877c7449eab3fecd84d4670cb236d5f57736aed936bc SHA512 bd35eefeb96fcdbd09ad530f5a814a1684aee6e77b848c82dec3654e5ab3f7218e3cae0cfc54ed70240525162cfc8901cd076b3d63b2f36fb8abd467961ea96a WHIRLPOOL 9896467e9c20565930ac6212f99336dec76c6cc6aa4cb66a65306354a49e119eac05665dbaa45fd67c4550340487b0cfb5b8527b3dc22a61e2026fced03fe1b3
+EBUILD Ice-3.6.3-r4.ebuild 9306 SHA256 a604cc12b61f2825bb7c9a04356262d7bd8aa5640c2d01fdc0f14e23535f851f SHA512 1930290db9aaea8ade220c83926b578c1aa36463084e3428a84ec2ff98f699661828eeed6299a4be0ba28b1a9a210d7645375a3e1bbaa40bd262625488d59852 WHIRLPOOL fbb75fca7c0d747b1f7fbedbe186dba9ae64e2060922083236a1234b868ec4125d3020817ff68872d5d1d6d0b19b5d70d7a0c4d001b839f7de44d9759d35fb8a
diff --git a/dev-libs/Ice/files/Ice-3.6.3-slice.patch b/dev-libs/Ice/files/Ice-3.6.3-slice.patch
new file mode 100644
index 0000000..fa04684
--- /dev/null
+++ b/dev-libs/Ice/files/Ice-3.6.3-slice.patch
@@ -0,0 +1,20 @@
+commit c56f8ab6ca6ca0bdb9536fcce1ef24f1ef40ddc7
+Author: Benoit Foucher <benoit@zeroc.com>
+Date:   Mon Jun 27 17:54:30 2016 +0200
+
+    Refactored SSL and iAP transports, support for running SSL on top
+    of TCP/iAP/Bluetooth.
+
+diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
+index 81c335ad2d..5fe808581f 100644
+--- a/cpp/src/slice2cpp/Gen.cpp
++++ b/cpp/src/slice2cpp/Gen.cpp
+@@ -2527,7 +2527,7 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
+     }
+ 
+     bool hasBaseClass = !bases.empty() && !bases.front()->isInterface();
+-    bool override = p->canBeCyclic() && (!hasBaseClass || !bases.front()->canBeCyclic());
++    bool override = !p->isLocal() && p->canBeCyclic() && (!hasBaseClass || !bases.front()->canBeCyclic());
+     bool hasGCObjectBaseClass = basePreserved || override || preserved;
+     if(!basePreserved && (override || preserved))
+     {