public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-libs/Ice: Ice-3.5.1.ebuild ChangeLog
@ 2013-10-11  8:01 Lars Wendler (polynomial-c)
  0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler (polynomial-c) @ 2013-10-11  8:01 UTC (permalink / raw
  To: gentoo-commits

polynomial-c    13/10/11 08:01:53

  Modified:             ChangeLog
  Added:                Ice-3.5.1.ebuild
  Log:
  Version bump
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

Revision  Changes    Path
1.26                 dev-libs/Ice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?r1=1.25&r2=1.26

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog	5 Sep 2013 18:29:54 -0000	1.25
+++ ChangeLog	11 Oct 2013 08:01:53 -0000	1.26
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/Ice
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.25 2013/09/05 18:29:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.26 2013/10/11 08:01:53 polynomial-c Exp $
+
+*Ice-3.5.1 (11 Oct 2013)
+
+  11 Oct 2013; Lars Wendler <polynomial-c@gentoo.org> +Ice-3.5.1.ebuild:
+  Version bump.
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> Ice-3.5.0-r1.ebuild:
   Clean up PYTHON_COMPAT from old implementations.



1.1                  dev-libs/Ice/Ice-3.5.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.1&content-type=text/plain

Index: Ice-3.5.1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.1 2013/10/11 08:01:53 polynomial-c Exp $

EAPI=5

PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
RUBY_OPTIONAL="yes"
USE_RUBY="ruby18"

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/"
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 ~ia64 ~x86 ~x86-linux ~x64-macos"
IUSE="doc examples +ncurses mono python ruby test debug"

RDEPEND=">=dev-libs/expat-2.0.1
	>=app-arch/bzip2-1.0.5
	>=dev-libs/openssl-0.9.8o:0
	<sys-libs/db-6.0[cxx]
	~dev-cpp/libmcpp-2.7.2
	python? ( ${PYTHON_DEPS} )
	ruby? ( $(ruby_implementation_depend ruby18) )
	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"

	if ! use test ; then
		sed -i \
			-e 's|^\(SUBDIRS.*\)test|\1|' \
			{cpp,cs,php,py,rb}/Makefile || die "sed failed"
	fi
}

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"

	MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I$(db_includedir)"
	sed -i \
		-e "s|c++|$(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)|" \
		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="$(ruby18 -r rbconfig -e 'print Config::CONFIG["sitedir"]')"
		MAKE_RULES_RB="install_rubydir=\"${ED}/${SITERUBY}\"
			install_libdir=\"${ED}/${SITERUBY}\""

		# make it use ruby18 only
		sed -i \
			-e 's|RUBY = ruby|\018|' \
			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() {
	if tc-is-cross-compiler ; then
		export CXX="${CHOST}-g++"
	fi

	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
#		ewarn "Tests for C# are currently disabled."
		run_tests cs || die "emake cs test failed"
	fi
}





^ permalink raw reply	[flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/Ice: Ice-3.5.1.ebuild ChangeLog
@ 2013-11-26 13:31 Sergey Popov (pinkbyte)
  0 siblings, 0 replies; 11+ messages in thread
From: Sergey Popov (pinkbyte) @ 2013-11-26 13:31 UTC (permalink / raw
  To: gentoo-commits

pinkbyte    13/11/26 13:31:45

  Modified:             Ice-3.5.1.ebuild ChangeLog
  Log:
  Use Ruby 1.9 for bindings as suggested by upstream, bug #490172
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

Revision  Changes    Path
1.2                  dev-libs/Ice/Ice-3.5.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?r1=1.1&r2=1.2

Index: Ice-3.5.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Ice-3.5.1.ebuild	11 Oct 2013 08:01:53 -0000	1.1
+++ Ice-3.5.1.ebuild	26 Nov 2013 13:31:45 -0000	1.2
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.1 2013/10/11 08:01:53 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.2 2013/11/26 13:31:45 pinkbyte Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 RUBY_OPTIONAL="yes"
-USE_RUBY="ruby18"
+USE_RUBY="ruby19"
 
 inherit toolchain-funcs versionator python-r1 mono-env ruby-ng db-use
 
@@ -25,7 +25,7 @@
 	<sys-libs/db-6.0[cxx]
 	~dev-cpp/libmcpp-2.7.2
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby18) )
+	ruby? ( $(ruby_implementation_depend ruby19) )
 	mono? ( dev-lang/mono )
 	!dev-python/IcePy
 	!dev-ruby/IceRuby"
