Merge lp:~gagern/bzr-gentoo-overlay/repoman into lp:bzr-gentoo-overlay

[Martin von Gagern]

This fixes many of the issues repoman reports for the overlay.
Remaining issues:
dev-vcs/bzr/bzr-9999.ebuild uses 'test?' conditional in RDEPEND
app-vim/bzr-vim/bzr-vim depends on non-existing <app-vim/vcscommand-1.99.31
dev-vcs/bzr-gtk/bzr-gtk[libnotify] depends on un-keyworded dev-vcs/bzr-dbus
www-apps/loggerhead has no unmasked version, due to its dep on bzr-search

=== modified file 'app-vim/bzr-vim/Manifest'
--- app-vim/bzr-vim/Manifest	2010-07-29 07:15:01 +0000
+++ app-vim/bzr-vim/Manifest	2010-12-20 18:41:23 +0000
@@ -1,4 +1,4 @@
 DIST vcsbzr-0.0.1.vim 8956 RMD160 83ce92b5b7305440886f6206ad6268b4786e179f SHA1 2505f92a5cc9d06f8bea7ccc0f5e5eba8ee73b40 SHA256 e5a708efd1101cddc53606b3d6f52d23e991c340a4bb64f02b0fd7c6576c4a5c
-EBUILD bzr-vim-0.0.1.ebuild 541 RMD160 f8938882d7b8c8f6bffc1ce23566f3b7aee76c3c SHA1 6e2b22d388bc9ce6c1d02137eb7abf1c783d0348 SHA256 7622d5eaf556976c9c257c7dc267a259a07fc672aa429774dfc74ba9f381d744
-EBUILD bzr-vim-9999.ebuild 470 RMD160 c5cc873537bfbbfb2ef01bc7c9643fd2154c7211 SHA1 df922921e11f5ce64db82368149295dd742582fb SHA256 1fe923a312357476b9a9b9fe57b8e66b422534a8772cca12ea72fc4873ef8e8b
+EBUILD bzr-vim-0.0.1.ebuild 541 RMD160 b0d30a12329f98841134125a66ac116011ef37b2 SHA1 2c4a09e2c8ad14b908ef154b265b000f752ad439 SHA256 3b3fda27f942bd187702bc9fec4b1529414ebcc9a966d2ec379f2ba22b4bbfd9
+EBUILD bzr-vim-9999.ebuild 459 RMD160 ee9b4f659cda4fb796d1542983a470fdabdc38bb SHA1 05361c23b8db4ac175283b710c7a38cd6c22fe68 SHA256 a249f6be4ed6d51f87b1aa360fb6ddd3317a087e544aacdbc8b42e8c2cb5ac26
 MISC metadata.xml 285 RMD160 a8952a49acb5b00e48df37554397820e313c99b9 SHA1 4fcb8a3ef1ef0a98a45e198fde764ea292e08ee8 SHA256 b44ef9ceebc8a707893640732ebd31680a99fbaab6cbbe3d9bf99f4c5486e0d4
 
=== modified file 'app-vim/bzr-vim/bzr-vim-0.0.1.ebuild'
--- app-vim/bzr-vim/bzr-vim-0.0.1.ebuild	2010-07-29 07:15:01 +0000
+++ app-vim/bzr-vim/bzr-vim-0.0.1.ebuild	2010-12-20 18:41:23 +0000
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 
=== modified file 'app-vim/bzr-vim/bzr-vim-9999.ebuild'
--- app-vim/bzr-vim/bzr-vim-9999.ebuild	2010-07-29 07:15:01 +0000
+++ app-vim/bzr-vim/bzr-vim-9999.ebuild	2010-12-20 18:41:23 +0000
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -7,7 +7,7 @@
 DESCRIPTION="vim plugin: Bazaar Integration"
 HOMEPAGE="https://launchpad.net/bzr-vim/"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE=""
 SRC_URI=""
 EBZR_REPO_URI="lp:bzr-vim"
 
