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

Package-Manager: portage-2.1.3_rc4

8 files changed, 53 insertions, 69 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/Manifest b/dev-util/bzr/Manifest
index 3294f1ce3011..6b025ca936bd 100644
--- a/dev-util/bzr/Manifest
+++ b/dev-util/bzr/Manifest
@@ -5,10 +5,6 @@ AUX 70bzr-gentoo.el 51 RMD160 6493432732fa0a735e8c9235ca087bc7afea6042 SHA1 4b73
 MD5 ee593fd318e231f5c0ae698af0c09899 files/70bzr-gentoo.el 51
 RMD160 6493432732fa0a735e8c9235ca087bc7afea6042 files/70bzr-gentoo.el 51
 SHA256 f62b36bca53b70c8f2e828233187b9beb39bc604b1e51b910478f123e3fa7417 files/70bzr-gentoo.el 51
-AUX bzr-0.10-fix-manpage-location.patch 438 RMD160 01e1a08e312ee80e14abb716f043e40f6c332218 SHA1 aff4809dab871b2f935883edab98b583a6dce663 SHA256 2bdcccd82a9d81ade3e2a4f9b1948516bce1219d509fe14ed6e5bad0821a14a5
-MD5 85c2ae99b48cedc73b723d2916b441e8 files/bzr-0.10-fix-manpage-location.patch 438
-RMD160 01e1a08e312ee80e14abb716f043e40f6c332218 files/bzr-0.10-fix-manpage-location.patch 438
-SHA256 2bdcccd82a9d81ade3e2a4f9b1948516bce1219d509fe14ed6e5bad0821a14a5 files/bzr-0.10-fix-manpage-location.patch 438
 AUX bzr-0.16-fix-manpage-location.patch 396 RMD160 89e706aace63a2a771aa0411d3d2a4dd81df7b16 SHA1 9afccc3c68ec5a946008d92cb8164bd3ee0d36ae SHA256 82a17b7af4707f83b22c287369027e5ceb5d784759012ddb700fc1285c025e4e
 MD5 975433265fc1bb3fea00047f05293d69 files/bzr-0.16-fix-manpage-location.patch 396
 RMD160 89e706aace63a2a771aa0411d3d2a4dd81df7b16 files/bzr-0.16-fix-manpage-location.patch 396
@@ -17,34 +13,34 @@ 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
-DIST bzr-0.15.tar.gz 1363733 RMD160 e3e6eeeff3df6dbd8ef9342b4a648a204cefae19 SHA1 7d166093b9ff5a5ab02f3bb840d34fdc4a8ccd79 SHA256 d84969833e1d588df3715e4910b891cbcc310a332796e0ce6528dd3b633c3171
 DIST bzr-0.16.tar.gz 1457816 RMD160 4b1790b7b4107e576a0072af1248200a6f946ee8 SHA1 fb707afaf951adad8046faf6be09d6fff4101598 SHA256 bc9c7e11ece9ab8f4946238d7f3e67390a5c4a2c21fe27862395810e0ea0ae85
