rename multilib-xlibs.eclass to multilib-native.eclass

9 files changed, 38 insertions, 38 deletions

diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index a7573e561..d4d032731 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -24,5 +24,5 @@ AUX perl-picdl.patch 250 RMD160 2a9cb2fe5debb0db2d3fd063f52f459ee4f4946f SHA1 30
 AUX perl-prelink-lpthread.patch 476 RMD160 f3252258e5f7a0f82b5f9ea49598ea9f4b0b44b6 SHA1 4202c290c578dfec58d5dbebf7f8f780a483f908 SHA256 289d0bdd08105e7fdf1c2d683d76a0cdcd009998f3ecd84f3a75cf79ab84e7a0
 AUX perl-regexp-nossp.patch 460 RMD160 dde3a25904275896e98d7b7f3a02926c8dbc5ca5 SHA1 e7de561f7885fb3d49635fa2dc733c0eed63b987 SHA256 e2d923711bb856b3c7f790dbc1cd1f468d647c1e50a3ff8a18745023c73b3e36
 DIST perl-5.8.8.tar.bz2 10123359 RMD160 e78f26d9b96e6db35f946ad4ff55e3a69385c71b SHA1 4aab490040727ca4419098720eca2ba4367df539 SHA256 818a140d9c04ea8dab3a05104b34ced7f7d9d0a91bfed91baf89a84d0dfb1bc9
-EBUILD perl-5.8.8-r5.ebuild 19245 RMD160 bc4b41efae012ec1365f193f700921cf134f29c7 SHA1 7daf72360702e0da35f9b1b210a6ba178f0c0e5d SHA256 47c6bfa2d7b9c7a931099399330d048fac5cfa98cd7ae7d1d0a796d186815184
-EBUILD perl-5.8.8-r6.ebuild 19352 RMD160 c273c1de5d0694a07c3890007f15bad6ddb50391 SHA1 4965d2fe06877c31aa289918d74640238f028fc9 SHA256 2d7189c4a86733f95f2d1936133d2c1724fac3f47e2d2e56e933df1613758555
+EBUILD perl-5.8.8-r5.ebuild 19251 RMD160 b08f57be99dbb4311373cfaa0bb6da29b948e5ae SHA1 eb97875d1d242af9d3b37d8eae85baad48603a13 SHA256 38ea00d9dfebe6d67418d2d436214d660f879c4754d4ae82beece9faa0ea7f71
+EBUILD perl-5.8.8-r6.ebuild 19359 RMD160 79558125be818c6c517bf6c5b50413b12d6ba571 SHA1 0671478c570666856e6c329c21b78f2d3323749d SHA256 359ce2cb27083dc3593e602b35907f8a8d8da03eac582d9f2066e963870dfbda
diff --git a/dev-lang/perl/perl-5.8.8-r5.ebuild b/dev-lang/perl/perl-5.8.8-r5.ebuild
index b82bc56fb..2ef263faa 100644
--- a/dev-lang/perl/perl-5.8.8-r5.ebuild
+++ b/dev-lang/perl/perl-5.8.8-r5.ebuild
@@ -47,7 +47,7 @@ PDEPEND=">=app-admin/perl-cleaner-1.03
 			>=perl-core/Test-Harness-2.56
 		)"
 
