version bump. fixed tests and removed RESTRICT=test

Package-Manager: portage-2.1.3.7

6 files changed, 158 insertions, 5 deletions

diff --git a/dev-util/bzr/ChangeLog b/dev-util/bzr/ChangeLog
index 26fd3c3e08b0..069e28066fe6 100644
--- a/dev-util/bzr/ChangeLog
+++ b/dev-util/bzr/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/bzr
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.37 2007/07/10 23:25:54 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.38 2007/09/06 09:21:25 hawking Exp $
+
+*bzr-0.90 (06 Sep 2007)
+
+  06 Sep 2007; Ali Polatel <hawking@gentoo.org>
+  +files/bzr-0.90-tests-fix_root.patch, +files/bzr-0.90-tests-sgid.patch,
+  +bzr-0.90.ebuild:
+  Version bump. Added a patch to fix tests when running w/o userpriv (bug
+  173301) and another patch to fix permission tests when running beneath a
+  directory with the setgid bit set. Pass --install-data /usr/share option to
+  distutils_src_install instead of patching for man page location.
 
   10 Jul 2007; Markus Ullmann <jokey@gentoo.org> bzr-0.17.ebuild:
   Stable on x86
diff --git a/dev-util/bzr/Manifest b/dev-util/bzr/Manifest
index a8a0fa4023e8..c8e1acb75100 100644
--- a/dev-util/bzr/Manifest
+++ b/dev-util/bzr/Manifest
@@ -10,8 +10,17 @@ AUX bzr-0.16-timed-tests-fix.patch 1382 RMD160 0a0599fe17d023b3d3161c2530bab8f19
 MD5 60dd2e57687144d46ac9e50ac4d46eba files/bzr-0.16-timed-tests-fix.patch 1382
 RMD160 0a0599fe17d023b3d3161c2530bab8f193736332 files/bzr-0.16-timed-tests-fix.patch 1382
 SHA256 dfd89e437401e8fadb3afc56161dfc471f910c9124c447bcd9f74429ac60cd60 files/bzr-0.16-timed-tests-fix.patch 1382
+AUX bzr-0.90-tests-fix_root.patch 1173 RMD160 572b86dbf99620abe5090b72a9a29c3d6d2ea566 SHA1 a41671354dcf7498039c421e81bc7d9fbbc7bb29 SHA256 b2275d04401bd4ba36c0a565f5e6b7c8471ca50acd48bbf5f5d1995b197809ec
+MD5 a49f9b203da55cb696192bb3cdd02e2e files/bzr-0.90-tests-fix_root.patch 1173
+RMD160 572b86dbf99620abe5090b72a9a29c3d6d2ea566 files/bzr-0.90-tests-fix_root.patch 1173
+SHA256 b2275d04401bd4ba36c0a565f5e6b7c8471ca50acd48bbf5f5d1995b197809ec files/bzr-0.90-tests-fix_root.patch 1173
+AUX bzr-0.90-tests-sgid.patch 611 RMD160 09a40cb4424e7dc86b48a577152cc7297c6333db SHA1 b7c42cb9b5cd5de4ebe11378870c6cf8eae52591 SHA256 e7514aa51c23405ba619c323b1bd6dbafffe5c584d8274d4e1df0c2347fd55a7
+MD5 b7ee258d56f9f0e5a3eadc2d1f51409f files/bzr-0.90-tests-sgid.patch 611
+RMD160 09a40cb4424e7dc86b48a577152cc7297c6333db files/bzr-0.90-tests-sgid.patch 611
+SHA256 e7514aa51c23405ba619c323b1bd6dbafffe5c584d8274d4e1df0c2347fd55a7 files/bzr-0.90-tests-sgid.patch 611
 DIST bzr-0.16.tar.gz 1457816 RMD160 4b1790b7b4107e576a0072af1248200a6f946ee8 SHA1 fb707afaf951adad8046faf6be09d6fff4101598 SHA256 bc9c7e11ece9ab8f4946238d7f3e67390a5c4a2c21fe27862395810e0ea0ae85
 DIST bzr-0.17.tar.gz 1500584 RMD160 f459a59013242e985403e3d451ee8d3c0f3d38b8 SHA1 bd5b8fb0a4ee73f023e7b1cf365fc3aa1064ca12 SHA256 687c8a31993f6453d32a3947543109008be27cf84cf16b7b81aaf6c5083a2f6d
+DIST bzr-0.90.tar.gz 1745848 RMD160 b37b59ed666b03eaf2ffd12aea19c1c2a7fab9fb SHA1 f3d588f00cd791dbc1419056970bb3ddada8ae50 SHA256 adf447e039fe8733e112a3de19712659aaca967a2ba626e44daba74bf1da1011
 EBUILD bzr-0.16.ebuild 2043 RMD160 45209e47871fdd8efc51c7fa9d5a4307948d6161 SHA1 c5b9b44856a8470f702b20ec800092aeb661141a SHA256 0fc4060acd366c73c9c5a95a080982b2eb5ed995bc17f67664b2428366721b0a
 MD5 295f2d8d9eca737b98db79f19dda8198 bzr-0.16.ebuild 2043
 RMD160 45209e47871fdd8efc51c7fa9d5a4307948d6161 bzr-0.16.ebuild 2043