=== modified file 'app-vim/vcscommand/Manifest'
--- app-vim/vcscommand/Manifest	2010-03-17 16:22:38 +0000
+++ app-vim/vcscommand/Manifest	2010-12-20 18:41:23 +0000
@@ -1,3 +1,3 @@
 DIST vcscommand-1.99.37.zip 48713 RMD160 4c4b55080244aa7c54bf5f0ad569375f4f4fc678 SHA1 0bdaf63759ed1df10e4057a27713324b5b3dec0f SHA256 c58430d006b99938192ef57c2d4e8e4ed87421ea37ad4264c30be6a793ea07bb
-EBUILD vcscommand-1.99.37.ebuild 1481 RMD160 13f9d1390b6e250f3e99ee8c7c9ad0d304b8ad29 SHA1 05939ee21922d192ec2b6d05f5b1e061bc6e1193 SHA256 b457c9ae9441223ad2959f464b5674505faa8ed3ab0db91a4556371b61ddd169
-MISC metadata.xml 503 RMD160 5a54a15bdada6eb29a18a2565a76680328e24c55 SHA1 24f6dcb138d110ae4cadf116f42a2775ce4fdcc9 SHA256 8d02b42ff921d7ab415dbc1175f1736f0abe54152cba31eacc61b42fa8f80577
+EBUILD vcscommand-1.99.37.ebuild 1478 RMD160 e63a117253530a94554e1e316081930cc1bd662d SHA1 6ecbc7b2a35c8f769e9bbfad027c0e3524da5288 SHA256 5123897840b4ea685d76a73586c5ab358ef91950dcb7154a46018c6dd3cb95e0
+MISC metadata.xml 583 RMD160 ec5aafd9a6c4f7f76768900e535fcb5cfc7ba115 SHA1 b183af7e99b442dfbd7a8c574dd4e85aa4900af1 SHA256 38e0ce165457165c9cd6ffe5a9ae826091556e294f67b9f8733e803d85c89ce0
 
=== modified file 'app-vim/vcscommand/metadata.xml'
--- app-vim/vcscommand/metadata.xml	2010-03-17 16:21:24 +0000
+++ app-vim/vcscommand/metadata.xml	2010-12-20 18:41:23 +0000
@@ -8,7 +8,8 @@
 	</maintainer>
 <use>
   <flag name='bzr'>Enable support for <pkg>dev-vcs/bzr</pkg></flag>
+  <flag name='mercurial'>Enable support for <pkg>dev-vcs/mercurial</pkg></flag>
+  <flag name='git'>Enable support for <pkg>dev-vcs/git</pkg></flag>
   <flag name='svk'>Enable support for <pkg>dev-util/svk</pkg></flag>
-  <flag name='git'>Enable support for <pkg>dev-vcs/git</pkg></flag>
 </use>
 </pkgmetadata>
 
=== modified file 'app-vim/vcscommand/vcscommand-1.99.37.ebuild'
--- app-vim/vcscommand/vcscommand-1.99.37.ebuild	2010-03-17 16:22:38 +0000
+++ app-vim/vcscommand/vcscommand-1.99.37.ebuild	2010-12-20 18:41:23 +0000
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -15,9 +15,9 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="bzr cvs git mercurial subversion svk"
 
-RDEPEND="cvs? ( dev-util/cvs )
-	subversion? ( dev-util/subversion )
-	svk? ( dev-util/svk )
+RDEPEND="cvs? ( dev-vcs/cvs )
+	subversion? ( dev-vcs/subversion )
+	svk? ( dev-vcs/svk )
 	git? ( dev-vcs/git )
 	bzr? ( dev-vcs/bzr )
 	mercurial? ( dev-vcs/mercurial )
 
=== modified file 'dev-python/pyftpdlib/Manifest'
--- dev-python/pyftpdlib/Manifest	2010-07-29 07:22:34 +0000
+++ dev-python/pyftpdlib/Manifest	2010-12-20 18:41:23 +0000
@@ -1,3 +1,3 @@
 DIST pyftpdlib-0.5.2.tar.gz 108432 RMD160 19a85293d5cc7eb2c4137bab278138397fd553ad SHA1 183950a9c239b23542dc880ff3a27d9fe5da63af SHA256 c24ebd1764c9e4b3d0eceec81d467601fd421bc45eaee5aab09ceb68d9995b4c