@@ -115,13 +115,13 @@
 	fi
 
 	if use ruby ; then
-		SITERUBY="$(ruby18 -r rbconfig -e 'print Config::CONFIG["sitedir"]')"
+		SITERUBY="$(ruby19 -r rbconfig -e 'print Config::CONFIG["sitedir"]')"
 		MAKE_RULES_RB="install_rubydir=\"${ED}/${SITERUBY}\"
 			install_libdir=\"${ED}/${SITERUBY}\""
 
-		# make it use ruby18 only
+		# make it use ruby19 only
 		sed -i \
-			-e 's|RUBY = ruby|\018|' \
+			-e 's|RUBY = ruby|\019|' \
 			rb/config/Make.rules || die "sed failed"
 	fi
 



1.27                 dev-libs/Ice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?r1=1.26&r2=1.27

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ChangeLog	11 Oct 2013 08:01:53 -0000	1.26
+++ ChangeLog	26 Nov 2013 13:31:45 -0000	1.27
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/Ice
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.26 2013/10/11 08:01:53 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.27 2013/11/26 13:31:45 pinkbyte Exp $
+
+  26 Nov 2013; Sergey Popov <pinkbyte@gentoo.org> Ice-3.5.1.ebuild:
+  Use Ruby 1.9 for bindings as suggested by upstream, bug #490172
 
 *Ice-3.5.1 (11 Oct 2013)
 