-EBUILD bzr-0.15.ebuild 2013 RMD160 5f93ec8b665688942e6b48e609bf281fa57d4430 SHA1 00b38c67dc03b5da99b1c1b09679717740bb6513 SHA256 f6313716209dc59ef7363e882a130c2572bbaece88410ee5940db5bee084c683
-MD5 5e5f8ca5109c5d8d91f73d266f2dce25 bzr-0.15.ebuild 2013
-RMD160 5f93ec8b665688942e6b48e609bf281fa57d4430 bzr-0.15.ebuild 2013
-SHA256 f6313716209dc59ef7363e882a130c2572bbaece88410ee5940db5bee084c683 bzr-0.15.ebuild 2013
-EBUILD bzr-0.16.ebuild 2138 RMD160 dddacd1803dcf62b63b58f48265d75a6f03c8df4 SHA1 4359ca5f06dc33345466d473f32889b9da4dac4a SHA256 dfeb367a33ea7eed2a986529c801c0d5e87e8c494c49b2e404b278b8b37eae91
-MD5 f48c1f6f5b8bf1b1470a1a9003ba3f81 bzr-0.16.ebuild 2138
-RMD160 dddacd1803dcf62b63b58f48265d75a6f03c8df4 bzr-0.16.ebuild 2138
-SHA256 dfeb367a33ea7eed2a986529c801c0d5e87e8c494c49b2e404b278b8b37eae91 bzr-0.16.ebuild 2138
-MISC ChangeLog 5914 RMD160 6fdb4beffbc623d126878755101e4fe6c1230ef1 SHA1 74b89680853b2043f69ab4f753e0d5d373c43baa SHA256 876c876c1d312f999f4274f344fa48aac40a69c6871c756b2ff82b54de4024ac
-MD5 8759a470e23b7dbe34028be1f0760b31 ChangeLog 5914
-RMD160 6fdb4beffbc623d126878755101e4fe6c1230ef1 ChangeLog 5914
-SHA256 876c876c1d312f999f4274f344fa48aac40a69c6871c756b2ff82b54de4024ac ChangeLog 5914
+DIST bzr-0.17.tar.gz 1500584 RMD160 f459a59013242e985403e3d451ee8d3c0f3d38b8 SHA1 bd5b8fb0a4ee73f023e7b1cf365fc3aa1064ca12 SHA256 687c8a31993f6453d32a3947543109008be27cf84cf16b7b81aaf6c5083a2f6d
+EBUILD bzr-0.16.ebuild 2042 RMD160 a874bef0bed7643b71967b83b2c6c52c400c77bc SHA1 df1291c7233359888ffbb801cf3f8a209f90bedf SHA256 843cee18986880b5f1430e6ed068f52a63c6c260d1363baae8a7ba7665c3e3aa
+MD5 44dc93e43678d4ac36dcddc274d98b75 bzr-0.16.ebuild 2042
+RMD160 a874bef0bed7643b71967b83b2c6c52c400c77bc bzr-0.16.ebuild 2042
+SHA256 843cee18986880b5f1430e6ed068f52a63c6c260d1363baae8a7ba7665c3e3aa bzr-0.16.ebuild 2042
+EBUILD bzr-0.17.ebuild 1753 RMD160 f7eb153777c7f5cc6e5829a99a2fdfb1655e3051 SHA1 7a9fa65d5d99e285b71df2df1424a596789c148c SHA256 7b7b33351d29a9c0abd38a054bb37806312ada5cced7b12a08accbaf9bcb6e1f
+MD5 a5af315b11d62df4376cdf13d537e260 bzr-0.17.ebuild 1753
+RMD160 f7eb153777c7f5cc6e5829a99a2fdfb1655e3051 bzr-0.17.ebuild 1753
+SHA256 7b7b33351d29a9c0abd38a054bb37806312ada5cced7b12a08accbaf9bcb6e1f bzr-0.17.ebuild 1753
+MISC ChangeLog 6165 RMD160 54c6bbaeb69e8b4e2f42e3e97f62dd7614a4d42c SHA1 3a7d9577c1b66591c7af8831d4143b96f2ed29f9 SHA256 a67952ec89eed0727e56b930f933786382c6742d30106e84d1acd790fa3f1d67
+MD5 de230bcdde6531632d40238d35edfcc6 ChangeLog 6165
+RMD160 54c6bbaeb69e8b4e2f42e3e97f62dd7614a4d42c ChangeLog 6165
+SHA256 a67952ec89eed0727e56b930f933786382c6742d30106e84d1acd790fa3f1d67 ChangeLog 6165
 MISC metadata.xml 218 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b SHA1 0dc0efeb1f1c4a4e691f1f10d4dd28814582c74e SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2
 MD5 bc29fb845d6836abeba3eeff41da8476 metadata.xml 218
 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b metadata.xml 218
 SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2 metadata.xml 218
-MD5 9e69c3a90e4d8ddc7d46e71869dbc7c8 files/digest-bzr-0.15 229
-RMD160 0600155ea25c86fe9cd9d57119a92a7c1b851710 files/digest-bzr-0.15 229
-SHA256 9c7f9d7cb73e10d048ef635969cf522a53fde799c64ca669fcc8938e5c9e3b60 files/digest-bzr-0.15 229
 MD5 cb166eecbf3df093f43bec1bbb0835cc files/digest-bzr-0.16 229
 RMD160 c78dee9019f2aea09a925a65bf9e489300fa881b files/digest-bzr-0.16 229
 SHA256 8cd7c79d1ddfb506233170afe2d901b329f8c2ab1c16c36bf4ee42f4463ee9a1 files/digest-bzr-0.16 229