@@ -20,10 +29,14 @@ EBUILD bzr-0.17.ebuild 1804 RMD160 5ec6d8ebd1c269f6164bd8772f9ce57eee068c97 SHA1
 MD5 6a044fc18966d5f113bfd79fa3226ed1 bzr-0.17.ebuild 1804
 RMD160 5ec6d8ebd1c269f6164bd8772f9ce57eee068c97 bzr-0.17.ebuild 1804
 SHA256 c38c26beb493d615d9e733f291236160ddd44a265b97e06b962eeeb24b1d6cc3 bzr-0.17.ebuild 1804
-MISC ChangeLog 6353 RMD160 0bbaf92485ad7f4c8cf06cf7a43d13f383ebc22b SHA1 92893b896d5a4d44141ee5546cb449fcd44f4e60 SHA256 3376094a5b7d3e695dde993ad4a000c49c07424cd284ad5433b181429957ab2d
-MD5 443efcafa305292bec3656a371826213 ChangeLog 6353
-RMD160 0bbaf92485ad7f4c8cf06cf7a43d13f383ebc22b ChangeLog 6353
-SHA256 3376094a5b7d3e695dde993ad4a000c49c07424cd284ad5433b181429957ab2d ChangeLog 6353
+EBUILD bzr-0.90.ebuild 1921 RMD160 2bb0a155afaad81f943b80c331c5d8a15c803f6b SHA1 592e453e9abd259ea57695a6c80a9704a320e2e9 SHA256 2026eb14d3def5fc11bb58d31257547423d5a77d9e6503105a05efc10059d0cb
+MD5 68606513d6db46a52ec07dae07fd0147 bzr-0.90.ebuild 1921
+RMD160 2bb0a155afaad81f943b80c331c5d8a15c803f6b bzr-0.90.ebuild 1921
+SHA256 2026eb14d3def5fc11bb58d31257547423d5a77d9e6503105a05efc10059d0cb bzr-0.90.ebuild 1921
+MISC ChangeLog 6817 RMD160 931272f4dacacdef78966258090bf26a031dfd07 SHA1 21097e2e0da6e6d99415433ef9bcd09483a38eb3 SHA256 9b7da179495737199506448aaa66c98a0604e84f2c606defec4271c0283e4c2f
+MD5 ca912657b1d6d84d3695fcfcab8bdc44 ChangeLog 6817
+RMD160 931272f4dacacdef78966258090bf26a031dfd07 ChangeLog 6817
+SHA256 9b7da179495737199506448aaa66c98a0604e84f2c606defec4271c0283e4c2f ChangeLog 6817
 MISC metadata.xml 218 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b SHA1 0dc0efeb1f1c4a4e691f1f10d4dd28814582c74e SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2
 MD5 bc29fb845d6836abeba3eeff41da8476 metadata.xml 218
 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b metadata.xml 218
@@ -34,3 +47,6 @@ SHA256 8cd7c79d1ddfb506233170afe2d901b329f8c2ab1c16c36bf4ee42f4463ee9a1 files/di
 MD5 baa4421afeefe605661dc0b40a8ea464 files/digest-bzr-0.17 229
 RMD160 bad50148493595bfe0e92f7408f7d91191ed6bc3 files/digest-bzr-0.17 229
 SHA256 ab9be5ab14dc02475369c6012c396aef971849a80c60e270e4b99bf245d46bb5 files/digest-bzr-0.17 229
