diff options
author | Markos Chandras <hwoarang@gentoo.org> | 2011-03-22 09:51:47 +0000 |
---|---|---|
committer | Markos Chandras <hwoarang@gentoo.org> | 2011-03-22 09:51:47 +0000 |
commit | 029bdcee89fe1dd9764863bb8950b28a23b70831 (patch) | |
tree | 396565a17abe7351b49b20ebf2c3114aed16deae /dev-libs/boost | |
parent | Version bump. Bug #356479 (diff) | |
download | gentoo-2-029bdcee89fe1dd9764863bb8950b28a23b70831.tar.gz gentoo-2-029bdcee89fe1dd9764863bb8950b28a23b70831.tar.bz2 gentoo-2-029bdcee89fe1dd9764863bb8950b28a23b70831.zip |
Version bump. Bug #356479
(Portage version: 2.2.0_alpha27/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/boost')
-rw-r--r-- | dev-libs/boost/ChangeLog | 9 | ||||
-rw-r--r-- | dev-libs/boost/boost-1.46.1.ebuild | 490 | ||||
-rw-r--r-- | dev-libs/boost/files/point_release_naming_fix.patch | 14 | ||||
-rw-r--r-- | dev-libs/boost/files/random-Jamfile-1.46.1 | 15 | ||||
-rw-r--r-- | dev-libs/boost/files/remove-toolset-1.46.1.patch | 11 |
5 files changed, 538 insertions, 1 deletions
diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog index 08d299fb8a1b..e705deb8069d 100644 --- a/dev-libs/boost/ChangeLog +++ b/dev-libs/boost/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-libs/boost # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.215 2011/03/13 00:55:29 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.216 2011/03/22 09:51:47 hwoarang Exp $ + +*boost-1.46.1 (22 Mar 2011) + + 22 Mar 2011; Markos Chandras <hwoarang@gentoo.org> + +files/random-Jamfile-1.46.1, +boost-1.46.1.ebuild, + +files/remove-toolset-1.46.1.patch, +files/point_release_naming_fix.patch: + Version bump. Bug #356479 13 Mar 2011; Markus Meier <maekke@gentoo.org> boost-1.42.0-r2.ebuild: arm stable, bug #344677 diff --git a/dev-libs/boost/boost-1.46.1.ebuild b/dev-libs/boost/boost-1.46.1.ebuild new file mode 100644 index 000000000000..42a27f0a59de --- /dev/null +++ b/dev-libs/boost/boost-1.46.1.ebuild @@ -0,0 +1,490 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.46.1.ebuild,v 1.1 2011/03/22 09:51:47 hwoarang Exp $ + +EAPI="2" + +inherit python flag-o-matic multilib toolchain-funcs versionator check-reqs + +MY_P=${PN}_$(replace_all_version_separators _) + +DESCRIPTION="Boost Libraries for C++" +HOMEPAGE="http://www.boost.org/" +SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2" +LICENSE="Boost-1.0" +SLOT="$(get_version_component_range 1-2)" +IUSE="debug doc +eselect icu mpi python static-libs test tools" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" + +RDEPEND="icu? ( >=dev-libs/icu-3.3 ) + mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) + sys-libs/zlib + python? ( virtual/python ) + !!<=dev-libs/boost-1.35.0-r2 + >=app-admin/eselect-boost-0.3" +DEPEND="${RDEPEND} + dev-util/boost-build:${SLOT}" + +S=${WORKDIR}/${MY_P} + +MAJOR_PV=$(replace_all_version_separators _ ${SLOT}) +BJAM="bjam-${MAJOR_PV}" + +# Usage: +# _add_line <line-to-add> <profile> +# ... to add to specific profile +# or +# _add_line <line-to-add> +# ... to add to all profiles for which the use flag set + +_add_line() { + if [ -z "$2" ] ; then + echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/default" + use debug && echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/debug" + else + echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/${2}" + fi +} + +pkg_setup() { + # It doesn't compile with USE="python mpi" and python-3 (bug 295705) + if use python && use mpi ; then + if [[ "$(python_get_version --major)" != "2" ]]; then + eerror "The Boost.MPI python bindings do not support any other python version" + eerror "than 2.x. Please either use eselect to select a python 2.x version or" + eerror "disable the python and/or mpi use flag for =${CATEGORY}/${PF}." + die "unsupported python version" + fi + fi + + if use test ; then + CHECKREQS_DISK_BUILD="15360" + check_reqs + + ewarn "The tests may take several hours on a recent machine" + ewarn "but they will not fail (unless something weird happens ;-)" + ewarn "This is because the tests depend on the used compiler/-version" + ewarn "and the platform and upstream says that this is normal." + ewarn "If you are interested in the results, please take a look at the" + ewarn "generated results page:" + ewarn " ${ROOT}usr/share/doc/${PF}/status/cs-$(uname).html" + ebeep 5 + + fi + + if use debug ; then + ewarn "The debug USE-flag means that a second set of the boost libraries" + ewarn "will be built containing debug-symbols. You'll be able to select them" + ewarn "using the boost-eselect module. But even though the optimization flags" + ewarn "you might have set are not stripped, there will be a performance" + ewarn "penalty and linking other packages against the debug version" + ewarn "of boost is _not_ recommended." + fi +} + +src_prepare() { + epatch "${FILESDIR}/remove-toolset-${PV}.patch" + + # This enables building the boost.random library with /dev/urandom support + if [[ -e /dev/urandom ]] ; then + mkdir -p libs/random/build || die + cp "${FILESDIR}/random-Jamfile-${PV}" libs/random/build/Jamfile.v2 || die + fi + + # Ensure that the include dir and the libraries always have X_Y in their name if the boost version is X.Y.Z. + # By default the build system changes this to X_Y_Z if Z > 0, which breaks eselect-boost and some ebuilds. + epatch "${FILESDIR}/point_release_naming_fix.patch" +} + +src_configure() { + einfo "Writing new user-config.jam" + + local compiler compilerVersion compilerExecutable mpi + if [[ ${CHOST} == *-darwin* ]] ; then + compiler=darwin + compilerVersion=$(gcc-fullversion) + compilerExecutable=$(tc-getCXX) + # we need to add the prefix, and in two cases this exceeds, so prepare + # for the largest possible space allocation + append-ldflags -Wl,-headerpad_max_install_names + else + compiler=gcc + compilerVersion=$(gcc-version) + compilerExecutable=$(tc-getCXX) + fi + + # Using -fno-strict-aliasing to prevent possible creation of invalid code. + append-flags -fno-strict-aliasing + + # bug 298489 + if use ppc || use ppc64 ; then + [[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec + fi; + + use mpi && mpi="using mpi ;" + + if use python ; then + pystring="using python : $(python_get_version) : /usr : $(python_get_includedir) : $(python_get_libdir) ;" + fi + + cat > "${S}/user-config.jam" << __EOF__ + +variant gentoorelease : release : <optimization>none <debug-symbols>none ; +variant gentoodebug : debug : <optimization>none ; + +using ${compiler} : ${compilerVersion} : ${compilerExecutable} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ; + +${pystring} + +${mpi} + +__EOF__ + + # Maintainer information: + # The debug-symbols=none and optimization=none + # are not official upstream flags but a Gentoo + # specific patch to make sure that all our + # CXXFLAGS/LDFLAGS are being respected. + # Using optimization=off would for example add + # "-O0" and override "-O2" set by the user. + # Please take a look at the boost-build ebuild + # for more infomration. + + use icu && OPTIONS="-sICU_PATH=/usr" + use mpi || OPTIONS="${OPTIONS} --without-mpi" + use python || OPTIONS="${OPTIONS} --without-python" + + # https://svn.boost.org/trac/boost/attachment/ticket/2597/add-disable-long-double.patch + if use sparc || use mips || use hppa || use arm || use x86-fbsd || use sh; then + OPTIONS="${OPTIONS} --disable-long-double" + fi + + OPTIONS="${OPTIONS} pch=off --user-config=\"${S}/user-config.jam\" --boost-build=/usr/share/boost-build-${MAJOR_PV} --prefix=\"${D}/usr\" --layout=versioned" + + if use static-libs ; then + LINK_OPTS="link=shared,static" + LIBRARY_TARGETS="*.a *$(get_libname)" + else + LINK_OPTS="link=shared" + #there is no dynamicly linked version of libboost_test_exec_monitor + LIBRARY_TARGETS="libboost_test_exec_monitor*.a *$(get_libname)" + fi +} + +src_compile() { + jobs=$( echo " ${MAKEOPTS} " | \ + sed -e 's/ --jobs[= ]/ -j /g' \ + -e 's/ -j \([1-9][0-9]*\)/ -j\1/g' \ + -e 's/ -j\>/ -j1/g' | \ + ( while read -d ' ' j ; do if [[ "${j#-j}" = "$j" ]]; then continue; fi; jobs="${j#-j}"; done; echo ${jobs} ) ) + if [[ "${jobs}" != "" ]]; then NUMJOBS="-j"${jobs}; fi; + + export BOOST_ROOT="${S}" + + einfo "Using the following command to build: " + einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared" + + ${BJAM} ${NUMJOBS} -q -d+2 \ + gentoorelease \ + ${OPTIONS} \ + threading=single,multi ${LINK_OPTS} runtime-link=shared \ + || die "building boost failed" + + # ... and do the whole thing one more time to get the debug libs + if use debug ; then + einfo "Using the following command to build: " + einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoodebug ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --buildid=debug" + + ${BJAM} ${NUMJOBS} -q -d+2 \ + gentoodebug \ + ${OPTIONS} \ + threading=single,multi ${LINK_OPTS} runtime-link=shared \ + --buildid=debug \ + || die "building boost failed" + fi + + if use tools; then + cd "${S}/tools/" + einfo "Using the following command to build the tools: " + einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease ${OPTIONS}" + + ${BJAM} ${NUMJOBS} -q -d+2\ + gentoorelease \ + ${OPTIONS} \ + || die "building tools failed" + fi + +} + +src_install () { + export BOOST_ROOT="${S}" + + einfo "Using the following command to install: " + einfo "${BJAM} -q -d+2 gentoorelease ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --includedir=\"${D}/usr/include\" --libdir=\"${D}/usr/$(get_libdir)\" install" + + ${BJAM} -q -d+2 \ + gentoorelease \ + ${OPTIONS} \ + threading=single,multi ${LINK_OPTS} runtime-link=shared \ + --includedir="${D}/usr/include" \ + --libdir="${D}/usr/$(get_libdir)" \ + install || die "install failed for options '${OPTIONS}'" + + if use debug ; then + einfo "Using the following command to install: " + einfo "${BJAM} -q -d+2 gentoodebug ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --includedir=\"${D}/usr/include\" --libdir=\"${D}/usr/$(get_libdir)\" --buildid=debug" + + ${BJAM} -q -d+2 \ + gentoodebug \ + ${OPTIONS} \ + threading=single,multi ${LINK_OPTS} runtime-link=shared \ + --includedir="${D}/usr/include" \ + --libdir="${D}/usr/$(get_libdir)" \ + --buildid=debug \ + install || die "install failed for options '${OPTIONS}'" + fi + + use python || rm -rf "${D}/usr/include/boost-${MAJOR_PV}/boost"/python* || die + + dodir /usr/share/boost-eselect/profiles/${SLOT} || die + touch "${D}/usr/share/boost-eselect/profiles/${SLOT}/default" || die + if use debug ; then + touch "${D}/usr/share/boost-eselect/profiles/${SLOT}/debug" || die + fi + + # Move the mpi.so to the right place and make sure it's slotted + if use mpi && use python; then + mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" || die + mv "${D}/usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/" || die + touch "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py" || die + _add_line "python=\"$(python_get_sitedir)/boost_${MAJOR_PV}/mpi.so\"" + fi + + if use doc ; then + find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf + dohtml \ + -A pdf,txt,cpp,hpp \ + *.{htm,html,png,css} \ + -r doc || die + dohtml \ + -A pdf,txt \ + -r tools || die + insinto /usr/share/doc/${PF}/html + doins -r libs || die + doins -r more || die + + # To avoid broken links + insinto /usr/share/doc/${PF}/html + doins LICENSE_1_0.txt || die + + dosym /usr/include/boost-${MAJOR_PV}/boost /usr/share/doc/${PF}/html/boost || die + fi + + cd "${D}/usr/$(get_libdir)" || die + + # Remove (unversioned) symlinks + # And check for what we remove to catch bugs + # got a better idea how to do it? tell me! + for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v "${MAJOR_PV}") ; do + if [ ! -h "${f}" ] ; then + eerror "Ups, tried to remove '${f}' which is a a real file instead of a symlink" + die "slotting/naming of the libs broken!" + fi + rm "${f}" || die + done + + # The threading libs obviously always gets the "-mt" (multithreading) tag + # some packages seem to have a problem with it. Creating symlinks... + + if use static-libs ; then + THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}.a libboost_thread-mt-${MAJOR_PV}$(get_libname)" + else + THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}$(get_libname)" + fi + for lib in ${THREAD_LIBS} ; do + dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die + done + + # The same goes for the mpi libs + if use mpi ; then + if use static-libs ; then + MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}.a libboost_mpi-mt-${MAJOR_PV}$(get_libname)" + else + MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}$(get_libname)" + fi + for lib in ${MPI_LIBS} ; do + dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die + done + fi + + if use debug ; then + if use static-libs ; then + THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname) libboost_thread-mt-${MAJOR_PV}-debug.a" + else + THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname)" + fi + + for lib in ${THREAD_DEBUG_LIBS} ; do + dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die + done + + if use mpi ; then + if use static-libs ; then + MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug.a libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)" + else + MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)" + fi + + for lib in ${MPI_DEBUG_LIBS} ; do + dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die + done + fi + fi + + # Create a subdirectory with completely unversioned symlinks + # and store the names in the profiles-file for eselect + dodir /usr/$(get_libdir)/boost-${MAJOR_PV} || die + + _add_line "libs=\"" default + for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v debug) ; do + dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}/${f/-${MAJOR_PV}} || die + _add_line "/usr/$(get_libdir)/${f}" default + done + _add_line "\"" default + + if use debug ; then + _add_line "libs=\"" debug + dodir /usr/$(get_libdir)/boost-${MAJOR_PV}-debug || die + for f in $(ls -1 ${LIBRARY_TARGETS} | grep debug) ; do + dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}-debug/${f/-${MAJOR_PV}-debug} || die + _add_line "/usr/$(get_libdir)/${f}" debug + done + _add_line "\"" debug + + _add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" debug + _add_line "suffix=\"-debug\"" debug + fi + + _add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" default + + if use tools; then + cd "${S}/dist/bin" || die + # Append version postfix to binaries for slotting + _add_line "bins=\"" + for b in * ; do + newbin "${b}" "${b}-${MAJOR_PV}" || die + _add_line "/usr/bin/${b}-${MAJOR_PV}" + done + _add_line "\"" + + cd "${S}/dist" || die + insinto /usr/share || die + doins -r share/boostbook || die + # Append version postfix for slotting + mv "${D}/usr/share/boostbook" "${D}/usr/share/boostbook-${MAJOR_PV}" || die + _add_line "dirs=\"/usr/share/boostbook-${MAJOR_PV}\"" + fi + + cd "${S}/status" || die + if [ -f regress.log ] ; then + docinto status || die + dohtml *.html ../boost.png || die + dodoc regress.log || die + fi + + use python && python_need_rebuild + + # boost's build system truely sucks for not having a destdir. Because for + # this reason we are forced to build with a prefix that includes the + # DESTROOT, dynamic libraries on Darwin end messed up, referencing the + # DESTROOT instread of the actual EPREFIX. There is no way out of here + # but to do it the dirty way of manually setting the right install_names. + [[ -z ${ED+set} ]] && local ED=${D%/}${EPREFIX}/ + if [[ ${CHOST} == *-darwin* ]] ; then + einfo "Working around completely broken build-system(tm)" + for d in "${ED}"usr/lib/*.dylib ; do + if [[ -f ${d} ]] ; then + # fix the "soname" + ebegin " correcting install_name of ${d#${ED}}" + install_name_tool -id "/${d#${D}}" "${d}" + eend $? + # fix references to other libs + refs=$(otool -XL "${d}" | \ + sed -e '1d' -e 's/^\t//' | \ + grep "^libboost_" | \ + cut -f1 -d' ') + for r in ${refs} ; do + ebegin " correcting reference to ${r}" + install_name_tool -change \ + "${r}" \ + "${EPREFIX}/usr/lib/${r}" \ + "${d}" + eend $? + done + fi + done + fi +} + +src_test() { + export BOOST_ROOT=${S} + + cd "${S}/tools/regression/build" || die + einfo "Using the following command to build test helpers: " + einfo "${BJAM} -q -d+2 gentoorelease ${OPTIONS} process_jam_log compiler_status" + + ${BJAM} -q -d+2 \ + gentoorelease \ + ${OPTIONS} \ + process_jam_log compiler_status \ + || die "building regression test helpers failed" + + cd "${S}/status" || die + + # Some of the test-checks seem to rely on regexps + export LC_ALL="C" + + # The following is largely taken from tools/regression/run_tests.sh, + # but adapted to our needs. + + # Run the tests & write them into a file for postprocessing + einfo "Using the following command to test: " + einfo "${BJAM} ${OPTIONS} --dump-tests" + + ${BJAM} \ + ${OPTIONS} \ + --dump-tests 2>&1 | tee regress.log || die + + # Postprocessing + cat regress.log | "${S}/tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease/pch-off/process_jam_log" --v2 + if test $? != 0 ; then + die "Postprocessing the build log failed" + fi + + cat > "${S}/status/comment.html" <<- __EOF__ + <p>Tests are run on a <a href="http://www.gentoo.org">Gentoo</a> system.</p> +__EOF__ + + # Generate the build log html summary page + "${S}/tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease/pch-off/compiler_status" --v2 \ + --comment "${S}/status/comment.html" "${S}" \ + cs-$(uname).html cs-$(uname)-links.html + if test $? != 0 ; then + die "Generating the build log html summary page failed" + fi + + # And do some cosmetic fixes :) + sed -i -e 's|http://www.boost.org/boost.png|boost.png|' *.html || die +} + +pkg_postinst() { + if use eselect ; then + eselect boost update || ewarn "eselect boost update failed." + fi + + if [ ! -h "${ROOT}/etc/eselect/boost/active" ] ; then + elog "No active boost version found. Calling eselect to select one..." + eselect boost update || ewarn "eselect boost update failed." + fi +} diff --git a/dev-libs/boost/files/point_release_naming_fix.patch b/dev-libs/boost/files/point_release_naming_fix.patch new file mode 100644 index 000000000000..8da5efa3833b --- /dev/null +++ b/dev-libs/boost/files/point_release_naming_fix.patch @@ -0,0 +1,14 @@ +--- Jamroot.orig 2011-03-15 12:49:05.000000000 +0000 ++++ Jamroot 2011-03-15 12:49:20.000000000 +0000 +@@ -150,10 +150,7 @@ + + local version-tag = [ MATCH "^([^.]+)[.]([^.]+)[.]([^.]+)" : $(BOOST_VERSION) ] + ; +-if $(version-tag[3]) = 0 +-{ +- version-tag = $(version-tag[1-2]) ; +-} ++version-tag = $(version-tag[1-2]) ; + + constant BOOST_VERSION_TAG : $(version-tag:J="_") ; + diff --git a/dev-libs/boost/files/random-Jamfile-1.46.1 b/dev-libs/boost/files/random-Jamfile-1.46.1 new file mode 100644 index 000000000000..81fb136be2b0 --- /dev/null +++ b/dev-libs/boost/files/random-Jamfile-1.46.1 @@ -0,0 +1,15 @@ +# Copyright (c) 2006 Tiziano Mueller +# +# Use, modification and distribution of the file is subject to the +# Boost Software License, Version 1.0. +# (See at http://www.boost.org/LICENSE_1_0.txt) + + +project boost/random + : source-location ../src ; + +SOURCES = random_device ; + +lib boost_random + : $(SOURCES).cpp + : <link>shared:<define>BOOST_RANDOM_DYN_LINK=1 ; diff --git a/dev-libs/boost/files/remove-toolset-1.46.1.patch b/dev-libs/boost/files/remove-toolset-1.46.1.patch new file mode 100644 index 000000000000..c80191ce43d6 --- /dev/null +++ b/dev-libs/boost/files/remove-toolset-1.46.1.patch @@ -0,0 +1,11 @@ +--- Jamroot 2010-11-17 11:51:56.000000000 +0200 ++++ Jamroot.gentoo 2011-01-06 15:07:17.893270002 +0200 +@@ -377,7 +377,7 @@ + if $(layout) = versioned + { + result = [ common.format-name +- <base> <toolset> <threading> <runtime> -$(BOOST_VERSION_TAG) ++ <base> <threading> <runtime> -$(BOOST_VERSION_TAG) + -$(BUILD_ID) + : $(name) : $(type) : $(property-set) ] ; + } |