-multilib-xlibs_pkg_setup_internal() {
+multilib-native_pkg_setup_internal() {
 	# I think this should rather be displayed if you *have* 'ithreads'
 	# in USE if it could break things ...
 	if use ithreads
@@ -69,7 +69,7 @@ multilib-xlibs_pkg_setup_internal() {
 	fi
 }
 
-multilib-xlibs_src_prepare_internal() {
+multilib-native_src_prepare_internal() {
 	cd "${S}"
 
 	# Get -lpthread linked before -lc.  This is needed
@@ -157,7 +157,7 @@ myconf() {
 	myconf=( "${myconf[@]}" "$@" )
 }
 
-multilib-xlibs_src_configure_internal() {
+multilib-native_src_configure_internal() {
 	declare -a myconf
 
 	# some arches and -O do not mix :)
@@ -287,7 +287,7 @@ multilib-xlibs_src_configure_internal() {
 		"${myconf[@]}" || die "Unable to configure"
 }
 
-multilib-xlibs_src_compile_internal() {
+multilib-native_src_compile_internal() {
 
 	# would like to bracket this with a test for the existence of a
 	# dotfile, but can't clean it automatically now.
@@ -300,7 +300,7 @@ src_test() {
 	emake -i test CCDLFLAGS= || die "test failed"
 }
 
-multilib-xlibs_src_install_internal() {
+multilib-native_src_install_internal() {
 
 	export LC_ALL="C"
 
@@ -591,7 +591,7 @@ src_remove_extra_files()
 	popd > /dev/null
 }
 
-multilib-xlibs_pkg_postinst_internal() {
+multilib-native_pkg_postinst_internal() {
 	INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${MY_PV}'|etc|local|perl$/; print "$line\n" }')
 	if [[ "${ROOT}" = "/" ]]
 	then
diff --git a/dev-lang/perl/perl-5.8.8-r6.ebuild b/dev-lang/perl/perl-5.8.8-r6.ebuild
index 09c1e0b67..0765d730c 100644
--- a/dev-lang/perl/perl-5.8.8-r6.ebuild
+++ b/dev-lang/perl/perl-5.8.8-r6.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit eutils flag-o-matic toolchain-funcs multilib-xlibs
+inherit eutils flag-o-matic toolchain-funcs multilib-native
 
 # The slot of this binary compat version of libperl.so
 PERLSLOT="1"
@@ -47,7 +47,7 @@ PDEPEND=">=app-admin/perl-cleaner-1.03
 			>=perl-core/Test-Harness-2.56
 		)"
 
-multilib-xlibs_pkg_setup_internal() {
+multilib-native_pkg_setup_internal() {
 	# I think this should rather be displayed if you *have* 'ithreads'
 	# in USE if it could break things ...
 	if use ithreads
@@ -69,7 +69,7 @@ multilib-xlibs_pkg_setup_internal() {
 	fi
 }
 
-multilib-xlibs_src_prepare_internal() {
+multilib-native_src_prepare_internal() {
 	cd "${S}"
 
 	# Get -lpthread linked before -lc.  This is needed
@@ -159,7 +159,7 @@ myconf() {
 	myconf=( "${myconf[@]}" "$@" )
 }
 
-multilib-xlibs_src_configure_internal() {
+multilib-native_src_configure_internal() {
 	cd "${S}"
 	
 	declare -a myconf
@@ -291,7 +291,7 @@ multilib-xlibs_src_configure_internal() {
 		"${myconf[@]}" || die "Unable to configure"
 }
 
-multilib-xlibs_src_compile_internal() {
+multilib-native_src_compile_internal() {
 	cd "${S}"
 	# would like to bracket this with a test for the existence of a
 	# dotfile, but can't clean it automatically now.
@@ -304,7 +304,7 @@ src_test() {
 	emake -i test CCDLFLAGS= || die "test failed"
 }
 
-multilib-xlibs_src_install_internal() {
+multilib-native_src_install_internal() {
 	cd "${S}"
 	export LC_ALL="C"
 
@@ -595,7 +595,7 @@ src_remove_extra_files()
 	popd > /dev/null
 }
 
-multilib-xlibs_pkg_postinst_internal() {
+multilib-native_pkg_postinst_internal() {
 	cd "${S}"
 	INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${MY_PV}'|etc|local|perl$/; print "$line\n" }')
 	if [[ "${ROOT}" = "/" ]]
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index be63a1ecf..3e3d2b952 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -17,5 +17,5 @@ DIST Python-2.5.2.tar.bz2 9807597 RMD160 b23b02739833e6730799c5866e2b77aae884b63
 DIST Python-2.5.4.tar.bz2 9821313 RMD160 3a76c83464c3b1c38a60351ab054e33ac7195663 SHA1 0f2e819d6381f72f26c734e00a6780b3933ea404 SHA256 bc8d896a2bfe5523ba93b8d89b71017b74e8e6cb21dc676a0ccff668c8780110
 DIST python-gentoo-patches-2.5.2-r7.tar.bz2 28160 RMD160 c2a8c71f464f1cf0cd8e3d142a3f3454de46bc55 SHA1 b64fc90f331e42ea2c364fd61d13b515300fdcbf SHA256 8afff4ed12c3c5ca4418da657617317a8c646a69ae341a3d494747659825355f
 DIST python-gentoo-patches-2.5.4.tar.bz2 19474 RMD160 00bb0918414db251b11b7f19a9f8a112c9e49fbd SHA1 fd4955f7da3049abecc4df0e203e783a90390cf8 SHA256 6e050dd8e8a90655bf935af99ad1ae6456bc072f075ddb9bcd532201bbb37274
-EBUILD python-2.5.2-r7.ebuild 10759 RMD160 07716c7f956ea5ada82aba1e1ce37cec777678e9 SHA1 13f835a51eaed07ebd43ddab9ebb296185acaf38 SHA256 53af9bf47a468066062137a3ca4d0e3516a2b598d35205fcfbe3b70f923be10b
-EBUILD python-2.5.4-r2.ebuild 10820 RMD160 0818516b87d0af4f5a36e1909113861a4d2bb10e SHA1 b44e444371921e7e8ac7e23629964879d3b998c1 SHA256 66819cfad08725dedd87a1cf081b35fc3ffb3640403cf0fd5066525a3f49e2c6
+EBUILD python-2.5.2-r7.ebuild 10765 RMD160 bd829cc1088c4f71637d03973b2789294f573d28 SHA1 4caaf98aa148067bc84f58fd4d323a7fe4fa05d1 SHA256 b38b5a7e0b7bf77f3193e94a64004c6ba3b36fb416ce974efd33fdde9a42d163
+EBUILD python-2.5.4-r2.ebuild 10827 RMD160 cf7c1f68395da214c02c894b92d26c4fc59ef39f SHA1 88a20f961b10740dd41f671de11dcd63f5902196 SHA256 ab1a143c0d7b94d8417b3abe697f58c1c159adfe708a4d5beeacd7294d688c27
diff --git a/dev-lang/python/python-2.5.2-r7.ebuild b/dev-lang/python/python-2.5.2-r7.ebuild
index ecaa45604..075308ef5 100644
--- a/dev-lang/python/python-2.5.2-r7.ebuild
+++ b/dev-lang/python/python-2.5.2-r7.ebuild
@@ -9,7 +9,7 @@
 
 EAPI="2"
 
-inherit eutils autotools flag-o-matic python multilib versionator toolchain-funcs alternatives libtool multilib-xlibs
+inherit eutils autotools flag-o-matic python multilib versionator toolchain-funcs alternatives libtool multilib-native
 
 # we need this so that we don't depends on python.eclass
 PYVER_MAJOR=$(get_major_version)
@@ -52,7 +52,7 @@ DEPEND=">=sys-libs/zlib-1.1.3
 PDEPEND="${DEPEND} app-admin/python-updater"
 PROVIDE="virtual/python"
 
-multilib-xlibs_src_prepare_internal() {
+multilib-native_src_prepare_internal() {
 	if tc-is-cross-compiler ; then
 		epatch "${FILESDIR}"/python-2.4.4-test-cross.patch \
 			"${FILESDIR}"/python-2.5-cross-printf.patch
@@ -114,7 +114,7 @@ src_configure_internal() {
 
 src_configure() { :; }
 
-multilib-xlibs_src_compile_internal() {
+multilib-native_src_compile_internal() {
 	filter-flags -malign-double
 
 	# Seems to no longer be necessary
@@ -181,7 +181,7 @@ multilib-xlibs_src_compile_internal() {
 	emake || die "Parallel make failed"
 }
 
-multilib-xlibs_src_install_internal() {
+multilib-native_src_install_internal() {
 	dodir /usr
 	src_configure_internal
 	make DESTDIR="${D}" altinstall maninstall || die
@@ -228,7 +228,7 @@ multilib-xlibs_src_install_internal() {
 	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
 }
 
-multilib-xlibs_pkg_postrm_internal() {
+multilib-native_pkg_postrm_internal() {
 	local mansuffix=$(ecompress --suffix)
 	python_makesym
 	alternatives_auto_makesym "/usr/bin/idle" "idle[0-9].[0-9]"
@@ -244,7 +244,7 @@ multilib-xlibs_pkg_postrm_internal() {
 		python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
 }
 
-multilib-xlibs_pkg_postinst_internal() {
+multilib-native_pkg_postinst_internal() {
 	local myroot
 	myroot=$(echo $ROOT | sed 's:/$::')
 	local mansuffix=$(ecompress --suffix)
diff --git a/dev-lang/python/python-2.5.4-r2.ebuild b/dev-lang/python/python-2.5.4-r2.ebuild
index afe01f9b0..207b00ecb 100644
--- a/dev-lang/python/python-2.5.4-r2.ebuild
+++ b/dev-lang/python/python-2.5.4-r2.ebuild
@@ -9,7 +9,7 @@
 
 EAPI="2"
 
-inherit eutils autotools flag-o-matic python multilib versionator toolchain-funcs alternatives libtool multilib-xlibs
+inherit eutils autotools flag-o-matic python multilib versionator toolchain-funcs alternatives libtool multilib-native
 
 # we need this so that we don't depends on python.eclass
 PYVER_MAJOR=$(get_major_version)
@@ -52,7 +52,7 @@ DEPEND=">=sys-libs/zlib-1.1.3[lib32?]
 PDEPEND="${DEPEND} app-admin/python-updater"
 PROVIDE="virtual/python"
 
-multilib-xlibs_src_prepare_internal() {
+multilib-native_src_prepare_internal() {
 	if tc-is-cross-compiler ; then
 		epatch "${FILESDIR}"/python-2.4.4-test-cross.patch \
 			"${FILESDIR}"/python-2.5-cross-printf.patch
@@ -115,7 +115,7 @@ src_configure_internal() {
 	einfo "Disabled modules: $PYTHON_DISABLE_MODULES"
 }
 
-multilib-xlibs_src_compile_internal() {
+multilib-native_src_compile_internal() {
 	filter-flags -malign-double
 
 	# Seems to no longer be necessary
@@ -182,9 +182,9 @@ multilib-xlibs_src_compile_internal() {
 	emake || die "Parallel make failed"
 }
 
-multilib-xlibs_src_install_internal() {
+multilib-native_src_install_internal() {
 	dodir /usr
-	multilib-xlibs_src_configure_internal
+	multilib-native_src_configure_internal
 	make DESTDIR="${D}" altinstall maninstall || die
 
 	mv "${D}"/usr/bin/python${PYVER}-config \
@@ -232,7 +232,7 @@ multilib-xlibs_src_install_internal() {
 	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
 }
 
-multilib-xlibs_pkg_postrm_internal() {
+multilib-native_pkg_postrm_internal() {
 	local mansuffix=$(ecompress --suffix)
 	python_makesym
 	alternatives_auto_makesym "/usr/bin/idle" "idle[0-9].[0-9]"
@@ -248,7 +248,7 @@ multilib-xlibs_pkg_postrm_internal() {
 		python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
 }
 
-multilib-xlibs_pkg_postinst_internal() {
+multilib-native_pkg_postinst_internal() {
 	local myroot
 	myroot=$(echo $ROOT | sed 's:/$::')
 	local mansuffix=$(ecompress --suffix)
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 697763985..d59f7a728 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -7,7 +7,7 @@ AUX tcl-8.5_alpha6-tclm4-soname.patch 486 RMD160 1795d442bf8ced0804d6aa364f628c5
 AUX tcl-configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea
 DIST tcl8.4.19-src.tar.gz 3658647 RMD160 6e3d2991e8e44a2e32f0da8fdf7ab07aa9b8202f SHA1 ed25c5a206bcd603c2d5e58790354b9be178f331 SHA256 1c244722fb409e8774c5d45d6a0b21edc3e4541fd016a40afdf53c94a69a3db9
 DIST tcl8.5.6-src.tar.gz 4409651 RMD160 1f3c937a5e77ec2fbf79240d385474eed24f8ea5 SHA1 02c57eea35191f027460c6df289179d03f2e9584 SHA256 246d09da115307c60f1c91fcfcef8518952e166de058b6aef7fbcffa76ca150e
-EBUILD tcl-8.4.19.ebuild 3736 RMD160 454e874143ca3c39d35f03f1f2ceb157b1feb9c0 SHA1 bfe52021fb9d94f4e1368c6ffdbd47869c0afd68 SHA256 5f1a2933efc5d3efa2bbd9490b29628e8611de8efe3be3c5fb4f2f4a7ddcab61
-EBUILD tcl-8.5.6.ebuild 3289 RMD160 3dd0fd1fe8c1d7fb34f2a69e5850b75b6f43e8af SHA1 60850b1dc3fab2cec5d87a044e239d47bf88ab57 SHA256 46e6ec91ccb4630407a9646cd67e8cf619006066a8c413863326c0c33cebeb61
+EBUILD tcl-8.4.19.ebuild 3739 RMD160 97f44f1a09d24edd9c1fe146e053abb076e52637 SHA1 1fbc32a0f7060c84612372730b3bcd692b78e36b SHA256 152dfb855ac244de7834a8bbee8fe42bc072aeae638fb1ccfa99e6c84ca26949
+EBUILD tcl-8.5.6.ebuild 3292 RMD160 8d36805e9c5139e93fee13ab5dee788b4cc828ae SHA1 b13d1ed19e2b64937a3c42e532a6b64d2165ff25 SHA256 e679c938020b553630b100345774d1421a01d57b6751d2de68f4ef3df56ee103
 MISC ChangeLog 13507 RMD160 f72b3eadbc756055815d2a75ecd536edab8867f9 SHA1 fc495dc2fd8f3162f838543075b7340d9873ad23 SHA256 b7490f7e53f1cecf0aaa850199ae0dd144b96708ca0cc2a5c40d25e782f1635e
 MISC metadata.xml 264 RMD160 6318855997b3e957f4ad5c59677534993e352c34 SHA1 19fe5fc86133d09d7fcb0b2ce44054eff4fff028 SHA256 01ce19dabf2e53a73d86e4b16f653c6cd2b6c9aca1b79ec095f353315c8b84ee
diff --git a/dev-lang/tcl/tcl-8.4.19.ebuild b/dev-lang/tcl/tcl-8.4.19.ebuild
index 1de024299..9214e611d 100644
--- a/dev-lang/tcl/tcl-8.4.19.ebuild
+++ b/dev-lang/tcl/tcl-8.4.19.ebuild
@@ -7,7 +7,7 @@ EAPI=2
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
 
-inherit autotools eutils multilib toolchain-funcs multilib-xlibs
+inherit autotools eutils multilib toolchain-funcs multilib-native
 
 DESCRIPTION="Tool Command Language"
 HOMEPAGE="http://www.tcl.tk/"
@@ -56,7 +56,7 @@ src_unpack() {
 	eautoreconf
 }
 
-multilib-xlibs_src_configure_internal() {
+multilib-native_src_configure_internal() {
 	tc-export CC
 	local local_config_use=""
 
@@ -70,7 +70,7 @@ multilib-xlibs_src_configure_internal() {
 		$(use_enable debug symbols) || die
 }
 
-multilib-xlibs_src_install_internal() {
+multilib-native_src_install_internal() {
 	#short version number
 	local v1
 	v1=${PV%.*}
diff --git a/dev-lang/tcl/tcl-8.5.6.ebuild b/dev-lang/tcl/tcl-8.5.6.ebuild
index 2073ee83d..3c6019758 100644
--- a/dev-lang/tcl/tcl-8.5.6.ebuild
+++ b/dev-lang/tcl/tcl-8.5.6.ebuild
@@ -7,7 +7,7 @@ EAPI=2
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
 
-inherit autotools eutils multilib toolchain-funcs multilib-xlibs
+inherit autotools eutils multilib toolchain-funcs multilib-native
 
 MY_P="${PN}${PV/_beta/b}"
 DESCRIPTION="Tool Command Language"
@@ -48,7 +48,7 @@ src_unpack() {
 	eautoreconf
 }
 
-multilib-xlibs_src_configure_internal() {
+multilib-native_src_configure_internal() {
 	tc-export CC
 
 	cd "${S}"/unix
@@ -57,7 +57,7 @@ multilib-xlibs_src_configure_internal() {
 		$(use_enable debug symbols) || die
 }
 
-multilib-xlibs_src_install_internal() {
+multilib-native_src_install_internal() {
 	#short version number
 	local v1
 	v1=${PV%.*}