Version bump with a patch to install the manpage in /usr/share/man instead of /usr/man (thanks to exg for reporting).

Package-Manager: portage-2.1_rc1

5 files changed, 124 insertions, 7 deletions

diff --git a/dev-util/bzr/ChangeLog b/dev-util/bzr/ChangeLog
index 9bddcfd5c6ac..9ff27f69a7b7 100644
--- a/dev-util/bzr/ChangeLog
+++ b/dev-util/bzr/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/bzr
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.13 2006/05/14 00:55:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.14 2006/05/14 16:40:59 marienz Exp $
+
+*bzr-0.8 (14 May 2006)
+
+  14 May 2006; Marien Zwart <marienz@gentoo.org>
+  +files/bzr-0.8-fix-manpage-location.patch, -bzr-0.8_rc1.ebuild,
+  +bzr-0.8.ebuild:
+  Version bump with a patch to install the manpage in /usr/share/man instead
+  of /usr/man (thanks to exg for reporting).
 
   14 May 2006; Diego Pettenò <flameeyes@gentoo.org> bzr-0.8_rc1.ebuild:
   Add ~x86-fbsd keyword also to 0.8.
diff --git a/dev-util/bzr/bzr-0.8.ebuild b/dev-util/bzr/bzr-0.8.ebuild
new file mode 100644
index 000000000000..832c561827d2
--- /dev/null
+++ b/dev-util/bzr/bzr-0.8.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-0.8.ebuild,v 1.1 2006/05/14 16:40:59 marienz Exp $
+
+inherit distutils bash-completion elisp-common eutils
+
+DESCRIPTION="next generation distributed version control"
+HOMEPAGE="http://bazaar-vcs.org/"
+SRC_URI="http://bazaar-vcs.org/pkg/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="emacs"
+
+DEPEND=">=dev-lang/python-2.4
+	dev-python/celementtree
+	emacs? ( virtual/emacs )
+	>=dev-python/paramiko-1.5"
+
+PYTHON_MODNAME="bzrlib"
+
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-fix-manpage-location.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
+	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
+	# regenerate site-gentoo if we are merged USE=emacs and unmerged
+	# USE=-emacs
+	has_version virtual/emacs && elisp-site-regen
+}
+
+src_test() {
+	"${python}" bzr --no-plugins selftest || die "bzr selftest failed"
+}
diff --git a/dev-util/bzr/files/bzr-0.8-fix-manpage-location.patch b/dev-util/bzr/files/bzr-0.8-fix-manpage-location.patch
new file mode 100644
index 000000000000..f2c36e7800a7
--- /dev/null
+++ b/dev-util/bzr/files/bzr-0.8-fix-manpage-location.patch
@@ -0,0 +1,12 @@
+=== modified file 'setup.py'
+--- setup.py	
++++ setup.py	
+@@ -114,6 +114,6 @@
+                 ],
+       scripts=['bzr'],
+       cmdclass={'install_scripts': my_install_scripts, 'build': bzr_build},
+-      data_files=[('man/man1', ['bzr.1'])],
++      data_files=[('share/man/man1', ['bzr.1'])],
+     #   todo: install the txt files from bzrlib.doc.api.
+      )
+
diff --git a/dev-util/bzr/files/digest-bzr-0.8 b/dev-util/bzr/files/digest-bzr-0.8
new file mode 100644
index 000000000000..e44c0d704df0
--- /dev/null
+++ b/dev-util/bzr/files/digest-bzr-0.8
@@ -0,0 +1,3 @@
+MD5 88ccc545c202701544c4e039d373a48a bzr-0.8.tar.gz 711210
+RMD160 feb6f6c4a4a7b3b5d4741c7567f918a34a393305 bzr-0.8.tar.gz 711210
+SHA256 018617c70ff979e25c89a6aa70a3751253d498e3666e775b464e3ccdc6c8b709 bzr-0.8.tar.gz 711210
diff --git a/dev-util/bzrtools/Manifest b/dev-util/bzrtools/Manifest
index 627daa0e4293..2080ea2d46c1 100644
--- a/dev-util/bzrtools/Manifest
+++ b/dev-util/bzrtools/Manifest
@@ -1,16 +1,46 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e727a6ac72f54eed78400328ff98df71 ChangeLog 785
+AUX bzrtools-0.8-optional-pybaz.patch 748 RMD160 1b3fda42cf3b99cd74a74b1dcd1ca6bd9016837a SHA1 02ff32feca475a040b593fad52578b3be4edeed4 SHA256 48c3d3e1adee4cde794d0b967bffb5f55ffdc7691e15dfeac1921e9d3a27ef77 size 748
+MD5 e690aa10db0f15301549858c3f0ac956 files/bzrtools-0.8-optional-pybaz.patch 748
+RMD160 1b3fda42cf3b99cd74a74b1dcd1ca6bd9016837a files/bzrtools-0.8-optional-pybaz.patch 748
+SHA256 48c3d3e1adee4cde794d0b967bffb5f55ffdc7691e15dfeac1921e9d3a27ef77 files/bzrtools-0.8-optional-pybaz.patch 748
+DIST bzrtools-0.6.1.tar.gz 83961 size 83961
+DIST bzrtools-0.7.tar.gz 87811 size 87811
+DIST bzrtools-0.8.tar.gz 110940 RMD160 bfea650727814a041c92257577451a12b65230e9 SHA256 8c9b501ec4af50a79654f357eddd537083b4b2e4af7d72349fb231042eb48700 size 110940
+EBUILD bzrtools-0.6.1.ebuild 531 RMD160 fb32df8ea7d99ba64b7f7ad4b624aac7de140478 SHA1 9f3934f999863153bda6a042f715b12cdf92cef6 SHA256 80f0235a51a68fc2308abd16d702a8af8321e46935304011fd00fa5eb09cb524 size 531
 MD5 f86e5dd6d8957d6332117777f44c3da9 bzrtools-0.6.1.ebuild 531