^ permalink raw reply	[flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/Ice: Ice-3.5.1.ebuild ChangeLog
@ 2013-12-24 12:43 Agostino Sarubbo (ago)
  0 siblings, 0 replies; 11+ messages in thread
From: Agostino Sarubbo (ago) @ 2013-12-24 12:43 UTC (permalink / raw
  To: gentoo-commits

ago         13/12/24 12:43:59

  Modified:             Ice-3.5.1.ebuild ChangeLog
  Log:
  Stable for x86, wrt bug #492612
  
  (Portage version: 2.2.7/cvs/Linux x86_64, RepoMan options: --include-arches="x86", signed Manifest commit with key 7194459F)

Revision  Changes    Path
1.3                  dev-libs/Ice/Ice-3.5.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?r1=1.2&r2=1.3

Index: Ice-3.5.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Ice-3.5.1.ebuild	26 Nov 2013 13:31:45 -0000	1.2
+++ Ice-3.5.1.ebuild	24 Dec 2013 12:43:59 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.2 2013/11/26 13:31:45 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.3 2013/12/24 12:43:59 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@
 	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 ~ia64 x86 ~x86-linux ~x64-macos"
 IUSE="doc examples +ncurses mono python ruby test debug"
 
 RDEPEND=">=dev-libs/expat-2.0.1



1.28                 dev-libs/Ice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?r1=1.27&r2=1.28

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ChangeLog	26 Nov 2013 13:31:45 -0000	1.27
+++ ChangeLog	24 Dec 2013 12:43:59 -0000	1.28
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/Ice
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.27 2013/11/26 13:31:45 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.28 2013/12/24 12:43:59 ago Exp $
+
+  24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> Ice-3.5.1.ebuild:
+  Stable for x86, wrt bug #492612
 
   26 Nov 2013; Sergey Popov <pinkbyte@gentoo.org> Ice-3.5.1.ebuild:
   Use Ruby 1.9 for bindings as suggested by upstream, bug #490172





^ permalink raw reply	[flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/Ice: Ice-3.5.1.ebuild ChangeLog
@ 2014-01-18 18:37 Pacho Ramos (pacho)
  0 siblings, 0 replies; 11+ messages in thread
From: Pacho Ramos (pacho) @ 2014-01-18 18:37 UTC (permalink / raw
  To: gentoo-commits

pacho       14/01/18 18:37:46

  Modified:             Ice-3.5.1.ebuild ChangeLog
  Log:
  amd64 stable, bug #492612
  
  (Portage version: 2.2.8/cvs/Linux x86_64, RepoMan options: --include-arches="amd64", signed Manifest commit with key A188FBD4)

Revision  Changes    Path
1.4                  dev-libs/Ice/Ice-3.5.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?r1=1.3&r2=1.4

Index: Ice-3.5.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Ice-3.5.1.ebuild	24 Dec 2013 12:43:59 -0000	1.3
+++ Ice-3.5.1.ebuild	18 Jan 2014 18:37:46 -0000	1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.3 2013/12/24 12:43:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.4 2014/01/18 18:37:46 pacho Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@
 	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 ~ia64 x86 ~x86-linux ~x64-macos"
 IUSE="doc examples +ncurses mono python ruby test debug"
 
 RDEPEND=">=dev-libs/expat-2.0.1



1.29                 dev-libs/Ice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?r1=1.28&r2=1.29

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ChangeLog	24 Dec 2013 12:43:59 -0000	1.28
+++ ChangeLog	18 Jan 2014 18:37:46 -0000	1.29
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/Ice
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.28 2013/12/24 12:43:59 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.29 2014/01/18 18:37:46 pacho Exp $
+
+  18 Jan 2014; Pacho Ramos <pacho@gentoo.org> Ice-3.5.1.ebuild:
+  amd64 stable, bug #492612
 
   24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> Ice-3.5.1.ebuild:
   Stable for x86, wrt bug #492612





^ permalink raw reply	[flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/Ice: Ice-3.5.1.ebuild ChangeLog
@ 2014-01-18 18:44 Pacho Ramos (pacho)
  0 siblings, 0 replies; 11+ messages in thread
From: Pacho Ramos (pacho) @ 2014-01-18 18:44 UTC (permalink / raw
  To: gentoo-commits

pacho       14/01/18 18:44:01

  Modified:             Ice-3.5.1.ebuild ChangeLog
  Log:
  Revert as I was hitting bug #498484 but this the stab with the wrong bug number :S
  
  (Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

Revision  Changes    Path
1.5                  dev-libs/Ice/Ice-3.5.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?r1=1.4&r2=1.5

Index: Ice-3.5.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Ice-3.5.1.ebuild	18 Jan 2014 18:37:46 -0000	1.4
+++ Ice-3.5.1.ebuild	18 Jan 2014 18:44:01 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.4 2014/01/18 18:37:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.5 2014/01/18 18:44:01 pacho Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@
 	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 ~ia64 x86 ~x86-linux ~x64-macos"
 IUSE="doc examples +ncurses mono python ruby test debug"
 
 RDEPEND=">=dev-libs/expat-2.0.1



1.30                 dev-libs/Ice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?r1=1.29&r2=1.30

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ChangeLog	18 Jan 2014 18:37:46 -0000	1.29
+++ ChangeLog	18 Jan 2014 18:44:01 -0000	1.30
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/Ice
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.29 2014/01/18 18:37:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.30 2014/01/18 18:44:01 pacho Exp $
+
+  18 Jan 2014; Pacho Ramos <pacho@gentoo.org> Ice-3.5.1.ebuild:
+  Revert as I was hitting bug #498484 but this the stab with the wrong bug
+  number :S
 
   18 Jan 2014; Pacho Ramos <pacho@gentoo.org> Ice-3.5.1.ebuild:
   amd64 stable, bug #492612





^ permalink raw reply	[flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/Ice: Ice-3.5.1.ebuild ChangeLog
@ 2014-02-19 12:27 Sergey Popov (pinkbyte)
  0 siblings, 0 replies; 11+ messages in thread
From: Sergey Popov (pinkbyte) @ 2014-02-19 12:27 UTC (permalink / raw
  To: gentoo-commits

pinkbyte    14/02/19 12:27:25

  Modified:             Ice-3.5.1.ebuild ChangeLog
  Log:
  Respect compiler, skip mono tests cause they are badly broken, bug #498484
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

Revision  Changes    Path
1.6                  dev-libs/Ice/Ice-3.5.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?r1=1.5&r2=1.6

Index: Ice-3.5.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Ice-3.5.1.ebuild	18 Jan 2014 18:44:01 -0000	1.5
+++ Ice-3.5.1.ebuild	19 Feb 2014 12:27:25 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.5 2014/01/18 18:44:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.6 2014/02/19 12:27:25 pinkbyte Exp $
 
 EAPI=5
 
@@ -80,10 +80,15 @@
 		-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,cs,php,py,rb}/Makefile || die "sed failed"
+			{cpp,php,py,rb}/Makefile || die "sed failed"
 	fi
 }
 
@@ -100,7 +105,7 @@
 
 	MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I$(db_includedir)"
 	sed -i \
-		-e "s|c++|$(tc-getCXX)|" \
+		-e "s|g++|$(tc-getCXX)|" \
 		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
 		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
 		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
@@ -131,9 +136,8 @@
 }
 
 src_compile() {
-	if tc-is-cross-compiler ; then
-		export CXX="${CHOST}-g++"
-	fi
+	# Do not remove this export or build will break!
+	tc-export CXX
 
 	emake -C cpp ${MAKE_RULES} || die "emake failed"
 
@@ -257,7 +261,8 @@
 	fi
 
 	if use mono ; then
-#		ewarn "Tests for C# are currently disabled."
-		run_tests cs || die "emake cs test failed"
+		# skip mono tests, bug #498484
+		ewarn "Tests for C# are currently disabled."
+#		run_tests cs || die "emake cs test failed"
 	fi
 }



1.31                 dev-libs/Ice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?r1=1.30&r2=1.31

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ChangeLog	18 Jan 2014 18:44:01 -0000	1.30
+++ ChangeLog	19 Feb 2014 12:27:25 -0000	1.31
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/Ice
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.30 2014/01/18 18:44:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.31 2014/02/19 12:27:25 pinkbyte Exp $
+
+  19 Feb 2014; Sergey Popov <pinkbyte@gentoo.org> Ice-3.5.1.ebuild:
+  Respect compiler, skip mono tests cause they are badly broken, bug #498484
 
   18 Jan 2014; Pacho Ramos <pacho@gentoo.org> Ice-3.5.1.ebuild:
   Revert as I was hitting bug #498484 but this the stab with the wrong bug





^ permalink raw reply	[flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/Ice: Ice-3.5.1.ebuild ChangeLog
@ 2014-02-19 12:29 Sergey Popov (pinkbyte)
  0 siblings, 0 replies; 11+ messages in thread
From: Sergey Popov (pinkbyte) @ 2014-02-19 12:29 UTC (permalink / raw
  To: gentoo-commits

pinkbyte    14/02/19 12:29:25

  Modified:             Ice-3.5.1.ebuild ChangeLog
  Log:
  Stable on amd64, wrt bug #492612
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

Revision  Changes    Path
1.7                  dev-libs/Ice/Ice-3.5.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?r1=1.6&r2=1.7

Index: Ice-3.5.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Ice-3.5.1.ebuild	19 Feb 2014 12:27:25 -0000	1.6
+++ Ice-3.5.1.ebuild	19 Feb 2014 12:29:24 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.6 2014/02/19 12:27:25 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.7 2014/02/19 12:29:24 pinkbyte Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@
 	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 ~ia64 x86 ~x86-linux ~x64-macos"
 IUSE="doc examples +ncurses mono python ruby test debug"
 
 RDEPEND=">=dev-libs/expat-2.0.1



1.32                 dev-libs/Ice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?r1=1.31&r2=1.32

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ChangeLog	19 Feb 2014 12:27:25 -0000	1.31
+++ ChangeLog	19 Feb 2014 12:29:24 -0000	1.32
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/Ice
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.31 2014/02/19 12:27:25 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.32 2014/02/19 12:29:24 pinkbyte Exp $
+
+  19 Feb 2014; Sergey Popov <pinkbyte@gentoo.org> Ice-3.5.1.ebuild:
+  Stable on amd64, wrt bug #492612
 
   19 Feb 2014; Sergey Popov <pinkbyte@gentoo.org> Ice-3.5.1.ebuild:
   Respect compiler, skip mono tests cause they are badly broken, bug #498484





^ permalink raw reply	[flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/Ice: Ice-3.5.1.ebuild ChangeLog
@ 2014-03-31 20:38 Michal Gorny (mgorny)
  0 siblings, 0 replies; 11+ messages in thread
From: Michal Gorny (mgorny) @ 2014-03-31 20:38 UTC (permalink / raw
  To: gentoo-commits

mgorny      14/03/31 20:38:16

  Modified:             Ice-3.5.1.ebuild ChangeLog
  Log:
  Add support for the new PyPy slotting.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

Revision  Changes    Path
1.8                  dev-libs/Ice/Ice-3.5.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?r1=1.7&r2=1.8

Index: Ice-3.5.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Ice-3.5.1.ebuild	19 Feb 2014 12:29:24 -0000	1.7
+++ Ice-3.5.1.ebuild	31 Mar 2014 20:38:16 -0000	1.8
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.7 2014/02/19 12:29:24 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.8 2014/03/31 20:38:16 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby19"
 



1.34                 dev-libs/Ice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?r1=1.33&r2=1.34

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ChangeLog	19 Feb 2014 12:30:08 -0000	1.33
+++ ChangeLog	31 Mar 2014 20:38:16 -0000	1.34
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/Ice
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.33 2014/02/19 12:30:08 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.34 2014/03/31 20:38:16 mgorny Exp $
+
+  31 Mar 2014; Michał Górny <mgorny@gentoo.org> Ice-3.5.1.ebuild:
+  Add support for the new PyPy slotting.
 
   19 Feb 2014; Sergey Popov <pinkbyte@gentoo.org> -Ice-3.4.2.ebuild,
   -Ice-3.5.0-r1.ebuild:





^ permalink raw reply	[flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/Ice: Ice-3.5.1.ebuild ChangeLog
@ 2014-09-06 11:06 Sergey Popov (pinkbyte)
  0 siblings, 0 replies; 11+ messages in thread
From: Sergey Popov (pinkbyte) @ 2014-09-06 11:06 UTC (permalink / raw
  To: gentoo-commits

pinkbyte    14/09/06 11:06:53

  Modified:             Ice-3.5.1.ebuild ChangeLog
  Log:
  Make dependency on dev-libs/db more strict, forbid linking to incompatible versions of it, wrt bug #519248. Thanks to Jonathan Vasquez <jvasquez1011 AT gmail.com> for discovering this issue and Stefan Talpalaru <stefantalpalaru AT yahoo.com> for draft of proposed solution
  
  (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

Revision  Changes    Path
1.9                  dev-libs/Ice/Ice-3.5.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?r1=1.8&r2=1.9

Index: Ice-3.5.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Ice-3.5.1.ebuild	31 Mar 2014 20:38:16 -0000	1.8
+++ Ice-3.5.1.ebuild	6 Sep 2014 11:06:53 -0000	1.9
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.8 2014/03/31 20:38:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.9 2014/09/06 11:06:53 pinkbyte Exp $
 
 EAPI=5
 
@@ -16,13 +16,17 @@
 	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 ~ia64 ~x86 ~x86-linux ~x64-macos"
 IUSE="doc examples +ncurses mono python ruby test debug"
 
 RDEPEND=">=dev-libs/expat-2.0.1
 	>=app-arch/bzip2-1.0.5
 	>=dev-libs/openssl-0.9.8o:0
-	<sys-libs/db-6.0[cxx]
+	|| (
+		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) )
@@ -92,6 +96,17 @@
 	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}\"
@@ -103,13 +118,14 @@
 	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"
 
-	MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I$(db_includedir)"
+	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)|" \
+		-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



1.35                 dev-libs/Ice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?r1=1.34&r2=1.35

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ChangeLog	31 Mar 2014 20:38:16 -0000	1.34
+++ ChangeLog	6 Sep 2014 11:06:53 -0000	1.35
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/Ice
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.34 2014/03/31 20:38:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.35 2014/09/06 11:06:53 pinkbyte Exp $
+
+  06 Sep 2014; Sergey Popov <pinkbyte@gentoo.org> Ice-3.5.1.ebuild:
+  Make dependency on dev-libs/db more strict, forbid linking to incompatible
+  versions of it, wrt bug #519248. Thanks to Jonathan Vasquez <jvasquez1011 AT
+  gmail.com> for discovering this issue and Stefan Talpalaru <stefantalpalaru
+  AT yahoo.com> for draft of proposed solution
 
   31 Mar 2014; Michał Górny <mgorny@gentoo.org> Ice-3.5.1.ebuild:
   Add support for the new PyPy slotting.





^ permalink raw reply	[flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/Ice: Ice-3.5.1.ebuild ChangeLog
@ 2014-09-06 16:45 Richard Farina (zerochaos)
  0 siblings, 0 replies; 11+ messages in thread
From: Richard Farina (zerochaos) @ 2014-09-06 16:45 UTC (permalink / raw
  To: gentoo-commits

zerochaos    14/09/06 16:45:15

  Modified:             Ice-3.5.1.ebuild ChangeLog
  Log:
  since none of the changelogs include reasoning for dropping the stable keywords, I'm going to assume it was an accident and restore them.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)

Revision  Changes    Path
1.10                 dev-libs/Ice/Ice-3.5.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?r1=1.9&r2=1.10

Index: Ice-3.5.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Ice-3.5.1.ebuild	6 Sep 2014 11:06:53 -0000	1.9
+++ Ice-3.5.1.ebuild	6 Sep 2014 16:45:15 -0000	1.10
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.9 2014/09/06 11:06:53 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.10 2014/09/06 16:45:15 zerochaos Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@
 	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 ~ia64 x86 ~x86-linux ~x64-macos"
 IUSE="doc examples +ncurses mono python ruby test debug"
 
 RDEPEND=">=dev-libs/expat-2.0.1



1.36                 dev-libs/Ice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?r1=1.35&r2=1.36

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ChangeLog	6 Sep 2014 11:06:53 -0000	1.35
+++ ChangeLog	6 Sep 2014 16:45:15 -0000	1.36
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/Ice
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.35 2014/09/06 11:06:53 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.36 2014/09/06 16:45:15 zerochaos Exp $
+
+  06 Sep 2014; Rick Farina <zerochaos@gentoo.org> Ice-3.5.1.ebuild:
+  since none of the changelogs include reasoning for dropping the stable
+  keywords, I'm going to assume it was an accident and restore them.
 
   06 Sep 2014; Sergey Popov <pinkbyte@gentoo.org> Ice-3.5.1.ebuild:
   Make dependency on dev-libs/db more strict, forbid linking to incompatible





^ permalink raw reply	[flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/Ice: Ice-3.5.1.ebuild ChangeLog
@ 2015-04-08 17:51 Michal Gorny (mgorny)
  0 siblings, 0 replies; 11+ messages in thread
From: Michal Gorny (mgorny) @ 2015-04-08 17:51 UTC (permalink / raw
  To: gentoo-commits

mgorny      15/04/08 17:51:56

  Modified:             Ice-3.5.1.ebuild ChangeLog
  Log:
  Drop old Python implementations
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

Revision  Changes    Path
1.11                 dev-libs/Ice/Ice-3.5.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild?r1=1.10&r2=1.11

Index: Ice-3.5.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Ice-3.5.1.ebuild	6 Sep 2014 16:45:15 -0000	1.10
+++ Ice-3.5.1.ebuild	8 Apr 2015 17:51:56 -0000	1.11
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.10 2014/09/06 16:45:15 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.11 2015/04/08 17:51:56 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
+PYTHON_COMPAT=( python2_7 pypy )
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby19"
 



1.37                 dev-libs/Ice/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/ChangeLog?r1=1.36&r2=1.37

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ChangeLog	6 Sep 2014 16:45:15 -0000	1.36
+++ ChangeLog	8 Apr 2015 17:51:56 -0000	1.37
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/Ice
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.36 2014/09/06 16:45:15 zerochaos Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.37 2015/04/08 17:51:56 mgorny Exp $
+
+  08 Apr 2015; Michał Górny <mgorny@gentoo.org> Ice-3.5.1.ebuild:
+  Drop old Python implementations
 
   06 Sep 2014; Rick Farina <zerochaos@gentoo.org> Ice-3.5.1.ebuild:
   since none of the changelogs include reasoning for dropping the stable





^ permalink raw reply	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2015-04-08 17:52 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-19 12:29 [gentoo-commits] gentoo-x86 commit in dev-libs/Ice: Ice-3.5.1.ebuild ChangeLog Sergey Popov (pinkbyte)
  -- strict thread matches above, loose matches on Subject: below --
2015-04-08 17:51 Michal Gorny (mgorny)
2014-09-06 16:45 Richard Farina (zerochaos)
2014-09-06 11:06 Sergey Popov (pinkbyte)
2014-03-31 20:38 Michal Gorny (mgorny)
2014-02-19 12:27 Sergey Popov (pinkbyte)
2014-01-18 18:44 Pacho Ramos (pacho)
2014-01-18 18:37 Pacho Ramos (pacho)
2013-12-24 12:43 Agostino Sarubbo (ago)
2013-11-26 13:31 Sergey Popov (pinkbyte)
2013-10-11  8:01 Lars Wendler (polynomial-c)

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