Delete calls to deprecated python_version().

Package-Manager: portage-HEAD/cvs/Linux x86_64

4 files changed, 28 insertions, 32 deletions

diff --git a/dev-db/metakit/ChangeLog b/dev-db/metakit/ChangeLog
index eb2e4dbc70f3..15281ac2641e 100644
--- a/dev-db/metakit/ChangeLog
+++ b/dev-db/metakit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/metakit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/ChangeLog,v 1.45 2010/02/22 11:46:57 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/ChangeLog,v 1.46 2010/04/04 21:36:16 arfrever Exp $
+
+  04 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  metakit-2.4.9.6.ebuild, metakit-2.4.9.7.ebuild:
+  Delete calls to deprecated python_version().
 
   22 Feb 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   metakit-2.4.9.7.ebuild:
diff --git a/dev-db/metakit/Manifest b/dev-db/metakit/Manifest
index e3ff4393405c..025c1b281a14 100644
--- a/dev-db/metakit/Manifest
+++ b/dev-db/metakit/Manifest
@@ -1,9 +1,7 @@
 AUX metakit-2.4.9.3-64bit.patch 1402 RMD160 a62370b09168ae6420bb5c109aaf354a1409c869 SHA1 f074f989818addd8a5345f9a148e0893563facdd SHA256 28884685e4627cfbd8e6bf0c2f0d7304f7d9495b2d63da435a64376779c74093
-DIST metakit-2.4.9.3.tar.gz 894808 RMD160 ea2cbec5247dde58ff657de9908db5229ae0e5f5 SHA1 466f062cbe467bc06a07f47a818af9ecfe4d121f SHA256 4d6c46289b1f1dea4e8bbc78332901491bde0c552727c27431ca9cb0234658da
 DIST metakit-2.4.9.6.tar.gz 868298 RMD160 f0515f21c6dfc96f912989155938d9e54b7d0810 SHA1 c8d1babae6d1569a188a77e8648c987a83c7f282 SHA256 bcaef27ca5f0ca44b189ccb0d6fc7e1f07b5781ee1ebda6b75edd8ed4acfe8e2
 DIST metakit-2.4.9.7.tar.gz 868310 RMD160 e563c2187e66ed7a8ea0e9a16971e6ce777e3088 SHA1 1b75400038fcad941886deb0748e669c224bc995 SHA256 d1ba361d2d8517925cff5c23e8602822da9c8c347a75a15c225ec656ff7ca94d
-EBUILD metakit-2.4.9.3-r2.ebuild 1663 RMD160 779c089af9e292cb26d259ae7998daee956a0e05 SHA1 b3ed5d3f56480b5258b7f2908d5d9a8792c5f75d SHA256 6cd3c3925face20d3960c1d61580fd5081c3bcac8695b68f8207ef30af834658
-EBUILD metakit-2.4.9.6.ebuild 1777 RMD160 f411dcfff018bc58348465aae0c8cc306614edda SHA1 208220287e31121496e50b0897c5bc8dbb6d1d21 SHA256 a46dcbaa1dd7370582f460195f008140acf191776c31de71db82a062c56b23a3
-EBUILD metakit-2.4.9.7.ebuild 1782 RMD160 11b8ea45b4b416579421d1c16e8b428ffb086707 SHA1 4d87ca84615a0eaba1be97d4f7d57e4ff5890d00 SHA256 fe65aebb9053b678d15fd38ccdcbfa195f6c2354000b461c9cb6337f4a455aa1
-MISC ChangeLog 5500 RMD160 6b58872c03e3f3ecb49f14accc9c4fc7525986bc SHA1 e1573e5b4e92cdee0d290fcded3da7c8e8af937e SHA256 cc4065c08ba45b9357bd4ff0557e07f81d3efd017e95de7a17a5748fa749a8f8
+EBUILD metakit-2.4.9.6.ebuild 1719 RMD160 9ca4173b6f480b0a5b9ce4b0f4e569f71d612b09 SHA1 ac494a7c749bd6961b32add795601b585c7f646d SHA256 e3ccc1ea1c007f7c612d75537cf91521a59af78f1eea38d42622b06cef24e003
+EBUILD metakit-2.4.9.7.ebuild 1716 RMD160 ba9f0fe659ce5ddcfc7f54fa1c16aa50f3b664c5 SHA1 ae77c4a217708da1b4d23f45bf5d50f22fca780a SHA256 870a0da8dbee6487620c2740c28c6778e98028c47f326486d2403d1875ebc2e7
+MISC ChangeLog 5669 RMD160 34d7310603ba1b51589ef245f365b633c3975605 SHA1 2760b4a26f556fa83c8e708a8c7c8912c3278483 SHA256 5951001ca72a602227689542804acded9263099290a912f478c88a533ce64cdc
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
diff --git a/dev-db/metakit/metakit-2.4.9.6.ebuild b/dev-db/metakit/metakit-2.4.9.6.ebuild
index 87ffa906e79e..a80009252dea 100644
--- a/dev-db/metakit/metakit-2.4.9.6.ebuild
+++ b/dev-db/metakit/metakit-2.4.9.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.6.ebuild,v 1.7 2007/06/24 21:51:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.6.ebuild,v 1.8 2010/04/04 21:36:16 arfrever Exp $
 