+RMD160 fb32df8ea7d99ba64b7f7ad4b624aac7de140478 bzrtools-0.6.1.ebuild 531
+SHA256 80f0235a51a68fc2308abd16d702a8af8321e46935304011fd00fa5eb09cb524 bzrtools-0.6.1.ebuild 531
+EBUILD bzrtools-0.7.ebuild 603 RMD160 506bbfa0afec4f62538c50849fa89ffe53aab22c SHA1 25461b12df55ba08071dc122bdc652348db60669 SHA256 8fdc2cf404876393eb7c60fc28d3d3e7f07e31ef301060d994ee09c5e727c7e2 size 603
 MD5 8fb9bf41d277bf25934765335e0efc11 bzrtools-0.7.ebuild 603
+RMD160 506bbfa0afec4f62538c50849fa89ffe53aab22c bzrtools-0.7.ebuild 603
+SHA256 8fdc2cf404876393eb7c60fc28d3d3e7f07e31ef301060d994ee09c5e727c7e2 bzrtools-0.7.ebuild 603
+EBUILD bzrtools-0.8.ebuild 771 RMD160 6f6ee6b007014bbb79ac027201439184a5d7f56a SHA1 b4fbe74918a040207b7f5019af6dc45cf9ae1b4d SHA256 87d78c3a91106a170969592caa6b912935d7832d580100e30f26278a6af1a76c size 771
+MD5 203a2f1da8ea6ae6f67158a387147ba8 bzrtools-0.8.ebuild 771
+RMD160 6f6ee6b007014bbb79ac027201439184a5d7f56a bzrtools-0.8.ebuild 771
+SHA256 87d78c3a91106a170969592caa6b912935d7832d580100e30f26278a6af1a76c bzrtools-0.8.ebuild 771
+MISC ChangeLog 975 RMD160 02d8d47d2530302ef083d922820d42263c1839ea SHA1 e6efaa5fbf6c8b9950563565bb42b8c3766e083f SHA256 9bc7491152b370f72f7252ffcb13c4900fea8d4274c76923a548dc2baacc2c15 size 975
+MD5 5a0352f41f43b374e61c5113e0edf239 ChangeLog 975
+RMD160 02d8d47d2530302ef083d922820d42263c1839ea ChangeLog 975
+SHA256 9bc7491152b370f72f7252ffcb13c4900fea8d4274c76923a548dc2baacc2c15 ChangeLog 975
+MISC metadata.xml 222 RMD160 01bd2c9180f544353de73063bede0dd6b8ca6152 SHA1 95963907e0f22bc3795213303a68a2155b1ba78a SHA256 6e5dda05386711c829057f65bfd0e3ae693232628949c1612163ce9915963a63 size 222
+MD5 5dff6cc33967055cfde969cbcb7b6d5d metadata.xml 222
+RMD160 01bd2c9180f544353de73063bede0dd6b8ca6152 metadata.xml 222
+SHA256 6e5dda05386711c829057f65bfd0e3ae693232628949c1612163ce9915963a63 metadata.xml 222
 MD5 03e6ce6083f7bb3915faa7db2c234666 files/digest-bzrtools-0.6.1 65
+RMD160 ca547a03838efa4cefc7ce8bb7d14adbb4769ebb files/digest-bzrtools-0.6.1 65
+SHA256 5bccf2f96d163281381688bef3688e2982261fd19a11ad7d61a66a7f9ac9242f files/digest-bzrtools-0.6.1 65
 MD5 a0ffc6c67eb0f9bcbe6852a8ffa75e74 files/digest-bzrtools-0.7 63
-MD5 5dff6cc33967055cfde969cbcb7b6d5d metadata.xml 222
+RMD160 d8163a24ccd64d31270543ee5c922c7f81e43500 files/digest-bzrtools-0.7 63
+SHA256 c213a378c54308e35501158e6147ff4975396448bac7c8749ce0571013fd88b8 files/digest-bzrtools-0.7 63
+MD5 3bcdd4d56c2f507b097f65a435c57635 files/digest-bzrtools-0.8 238
+RMD160 ccbc62b4f29c8d6a947a577e99e8a86433844c13 files/digest-bzrtools-0.8 238
+SHA256 77db5a3cb78b58a806a861f11162ec62a25a183245dbacbbf9743d03ba6c080d files/digest-bzrtools-0.8 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEQDbW/NoSW7FuNV8RAqCqAKCIrFfPtYqdzyDuGWxC+q4pGGRkXwCgr3FD
-ISl+JU+oQzZgJ7kUG+QEBZY=
-=IZ7/
+iD8DBQFEZ135W78445TWHXcRApLvAJ0Xf+oV/iPVpC7KtRY3LA5dJEd4DQCcCwPc
++DZALepY61PL4vC0iaClqtY=
+=0DxX
 -----END PGP SIGNATURE-----