Version bump and fix bug #182639 (elisp-site-regen condition in postrm).

(Portage version: 2.1.3_rc4)

6 files changed, 19 insertions, 31 deletions

diff --git a/dev-util/bzr/ChangeLog b/dev-util/bzr/ChangeLog
index fa2fae48aaf7..bad193b5435a 100644
--- a/dev-util/bzr/ChangeLog
+++ b/dev-util/bzr/ChangeLog
@@ -1,6 +1,13 @@
 # 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.34 2007/06/04 23:11:06 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.35 2007/06/22 00:02:35 marienz Exp $
+
+*bzr-0.17 (22 Jun 2007)
+
+  22 Jun 2007; Marien Zwart <marienz@gentoo.org>
+  -files/bzr-0.10-fix-manpage-location.patch, -bzr-0.15.ebuild,
+  bzr-0.16.ebuild, +bzr-0.17.ebuild:
+  Version bump and fix bug #182639 (elisp-site-regen condition in postrm).
 
   04 Jun 2007; Marien Zwart <marienz@gentoo.org> bzr-0.15.ebuild,
   bzr-0.16.ebuild:
diff --git a/dev-util/bzr/bzr-0.16.ebuild b/dev-util/bzr/bzr-0.16.ebuild
index 752882b54850..65bd6df95c67 100644
--- a/dev-util/bzr/bzr-0.16.ebuild
+++ b/dev-util/bzr/bzr-0.16.ebuild
@@ -1,6 +1,6 @@
 # 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.16.ebuild,v 1.2 2007/06/04 23:11:06 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-0.16.ebuild,v 1.3 2007/06/22 00:02:35 marienz Exp $
 
 inherit distutils bash-completion elisp-common eutils
 
@@ -75,9 +75,7 @@ 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
+	use emacs && elisp-site-regen
 }
 
 src_test() {
diff --git a/dev-util/bzr/bzr-0.15.ebuild b/dev-util/bzr/bzr-0.17.ebuild
index e9768a051e52..36db06e1ec2f 100644
--- a/dev-util/bzr/bzr-0.15.ebuild
+++ b/dev-util/bzr/bzr-0.17.ebuild
@@ -1,6 +1,6 @@
 # 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.15.ebuild,v 1.2 2007/06/04 23:11:06 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-0.17.ebuild,v 1.1 2007/06/22 00:02:35 marienz Exp $
 
 inherit distutils bash-completion elisp-common eutils
 
@@ -30,7 +30,7 @@ RDEPEND=">=dev-lang/python-2.4
 
 PYTHON_MODNAME="bzrlib"
 
-DOCS="HACKING NEWS NEWS.developers doc/*"
+DOCS="doc/*.txt"
 
 
 src_unpack() {
@@ -38,7 +38,7 @@ src_unpack() {
 	cd "${S}"
 
 	# Install the manpage in /usr/share/man instead of /usr/man
-	epatch "${FILESDIR}/${PN}-0.10-fix-manpage-location.patch"
+	epatch "${FILESDIR}/${PN}-0.16-fix-manpage-location.patch"
 }
 
 src_compile() {
@@ -50,6 +50,8 @@ src_compile() {
 
 src_install() {
 	distutils_src_install
+	docinto developers
+	dodoc doc/developers/*
 	if use emacs; then
 		insinto "${SITELISP}"
 		doins contrib/emacs/bzr-mode.el*
@@ -64,17 +66,11 @@ pkg_postinst() {
 	distutils_pkg_postinst
 	use emacs && elisp-site-regen
 	bash-completion_pkg_postinst
-
-	elog "If you just upgraded from a version of bzr older than 0.9"
-	elog "you should rename your ~/.bazaar/branches.conf to locations.conf"
-	elog "(see /usr/share/doc/${PF}/NEWS.gz)"
 }
 
 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
+	use emacs && elisp-site-regen
 }
 
 src_test() {
diff --git a/dev-util/bzr/files/bzr-0.10-fix-manpage-location.patch b/dev-util/bzr/files/bzr-0.10-fix-manpage-location.patch
deleted file mode 100644
index 00d1e60e2d83..000000000000
--- a/dev-util/bzr/files/bzr-0.10-fix-manpage-location.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'setup.py'
---- setup.py	2006-09-04 14:46:59 +0000
-+++ setup.py	2006-09-04 14:47:28 +0000
-@@ -207,7 +207,7 @@
- else:
-     # std setup
-     ARGS = {'scripts': ['bzr'],
--            'data_files': [('man/man1', ['bzr.1'])],
-+            'data_files': [('share/man/man1', ['bzr.1'])],
-             'cmdclass': {'build': bzr_build,
-                          'install_scripts': my_install_scripts,
-                         },
-
diff --git a/dev-util/bzr/files/digest-bzr-0.15 b/dev-util/bzr/files/digest-bzr-0.15
deleted file mode 100644
index fcd54c067c6f..000000000000
--- a/dev-util/bzr/files/digest-bzr-0.15
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6512ced21dc26fba0915c50697f74e17 bzr-0.15.tar.gz 1363733
-RMD160 e3e6eeeff3df6dbd8ef9342b4a648a204cefae19 bzr-0.15.tar.gz 1363733
-SHA256 d84969833e1d588df3715e4910b891cbcc310a332796e0ce6528dd3b633c3171 bzr-0.15.tar.gz 1363733
diff --git a/dev-util/bzr/files/digest-bzr-0.17 b/dev-util/bzr/files/digest-bzr-0.17
new file mode 100644
index 000000000000..8f179641d847
--- /dev/null
+++ b/dev-util/bzr/files/digest-bzr-0.17
@@ -0,0 +1,3 @@
+MD5 da93565076f06e9f01b3951285757546 bzr-0.17.tar.gz 1500584
+RMD160 f459a59013242e985403e3d451ee8d3c0f3d38b8 bzr-0.17.tar.gz 1500584
+SHA256 687c8a31993f6453d32a3947543109008be27cf84cf16b7b81aaf6c5083a2f6d bzr-0.17.tar.gz 1500584