From f5c1288e1bac709ae5de2306d98b14571c5d1c18 Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Tue, 30 Jan 2007 20:34:37 +0000
Subject: [PATCH] xpak -> portage.xpak

svn path=/main/branches/prefix/; revision=5837
---
 bin/misc-functions.sh | 2 +-
 bin/quickpkg          | 2 +-
 bin/xpak              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 7566f366f..3b9eb877f 100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -541,7 +541,7 @@ dyn_package() {
 		die "Failed to create tarball"
 	cd ..
 	export PYTHONPATH=${PORTAGE_PYM_PATH:-${EPREFIX}/usr/lib/portage/pym}
-	python -c "import xpak; t=xpak.tbz2('${pkg_tmp}'); t.recompose('${PORTAGE_BUILDDIR}/build-info')"
+	python -c "import portage.xpak; t=portage.xpak.tbz2('${pkg_tmp}'); t.recompose('${PORTAGE_BUILDDIR}/build-info')"
 	if [ $? -ne 0 ]; then
 		rm -f "${pkg_tmp}"
 		die "Failed to append metadata to the tbz2 file"
diff --git a/bin/quickpkg b/bin/quickpkg
index e09bd148f..1309e8502 100755
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -96,7 +96,7 @@ do_pkg() {
 		tar vjcf "${pkg_tmp}" -C "${ROOT}" --files-from="${MYDIR}"/filelist --no-recursion
 
 		# join together the basic tbz2 and the pkg info files
-		python -c "import xpak; t=xpak.tbz2('${pkg_tmp}'); t.recompose('${MYDIR}/temp')"
+		python -c "import portage.xpak; t=portage.xpak.tbz2('${pkg_tmp}'); t.recompose('${MYDIR}/temp')"
 
 		# move the final binary package to PKGDIR
 		mv -f "${pkg_tmp}" "${pkg_dest}"
diff --git a/bin/xpak b/bin/xpak
index 95b15ec20..98fa10aee 100755
--- a/bin/xpak
+++ b/bin/xpak
@@ -14,4 +14,4 @@ except ImportError:
 	sys.path.insert(0, "@PORTAGE_BASE@/pym")
 	import portage.xpak
 
-xpak.xpak(sys.argv[1],sys.argv[2])
+portage.xpak.xpak(sys.argv[1],sys.argv[2])
-- 
2.26.2