Version bump

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 287 insertions, 18 deletions

diff --git a/dev-libs/Ice/ChangeLog b/dev-libs/Ice/ChangeLog
index 8d90018c3aa2..b081fed439f0 100644
--- a/dev-libs/Ice/ChangeLog
+++ b/dev-libs/Ice/ChangeLog
@@ -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.
diff --git a/dev-libs/Ice/Ice-3.5.1.ebuild b/dev-libs/Ice/Ice-3.5.1.ebuild
new file mode 100644
index 000000000000..c05957e7eea9
--- /dev/null
+++ b/dev-libs/Ice/Ice-3.5.1.ebuild
@@ -0,0 +1,263 @@
+# 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
+}
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index a2120d87c989..5c33e1c1811c 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -8,26 +8,27 @@ DIST Ice-3.4.2.pdf.gz 4232836 SHA256 6400efa65f879f964590759222dd46010bfeb3e4307
 DIST Ice-3.4.2.tar.gz 5485106 SHA256 dcf0484495b6df0849ec90a00e8204fe5fe1c0d3882bb438bf2c1d062f15c979 SHA512 4a69fbddf53112d36805dd276c9af5e221677ea45108553e1e7d580e18ba5a61b2444b8b44d5b2a88132cdebcba989a0dc212029ccbd8e17a2e70bcf50ebb6c8 WHIRLPOOL a79c0348d0454d802af85c72c249a9e162108b71391a77f7b0c9887f3d22974dd4729426308247af8aabda6babc0608691fbb622ac25a54820e8c20ca4e80ec7
 DIST Ice-3.5.0.pdf 11534532 SHA256 20ae6c1b0a563458ec0afe28130ab22f0328e0cd0da3000ae109bb41d42d2a88 SHA512 de427f632664fe4bee6768da07015f12ccef8c242644f343a51aa30b2220450a57afd624946e814caca678a37114a0fc20bcfb4f73375a42463fd0d5078aa61a WHIRLPOOL 6a2de0630e4643ca79917df43e20a4147474c776d4852ec49ee4affeb335365d28915a6319a6a9819b4d8423c2b4664cc232244ae2b35b7ee6e2d6f440bd98e5
 DIST Ice-3.5.0.tar.gz 5388847 SHA256 583d4a819d50ad8b79b1e9ad45abfa3078f981486271ca8cd9ede8fa420ff575 SHA512 a84451690e1bfa2d7d3bbc90cf6233fe9d20b2cadca7f3dbc9802d51e8fbe81fd4203c6c780960b4baab9cfaa891bd0821b46e651f0fe43a58e32ca37410be21 WHIRLPOOL bb1f6e1ae9161dfa71c4e3db910a91515a6dd2d161e58dca952f2c05fe5086ab645e4c9ba36fa4490fc87deb328665e6488c1b330ee4e6e42b183252bd51c846
+DIST Ice-3.5.1.pdf 8279548 SHA256 236f509a3868301ebe688f50417f30155ffa1d330a6c7ab3ef926d40ab145150 SHA512 6fe78ed629de330c56cf260a0a78d650ad9e1507d737a8e58c616f1c61897487dae2f9fb942f1e878706dbc645cb9c672377eeef905f8764b57dd7e6f8d1c7f2 WHIRLPOOL 9fc90d131b028b74f3393df88adb8719a1fef0f829a6226e833c95bcf3bc6b53394a11e3722f0fad2a5597b2468498728310a6e974e1dcb1138fea0ab5b68b28
+DIST Ice-3.5.1.tar.gz 4799296 SHA256 989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392 SHA512 610fa317bd75e64802d1b5216db4747f86157d3246a2022397bafaefdd9b1b78d131733762003ee779065401c8a83120db65cf9b86fbf1914266309571baf58f WHIRLPOOL 0b760edcd7e3eb1220af81a2236634b86775a18050b0645e4e662bf0fb543aa14177d83e2c8659a62bd5bf6e403384998b893e84b9d547c32bbc2064b5f7de9c
 EBUILD Ice-3.4.2.ebuild 6943 SHA256 223d6682df8a00fbe262b9fa881cc67110e75b7eccd6769137b551715f087339 SHA512 ddb90a72e4adb1a660d54ab562ec1d54492c417f94cdc7e02db6db0b147c3c9ed49c09f11a267da2d1c821ae5563dd639c5dda18adc64ef2b024d0a04c2d95ad WHIRLPOOL 81f67259aa23356b35d0673d6fd0f91acf41a72538d021c6061b30e3368558593cc6f3b2f124eddd1582a864723b97cdafa8b2ac770ac2e754965aa51037083c
 EBUILD Ice-3.5.0-r1.ebuild 6742 SHA256 b313b7484483e7ed33895e786bf2cab4b1e89333df61609050e6c6d4b906dd49 SHA512 d0c9969881a9cf7f433f2c2a9398f1b8099f6968dac016ff27e09214d69be742507f94b450d816d1bebcad8473a4d24cf3c34d7259073d0f8961476c0d99dd94 WHIRLPOOL 3076974438db2d3f7a4cba7bc41d4f97985881107a0739f8feadfa38317aa933254eac393378f299dc39097fa547eee852c9e0262edfee1800b9c1ec3884015b