+MD5 63c2b70af65dcd83be9cde7a0b330216 files/digest-bzr-0.90 229
+RMD160 c5117a7b50115e5e689715a64302124d1d48ad6e files/digest-bzr-0.90 229
+SHA256 df8d70a8fbcb64ce2dc94111cc6f3072ef958d39dc98e666419b70e9872a047f files/digest-bzr-0.90 229
diff --git a/dev-util/bzr/bzr-0.90.ebuild b/dev-util/bzr/bzr-0.90.ebuild
new file mode 100644
index 000000000000..b0f88069303e
--- /dev/null
+++ b/dev-util/bzr/bzr-0.90.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-0.90.ebuild,v 1.1 2007/09/06 09:21:25 hawking Exp $
+
+inherit distutils bash-completion elisp-common eutils
+
+MY_P=${P/_rc/rc}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Bazaar is a next generation distributed version control system."
+HOMEPAGE="http://bazaar-vcs.org/"
+SRC_URI="http://bazaar-vcs.org/releases/src/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="curl emacs test"
+
+python_rdep="dev-python/celementtree
+	>=dev-python/paramiko-1.5
+	curl? ( dev-python/pycurl )"
+DEPEND=">=dev-lang/python-2.4
+	emacs? ( virtual/emacs )
+	test? (
+		$python_rdep
+		dev-python/medusa
+	)"
+RDEPEND=">=dev-lang/python-2.4
+	$python_rdep"
+
+PYTHON_MODNAME="bzrlib"
+
+DOCS="doc/*.txt"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Don't run lock permission tests when running as root
+	epatch "${FILESDIR}/${P}-tests-fix_root.patch"
+	# Fix permission errors when run under directories with setgid set.
+	epatch "${FILESDIR}/${P}-tests-sgid.patch"
+}
+
+src_compile() {
+	distutils_src_compile
+	if use emacs; then
+		elisp-compile contrib/emacs/bzr-mode.el || die "Emacs modules failed!"
+	fi
+}
+
+src_install() {
+	distutils_src_install --install-data /usr/share
+	docinto developers
+	dodoc doc/developers/*
+	docinto user-guide
+	dodoc doc/en/user-guide/*
+	if use emacs; then
+		insinto "${SITELISP}"
+		doins contrib/emacs/bzr-mode.el*
+		elisp-site-file-install "${FILESDIR}/70bzr-gentoo.el"
+	fi
+	insinto /usr/share/zsh/site-functions
+	doins contrib/zsh/_bzr
+	dobashcompletion contrib/bash/bzr
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	use emacs && elisp-site-regen
+	bash-completion_pkg_postinst
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	use emacs && elisp-site-regen
+}
+
+src_test() {
+	"${python}" bzr --no-plugins selftest || die "bzr selftest failed"
+}
diff --git a/dev-util/bzr/files/bzr-0.90-tests-fix_root.patch b/dev-util/bzr/files/bzr-0.90-tests-fix_root.patch
new file mode 100644
index 000000000000..03f95b33da3e
--- /dev/null
+++ b/dev-util/bzr/files/bzr-0.90-tests-fix_root.patch
@@ -0,0 +1,30 @@
+--- bzrlib/tests/test_lockdir.py	2007-08-28 22:51:01.000000000 +0300
++++ bzrlib/tests/test_lockdir.py	2007-08-31 15:54:46.000000000 +0300
+@@ -594,6 +594,8 @@
+     def test_lock_permission(self):
+         if not osutils.supports_posix_readonly():
+             raise tests.TestSkipped('Cannot induce a permission failure')
++        if not os.getuid():
++            raise tests.TestSkipped('Running as root')
+         ld1 = self.get_lock()
+         lock_path = ld1.transport.local_abspath('test_lock')
+         os.mkdir(lock_path)
+--- bzrlib/tests/per_lock/test_lock.py  2007-08-28 22:51:00.000000000 +0300
++++ bzrlib/tests/per_lock/test_lock.py	2007-08-31 16:34:22.000000000 +0300
+@@ -22,6 +22,7 @@
+     )
+ 
+ from bzrlib.tests.per_lock import TestCaseWithLock
++from bzrlib.tests import TestSkipped
+ 
+ 
+ class TestLock(TestCaseWithLock):
+@@ -62,6 +63,8 @@
+ 
+         But we shouldn't be able to take a write lock.
+         """
++        if not osutils.os.getuid():
++            raise TestSkipped('Running as root')
+         osutils.make_readonly('a-file')
+         # Make sure the file is read-only (on all platforms)
+         self.assertRaises(IOError, open, 'a-file', 'rb+')
diff --git a/dev-util/bzr/files/bzr-0.90-tests-sgid.patch b/dev-util/bzr/files/bzr-0.90-tests-sgid.patch
new file mode 100644
index 000000000000..2a47db5bef73
--- /dev/null
+++ b/dev-util/bzr/files/bzr-0.90-tests-sgid.patch
@@ -0,0 +1,13 @@
+https://bugs.launchpad.net/bzr/+bug/109124
+--- bzrlib/tests/__init__.py	2007-08-28 22:50:57.000000000 +0300
++++ bzrlib/tests/__init__.py	2007-08-31 14:28:44.000000000 +0300
+@@ -933,6 +933,9 @@
+             return
+         path_stat = transport.stat(path)
+         actual_mode = stat.S_IMODE(path_stat.st_mode)
++        # test if running run beneath a directory with the setgid bit set.
++        if actual_mode & stat.S_ISGID and not mode & stat.S_ISGID:
++            mode |= stat.S_ISGID
+         self.assertEqual(mode, actual_mode,
+             'mode of %r incorrect (%o != %o)' % (path, mode, actual_mode))
+ 
diff --git a/dev-util/bzr/files/digest-bzr-0.90 b/dev-util/bzr/files/digest-bzr-0.90
new file mode 100644
index 000000000000..6346a071cb09
--- /dev/null
+++ b/dev-util/bzr/files/digest-bzr-0.90
@@ -0,0 +1,3 @@
+MD5 596020e249604418e5ab8bde1d512472 bzr-0.90.tar.gz 1745848
+RMD160 b37b59ed666b03eaf2ffd12aea19c1c2a7fab9fb bzr-0.90.tar.gz 1745848
+SHA256 adf447e039fe8733e112a3de19712659aaca967a2ba626e44daba74bf1da1011 bzr-0.90.tar.gz 1745848