-EBUILD pyftpdlib-0.5.2.ebuild 429 RMD160 879edad3884f492dd46a1669336761838cfedd64 SHA1 3a70f67143ae7b2a19b1120fb1d2a368ebdbf74c SHA256 facfff2699dc9b06611fc7f3669084def5920389ce677893defe89acd2ad1205
+EBUILD pyftpdlib-0.5.2.ebuild 429 RMD160 d80f7fc6737ec6cd1c508467400af9c1b2a8de1f SHA1 002cf0c189742abe235bb84251a37c38d58636af SHA256 537635a6fd746be4215b0a0fdc7d9b1b3d718914af39d143bf6ec2b9351c5329
 MISC metadata.xml 285 RMD160 a8952a49acb5b00e48df37554397820e313c99b9 SHA1 4fcb8a3ef1ef0a98a45e198fde764ea292e08ee8 SHA256 b44ef9ceebc8a707893640732ebd31680a99fbaab6cbbe3d9bf99f4c5486e0d4
 
=== modified file 'dev-python/pyftpdlib/pyftpdlib-0.5.2.ebuild'
--- dev-python/pyftpdlib/pyftpdlib-0.5.2.ebuild	2010-07-29 07:22:34 +0000
+++ dev-python/pyftpdlib/pyftpdlib-0.5.2.ebuild	2010-12-20 18:41:23 +0000
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 
=== modified file 'dev-vcs/bzr-gtk/Manifest'
--- dev-vcs/bzr-gtk/Manifest	2010-11-27 11:11:12 +0000
+++ dev-vcs/bzr-gtk/Manifest	2010-12-20 18:41:23 +0000
@@ -1,4 +1,4 @@
 DIST bzr-gtk-0.98.0.tar.gz 243271 RMD160 5a890f24a0de55092d6892872b5ae6fec3e68165 SHA1 3b1a2f3e5dbc45763ab4a69b4b4ca84bdc49a836 SHA256 ca9f41c66583d04acec7961810aab888dcdee1e36e7395356a9a4ad5e3dcfee8
-EBUILD bzr-gtk-0.98.0.ebuild 1107 RMD160 f69896dde5df0d9fce51744e4a88143e3da5ba92 SHA1 3a022e2f5f96ac19ab49c96b6ff82490b7a01ed2 SHA256 0c923df3d3b24936b5fe0f5667363bb6da2587f4d92f22b465848d84ab288f17
-EBUILD bzr-gtk-9999.ebuild 1188 RMD160 e873a378fdb5785e9f549bc384622a2af0f1e689 SHA1 03221f61e95691f0ddc628e248130336cf25ddc1 SHA256 0534db4366b6491f61cdb4ce05d95f5761be521f3e3aef7ddf4f9810b7f18c80
-MISC metadata.xml 504 RMD160 aba1f65905779b31c29d6f829f0ec4a55c2aed56 SHA1 20af29a23820e43c72838a2d34a4643e177fcb46 SHA256 0b0cc9c75e0e6ee159c90f1f924ded64726f4352d0f227e3cfd7f3dd746e7fed
+EBUILD bzr-gtk-0.98.0.ebuild 1101 RMD160 c3e258656efa5981a86f6fb91c385a1ab02b976a SHA1 0895d9e6faaf61b4add2a61c3012ab6bdaabefee SHA256 f6eb6c36e88c16f7f215aa299a3afd431e9b696fdd86d7359fd77e1f1cad8f6a
+EBUILD bzr-gtk-9999.ebuild 1181 RMD160 0f7331a984d532396f47a3e75073036a649601b2 SHA1 f04ffea706d4168b70f45c078c9a6fbd5e9fcb23 SHA256 39c2d50bfa06fa722b863543d58ebe9ce6a5e693b387906d5bc25c585d14694c
+MISC metadata.xml 705 RMD160 d1bbaec951e61c53695355d9b41b4b4852c28303 SHA1 b16f1d497821168d89d5828ebf7dfd9baf6f8f06 SHA256 a52a4c522558e6a4130629a77b1ef5ffc502378eb53d65e2922123570c05c871
 