-MISC ChangeLog 11374 SHA256 ed5574397afd1bb54ba15dfc0a34e46f8da1a476109a4cb391efa0d66183882b SHA512 ea8d44aff99625a99cc871112f300ba2bf03d9d08f2c60e0fc0b596899598488c80ee17e4e5829f8d417eaf2455fdeef8ff9745533d53fd8c96635077f6e8db8 WHIRLPOOL e7aa8283a659d7369562ac0e371996eba45929c56b937b76fc68f7aceab5cbead7557a82db50087e9bdd38a5aec60566a49af78457485d23ea262d13482f3c6e
+EBUILD Ice-3.5.1.ebuild 6786 SHA256 f008c6174777fdb46f071d13c1fc3661f72e3aaffac3990f09811fa14a4c22af SHA512 aa2f9ba0262abae122f78ac40bd73662bc6cfaf082f54c33a5812e001d558813ced0b15e2684c5cb35f8ef2f27276c879e675965a55f011ad353c6117c76c9cf WHIRLPOOL 207eba39f12375151f5d470f2625aa835cc013ab53dbe25ecabbf99b5f21edc6db4850458363348e6a9008a2d4ccf760adb5b7672f766709f7f061ac691ad3c9
+MISC ChangeLog 11496 SHA256 3b27c4eb34fb5141406e1abfd1ff6e251fb69c3b1506635b9c63e8f7ec28913a SHA512 a16cf0b1709330fc6da789837cb5c89e3ce964e38edf375da4ae3b13a8e994091482db08eab8bb4616755ebabb208079750c3f7b26c501c874b2679f22b92756 WHIRLPOOL 7e49ac00e7a7b0292a1e404c0c1c3850098144e2899b3386ca5b7ce686f2a39c31e8880664888e510ac1347c14c737a24134be602ed267a5bf2612120b6ef010
 MISC metadata.xml 339 SHA256 dec27f6d803819a7791826c1a98a83a1c21a23df0a3384234ac68abf8b8466a3 SHA512 a52d0a34b45483cbf16e870e458c31e002a62fbe4c18b7839964476696a8650c6db254392f8ff6166f4a434958eb2384cd3267f004c45726d75907983f494e60 WHIRLPOOL 8362526bb468b608b63bb17ea08ee20050904aeed1728efea1e48420fb2b5e820cedcedbecee0a37c0a2b061e0a06aa67ce6b18e148d4fbb785d528e6a80c2f3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKM3JXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO4IoQAM05hBLayRXu72tJD8p1IC/t
-VXcjgaJxnUNXwyKXGmbhedDIa0PuD4f59Izo5d5AiaVyGOjVijT7DcrQl7vQAn+P
-ec32jA1StCBdW8RcNAvYVc8ovJwNFXbd9y/K+9TdnD/qJrA15jXmerF4lIQ/Oa5j
-ub+GRkxfjGWZpQz+LcpQDaPdLXT3XUIpPbX+xZ1xE9u0RlhSYIcYie61SW90lcNi
-frEXztU2rAz0k1B9x2/Bn2CiLfVA4i3l6oLTRg2bu+xdVVxHKuBF7KBbcu2x1L3z
-nWNuqJytZTWmq+Mz3KMuGgzDKtxL0L85QtvoT/Kir48OYGl0CycUeapZVVmrhW2R
-YO25biJ4Wwlo3ttFcUuYX+tUhds6HVhwsHzXb3kbI2EVCL89nS0btU+iD9bZMC4F
-nYrnnFu9wXYQlCQGvnmcZivYsFNeS5T2O4q+yWfxI3Bgy/tyxBDOdE6l3ToiDxN1
-RGGmgVa3q74uLLVc/oMHoDuTaZ1WJdLOrMlukzme4uRnBFuD7W4kl833WpHwTnI4
-edxezVXrt/xaR9mD5tu+aeGKpHntFPpAXsT62NEmqoq15P5hhgIp5pkNdx2sJ3pB
-XsAw+3FhQiEcCaYbocpciSaN51BJZ4FCVAn9fWMLNjsQX/fM7WIN8ELEe3e3Rvr7
-IHV3RIXzRG18K2C4M0fU
-=JINB
+iQIcBAEBCAAGBQJSV7BzAAoJEPiazRVxLXTFLv0QANj9knHpz3qJBZunBsTKThOx
+/EN+4GwebjYgM+bAmfa0ZuiFcd5SrUZqshkYUUdSONE54DaCbYwFxZ5xh1o1SE/r
+oO+ByGWTSJU+TBvi5JFn88z6qfEcsCbnIVeSV/mtMgBzU7YVcYBdygGYkhUEV4YJ
+eN8YiuQFSK4bwe/r3E9NpZ8diVLpb+uZe9Fbq08FNMROgqyr0OrEKsMRgiXefW/A
+ztFoc9OPFEJtC4a32aofO1wOOTnlTRhfKuUYLs8N+MTIH7OcyAtlx0nzzZnswlHK
+vQhyjU/KkAR2pZKc/H5vM/vLpxP43p+00kCmtZhDWbMWAOhL9zLvMsihJJDch5ZA
+Kq60mt2BVb2X1K84A3DolG1MCSkvoe/Z5H6c433CBDxP5Q+4WODzclK63UoD84zg
+ICYwXqxhPTZdRIHwNbjgMIMl1K7ljF302mE4f9Y+ehE6LxrGodQXPadsePmISAqf
+2f65zKRFhy5PotvzS+Y7Go2AcxgVIIvr3syAFgT05AOx0C/P90ljscRqb52tuDnH
+I+jBL79cieF5jzzFyBqdHLe3YkuUlGvtxaGtNGsLArVmmLODp00vjm772FGTn3Sa
+wD08FPq2ZFno0Mm+rd9cPpufl1KeiYzFN7G26h6BlY+PlpXHrAUq224Fy0KzjF4Y
+SEEH9cXMelhRCqflUjWh
+=ZxYo
 -----END PGP SIGNATURE-----