uml on ppc not available

5 files changed, 24 insertions, 18 deletions

diff --git a/dev-util/pbuilder/ChangeLog b/dev-util/pbuilder/ChangeLog
index 603aa01be31b..9297ec7e83b6 100644
--- a/dev-util/pbuilder/ChangeLog
+++ b/dev-util/pbuilder/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/pbuilder
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pbuilder/ChangeLog,v 1.16 2004/11/10 21:55:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pbuilder/ChangeLog,v 1.17 2004/11/11 15:16:47 lanius Exp $
+
+  11 Nov 2004; <heino@gentoo.org> pbuilder-0.110.ebuild,
+  pbuilder-0.114.ebuild, pbuilder-0.99.ebuild:
+  uml on ppc not available
 
   10 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> pbuilder-0.110.ebuild,
   pbuilder-0.114.ebuild:
diff --git a/dev-util/pbuilder/Manifest b/dev-util/pbuilder/Manifest
index 6e6f01cca05e..7b7d8d911267 100644
--- a/dev-util/pbuilder/Manifest
+++ b/dev-util/pbuilder/Manifest
@@ -1,8 +1,8 @@
-MD5 d374780a8315e3d8a2acd9b89a4a7cb1 ChangeLog 1943
+MD5 d065d2d2afe2f30ff6f25100db52d99b pbuilder-0.110.ebuild 1073
+MD5 00bc4e8dd71c87ed223fbecc21639a25 pbuilder-0.99.ebuild 1010
+MD5 c3f7217767416c6a36e4085e14d6d8a1 pbuilder-0.114.ebuild 1064
+MD5 4f1d6e7b3f3041ebe58ea6a9b9dde277 ChangeLog 2072
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
-MD5 17b3ef61ec4a1387d1ff0645a5c8ea1e pbuilder-0.99.ebuild 932
-MD5 79933f62d816620405b8e3254c08a721 pbuilder-0.114.ebuild 1063
-MD5 0deba2f3f777ef33821db7a20a0d2411 pbuilder-0.110.ebuild 1063
 MD5 928b50a1c4fb41c3c608135087d99e68 files/digest-pbuilder-0.99 65
-MD5 b3edd09c3d898dc8247ed193c46c1384 files/digest-pbuilder-0.114 66
 MD5 183ba2b2e8cef15325e2e50e7bc8a196 files/digest-pbuilder-0.110 66
+MD5 b3edd09c3d898dc8247ed193c46c1384 files/digest-pbuilder-0.114 66
diff --git a/dev-util/pbuilder/pbuilder-0.110.ebuild b/dev-util/pbuilder/pbuilder-0.110.ebuild
index 93e71f8733fa..cd167c029d12 100644
--- a/dev-util/pbuilder/pbuilder-0.110.ebuild
+++ b/dev-util/pbuilder/pbuilder-0.110.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pbuilder/pbuilder-0.110.ebuild,v 1.3 2004/11/10 21:55:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pbuilder/pbuilder-0.110.ebuild,v 1.4 2004/11/11 15:16:47 lanius Exp $
 
 DESCRIPTION="personal package builder for Debian packages"
 HOMEPAGE="http://packages.qa.debian.org/p/pbuilder.html"
@@ -15,10 +15,10 @@ DEPEND=">=sys-apps/debianutils-1.13.1
 	net-misc/wget
 	>=dev-util/debootstrap-0.2.29
 	app-arch/dpkg
-	uml? (
+	x86? ( uml? (
 		dev-util/rootstrap
 		sys-apps/usermode-utilities
-		)"
+		) )"
 
 IUSE="uml"
 
@@ -27,13 +27,13 @@ src_install() {
 	dodoc AUTHORS COPYING ChangeLog README THANKS
 	doman pbuilder.8 pbuilderrc.5 pdebuild.1
 
-	if ! use uml; then
+	if use uml && use x86; then
+		doman pdebuild-user-mode-linux.1 pbuilder-user-mode-linux.1
+	else
 		cd ${D}
 		rm -f etc/pbuilder/pbuilder-uml.conf
 		rm -f usr/share/pbuilder/pbuilder-uml.conf
 		rm -f usr/bin/pbuilder-user-mode-linux
 		rm -f usr/bin/pdebuild-user-mode-linux
 	fi
-
-	use uml && doman pdebuild-user-mode-linux.1 pbuilder-user-mode-linux.1
 }
diff --git a/dev-util/pbuilder/pbuilder-0.114.ebuild b/dev-util/pbuilder/pbuilder-0.114.ebuild
index 0b08bb56ca64..b56ac0f0791e 100644
--- a/dev-util/pbuilder/pbuilder-0.114.ebuild
+++ b/dev-util/pbuilder/pbuilder-0.114.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pbuilder/pbuilder-0.114.ebuild,v 1.2 2004/11/10 21:55:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pbuilder/pbuilder-0.114.ebuild,v 1.3 2004/11/11 15:16:47 lanius Exp $
 
 DESCRIPTION="personal package builder for Debian packages"
 HOMEPAGE="http://packages.qa.debian.org/p/pbuilder.html"
@@ -27,13 +27,13 @@ src_install() {
 	dodoc AUTHORS COPYING ChangeLog README THANKS
 	doman pbuilder.8 pbuilderrc.5 pdebuild.1
 
-	if ! use uml; then
+	if use uml && use x86; then
+		doman pdebuild-user-mode-linux.1 pbuilder-user-mode-linux.1
+	else
 		cd ${D}
 		rm -f etc/pbuilder/pbuilder-uml.conf
 		rm -f usr/share/pbuilder/pbuilder-uml.conf
 		rm -f usr/bin/pbuilder-user-mode-linux
 		rm -f usr/bin/pdebuild-user-mode-linux
 	fi
-
-	use uml && doman pdebuild-user-mode-linux.1 pbuilder-user-mode-linux.1
 }
diff --git a/dev-util/pbuilder/pbuilder-0.99.ebuild b/dev-util/pbuilder/pbuilder-0.99.ebuild
index 7e07ca284855..82fb7b3606a2 100644
--- a/dev-util/pbuilder/pbuilder-0.99.ebuild
+++ b/dev-util/pbuilder/pbuilder-0.99.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pbuilder/pbuilder-0.99.ebuild,v 1.6 2004/09/25 21:43:38 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pbuilder/pbuilder-0.99.ebuild,v 1.7 2004/11/11 15:16:47 lanius Exp $
 
 DESCRIPTION="personal package builder for Debian packages"
 HOMEPAGE="http://packages.qa.debian.org/p/pbuilder.html"
@@ -26,7 +26,9 @@ src_install() {
 	make DESTDIR=${D} install
 	dodoc AUTHORS COPYING ChangeLog README THANKS
 
-	if ! use uml; then
+	if use uml && use x86; then
+		doman pdebuild-user-mode-linux.1 pbuilder-user-mode-linux.1
+	else
 		cd ${D}
 		rm -f etc/pbuilder/pbuilder-uml.conf
 		rm -f usr/share/pbuilder/pbuilder-uml.conf