version bump; remove old version; use debian mirrors

6 files changed, 43 insertions, 28 deletions

diff --git a/dev-util/pbuilder/Manifest b/dev-util/pbuilder/Manifest
index 06fc1b85f2fc..a4408048f3c6 100644
--- a/dev-util/pbuilder/Manifest
+++ b/dev-util/pbuilder/Manifest
@@ -1,6 +1,6 @@
-MD5 7aebb9442e8adb16d08fb51af6d99123 pbuilder-0.86.ebuild 959
-MD5 7aebb9442e8adb16d08fb51af6d99123 pbuilder-0.99.ebuild 959
-MD5 0ecf8208c97eb695fb03ccff4badb51f ChangeLog 826
+MD5 716f96a66d87f14213254c887e85d76e pbuilder-0.86.ebuild 942
+MD5 e65f76a7eeef75be5a3f8ae6e33b3492 pbuilder-0.99.ebuild 943
+MD5 3a01b921d379ded9520ae5517f3943f4 ChangeLog 1031
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 d86c6645c57b2a7ee38a3ee2e552297e files/digest-pbuilder-0.86 65
 MD5 928b50a1c4fb41c3c608135087d99e68 files/digest-pbuilder-0.99 65
diff --git a/dev-util/pbuilder/files/digest-pbuilder-0.80 b/dev-util/pbuilder/files/digest-pbuilder-0.80
deleted file mode 100644
index 8b281af8159e..000000000000
--- a/dev-util/pbuilder/files/digest-pbuilder-0.80
+++ /dev/null
@@ -1 +0,0 @@
-MD5 094a203b20a3af2a68a63865e1bed346 pbuilder_0.80.tar.gz 98476
diff --git a/dev-util/pbuilder/files/digest-pbuilder-0.99 b/dev-util/pbuilder/files/digest-pbuilder-0.99
new file mode 100644
index 000000000000..568dabfb8c32
--- /dev/null
+++ b/dev-util/pbuilder/files/digest-pbuilder-0.99
@@ -0,0 +1 @@
+MD5 8f8cab8319f46f01830cc0b7aa2c00d7 pbuilder_0.99.tar.gz 251318
diff --git a/dev-util/pbuilder/pbuilder-0.80.ebuild b/dev-util/pbuilder/pbuilder-0.80.ebuild
deleted file mode 100644
index 563a6b6b30eb..000000000000
--- a/dev-util/pbuilder/pbuilder-0.80.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pbuilder/pbuilder-0.80.ebuild,v 1.2 2003/08/15 11:29:16 lanius Exp $
-
-DESCRIPTION="personal package builder for Debian packages"
-HOMEPAGE="http://packages.qa.debian.org/p/pbuilder.html"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-SRC_URI="http://http.us.debian.org/debian/pool/main/p/pbuilder/pbuilder_${PV}.tar.gz"
-S=${WORKDIR}/pbuilder
-DEPEND=">=sys-apps/debianutils-1.13.1
-	net-misc/wget
-	dev-util/debootstrap
-	app-arch/dpkg"
-IUSE=""
-
-src_install() {
-	make DESTDIR=${D} install
-	dodoc AUTHORS COPYING ChangeLog README THANKS
-}
diff --git a/dev-util/pbuilder/pbuilder-0.86.ebuild b/dev-util/pbuilder/pbuilder-0.86.ebuild
index 174f292a3acd..e95a56a21426 100644
--- a/dev-util/pbuilder/pbuilder-0.86.ebuild
+++ b/dev-util/pbuilder/pbuilder-0.86.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pbuilder/pbuilder-0.86.ebuild,v 1.3 2003/10/31 13:48:57 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pbuilder/pbuilder-0.86.ebuild,v 1.4 2004/01/23 18:27:20 lanius Exp $
 
 DESCRIPTION="personal package builder for Debian packages"
 HOMEPAGE="http://packages.qa.debian.org/p/pbuilder.html"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86"
-SRC_URI="http://http.us.debian.org/debian/pool/main/p/pbuilder/pbuilder_${PV}.tar.gz"
+SRC_URI="mirror://debian/pool/main/p/pbuilder/pbuilder_${PV}.tar.gz"
 
 S=${WORKDIR}/${PN}
 
diff --git a/dev-util/pbuilder/pbuilder-0.99.ebuild b/dev-util/pbuilder/pbuilder-0.99.ebuild
new file mode 100644
index 000000000000..23682e9652b4
--- /dev/null
+++ b/dev-util/pbuilder/pbuilder-0.99.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/01/23 18:27:20 lanius Exp $
+
+DESCRIPTION="personal package builder for Debian packages"
+HOMEPAGE="http://packages.qa.debian.org/p/pbuilder.html"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+SRC_URI="mirror://debian/pool/main/p/pbuilder/pbuilder_${PV}.tar.gz"
+
+S=${WORKDIR}/${PN}
+
+DEPEND=">=sys-apps/debianutils-1.13.1
+	net-misc/wget
+	dev-util/debootstrap
+	app-arch/dpkg
+	uml? (
+		dev-util/rootstrap
+		sys-apps/usermode-utilities
+		)"
+
+IUSE="uml"
+
+src_install() {
+	make DESTDIR=${D} install
+	dodoc AUTHORS COPYING ChangeLog README THANKS
+
+	if [ ! `use uml` ]; then
+		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
+}