-inherit python multilib eutils
+inherit eutils multilib python
 
 DESCRIPTION="Embedded database library"
 HOMEPAGE="http://www.equi4.com/metakit/"
@@ -11,7 +11,7 @@ SRC_URI="http://www.equi4.com/pub/mk/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ia64 ppc s390 sparc x86"
-IUSE="python tcl static"
+IUSE="python static tcl"
 
 DEPEND=">=sys-apps/sed-4
 	python? ( >=dev-lang/python-2.2.1 )
@@ -20,19 +20,19 @@ DEPEND=">=sys-apps/sed-4
 RESTRICT="test"
 
 src_unpack() {
-	python_version
+	unpack ${A}
+	cd "${S}"
 
-	unpack ${A} ; cd ${S}
 	# Fix all hardcoded python2.5 paths
-	for name in python/scxx/PWOBase.h python/PyHead.h python/PyStorage.cpp ; do
-		sed -i -e "s:Python.h:python${PYVER}/Python.h:" ${name}
+	for name in python/scxx/PWOBase.h python/PyHead.h python/PyStorage.cpp; do
+		sed -i -e "s:Python.h:python$(python_get_version)/Python.h:" ${name}
 	done
-	sed -i -e "s:python2.5:python${PYVER}:" unix/configure
+	sed -i -e "s:python2.5:python$(python_get_version):" unix/configure
 }
 
 src_compile() {
 	local myconf mycxxflags
-	use python && myconf="--with-python=/usr/include/python${PYVER},/usr/$(get_libdir)/python${PYVER}/site-packages"
+	use python && myconf="--with-python=$(python_get_includedir),$(python_get_sitedir)"
 	use tcl && myconf="${myconf} --with-tcl=/usr/include,/usr/$(get_libdir)"
 	use static && myconf="${myconf} --disable-shared"
 	use static || mycxxflags="-fPIC"
@@ -51,10 +51,8 @@ src_compile() {
 }
 
 src_install () {
-	python_version
-
-	use python && dodir /usr/$(get_libdir)/python${PYVER}/site-packages
-	make DESTDIR=${D} install || die
+	use python && dodir $(python_get_sitedir)
+	make DESTDIR="${D}" install || die
 
 	dodoc CHANGES README WHATSNEW
 	dohtml MetaKit.html
diff --git a/dev-db/metakit/metakit-2.4.9.7.ebuild b/dev-db/metakit/metakit-2.4.9.7.ebuild
index f04f9eb4d758..9dfad74aa090 100644
--- a/dev-db/metakit/metakit-2.4.9.7.ebuild
+++ b/dev-db/metakit/metakit-2.4.9.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.7.ebuild,v 1.3 2010/02/22 11:46:57 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.7.ebuild,v 1.4 2010/04/04 21:36:16 arfrever Exp $
 
-inherit python multilib eutils
+inherit eutils multilib python
 
 DESCRIPTION="Embedded database library"
 HOMEPAGE="http://www.equi4.com/metakit/"
@@ -11,7 +11,7 @@ SRC_URI="http://www.equi4.com/pub/mk/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
-IUSE="python tcl static"
+IUSE="python static tcl"
 
 DEPEND=">=sys-apps/sed-4
 	python? ( >=dev-lang/python-2.2.1 )
@@ -20,21 +20,19 @@ DEPEND=">=sys-apps/sed-4
 RESTRICT="test"
 
 src_unpack() {
-	python_version
-
 	unpack ${A}
 	cd "${S}"
 
 	# Fix all hardcoded python2.5 paths
-	for name in python/scxx/PWOBase.h python/PyHead.h python/PyStorage.cpp ; do
-		sed -i -e "s:Python.h:python${PYVER}/Python.h:" ${name}
+	for name in python/scxx/PWOBase.h python/PyHead.h python/PyStorage.cpp; do
+		sed -i -e "s:Python.h:python$(python_get_version)/Python.h:" ${name}
 	done
-	sed -i -e "s:python2.5:python${PYVER}:" unix/configure
+	sed -i -e "s:python2.5:python$(python_get_version):" unix/configure
 }
 
 src_compile() {
 	local myconf mycxxflags
-	use python && myconf="--with-python=/usr/include/python${PYVER},/usr/$(get_libdir)/python${PYVER}/site-packages"
+	use python && myconf="--with-python=$(python_get_includedir),$(python_get_sitedir)"
 	use tcl && myconf="${myconf} --with-tcl=/usr/include,/usr/$(get_libdir)"
 	use static && myconf="${myconf} --disable-shared"
 	use static || mycxxflags="-fPIC"
@@ -53,9 +51,7 @@ src_compile() {
 }
 
 src_install () {
-	python_version
-
-	use python && dodir /usr/$(get_libdir)/python${PYVER}/site-packages
+	use python && dodir $(python_get_sitedir)
 	make DESTDIR="${D}" install || die
 
 	dodoc CHANGES README