From 00a9f3c049ec9417d8b496435d3ee9f61539fea3 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Sun, 25 Apr 2010 18:28:14 +0000 Subject: [PATCH] Delete calls to deprecated python_version(). Package-Manager: portage-HEAD/cvs/Linux x86_64 --- dev-libs/boost/ChangeLog | 7 ++++++- dev-libs/boost/Manifest | 15 +++++++-------- dev-libs/boost/boost-1.35.0-r2.ebuild | 11 +++++------ dev-libs/boost/boost-1.35.0-r5.ebuild | 15 +++++++-------- dev-libs/boost/boost-1.37.0-r1.ebuild | 15 +++++++-------- dev-libs/boost/boost-1.39.0.ebuild | 15 +++++++-------- dev-libs/boost/boost-1.41.0-r3.ebuild | 16 +++++++--------- dev-libs/boost/boost-1.42.0.ebuild | 16 +++++++--------- 8 files changed, 53 insertions(+), 57 deletions(-) diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog index 32e751dfad91..74deb036a903 100644 --- a/dev-libs/boost/ChangeLog +++ b/dev-libs/boost/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/boost # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.195 2010/04/22 17:25:16 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.196 2010/04/25 18:28:14 arfrever Exp $ + + 25 Apr 2010; Arfrever Frehtes Taifersar Arahesis + boost-1.35.0-r2.ebuild, boost-1.35.0-r5.ebuild, boost-1.37.0-r1.ebuild, + boost-1.39.0.ebuild, boost-1.41.0-r3.ebuild, boost-1.42.0.ebuild: + Delete calls to deprecated python_version(). 22 Apr 2010; Samuli Suominen -boost-1.36.0-r1.ebuild: diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest index a56585c183d8..e645c87f237a 100644 --- a/dev-libs/boost/Manifest +++ b/dev-libs/boost/Manifest @@ -20,12 +20,11 @@ DIST boost_1_37_0.tar.bz2 29435646 RMD160 3c4cf7eb97a8fb126e564ba529ed9edec87651 DIST boost_1_39_0.tar.bz2 29408537 RMD160 4962256b48fa8563bf373b8bed97cc8655206a51 SHA1 6af42f74ab24ccc51589a025593bad298c8adde8 SHA256 44785eae8c6cce61a29a8a51f9b737e57b34d66baa7c0bcd4af188832b8018fd DIST boost_1_41_0.tar.bz2 33348161 RMD160 a604ef5a6f6f5bf50be59206c8534258ab431aea SHA1 31134e28866b90c39ca4a903c263e036bb25550c SHA256 1ef94e6749eaf13318284b4f629be063544c7015b45e38113b975ac1945cc726 DIST boost_1_42_0.tar.bz2 33426755 RMD160 90cea6aaa35f22b97e6eb3f5879ca9fe21098349 SHA1 3ce3bb1a1bed504635287017f9e628597b409e7b SHA256 4b1eb95bd250ce15ac66435d6167f225b072b0d3a7eb72477a31847a9ca9e609 -EBUILD boost-1.35.0-r2.ebuild 7110 RMD160 561df964af02bc9aac75ad3f33f610c2aa8a9ad7 SHA1 70b4d1946342770d6a361cb61fdbaba678fc70c3 SHA256 be62c1e09e7aa5bb4e44115fa0a49797f4a8333dd40f0311e4019090c0b09626 -EBUILD boost-1.35.0-r5.ebuild 9714 RMD160 15a86ae2b066e759352954f9e7dbbc520b71acc0 SHA1 8ddb9fffce9068bed7d99fcdcac8e520a519b768 SHA256 4eddd4aa993478e1fa0bdab8c4d9f3ab73913380b49975d3695494ef0089292e -EBUILD boost-1.37.0-r1.ebuild 13178 RMD160 14d44df115bb49d1551abd07ad9dc5303ade1f94 SHA1 5108f92ac808fb83fa4dd1d49c29ae299ab86cf0 SHA256 96a715f1af3950b5440bd5b415f01efea3b186c480eaf48d4d63cca4f633c809 -EBUILD boost-1.39.0.ebuild 12985 RMD160 f6f349747e51213713321a3d31b1e1c53713f47e SHA1 a26afdda9369d7ea8a690ec67e854e53eee3d045 SHA256 74d8f0e1992659639b52012bf01097d3f9b4da809f8bf7aed4eb2dea5a4bb22a -EBUILD boost-1.41.0-r2.ebuild 15247 RMD160 f4ba3600d5eecf90ecb5dc576e3889f03bb5480b SHA1 caa0837da2cef41b4db5036b0de7a3a688a71bec SHA256 1880b29eb5ebb7f6d5ed05ee151c935053e07622402c259b01f2bcba4faffdfd -EBUILD boost-1.41.0-r3.ebuild 15557 RMD160 055ad29c9cee055e54d81afb9a4b33222f03623b SHA1 2fb7238bc802909f7c249d85db46d6d6195d93f3 SHA256 c6d1d5195d3affec14627b1a6180c237c238ee76ac052330c30842577487fc72 -EBUILD boost-1.42.0.ebuild 16152 RMD160 63a9cf2995b1f15f9829d42d80567b1148fead79 SHA1 4bba36eb5d344535aa13fc651d052b3888b04d44 SHA256 575a536b30024cb315a93fb957b00f18d4c599a0c646650ae10ac0e280a22a5c -MISC ChangeLog 30083 RMD160 e1e9049c736c0f7de76ad50c0587096f9d6f1355 SHA1 aed1f1bb75631b3973d362c469bc0a165ebef7b9 SHA256 2a333585c8d8286c30780bdb97ebf1fb8b052490d8ca189cb3182b493d29a7ee +EBUILD boost-1.35.0-r2.ebuild 7054 RMD160 5d5cc8203f0cda430ad28896bf88f74319583a23 SHA1 b779518a223871c1b049575dbe5f4b80a9f90146 SHA256 0fe9f32e4413c142453cf95e1bfb340ad6f5fd545a232f403ee9d4bfe2e5fc05 +EBUILD boost-1.35.0-r5.ebuild 9601 RMD160 840a122fb70b8e1c3cf3dd5a8ed6ebf7ed04ed19 SHA1 327235a8e3f204148172bb419e4985a16db9ccd5 SHA256 8b1b73a2e104386e86bc9017e4d3a9876f5ee58f43540edb55f793b54747c858 +EBUILD boost-1.37.0-r1.ebuild 13069 RMD160 3d7d732c972af3ee272c7603e783f179f14159a8 SHA1 435454c3e54af6e166b4975aebbee902da29c8e1 SHA256 e714eac0b1e34d9ef07d79097157858fb74afb0ac3d808665cd11935f26dcfa3 +EBUILD boost-1.39.0.ebuild 12876 RMD160 a6fb57aef046faba9a9412fa2b258760e92dc5a5 SHA1 eaad5f9bf48cb4ac5377382259ac49057bd61ae0 SHA256 b172fca2f88fab07f610009881fbe170df5c1191ba949084b78aea33ed60544d +EBUILD boost-1.41.0-r3.ebuild 15444 RMD160 cbc01c466ed35a9147287491b0cc640d4660d975 SHA1 8d46a452e30432dea4844f2099e4532a7762a719 SHA256 74b2614ad90de9945073b811beb14932806ab6e950c2bbdbda5b49758518b546 +EBUILD boost-1.42.0.ebuild 16037 RMD160 fb19bbd7c255bfbb221879a171af73e6f85544f4 SHA1 2f893b5838006598e473afbcda43d3a15cdc666f SHA256 6334aea533ccbd829891ea04aeb3de437d070aa8f643baeef6c6c3cdcd9f2ac7 +MISC ChangeLog 30345 RMD160 d90cf51113890e247d7d7f1f05a21883884e078e SHA1 348c96d72ab4587844eec1ff4bb85ea429e5eb30 SHA256 1a27002826cc81832b65776e6c0516ef67d2f8d74adfcf4825281c1215881599 MISC metadata.xml 772 RMD160 297ebd4b4bed754fdfe0886a749c07abf7126c56 SHA1 75c9d162fe0b342ceffb3e1c465106d7d8b8673b SHA256 3753a208b747a53c9f0e18daad731b9bffa95cfa7efdce409f2d6ed2aac5340b diff --git a/dev-libs/boost/boost-1.35.0-r2.ebuild b/dev-libs/boost/boost-1.35.0-r2.ebuild index f52e05d9168c..645c77bfe996 100644 --- a/dev-libs/boost/boost-1.35.0-r2.ebuild +++ b/dev-libs/boost/boost-1.35.0-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.35.0-r2.ebuild,v 1.14 2009/10/21 16:57:23 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.35.0-r2.ebuild,v 1.15 2010/04/25 18:28:14 arfrever Exp $ inherit python flag-o-matic multilib toolchain-funcs versionator check-reqs @@ -94,7 +94,6 @@ generate_options() { generate_userconfig() { einfo "Writing new user-config.jam" - python_version local compiler compilerVersion compilerExecutable if [[ ${CHOST} == *-darwin* ]] ; then @@ -114,7 +113,7 @@ variant gentoorelease : release : none none ; variant gentoodebug : debug : none none ; using ${compiler} : ${compilerVersion} : ${compilerExecutable} : "${CXXFLAGS}" "${LDFLAGS}" ; -using python : ${PYVER} : /usr : /usr/include/python${PYVER} : /usr/lib/python${PYVER} ; +using python : $(python_get_version) : /usr : $(python_get_includedir) : $(python_get_libdir) ; __EOF__ @@ -171,8 +170,8 @@ src_install () { # Move the mpi.so to the right place if use mpi; then - mkdir -p "${D}/usr/$(get_libdir)/python${PYVER}/site-packages" - mv "${D}/usr/$(get_libdir)/mpi.so" "${D}/usr/$(get_libdir)/python${PYVER}/site-packages" + mkdir -p "${D}$(python_get_sitedir)" + mv "${D}/usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)" fi if use doc ; then diff --git a/dev-libs/boost/boost-1.35.0-r5.ebuild b/dev-libs/boost/boost-1.35.0-r5.ebuild index 25ae3e48a0d8..a8f32276fd28 100644 --- a/dev-libs/boost/boost-1.35.0-r5.ebuild +++ b/dev-libs/boost/boost-1.35.0-r5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.35.0-r5.ebuild,v 1.14 2009/12/27 12:51:09 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.35.0-r5.ebuild,v 1.15 2010/04/25 18:28:14 arfrever Exp $ EAPI="2" @@ -110,8 +110,7 @@ src_configure() { use mpi && mpi="using mpi ;" if use python ; then - python_version - pystring="using python : ${PYVER} : /usr : /usr/include/python${PYVER} : /usr/lib/python${PYVER} ;" + pystring="using python : $(python_get_version) : /usr : $(python_get_includedir) : $(python_get_libdir) ;" fi cat > "${S}/user-config.jam" << __EOF__ @@ -192,10 +191,10 @@ src_install () { # Move the mpi.so to the right place and make sure it's slotted if use mpi && use python; then - mkdir -p "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}" - mv "${D}/usr/$(get_libdir)/mpi.so" "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/" - touch "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/__init__.py" - _add_line "python=\"/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/mpi.so\"" + mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" + mv "${D}/usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/" + touch "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py" + _add_line "python=\"$(python_get_sitedir)/boost_${MAJOR_PV}/mpi.so\"" fi if use doc ; then diff --git a/dev-libs/boost/boost-1.37.0-r1.ebuild b/dev-libs/boost/boost-1.37.0-r1.ebuild index a0b98c3823d5..5f4a999cc005 100644 --- a/dev-libs/boost/boost-1.37.0-r1.ebuild +++ b/dev-libs/boost/boost-1.37.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild,v 1.14 2009/11/25 17:59:16 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.37.0-r1.ebuild,v 1.15 2010/04/25 18:28:14 arfrever Exp $ EAPI="2" @@ -123,8 +123,7 @@ src_configure() { use mpi && mpi="using mpi ;" if use python ; then - python_version - pystring="using python : ${PYVER} : /usr : /usr/include/python${PYVER} : /usr/lib/python${PYVER} ;" + pystring="using python : $(python_get_version) : /usr : $(python_get_includedir) : $(python_get_libdir) ;" fi cat > "${S}/user-config.jam" << __EOF__ @@ -227,10 +226,10 @@ src_install () { # Move the mpi.so to the right place and make sure it's slotted if use mpi && use python; then - mkdir -p "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}" - mv "${D}/usr/$(get_libdir)/mpi.so" "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/" - touch "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/__init__.py" - _add_line "python=\"/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/mpi.so\"" + mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" + mv "${D}/usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/" + touch "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py" + _add_line "python=\"$(python_get_sitedir)/boost_${MAJOR_PV}/mpi.so\"" fi if use doc ; then diff --git a/dev-libs/boost/boost-1.39.0.ebuild b/dev-libs/boost/boost-1.39.0.ebuild index 27733ce2b64a..c07ea6483aad 100644 --- a/dev-libs/boost/boost-1.39.0.ebuild +++ b/dev-libs/boost/boost-1.39.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.39.0.ebuild,v 1.8 2009/11/25 17:59:16 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.39.0.ebuild,v 1.9 2010/04/25 18:28:14 arfrever Exp $ EAPI="2" @@ -117,8 +117,7 @@ src_configure() { use mpi && mpi="using mpi ;" if use python ; then - python_version - pystring="using python : ${PYVER} : /usr : /usr/include/python${PYVER} : /usr/lib/python${PYVER} ;" + pystring="using python : $(python_get_version) : /usr : $(python_get_includedir) : $(python_get_libdir) ;" fi cat > "${S}/user-config.jam" << __EOF__ @@ -221,10 +220,10 @@ src_install () { # Move the mpi.so to the right place and make sure it's slotted if use mpi && use python; then - mkdir -p "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}" - mv "${D}/usr/$(get_libdir)/mpi.so" "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/" - touch "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/__init__.py" - _add_line "python=\"/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/mpi.so\"" + mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" + mv "${D}/usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/" + touch "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py" + _add_line "python=\"$(python_get_sitedir)/boost_${MAJOR_PV}/mpi.so\"" fi if use doc ; then diff --git a/dev-libs/boost/boost-1.41.0-r3.ebuild b/dev-libs/boost/boost-1.41.0-r3.ebuild index 53b7d9daa8dd..eb8f8730e032 100644 --- a/dev-libs/boost/boost-1.41.0-r3.ebuild +++ b/dev-libs/boost/boost-1.41.0-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.41.0-r3.ebuild,v 1.9 2010/04/17 23:52:17 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.41.0-r3.ebuild,v 1.10 2010/04/25 18:28:14 arfrever Exp $ EAPI="2" @@ -51,8 +51,7 @@ _add_line() { pkg_setup() { # It doesn't compile with USE="python mpi" and python-3 (bug 295705) if use python && use mpi ; then - python_version - if [[ "${PYVER_MAJOR}" != "2" ]]; 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}." @@ -142,8 +141,7 @@ src_configure() { use mpi && mpi="using mpi ;" if use python ; then - python_version - pystring="using python : ${PYVER} : /usr : /usr/include/python${PYVER} : /usr/lib/python${PYVER} ;" + pystring="using python : $(python_get_version) : /usr : $(python_get_includedir) : $(python_get_libdir) ;" fi cat > "${S}/user-config.jam" << __EOF__ @@ -264,10 +262,10 @@ src_install () { # Move the mpi.so to the right place and make sure it's slotted if use mpi && use python; then - mkdir -p "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}" - mv "${D}/usr/$(get_libdir)/mpi.so" "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/" - touch "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/__init__.py" - _add_line "python=\"/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/mpi.so\"" + mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" + mv "${D}/usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/" + touch "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py" + _add_line "python=\"$(python_get_sitedir)/boost_${MAJOR_PV}/mpi.so\"" fi if use doc ; then diff --git a/dev-libs/boost/boost-1.42.0.ebuild b/dev-libs/boost/boost-1.42.0.ebuild index 9dd8df0140a7..9be5b07bb920 100644 --- a/dev-libs/boost/boost-1.42.0.ebuild +++ b/dev-libs/boost/boost-1.42.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.42.0.ebuild,v 1.2 2010/03/28 17:16:04 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.42.0.ebuild,v 1.3 2010/04/25 18:28:14 arfrever Exp $ EAPI="2" @@ -50,8 +50,7 @@ _add_line() { pkg_setup() { # It doesn't compile with USE="python mpi" and python-3 (bug 295705) if use python && use mpi ; then - python_version - if [[ "${PYVER_MAJOR}" != "2" ]]; 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}." @@ -127,8 +126,7 @@ src_configure() { use mpi && mpi="using mpi ;" if use python ; then - python_version - pystring="using python : ${PYVER} : /usr : /usr/include/python${PYVER} : /usr/lib/python${PYVER} ;" + pystring="using python : $(python_get_version) : /usr : $(python_get_includedir) : $(python_get_libdir) ;" fi cat > "${S}/user-config.jam" << __EOF__ @@ -258,10 +256,10 @@ src_install () { # Move the mpi.so to the right place and make sure it's slotted if use mpi && use python; then - mkdir -p "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}" || die - mv "${D}/usr/$(get_libdir)/mpi.so" "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/" || die - touch "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/__init__.py" || die - _add_line "python=\"/usr/$(get_libdir)/python${PYVER}/site-packages/boost_${MAJOR_PV}/mpi.so\"" + 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 -- 2.26.2