From: Tiziano Müller Date: Sat, 10 Feb 2007 12:38:14 +0000 (+0000) Subject: Fixed python_version typo. Removed the check for ucs2 for python. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=55b2b785c905eacefc45b27260d1e476a1854158;p=gentoo.git Fixed python_version typo. Removed the check for ucs2 for python. Package-Manager: portage-2.1.2-r7 --- diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog index 1639ed615863..f6ed68932b99 100644 --- a/dev-libs/boost/ChangeLog +++ b/dev-libs/boost/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/boost # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.105 2007/02/06 23:54:38 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.106 2007/02/10 12:38:14 dev-zero Exp $ + + 10 Feb 2007; Tiziano Müller + boost-1.34_pre20061214.ebuild: + Fixed python_version typo. Removed the check for ucs2 for python. 06 Feb 2007; Tiziano Müller -boost-1.34_pre20060930.ebuild, boost-1.34_pre20061214.ebuild: diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest index 7b3006e8d8da..e5ab93a01111 100644 --- a/dev-libs/boost/Manifest +++ b/dev-libs/boost/Manifest @@ -20,14 +20,14 @@ EBUILD boost-1.33.1.ebuild 5698 RMD160 6c77b00c3027e82a9753419446d57fd489b93a5e MD5 85e241bdaa449cd9fd1f1dfd99915f64 boost-1.33.1.ebuild 5698 RMD160 6c77b00c3027e82a9753419446d57fd489b93a5e boost-1.33.1.ebuild 5698 SHA256 40ca99406b69fc646969eade68e3363279218df5fce358ec9d7ad98b289dc0f5 boost-1.33.1.ebuild 5698 -EBUILD boost-1.34_pre20061214.ebuild 4312 RMD160 8105d3d27a48660ffa45065e111f5abd1bfb234e SHA1 e12b78c0b1283a7ec2c78a0be21d8390b4963f8e SHA256 071d93f7f08d3c3b19d36f37527e22adfeca69bebb80edc9ad34c7def06a7ee4 -MD5 83bd755545b47a8e1da745873e21d47e boost-1.34_pre20061214.ebuild 4312 -RMD160 8105d3d27a48660ffa45065e111f5abd1bfb234e boost-1.34_pre20061214.ebuild 4312 -SHA256 071d93f7f08d3c3b19d36f37527e22adfeca69bebb80edc9ad34c7def06a7ee4 boost-1.34_pre20061214.ebuild 4312 -MISC ChangeLog 14236 RMD160 2d9eef3e2fd747a0bf994763e35be9b4e25ca176 SHA1 fe735bf0ca6e8a9260e0c54abdda7687532acd3d SHA256 c15b274d3d104be13488dd1f3ac9fd453162e0e5ad0c9830bf81063cf1af03a4 -MD5 22187539ab926a5a2b9fbae9d493854c ChangeLog 14236 -RMD160 2d9eef3e2fd747a0bf994763e35be9b4e25ca176 ChangeLog 14236 -SHA256 c15b274d3d104be13488dd1f3ac9fd453162e0e5ad0c9830bf81063cf1af03a4 ChangeLog 14236 +EBUILD boost-1.34_pre20061214.ebuild 3894 RMD160 40ea9af1aa31c914657bf91a7ca582added1644d SHA1 89c60a3f0ad2a5af4854dec2a2ffb5c7c75e6baa SHA256 0f62fbc36c404dc2d33bb2aa14ddd240bd2790778bb71f6cbbca9b32dd61c401 +MD5 88d8c7d72f0784d8a274f8d4f5a8198a boost-1.34_pre20061214.ebuild 3894 +RMD160 40ea9af1aa31c914657bf91a7ca582added1644d boost-1.34_pre20061214.ebuild 3894 +SHA256 0f62fbc36c404dc2d33bb2aa14ddd240bd2790778bb71f6cbbca9b32dd61c401 boost-1.34_pre20061214.ebuild 3894 +MISC ChangeLog 14391 RMD160 67bcfa66fba7bdbddcdd302ccffb5307fd5d8be4 SHA1 2e4ba9a248deb350ad9431130175580d6a752b81 SHA256 df44dac768e92d3a385b3dabb389ee37c45be3bee937849ee24ec9a0a769c9f7 +MD5 2239ae03e444a5a332646964d2682c78 ChangeLog 14391 +RMD160 67bcfa66fba7bdbddcdd302ccffb5307fd5d8be4 ChangeLog 14391 +SHA256 df44dac768e92d3a385b3dabb389ee37c45be3bee937849ee24ec9a0a769c9f7 ChangeLog 14391 MISC metadata.xml 349 RMD160 d25d9702dc4a5438f4bf5f7a9e9fc1b0664b6bdd SHA1 042144f72d878c355a55ad72a5212b2c2db88b9a SHA256 17524a0d3400af3c713289c5cf1f713cf63619264b9c6b535be3e2d543512cf6 MD5 b0f631e883fed00f233ff27ce7ceb93d metadata.xml 349 RMD160 d25d9702dc4a5438f4bf5f7a9e9fc1b0664b6bdd metadata.xml 349 diff --git a/dev-libs/boost/boost-1.34_pre20061214.ebuild b/dev-libs/boost/boost-1.34_pre20061214.ebuild index c01a54935dd4..4deea05625ca 100644 --- a/dev-libs/boost/boost-1.34_pre20061214.ebuild +++ b/dev-libs/boost/boost-1.34_pre20061214.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.34_pre20061214.ebuild,v 1.2 2007/02/06 23:54:38 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.34_pre20061214.ebuild,v 1.3 2007/02/10 12:38:14 dev-zero Exp $ inherit distutils flag-o-matic multilib toolchain-funcs versionator @@ -13,7 +13,7 @@ HOMEPAGE="http://www.boost.org/" SRC_URI="http://dev.gentoo.org/~dev-zero/distfiles/${MY_P}.tar.bz2" LICENSE="freedist Boost-1.0" SLOT="0" -IUSE="debug doc icc icu pyste static threads threadsonly tools userland_Darwin" +IUSE="debug doc icc icu pyste tools userland_Darwin" DEPEND="icu? ( >=dev-libs/icu-3.2 ) sys-libs/zlib @@ -23,13 +23,6 @@ RDEPEND="${DEPEND} S=${WORKDIR}/${MY_P} -pkg_setup() { - if ! built_with_use dev-lang/python ucs2 ; then - eerror "dev-lang/python has to be built with the ucs2 USE-flag enabled" - die "missing USE-flag for dev-lang/python" - fi -} - src_unpack() { unpack ${A} cd "${S}" @@ -43,8 +36,7 @@ src_unpack() { } generate_options() { - LINK_OPTIONS="shared" - use static && LINK_OPTIONS="${LINK_OPTIONS} static" + LINK_OPTIONS="shared static" if ! use debug ; then OPTIONS="release debug-symbols=none" @@ -53,16 +45,7 @@ generate_options() { fi OPTIONS="${OPTIONS} optimization=none" - - if use threads ; then - if use threadsonly ; then - OPTIONS="${OPTIONS} threading=multi" - else - OPTIONS="${OPTIONS} threading=single,multi" - fi - else - OPTIONS="${OPTIONS} threading=single" - fi + OPTIONS="${OPTIONS} threading=single,multi" use icu && OPTIONS="${OPTIONS} -sHAVE_ICU=1 -sICU_PATH=\"${ROOT}/usr\"" @@ -70,7 +53,7 @@ generate_options() { generate_userconfig() { einfo "Writing new user-config.jam" - distutils python_version + distutils_python_version local compiler compilerVersion compilerExecutable if use icc ; then