+MD5 baa4421afeefe605661dc0b40a8ea464 files/digest-bzr-0.17 229
+RMD160 bad50148493595bfe0e92f7408f7d91191ed6bc3 files/digest-bzr-0.17 229
+SHA256 ab9be5ab14dc02475369c6012c396aef971849a80c60e270e4b99bf245d46bb5 files/digest-bzr-0.17 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGZJw7UElL7eJpfEQRAvqOAKCveO0Zs0hh/FAGCpu+4b9RcclzOwCgmhGL
-1EpIuKTt7HU17umIysccqHw=
-=zK4m
+iD8DBQFGexHcUElL7eJpfEQRAiZFAJ9QUKhk6pcZ4hmxh2kBaCWovOsKcwCgjPLA
+DW4ehQG/O8agkfjQuGMHrgw=
+=eWXP
 -----END PGP SIGNATURE-----
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
diff --git a/dev-util/bzrtools/Manifest b/dev-util/bzrtools/Manifest
index 2408a6dff52c..5eef281c39a9 100644
--- a/dev-util/bzrtools/Manifest
+++ b/dev-util/bzrtools/Manifest
@@ -1,34 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST bzrtools-0.15.4.tar.gz 76158 RMD160 58dd6ad9e55157e52769e58a2ddd3a23d15f71b6 SHA1 8ff02d6d484ab1b72e7d1af625cd8661f1183519 SHA256 cf951c485a91061ba546d8f7d5f333a2b748e833dbc42ba5439d86a38352c170
 DIST bzrtools-0.16.1.tar.gz 77624 RMD160 92d0d24d7818f99b5af9f74952012b0320248879 SHA1 a3218bd3342e7b31152b720793b738030063843f SHA256 cabed19bcb2087283ed51641473290dff6c911e6af30287e67689987482e334b
-EBUILD bzrtools-0.15.4.ebuild 712 RMD160 7805c4138cb96e65432398c0bd685399b6d0b9f6 SHA1 e2f262439e83098f98e88d8fc2aa0cd5538fd4a9 SHA256 64b668adc30036f122e5597eadb26a21aa163f517f80e264e633165574718b39
-MD5 4bdc1e9f713ca247a5feff7da2c67659 bzrtools-0.15.4.ebuild 712
-RMD160 7805c4138cb96e65432398c0bd685399b6d0b9f6 bzrtools-0.15.4.ebuild 712
-SHA256 64b668adc30036f122e5597eadb26a21aa163f517f80e264e633165574718b39 bzrtools-0.15.4.ebuild 712
+DIST bzrtools-0.17.1.tar.gz 77679 RMD160 bf59a8869d0ebcec2746bc60b1bbe98489da5196 SHA1 82812351db18bab019104c086f627bdaa42c182a SHA256 c6473239b381a0a7dd49bc6a6e653ac54d878f3c017e544ba4486473cb70ff82
 EBUILD bzrtools-0.16.1.ebuild 712 RMD160 51cf0c4ba3710b7155045b3a581cedce12175554 SHA1 238f415c1861b2aec8d7b004d9783b211efc3a45 SHA256 5d14b723d65fff5893820f9f0ebd737b85f1763f429ef04577afde021683617f
 MD5 d7de17b97202a07c4361254483664404 bzrtools-0.16.1.ebuild 712
 RMD160 51cf0c4ba3710b7155045b3a581cedce12175554 bzrtools-0.16.1.ebuild 712
 SHA256 5d14b723d65fff5893820f9f0ebd737b85f1763f429ef04577afde021683617f bzrtools-0.16.1.ebuild 712