=== modified file 'dev-vcs/bzr-gtk/bzr-gtk-0.98.0.ebuild'
--- dev-vcs/bzr-gtk/bzr-gtk-0.98.0.ebuild	2010-07-29 07:07:37 +0000
+++ dev-vcs/bzr-gtk/bzr-gtk-0.98.0.ebuild	2010-12-20 18:41:23 +0000
@@ -19,7 +19,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gconf gnome-keyring gpg +gtksourceview libnotify nautilus"
+IUSE="gconf gnome-keyring gpg +sourceview libnotify nautilus"
 
 DEPEND=">=dev-vcs/bzr-1.6_rc1
 	>=dev-python/pygtk-2.8
@@ -28,7 +28,7 @@
 RDEPEND="${DEPEND}
 	gnome-keyring? ( dev-python/gnome-keyring-python )
 	gpg? ( app-crypt/seahorse )
-	gtksourceview? (
+	sourceview? (
 		dev-python/pygtksourceview
 		gconf? ( dev-python/gconf-python )
 	)
 
=== modified file 'dev-vcs/bzr-gtk/bzr-gtk-9999.ebuild'
--- dev-vcs/bzr-gtk/bzr-gtk-9999.ebuild	2010-11-27 11:11:12 +0000
+++ dev-vcs/bzr-gtk/bzr-gtk-9999.ebuild	2010-12-20 18:41:23 +0000
@@ -20,7 +20,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="gconf gnome-keyring gpg +gtksourceview libnotify nautilus"
+IUSE="gconf gnome-keyring gpg +sourceview libnotify nautilus"
 
 DEPEND=">=dev-vcs/bzr-1.6_rc1
 	>=dev-python/pygtk-2.8
@@ -29,7 +29,7 @@
 RDEPEND="${DEPEND}
 	gnome-keyring? ( dev-python/gnome-keyring-python )
 	gpg? ( app-crypt/seahorse )
-	gtksourceview? (
+	sourceview? (
 		dev-python/pygtksourceview
 		gconf? ( dev-python/gconf-python )
 	)
@@ -47,7 +47,6 @@
 	sed -e '/.*credits.pickle.*/d' -i "${S}"/setup.py
 }
 
-
 src_install() {
 	distutils_src_install
 
 
=== modified file 'dev-vcs/bzr-gtk/metadata.xml'
--- dev-vcs/bzr-gtk/metadata.xml	2009-03-08 02:01:25 +0000
+++ dev-vcs/bzr-gtk/metadata.xml	2010-12-20 18:41:23 +0000
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>[e-mail]</email>
-		<name>Default assignee for new packages</name>
-	</maintainer>
-<use>
-  <flag name='gpg'>Enable signing with <pkg>app-crypt/gnupg</pkg></flag>
-  <flag name='nautilus'>Integrate with Nautilus file manager</flag>
-  <flag name='gtksourceview'>Integrate with GTKsourceview</flag>
-</use>
+  <herd>bazaar</herd>
+  <longdescription lang="en">
+    GTK+ Frontends to various Bazaar commands. Currently contains
+    dialogs for almost all common operations, including annotate and
+    visualise (log). Olive, the integrated version control application
+    is also part of bzr-gtk.
+  </longdescription>
+  <use>
+    <flag name="gconf">Enable GConf support</flag>
+    <flag name="gpg">Support signing with GnuPG.</flag>
+    <flag name="sourceview">Enable GtkSourceView support</flag>
+    <flag name="nautilus">Integrate with Nautilus file manager</flag>
+  </use>
 </pkgmetadata>
 
=== modified file 'dev-vcs/bzr-hg/Manifest'
--- dev-vcs/bzr-hg/Manifest	2010-07-29 07:14:27 +0000
+++ dev-vcs/bzr-hg/Manifest	2010-12-20 18:41:23 +0000
@@ -1,3 +1,3 @@
 DIST bzr-hg-0.1.tar.gz 20503 RMD160 f436bc14ffb6b04aaccb247cc2b9a0cce83b9ad9 SHA1 04a470a7dfb7d9e72bb70bc7c3a521e415ae6004 SHA256 5498103bda42b0efd585e5d3f4ca9cd051ef500ead8a176d875a1426b52cd058
-EBUILD bzr-hg-0.1.ebuild 566 RMD160 867f3bf04fa3231df471b1a42572b1fcd5aba6d1 SHA1 e64a3776d1df8fe5d05640eb5eef8de8415eb917 SHA256 714f0073c757a3ab22d5b30968d69648f61a71f38adb6caf0b57b9cf1bbc8821
+EBUILD bzr-hg-0.1.ebuild 565 RMD160 083d89696d291502797c723af6f4446b6d4a840b SHA1 0780f7fe94602e912a5f98a25b1210f0cd950659 SHA256 800d6858ef86dabdf384f9286bba759a2bc666582c70a848ad7dd0ff91bb19b0
 MISC metadata.xml 285 RMD160 a8952a49acb5b00e48df37554397820e313c99b9 SHA1 4fcb8a3ef1ef0a98a45e198fde764ea292e08ee8 SHA256 b44ef9ceebc8a707893640732ebd31680a99fbaab6cbbe3d9bf99f4c5486e0d4
 
=== modified file 'dev-vcs/bzr-hg/bzr-hg-0.1.ebuild'
--- dev-vcs/bzr-hg/bzr-hg-0.1.ebuild	2010-07-29 07:14:27 +0000
+++ dev-vcs/bzr-hg/bzr-hg-0.1.ebuild	2010-12-20 18:41:23 +0000
@@ -23,4 +23,3 @@
 	>=dev-vcs/bzr-1.16
 	<dev-vcs/bzr-2.1.0_beta1
 	>=dev-vcs/mercurial-1.3.1"
-
 
=== modified file 'dev-vcs/bzr/Manifest'
--- dev-vcs/bzr/Manifest	2010-11-27 11:11:12 +0000
+++ dev-vcs/bzr/Manifest	2010-12-20 18:41:23 +0000
@@ -2,3 +2,4 @@
 AUX bzr-0.90-tests-fix_root.patch 1173 RMD160 572b86dbf99620abe5090b72a9a29c3d6d2ea566 SHA1 a41671354dcf7498039c421e81bc7d9fbbc7bb29 SHA256 b2275d04401bd4ba36c0a565f5e6b7c8471ca50acd48bbf5f5d1995b197809ec
 AUX bzr-0.90-tests-sgid.patch 611 RMD160 09a40cb4424e7dc86b48a577152cc7297c6333db SHA1 b7c42cb9b5cd5de4ebe11378870c6cf8eae52591 SHA256 e7514aa51c23405ba619c323b1bd6dbafffe5c584d8274d4e1df0c2347fd55a7
 EBUILD bzr-9999.ebuild 2960 RMD160 dec6241851375b228b6e2d8b8a6d35ba9a26da78 SHA1 1bcf46469813615121422e2c38462d92ae53c7cb SHA256 dd5b4d10fc5636eeb06a2665ef1c6bcddc777056e99962f3f08fdc96b0327a64
+MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb
 
=== added file 'dev-vcs/bzr/metadata.xml'
--- dev-vcs/bzr/metadata.xml	1970-01-01 00:00:00 +0000
+++ dev-vcs/bzr/metadata.xml	2010-12-20 18:41:23 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <herd>bazaar</herd>
+  <longdescription lang="en">
+    Bazaar (``bzr``) is a decentralized revision control system, designed to be
+    easy for developers and end users alike.  Bazaar is part of the GNU project
+    to develop a complete free operating system.
+    Bazaar was formerly known as Bazaar-NG.  It's the successor to ``baz``, a
+    fork of GNU arch, but shares no code.  (To upgrade from Baz, use the
+    ``baz-import`` command in the bzrtools plugin.)
+  </longdescription>
+  <use>
+    <flag name="sftp">Enable sftp support</flag>
+  </use>
+</pkgmetadata>
 
=== modified file 'www-apps/loggerhead/Manifest'
--- www-apps/loggerhead/Manifest	2010-03-05 09:15:13 +0000
+++ www-apps/loggerhead/Manifest	2010-12-20 18:41:23 +0000
@@ -1,5 +1,5 @@
 AUX loggerhead.confd 70 RMD160 c296a0e5db2ad2e59a9fd0b02e66fbd48a6fa4cc SHA1 be2e6c10f0930620aec3db49bae97a9e26f6268f SHA256 c6bba819e39df844cf7e36bdca19fef8732cce4b01ef7f38cc48365898238596
 AUX loggerhead.init 556 RMD160 4c1ac57d17702c2484a40bdd978ef0afbcb2af72 SHA1 41f599dd7f13232a8205c17a76abef299bacb559 SHA256 93d9c40ca49370db748d56afffafd6b0a8531a751ff6a4e8df6ab9d3e75f9818
 DIST loggerhead-1.17.tar.gz 706897 RMD160 847e3c12eff66e9fdf617e0ef7523f7f74e3c82c SHA1 910b5f569c8647294cabfa45698909b1fffda1ee SHA256 84af906b54407b1be01e016c4447b52cc48e714c5b9f21cf091f5cdbbe65fb97
-EBUILD loggerhead-1.17-r2.ebuild 790 RMD160 d09a27af9137ad5152b7787249e5655002270a5f SHA1 8caf9cb7464ed460e9f3a04a88e85146b6977b97 SHA256 9412aeca2b1da6a960d0c2164139fe0e087b9a824ad2fd2e63124b71d5835598
-MISC metadata.xml 285 RMD160 a8952a49acb5b00e48df37554397820e313c99b9 SHA1 4fcb8a3ef1ef0a98a45e198fde764ea292e08ee8 SHA256 b44ef9ceebc8a707893640732ebd31680a99fbaab6cbbe3d9bf99f4c5486e0d4
+EBUILD loggerhead-1.17-r2.ebuild 786 RMD160 bebf9e86981dbf7160d5a9be4d6336b3255a07f4 SHA1 a2681442fb7f84a361107697d74dc05ae917b6ad SHA256 40d3642d09baee4a28821702e04ee9b936392a74fd1c88da3e950155dc7e4a6f
+MISC metadata.xml 380 RMD160 d2836fb3518f6028fe7b94c4fbfe0f953940c162 SHA1 cf0c3edc469fa0a8dc65828ff10de7d99819a177 SHA256 ff299b6067b90a8bf61aff7f5e74854926a8b9a85f3044c0e8da4579a66355a2
 
=== modified file 'www-apps/loggerhead/loggerhead-1.17-r2.ebuild'
--- www-apps/loggerhead/loggerhead-1.17-r2.ebuild	2010-03-05 09:15:13 +0000
+++ www-apps/loggerhead/loggerhead-1.17-r2.ebuild	2010-12-20 18:41:23 +0000
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS=""
 IUSE="apache2 search"
 
 DEPEND=">=dev-python/paste-1.6
 
=== modified file 'www-apps/loggerhead/metadata.xml'
--- www-apps/loggerhead/metadata.xml	2010-02-08 05:56:52 +0000
+++ www-apps/loggerhead/metadata.xml	2010-12-20 18:41:23 +0000
@@ -6,4 +6,7 @@
 		<email>[e-mail]</email>
 		<name>Default assignee for new packages</name>
 	</maintainer>
+<use>
+  <flag name='search'>Use <pkg>dev-vcs/bzr-search</pkg> for search indices</flag>
+</use>
 </pkgmetadata>
 
=== modified file 'www-apps/trac-bzr/Manifest'
--- www-apps/trac-bzr/Manifest	2010-08-13 13:04:45 +0000
+++ www-apps/trac-bzr/Manifest	2010-12-20 18:41:23 +0000
@@ -1,3 +1,3 @@
 DIST TracBzr-0.4.1.tar.gz 26934 RMD160 21d305b21f4d60acb181a996abb52b9d242b648d SHA1 2c3230b39bb184c10f1ecb3cac7e5b9bd9b6d9a3 SHA256 cf9ed1883182e1d8848a9a38d8f17c358b8b21961afeda434c7632b759950993
-EBUILD trac-bzr-0.4.1.ebuild 475 RMD160 6b23797e2b04a773d4f1499d9880ce104d732206 SHA1 716d3d5f50e7b7b7c105bbb7e3794881b7261463 SHA256 badd2ee3b32ddca45ac9b13ac01f889ea94e80e2b7f10b9db3f240d5ba1e5a14
+EBUILD trac-bzr-0.4.1.ebuild 451 RMD160 d39d420f694061c89cd69a8d63901d09c74c5e75 SHA1 4639c851e2ba133034957f16e67e50f4a6fbd5a9 SHA256 28ee71d3f302a90e9ddad15edac61f536398056277778fe162f596de6fc4c01c
 MISC metadata.xml 302 RMD160 f7f00ac86e9287aed9e2ab7b93ac533420cfa707 SHA1 0723594916425f1503729b08624fa026ddfcd517 SHA256 3e2c82529f40a2abc2e403e16c76a066f60fe9e74d46eb2e3d0c403f2f960943
 
=== modified file 'www-apps/trac-bzr/trac-bzr-0.4.1.ebuild'
--- www-apps/trac-bzr/trac-bzr-0.4.1.ebuild	2010-08-13 13:04:45 +0000
+++ www-apps/trac-bzr/trac-bzr-0.4.1.ebuild	2010-12-20 18:41:23 +0000
@@ -10,9 +10,9 @@
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Bazaar plugin for Trac"
 HOMEPAGE="https://launchpad.net/trac-bzr"
-SRC_URI="http://pypi.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
-LICENSE="GPL2"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
=== modified file 'x11-plugins/bzr-gedit/Manifest'
--- x11-plugins/bzr-gedit/Manifest	2010-07-29 07:24:59 +0000
+++ x11-plugins/bzr-gedit/Manifest	2010-12-20 18:41:23 +0000
@@ -1,4 +1,4 @@
 AUX bzr-gedit-0.6.5-no-autodetect.patch 791 RMD160 962e7a967746dd71adc1cb459cf4321854e3d2d3 SHA1 a6d8dd19543e87d7446b549e97aaabc0bfe80cf1 SHA256 a24e131dfe6e6c623b0222478f14a190396281bae05c683e171e808f2f4e02d1
 DIST bzr-gedit.0.80.tgz 81276 RMD160 3ca05836a41d07d18464512d8615ed18e5eab7ba SHA1 def0c96432f8638b70b03e036f69cebe992f0a76 SHA256 d80176b612920836a2cb5d8e1bdd6393ca481c9deceab6515056dbd99959abb0
-EBUILD bzr-gedit-0.80.ebuild 817 RMD160 27df6a9f26f870dc2ae49e11cde28847f1e0a504 SHA1 38360cf21b290c713cecfeee74918581389771ef SHA256 44b099855a91fa603b5c3b3af243c60affd3ed596a63bc8fdb4fbf00412c6aa8
+EBUILD bzr-gedit-0.80.ebuild 817 RMD160 9d0d980148ad04d42ba8abd5e2ce4ee90e21fa56 SHA1 1845101742518e593600d675825ce1de1cb69206 SHA256 5771667357e46175bccc68247b56e2e9a2ad52bb00735421093b6f32088fee5e
 MISC metadata.xml 363 RMD160 6a08b5bc15a5a8e057111ad1fc2ad39fa3f4e318 SHA1 bfc72bd960946d66e28ed575f1fda3c80888f297 SHA256 f2b25179a1690fc677a6156b65f6dd707474d42c500b7ebc33067f9aef42c901
 
=== modified file 'x11-plugins/bzr-gedit/bzr-gedit-0.80.ebuild'
--- x11-plugins/bzr-gedit/bzr-gedit-0.80.ebuild	2010-07-29 07:24:59 +0000
+++ x11-plugins/bzr-gedit/bzr-gedit-0.80.ebuild	2010-12-20 18:41:23 +0000
@@ -1,11 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=2
+
 inherit versionator eutils
 
-EAPI=2
-
 DESCRIPTION="gedit plugin: Bazaar integration"
 HOMEPAGE="https://launchpad.net/bzr-gedit/"
 SRC_URI="http://edge.launchpad.net/${PN}/${PV}/${PV}/+download/${PN}.${PV}.tgz"