-MISC ChangeLog 3086 RMD160 1db5d376982cb7727e5fa4cc2fde32d8d1f0644c SHA1 69752f9d03d7c0300fa89ea120bafe14594ca56f SHA256 df36731201be68e27aabc2e32673dc33757bfabbdce2f8c7c293de6a3c045716
-MD5 4e2e9f6cf7fcdd264dc72ce88a9a0cb6 ChangeLog 3086
-RMD160 1db5d376982cb7727e5fa4cc2fde32d8d1f0644c ChangeLog 3086
-SHA256 df36731201be68e27aabc2e32673dc33757bfabbdce2f8c7c293de6a3c045716 ChangeLog 3086
+EBUILD bzrtools-0.17.1.ebuild 712 RMD160 494474c8c7a6b47a0919ce5dfa80b5b0f5295162 SHA1 2b40bb6a34ce7cffbb275702b71dd725a3bba94d SHA256 ac0a9af4c437cbe363c449a6e7a54491bad10d61796dfd7dd2971cc1fba6e5f2
+MD5 f548ea338ae919315af11b9534ce2c2a bzrtools-0.17.1.ebuild 712
+RMD160 494474c8c7a6b47a0919ce5dfa80b5b0f5295162 bzrtools-0.17.1.ebuild 712
+SHA256 ac0a9af4c437cbe363c449a6e7a54491bad10d61796dfd7dd2971cc1fba6e5f2 bzrtools-0.17.1.ebuild 712
+MISC ChangeLog 3236 RMD160 ba22c91e551150d2ddd4716fe8f237cc4d585f2b SHA1 25557a385cc20252603c0312910793383f4704dd SHA256 9eed391b7c9ce733416c435dfc766a5bcec954b86dc66100ea2c51ced925455d
+MD5 7dcb6c47cc2c96b50e38af267d8c3081 ChangeLog 3236
+RMD160 ba22c91e551150d2ddd4716fe8f237cc4d585f2b ChangeLog 3236
+SHA256 9eed391b7c9ce733416c435dfc766a5bcec954b86dc66100ea2c51ced925455d ChangeLog 3236
 MISC metadata.xml 222 RMD160 01bd2c9180f544353de73063bede0dd6b8ca6152 SHA1 95963907e0f22bc3795213303a68a2155b1ba78a SHA256 6e5dda05386711c829057f65bfd0e3ae693232628949c1612163ce9915963a63
 MD5 5dff6cc33967055cfde969cbcb7b6d5d metadata.xml 222
 RMD160 01bd2c9180f544353de73063bede0dd6b8ca6152 metadata.xml 222
 SHA256 6e5dda05386711c829057f65bfd0e3ae693232628949c1612163ce9915963a63 metadata.xml 222
-MD5 483b77c3572f509f4eabb3462d59695c files/digest-bzrtools-0.15.4 244
-RMD160 9747feba9e4ea8f79cad525fc2a555b32acccfec files/digest-bzrtools-0.15.4 244
-SHA256 c6fd229b34e67717c4ea860f17cc1aa6012226fb6b8324e5a6e8669b7e277952 files/digest-bzrtools-0.15.4 244
 MD5 f18bddc4bd0c631f9c41f5cf861d6ef5 files/digest-bzrtools-0.16.1 244
 RMD160 8456497873a07a5893a46c19172dcef5470fd706 files/digest-bzrtools-0.16.1 244
 SHA256 17e8afd5dc516011cc05e4cc3713fbf0f4b033c1fa9f08c03d75847311c2ced8 files/digest-bzrtools-0.16.1 244
+MD5 c481a4f764e552c640077c97b81998eb files/digest-bzrtools-0.17.1 244
+RMD160 5d89bb5cf20a1142cb1e25ac403593d9890bb8b4 files/digest-bzrtools-0.17.1 244
+SHA256 007018d2dc64ad3fbafd976468f50db6c484fa69cdbbce5c428a488529ae0f80 files/digest-bzrtools-0.17.1 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGQ85mUElL7eJpfEQRAtHwAJ9rNSA3FTpThF1w1xVIjoosGSeDPgCfThNQ
-C6Iju4F5znJPb8tzuUyyBTE=
-=yUjL
+iD8DBQFGexImUElL7eJpfEQRAp54AKCqFx/GobhY3M2psOhE6Ob9JEBMOgCgkCnV
+vs3MG/KCQrO9Log+0R43A08=
+=MmB+
 -----END PGP SIGNATURE-----