Fix references for pkgmove from www-client/mozilla-firefox -> www-client/firefox, remove 0.3.9-r1 because it is broken

(Portage version: 2.1.8.3/cvs/Linux i686)

4 files changed, 13 insertions, 738 deletions

diff --git a/app-misc/beagle/ChangeLog b/app-misc/beagle/ChangeLog
index ab3885b1b31e..043bdda2b060 100644
--- a/app-misc/beagle/ChangeLog
+++ b/app-misc/beagle/ChangeLog
@@ -1,542 +1,9 @@
 # ChangeLog for app-misc/beagle
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.115 2010/07/12 18:01:11 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.116 2010/07/25 19:19:25 nirbheek Exp $
 
-  12 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
-  beagle-0.3.9-r3.ebuild:
-  stable x86, bug 324723
-
-  09 Jul 2010; Pacho Ramos <pacho@gentoo.org> beagle-0.3.9-r3.ebuild:
-  amd64 stable, bug 324723
-
-*beagle-0.3.9-r3 (19 Jun 2010)
-
-  19 Jun 2010; Pacho Ramos <pacho@gentoo.org>
-  +files/beagle-0.3.9-firefox-3.6.patch, +files/beagle-0.3.9-gmime24.patch,
-  +files/beagle-0.3.9-grow-shrink.patch, +files/beagle-0.3.9-mono2.6.patch,
-  +files/beagle-0.3.9-openfix.patch,
-  +files/beagle-0.3.9-update-tileindex.patch:
-  Revision bump with multiple fixes and changes: drop epiphany support since
-  it requires old epiphany-extensions-2.26, and won't work with webkit based
-  versions; support Firefox 3.6, fix building against gmime-2.4, remove bugs
-  open check, make it work with mono-2.6, some upstream fixes committed to
-  master. Thanks to Fedora and Mandriva folks for most of the patches.
-
-  19 Jun 2010; Cédric Krier <cedk@gentoo.org> metadata.xml:
-  Remove myself as maintainer
-
-  13 Jun 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
-  beagle-0.3.9-r1.ebuild, beagle-0.3.9-r2.ebuild, metadata.xml:
-  pkgmove from mozilla-thunderbird -> thunderbird. Also update metadata.xml
-  for this and previous pkgmoves (fx-bin, tbd-bin)
-
-  16 May 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
-  beagle-0.3.9-r1.ebuild, beagle-0.3.9-r2.ebuild:
-  Forgot to change has_version entries in the previous commit for
-  thunderbird-bin pkgmove. It seems the same mistake was also made during
-  the firefox-bin pkgmove.
-
-  16 May 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
-  beagle-0.3.9-r1.ebuild, beagle-0.3.9-r2.ebuild:
-  Update deps for pkgmove from mozilla-thunderbird-bin to thunderbird-bin
-
-  24 Apr 2010; Fabio Erculiani <lxnay@gentoo.org> beagle-0.3.9-r1.ebuild,
-  beagle-0.3.9-r2.ebuild, +files/beagle-0.3.9-sqlite.patch:
-  fix compilation issue against sqlite, close #306313
-
-  10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
-  beagle-0.3.9-r1.ebuild, beagle-0.3.9-r2.ebuild:
-  Fix poppler depend.
-
-  01 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
-  beagle-0.3.9-r1.ebuild, beagle-0.3.9-r2.ebuild:
-  mozilla-firefox-bin -> firefox-bin
-
-  06 Sep 2009; Peter Alfredsen <loki_val@gentoo.org> beagle-0.3.9-r2.ebuild:
-  Sed on configure.in now that we are eautoreconfing. Fixes bug 283855.
-  Thanks to Wilbur Pan <wilburpan@yahoo.com> for reporting.
-
-*beagle-0.3.9-r2 (05 Sep 2009)
-
-  05 Sep 2009; Peter Alfredsen <loki_val@gentoo.org>
-  -files/beagle-0.2.7-crawltweek.patch,
-  -files/beagle-0.2.18-mono-1.9.1.patch,
-  -files/beagle-0.3.7-evo-sharp.patch, -beagle-0.3.9.ebuild,
-  beagle-0.3.9-r1.ebuild, +beagle-0.3.9-r2.ebuild,
-  +files/beagle-0.3.9-firefox-3.5.patch:
-  Backport patch from upstream to fix bug 283740, problems with firefox
-  extension and >=firefox-3.5 in 0.3.9-r2. Restrict 0.3.9-r1 to older
-  versions of firefox. Clean out old patches.
-
-  01 Jun 2009; nixnut <nixnut@gentoo.org> beagle-0.3.9-r1.ebuild:
-  ppc stable #269875
-
-  14 May 2009; Markus Meier <maekke@gentoo.org> beagle-0.3.9-r1.ebuild:
-  amd64/x86 stable, bug #269875
-
-  18 Apr 2009; Peter Alfredsen <loki_val@gentoo.org> beagle-0.3.9-r1:
-  Sed configure instead of configure.in now that we're no longer running
-  eautoreconf.
-
-*beagle-0.3.9-r1 (17 Apr 2009)
-
-  17 Apr 2009; Peter Alfredsen <loki_val@gentoo.org>
-  +beagle-0.3.9-r1.ebuild:
-  Drop gmime-2.4 patch. We don't need it anymore since gmime-2.2[mono] works
-  ( bug 248657 ) and there have been reports of problems with the patch.
-
-  05 Apr 2009; Peter Alfredsen <loki_val@gentoo.org>
-  -beagle-0.3.7-r1.ebuild:
-  Remove old versions.
-
-  04 Apr 2009; Markus Meier <maekke@gentoo.org> beagle-0.3.9.ebuild:
-  amd64/x86 stable, bug #234305
-
-  30 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> beagle-0.3.7-r1.ebuild,
-  beagle-0.3.9.ebuild:
-  Update dependencies w.r.t. bug 264230, fully-split-out poppler transition.
-
-  27 Mar 2009; Brent Baude <ranger@gentoo.org> beagle-0.3.9.ebuild:
-  Marking beagle-0.3.9 ppc stable for bug 234305
-
-  25 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> -beagle-0.2.18.ebuild,
-  -beagle-0.2.18-r1.ebuild, beagle-0.3.7-r1.ebuild, -beagle-0.3.8-r2.ebuild,
-  beagle-0.3.9.ebuild:
-  Check for inotify useflag if thunderbird useflag is enabled. Bug 263781.
-  Thanks to Felix Salfner <salfner@informatik.hu-berlin.de> for reporting.
-
-  21 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> beagle-0.3.9.ebuild:
-  Make beagle build with epiphany-2.26
-
-  28 Jan 2009; Peter Alfredsen <loki_val@gentoo.org> beagle-0.3.9.ebuild:
-  Avahi needs USE=mono to enable beagle avahi support, thanks to pipping for
-  reporting.
-
-*beagle-0.3.9 (28 Jan 2009)
-
-  28 Jan 2009; Peter Alfredsen <loki_val@gentoo.org> +beagle-0.3.9.ebuild:
-  Bump. Reviewed dependencies.
-
-  05 Jan 2009; Peter Alfredsen <loki_val@gentoo.org> beagle-0.3.8-r2.ebuild:
-  Fix for new gtk-sharp-module eclass
-
-*beagle-0.3.8-r2 (16 Dec 2008)
-
-  16 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
-  -files/beagle-0.3.8-fix_gmime-2.4.patch,
-  -files/beagle-0.3.8-fix_gvfs.patch, metadata.xml, -beagle-0.3.6.ebuild,
-  -beagle-0.3.8.ebuild, -beagle-0.3.8-r1.ebuild, +beagle-0.3.8-r2.ebuild:
-  Bump, fix bug 246336, bug 248331, bug 248703 and bug 248957. Also trawled
-  upstream SVN and fixed a number of hangs and crashes. Also add dotnet herd
-  as herd.
-
-  14 Dec 2008; Peter Alfredsen <loki_val@gentoo.org> beagle-0.3.6.ebuild,
-  beagle-0.3.7-r1.ebuild, beagle-0.3.8.ebuild, beagle-0.3.8-r1.ebuild:
-  Use virtual/monodoc to accomodate inclusion of monodoc in mono from
-  >=mono-2.2_pre1
-
-*beagle-0.3.8-r1 (22 Nov 2008)
-
-  22 Nov 2008; Peter Alfredsen <loki_val@gentoo.org>
-  +files/beagle-0.3.8-fix_gmime-2.4.patch,
-  +files/beagle-0.3.8-fix_gvfs.patch, +beagle-0.3.8-r1.ebuild:
-  Fix beagle for gmime-2.4, patch from frugalware and adjust deps for
-  gtk-sharp-2.12*
-
-  11 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org> beagle-0.2.18.ebuild,
-  beagle-0.2.18-r1.ebuild, beagle-0.3.6.ebuild, beagle-0.3.7-r1.ebuild,
-  beagle-0.3.8.ebuild:
-  Use gmime-2.2*, bug #239412.
-
-*beagle-0.3.8 (06 Sep 2008)
-
-  06 Sep 2008; Cédric Krier <cedk@gentoo.org> +beagle-0.3.8.ebuild:
-  Version bump
-
-  31 Jul 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
-  Add missing USE flag description for inotify to metadata.
-
-  28 Jul 2008; Raúl Porcel <armin76@gentoo.org> beagle-0.3.7-r1.ebuild:
-  x86 stable wrt #230185
-
-  27 Jul 2008; Olivier Crête <tester@gentoo.org> beagle-0.3.7-r1.ebuild:
-  Stable on amd64, bug #230185
-
-  16 Jul 2008; nixnut <nixnut@gentoo.org> beagle-0.3.7-r1.ebuild:
-  Stable on ppc wrt bug 230185
-
-*beagle-0.2.18-r1 (29 Jun 2008)
-
-  29 Jun 2008; Cédric Krier <cedk@gentoo.org>
-  +files/beagle-0.2.18-mono-1.9.1.patch, +beagle-0.2.18-r1.ebuild:
-  Add patch for bug #229389
-
-*beagle-0.3.7-r1 (07 Jun 2008)
-
-  07 Jun 2008; Cédric Krier <cedk@gentoo.org>
-  +files/beagle-0.3.7-evo-sharp.patch, -beagle-0.3.7.ebuild,
-  +beagle-0.3.7-r1.ebuild:
-  Add evo-sharp patch from redhat for bug #224621
-
-*beagle-0.3.7 (28 May 2008)
-
-  28 May 2008; Cédric Krier <cedk@gentoo.org> +beagle-0.3.7.ebuild:
-  Version bump
-
-  13 May 2008; Peter Volkov <pva@gentoo.org> beagle-0.2.18.ebuild,
-  beagle-0.3.6.ebuild:
-  Moving app-doc/chmlib -> dev-libs/chmlib, bug #220741.
-
-  22 Apr 2008; Cédric Krier <cedk@gentoo.org> beagle-0.3.6.ebuild:
-  Fix typo for bug #201093
-
-*beagle-0.3.6 (20 Apr 2008)
-
-  20 Apr 2008; Cédric Krier <cedk@gentoo.org> -beagle-0.3.5.ebuild,
-  +beagle-0.3.6.ebuild:
-  Version bump
-
-*beagle-0.3.5 (04 Apr 2008)
-
-  04 Apr 2008; Cédric Krier <cedk@gentoo.org>
-  -files/beagle-0.3.4-dbus.patch,
-  -files/beagle-0.3.4-epiphany-extension.patch, -beagle-0.3.4-r1.ebuild,
-  +beagle-0.3.5.ebuild:
-  Version bump
-
-*beagle-0.3.4-r1 (29 Mar 2008)
-
-  29 Mar 2008; Cédric Krier <cedk@gentoo.org>
-  -files/beagle-0.3.3-log-level-warn.patch, +files/beagle-0.3.4-dbus.patch,
-  +files/beagle-0.3.4-epiphany-extension.patch, -beagle-0.3.3.ebuild,
-  -beagle-0.3.4.ebuild, +beagle-0.3.4-r1.ebuild:
-  Add patch for epiphany and dbus
-
-*beagle-0.3.4 (26 Mar 2008)
-
-  26 Mar 2008; Cédric Krier <cedk@gentoo.org> +beagle-0.3.4.ebuild:
-  Version bump
-
-*beagle-0.3.3 (25 Mar 2008)
-
-  25 Mar 2008; Cédric Krier <cedk@gentoo.org>
-  +files/beagle-0.3.3-log-level-warn.patch, +beagle-0.3.3.ebuild:
-  Version bump
-
-  09 Mar 2008; Cédric Krier <cedk@gentoo.org> metadata.xml,
-  beagle-0.2.18.ebuild:
-  Add intltool to DEPEND
-
-  09 Mar 2008; Mart Raudsepp <leio@gentoo.org> beagle-0.2.18.ebuild:
-  Fix build with newer intltool, bug 200711
-
-  01 Mar 2008; Cédric Krier <cedk@gentoo.org> beagle-0.2.18.ebuild:
-  Add blocker dependency to libbeagle
-
-  28 Feb 2008; Cédric Krier <cedk@gentoo.org> metadata.xml:
-  Add myself as maintainer
-
-  25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
-  Removing metalgod from metadata.xml as per #99350.
-
-  25 Nov 2007; Brent Baude <ranger@gentoo.org> beagle-0.2.18.ebuild:
-  Marking beagle-0.2.18 ppc stable for bug 196755
-
-  23 Nov 2007; Markus Meier <maekke@gentoo.org> beagle-0.2.18.ebuild:
-  x86 stable, bug #196755
-
-  22 Nov 2007; Samuli Suominen <drac@gentoo.org> beagle-0.2.18.ebuild:
-  Beagle can use also thunderbird-bin, thanks to Nirbheek Chauhan for testing.
-
-*beagle-0.2.18 (22 Nov 2007)
-
-  22 Nov 2007; Samuli Suominen <drac@gentoo.org> +beagle-0.2.18.ebuild:
-  Version bump, closing bug #190707, for #196755 straight to stable for amd64.
-
-  24 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org>
-  beagle-0.2.17.ebuild:
-  ppc stable, bug #18944
-
-  23 Aug 2007; Christoph Mende <angelos@gentoo.org> beagle-0.2.17.ebuild:
-  Stable on amd64 wrt bug #189442
-
-  22 Aug 2007; Jurek Bartuszek <jurek@gentoo.org> beagle-0.2.17.ebuild:
-  x86 stable (bug #189442)
-
-*beagle-0.2.17 (28 Jul 2007)
-
-  28 Jul 2007; Daniel Drake <dsd@gentoo.org> -beagle-0.2.16.ebuild,
-  +beagle-0.2.17.ebuild:
-  Version bump thanks to Pacho Ramos in bug #175497, and fix EXIF tag breakage
-  thanks to Pat Double in bug #169496.
-
-  22 Jul 2007; David Shakaryan <omp@gentoo.org> beagle-0.2.16.ebuild,
-  beagle-0.2.16.2.ebuild:
-  Remove virtual/x11 from dependencies.
-
-  14 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
-  add <herd>no-herd</herd>
-
-  03 Mar 2007; nixnut <nixnut@gentoo.org> beagle-0.2.16.2.ebuild:
-  Stable on ppc wrt bug 168400
-
-  01 Mar 2007; Luis Medinas <metalgod@gentoo.org> beagle-0.2.16.2.ebuild:
-  Stable on amd64. Bug #168400.
-
-  26 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
-  beagle-0.2.16.2.ebuild:
-  stable x86; bug 168400
-
-*beagle-0.2.16.2 (26 Feb 2007)
-
-  26 Feb 2007; Luis Medinas <metalgod@gentoo.org> +beagle-0.2.16.2.ebuild:
-  Version Bump. Bug fix release for this stable branch that will be on Gentoo
-  2007.0 and SLED 10. Closes bug #168400.
-
-  11 Feb 2007; Lars Weiler <pylon@gentoo.org> beagle-0.2.16.ebuild:
-  Stable on ppc; bug #156155.
-
-  09 Feb 2007; Simon Stelling <blubb@gentoo.org> beagle-0.2.16.ebuild:
-  stable on amd64
-
-  08 Feb 2007; Christian Faulhammer <opfer@gentoo.org> beagle-0.2.16.ebuild:
-  stable x86; bug #156155
-
-  07 Feb 2007; Luis Medinas <metalgod@gentoo.org>
-  +files/beagle-0.2.16-monofix.patch, beagle-0.2.16.ebuild:
-  Add a latest patch from upstream to make it compile with newer versions of
-  mono. This release will hit stable.
-
-*beagle-0.2.16 (07 Feb 2007)
-
-  07 Feb 2007; Luis Medinas <metalgod@gentoo.org>
-  -files/beagle-0.2.15.1-crawllocation.patch, -beagle-0.2.13.ebuild,
-  -beagle-0.2.14.ebuild, -beagle-0.2.15.1.ebuild, +beagle-0.2.16.ebuild:
-  Version Bump. Fixes bug #164039.
-
-*beagle-0.2.15.1 (02 Feb 2007)
-
-  02 Feb 2007; Luis Medinas <metalgod@gentoo.org>
-  +files/beagle-0.2.15.1-crawllocation.patch,
-  +files/beagle-log-level-warn.patch, +beagle-0.2.15.1.ebuild:
-  Version Bump. This release closes bgo #155732 #163958 #164039 #163081
-  #159454 and #158446.
-
-  28 Jan 2007; Marius Mauch <genone@gentoo.org> beagle-0.2.7.ebuild,
-  beagle-0.2.13.ebuild, beagle-0.2.14.ebuild:
-  Replacing einfo with elog
-
-  15 Jan 2007; Luis Medinas <metalgod@gentoo.org> beagle-0.2.13.ebuild,
-  beagle-0.2.14.ebuild:
-  Remove debug expression now that beagle uses a different way and its more
-  stable. Closes bug #161666.
-
-  20 Dec 2006; Luis Medinas <metalgod@gentoo.org> beagle-0.2.14.ebuild:
-  Change gsf-sharp mandatory dependency to OLE that really needs it. This bug
-  was fixed on upstream CVS right after 0.1.13 release.
-
-*beagle-0.2.14 (16 Dec 2006)
-
-  16 Dec 2006; Luis Medinas <metalgod@gentoo.org> +beagle-0.2.14.ebuild:
-  Version Bump. This release got the xdg autostart files fixes bug #128839.
-
-*beagle-0.2.13 (20 Nov 2006)
-
-  20 Nov 2006; Luis Medinas <metalgod@gentoo.org> +beagle-0.2.13.ebuild:
-  Version Bump. This version fixes thunderbird compile issue bug #155568 and
-  need gsf-sharp due a bug on the release tarball.
-
-*beagle-0.2.12-r1 (18 Nov 2006)
-
-  18 Nov 2006; Luis Medinas <metalgod@gentoo.org> +beagle-0.2.12-r1.ebuild:
-  Added support for thunderbird and developer docs.
-
-*beagle-0.2.12 (02 Nov 2006)
-
-  02 Nov 2006; Luis Medinas <metalgod@gentoo.org> +beagle-0.2.12.ebuild:
-  Version Bump.
-
-*beagle-0.2.11 (27 Oct 2006)
-
-  27 Oct 2006; Luis Medinas <metalgod@gentoo.org> +beagle-0.2.11.ebuild:
-  Version Bump. Added galago support. Closes bug #149838.
-
-*beagle-0.2.9 (03 Sep 2006)
-
-  03 Sep 2006; Luis Medinas <metalgod@gentoo.org> +beagle-0.2.9.ebuild:
-  Version Bump
-
-*beagle-0.2.8 (18 Aug 2006)
-
-  18 Aug 2006; Luis Medinas <metalgod@gentoo.org> +beagle-0.2.8.ebuild:
-  Version Bump.
-
-  17 Jul 2006; Daniel Gryniewicz <dang@gentoo.org> beagle-0.2.7.ebuild:
-  Marked stable on amd64 for bug #139612
-
-  14 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org> beagle-0.2.7.ebuild:
-  ppc stable, bug #139612
-
-  12 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> beagle-0.2.7.ebuild:
-  Stable on x86 wrt bug #139612.
-
-*beagle-0.2.7 (20 Jun 2006)
-
-  20 Jun 2006; Luis Medinas <metalgod@gentoo.org>
-  +files/beagle-0.2.7-crawltweek.patch, +beagle-0.2.7.ebuild:
-  Version bump from upstream. This release includes again chm support and a
-  few important fixes.
-
-  20 Jun 2006; Luis Medinas <metalgod@gentoo.org>
-  -files/beagle-0.2.1-multilib.patch,
-  -files/beagle-0.2.3-CVE-2006-1296.patch,
-  -files/beagle-0.2.4-crawltweek.patch, -files/beagle-0.2.4-searchfix.patch,
-  -beagle-0.2.4.ebuild, -beagle-0.2.4-r2.ebuild:
-  Removed older version and some patches that were accepted by upstream.
-
-  29 May 2006; Luis Medinas <metalgod@gentoo.org> beagle-0.2.6.ebuild:
-  Added missing pdf use flag thanks to Christoph Galler <galler@ch.risto.ph>
-  for reporting to us. Closes bug #134638.
-
-*beagle-0.2.6 (29 Apr 2006)
-
-  29 Apr 2006; Luis Medinas <metalgod@gentoo.org> +beagle-0.2.6.ebuild:
-  Version Bump.
-
-*beagle-0.2.5 (22 Apr 2006)
-
-  22 Apr 2006; Luis Medinas <metalgod@gentoo.org>
-  +files/beagle-0.2.5-crawltweek.patch, files/crawl-portage,
-  +beagle-0.2.5.ebuild:
-  Version Bump. Removed multilib patch that was accept by upstream. Closes 
-  bug #130711, #130233.
-
-  12 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> beagle-0.2.4-r1.ebuild,
-  beagle-0.2.4-r2.ebuild:
-  Replace /bin/false to -1 or enewuser won't work.
-
-*beagle-0.2.4-r2 (10 Apr 2006)
-
-  10 Apr 2006; Luis Medinas <metalgod@gentoo.org>
-  files/beagle-0.2.4-crawltweek.patch, +files/beagle-0.2.4-searchfix.patch,
-  files/crawl-portage, +beagle-0.2.4-r2.ebuild:
-  Revbump to modify the crawl-portage to use portdir instead of /usr/portage.
-  Added kde paths to our crawltweek patch and add a upstream patch to fix a
-  search crash thanks to Arif Lukito <maxima.bugs@gmail.com> and Pat Double
-  <double@inebraska.com>.
-
-  09 Apr 2006; Stefan Jones <cretin@gentoo.org> beagle-0.2.4-r1.ebuild:
-  You want chown not chmod :-)
-
-*beagle-0.2.4-r1 (09 Apr 2006)
-
-  09 Apr 2006; Luis Medinas <metalgod@gentoo.org>
-  +files/beagle-0.2.4-crawltweek.patch, +files/crawl-portage,
-  +beagle-0.2.4-r1.ebuild:
-  Enable support for beagle crawl thanks to Pat Double <double@inebraska.com>.
-  Added a patch to fix crawl searches path's.
-
-*beagle-0.2.4 (08 Apr 2006)
-
-  08 Apr 2006; Luis Medinas <metalgod@gentoo.org>
-  +files/beagle-0.2.4-CVE-2006-1296.patch, +beagle-0.2.4.ebuild:
-  Version Bump. This version includes a new ebuild filter.
-
-  06 Apr 2006; Luis Medinas <metalgod@gentoo.org> beagle-0.2.3-r1.ebuild:
-  Update wv dependency. Thanks to B. Keroack <mutualaid@gmail.com> cloes bug
-  #128589.
-
-*beagle-0.2.3-r1 (30 Mar 2006)
-
-  30 Mar 2006; Luis Medinas <metalgod@gentoo.org>
-  -files/beagle-0.1.1-null-task-source.patch,
-  -files/beagle-0.1.1-uri-serialization.patch,
-  -files/beagle-0.2.1-noguisettings.patch,
-  +files/beagle-0.2.3-CVE-2006-1296.patch, -beagle-0.1.1.ebuild,
-  -beagle-0.1.2.ebuild, -beagle-0.2.1.ebuild, -beagle-0.2.1-r1.ebuild,
-  -beagle-0.2.2.1.ebuild, -beagle-0.2.3.ebuild, +beagle-0.2.3-r1.ebuild:
-  Added a patch to fix the security hole on beagle-status fixes bug #128136.
-  Removed older and affected versions.
-
-  25 Mar 2006; Joseph Jezak <josejx@gentoo.org> beagle-0.2.2.1.ebuild,
-  beagle-0.2.3.ebuild:
-  Marked ~ppc for bug #123847.
-
-  20 Mar 2006; Luis Medinas <metalgod@gentoo.org> beagle-0.2.2.1.ebuild,
-  beagle-0.2.3.ebuild:
-  Added ~amd64 keyword. Closes bug #111904.
-
-*beagle-0.2.3 (18 Mar 2006)
-
-  18 Mar 2006; Luis Medinas <metalgod@gentoo.org> +beagle-0.2.3.ebuild:
-  Version Bump.
-
-*beagle-0.2.2.1 (07 Mar 2006)
-
-  07 Mar 2006; Luis Medinas <metalgod@gentoo.org> +beagle-0.2.2.1.ebuild:
-  Version Bump. Quick fix from upstream to fix 64bit issue.
-
-*beagle-0.2.2 (07 Mar 2006)
-
-  07 Mar 2006; Luis Medinas <metalgod@gentoo.org> +beagle-0.2.2.ebuild:
-  Version Bump from upstream.
-
-*beagle-0.2.1-r1 (04 Mar 2006)
-
-  04 Mar 2006; Luis Medinas <metalgod@gentoo.org>
-  +files/beagle-0.2.1-noguisettings.patch, +beagle-0.2.1-r1.ebuild:
-  Added a patch from Daniel Drake <dsd@gentoo.org> to fix desktop entry if the
-  gui is disable. Fixes bug #124192.
-
-  26 Feb 2006; Luis Medinas <metalgod@gentoo.org> beagle-0.2.1.ebuild:
-  Added a sqlite version fix. Closes bug #123928.
-
-  24 Feb 2006; Luis Medinas <metalgod@gentoo.org> beagle-0.2.1.ebuild:
-  Add librsvg missing dependency fixes bug #123902. Remove ~amd64 keywords for
-  now.
-
-*beagle-0.2.1 (23 Feb 2006)
-
-  23 Feb 2006; Luis Medinas <metalgod@gentoo.org>
-  +files/beagle-0.2.1-multilib.patch, metadata.xml, +beagle-0.2.1.ebuild:
-  Version Bump. Closes bug #116654 and #119740. Added myself as temporary
-  maintainer.
-
-  14 Dec 2005; Doug Goldstein <cardoe@gentoo.org> beagle-0.1.2.ebuild:
-  Fix my typo on the modular X depends. Simplify the depends as well.
-
-  27 Nov 2005; Herbie Hopkins <herbs@gentoo.org> beagle-0.1.2.ebuild:
-  Multilib fix.
-
-  22 Nov 2005; Joseph Jezak <josejx@gentoo.org> beagle-0.1.2.ebuild:
-  Marked ~ppc for bug #110551.
-
-*beagle-0.1.2 (14 Nov 2005)
-
-  14 Nov 2005; Daniel Drake <dsd@gentoo.org> +beagle-0.1.2.ebuild:
-  Version bump; this version does not support .doc file indexing due to bug
-  #111228
-
-  06 Nov 2005; Simon Stelling <blubb@gentoo.org> beagle-0.1.1.ebuild:
-  remove ~amd64 keyword again as it requires gmime to be built with USE=mono,
-  but mono is masked on amd64; bug 111702
-
-  06 Nov 2005; Simon Stelling <blubb@gentoo.org> beagle-0.1.1.ebuild:
-  added ~amd64 keyword
-
-  03 Nov 2005; Daniel Drake <dsd@gentoo.org> beagle-0.1.1.ebuild:
-  We aren't compatible with wv-1.2.0 yet, so depend on 1.0.3-r1 for now (will
-  be properly fixed in next beagle release).
-
-  25 Oct 2005; Daniel Drake <dsd@gentoo.org> beagle-0.1.1.ebuild:
-  Stop using gnome2 eclass. Use emake -j1 to prevent compilation errors -
-  solves the USE=webservices problem.
-
-*beagle-0.1.1 (24 Oct 2005)
-
-  24 Oct 2005; Daniel Drake <dsd@gentoo.org>
-  +files/beagle-0.1.1-null-task-source.patch,
-  +files/beagle-0.1.1-uri-serialization.patch, +metadata.xml,
-  +beagle-0.1.1.ebuild:
-  Initial import, thanks to everyone on bug #67768
+  25 Jul 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -beagle-0.3.9-r1.ebuild, beagle-0.3.9-r2.ebuild, beagle-0.3.9-r3.ebuild:
+  Fix references for pkgmove from www-client/mozilla-firefox ->
+  www-client/firefox, remove 0.3.9-r1 because it is broken
 
diff --git a/app-misc/beagle/beagle-0.3.9-r1.ebuild b/app-misc/beagle/beagle-0.3.9-r1.ebuild
deleted file mode 100644
index 3aaa99b761d5..000000000000
--- a/app-misc/beagle/beagle-0.3.9-r1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.9-r1.ebuild,v 1.11 2010/06/13 02:30:43 nirbheek Exp $
-
-EAPI=2
-
-inherit base gnome.org eutils mono mozextension
-
-DESCRIPTION="Search tool that ransacks your personal information space to find whatever you're looking for"
-HOMEPAGE="http://www.beagle-project.org/"
-LICENSE="MIT Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="avahi chm debug doc epiphany eds firefox +galago gtk +pdf +inotify +ole thunderbird +google  +xscreensaver"
-
-#See bug 248331 for blocker reason.
-RDEPEND="!!sci-libs/beagle
-	>=dev-lang/mono-1.9
-	>=app-shells/bash-3.2
-	app-arch/zip
-	>=dev-db/sqlite-3.3.1
-	>=dev-dotnet/dbus-sharp-0.6.0
-	>=dev-dotnet/dbus-glib-sharp-0.4.1
-	>=dev-dotnet/taglib-sharp-2.0
-	gtk? (
-		x11-libs/libX11
-		>=gnome-base/librsvg-2.22.0
-		sys-devel/gettext
-		>=dev-dotnet/gtk-sharp-2.12.6
-		>=dev-dotnet/gconf-sharp-2.24.0
-		>=dev-dotnet/glade-sharp-2.12.6
-		>=dev-dotnet/gnome-sharp-2.24.0
-		>=dev-dotnet/gnomevfs-sharp-2.24.0
-		dev-libs/gmime:0[mono]
-		x11-misc/xdg-utils
-		>=x11-libs/gtk+-2.14.0
-		>=dev-libs/atk-1.22.0
-	)
-	eds? (
-		>=dev-dotnet/evolution-sharp-0.18.1
-		>=dev-dotnet/gconf-sharp-2.24.0
-		>=dev-dotnet/glib-sharp-2.12.6
-		dev-libs/gmime:0[mono]
-	)
-	ole? (
-		>=app-text/wv-1.2.3
-		>=dev-dotnet/gsf-sharp-0.8.1
-		>=app-office/gnumeric-1.4.3-r3
-	)
-
-	x11-misc/shared-mime-info
-	>=dev-dotnet/glib-sharp-2.12.6
-	dev-libs/gmime:0[mono]
-	chm? ( dev-libs/chmlib )
-	pdf? ( >=app-text/poppler-0.12.3-r3[utils] )
-	galago? ( >=dev-dotnet/galago-sharp-0.5.0 )
-	thunderbird? (
-			|| (
-				>=mail-client/thunderbird-1.5
-				>=mail-client/thunderbird-bin-1.5
-			)
-	)
-	firefox? (
-			|| (
-				=www-client/mozilla-firefox-2*
-				=www-client/mozilla-firefox-3.0*
-				=www-client/firefox-bin-2*
-				=www-client/firefox-bin-3.0*
-			)
-	)
-	epiphany? (
-		>=www-client/epiphany-extensions-2.16[python]
-		>=dev-libs/libbeagle-0.3.9[python]
-	)
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	>=dev-libs/libbeagle-0.3.9
-	avahi?	( >=net-dns/avahi-0.6.10[mono] )"
-
-DEPEND="${RDEPEND}
-	doc? ( >=virtual/monodoc-1.2.4 )
-	dev-util/pkgconfig
-	xscreensaver? ( x11-proto/scrnsaverproto )
-	>=dev-util/intltool-0.35"
-
-pkg_setup() {
-	enewgroup beagleindex
-	enewuser beagleindex -1 -1 /var/lib/cache/beagle beagleindex
-	if use thunderbird
-	then
-		if ! use inotify
-		then
-			eerror "You have enabled the thunderbird use flag. This use-flag depends on the inotify use-flag."
-			eerror "Please enable the inotify use-flag also."
-			eerror "See http://bugs.gentoo.org/263781 for more information."
-			die "Please enable inotify use-flag."
-		fi
-	fi
-}
-
-src_prepare() {
-
-	# Fix upstream bug, Gentoo bug #306313
-	epatch "${FILESDIR}"/${P}-sqlite.patch
-
-	#Fix bug 248703
-	sed -i  -e 's:VALID_EPIPHANY_VERSIONS=":VALID_EPIPHANY_VERSIONS="2.26 2.25 2.24 :' \
-		configure || die "epiphany sed failed"
-
-	#Fix bugs.gnome.org/556243
-	sed -i	-e "s:libgnome-desktop-2.so.2:libgnome-desktop-2.so:" \
-		search/Beagle.Search.exe.config || die "gnome-desktop sed failed"
-}
-
-src_configure() {
-	econf 	--disable-static \
-		--disable-dependency-tracking \
-		$(use_enable debug xml-dump) \
-		$(use_enable doc docs) \
-		$(use_enable epiphany epiphany-extension) \
-		$(use_enable thunderbird) \
-		$(use_enable eds evolution) \
-		$(use_enable gtk gui) \
-		$(use_enable ole gsf-sharp wv1) \
-		$(use_enable xscreensaver xss) \
-		$(use_enable inotify) \
-		$(use_enable avahi) \
-		$(use_enable google googlebackends)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-
-	dodoc AUTHORS NEWS README || die "dodoc failed"
-
-	declare MOZILLA_FIVE_HOME
-	if use firefox; then
-		xpi_unpack "${S}"/firefox-extension/beagle.xpi \
-		|| die "Unable to find Beagle Firefox Extension"
-		mv "${WORKDIR}"/beagle "${WORKDIR}"/firefox-beagle
-
-		if has_version '>=www-client/mozilla-firefox-1.5'; then
-			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
-			xpi_install "${WORKDIR}"/firefox-beagle \
-			|| die "xpi install for mozilla-firefox failed!"
-		fi
-		if has_version '>=www-client/firefox-bin-1.5'; then
-			MOZILLA_FIVE_HOME="/opt/firefox"
-			xpi_install "${WORKDIR}"/firefox-beagle \
-			|| die "xpi install for firefox-bin failed!"
-		fi
-	fi
-
-	if use thunderbird; then
-		xpi_unpack "${S}"/thunderbird-extension/beagle.xpi \
-		|| die "Unable to find Beagle Thunderbird Extension"
-		mv "${WORKDIR}"/beagle "${WORKDIR}"/thunderbird-beagle
-
-		if has_version '>=mail-client/thunderbird-1.5'; then
-			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
-			xpi_install "${WORKDIR}"/thunderbird-beagle \
-			|| die "xpi install for thunderbird failed!"
-		fi
-		if has_version '>=mail-client/thunderbird-bin-1.5'; then
-			MOZILLA_FIVE_HOME="/opt/thunderbird"
-			xpi_install "${WORKDIR}"/thunderbird-beagle \
-			|| die "xpi install for thunderbird-bin failed!"
-		fi
-	fi
-
-	sed -i -e 's/CRAWL_ENABLED="yes"/CRAWL_ENABLED="no"/' \
-		"${D}"/etc/beagle/crawl-rules/crawl-*
-
-	insinto /etc/beagle/crawl-rules
-	doins "${FILESDIR}/crawl-portage"
-
-	keepdir "/usr/$(get_libdir)/beagle/Backends"
-	diropts -o beagleindex -g beagleindex
-	keepdir "/var/lib/cache/beagle/indexes"
-}
-
-pkg_postinst() {
-	elog "If available, Beagle greatly benefits from using certain operating"
-	elog "system features such as Extended Attributes and inotify."
-	elog
-	elog "If you want static queryables such as the portage tree and system"
-	elog "documentation you will need to edit the /etc/beagle/crawl-* files"
-	elog "and change CRAWL_ENABLE from 'no' to 'yes'."
-	elog
-	elog "For more info on how to create the optimal beagle environment, and"
-	elog "basic usage info, see the Gentoo page of the Beagle website:"
-	elog "http://www.beagle-project.org/Gentoo_Installation"
-}
diff --git a/app-misc/beagle/beagle-0.3.9-r2.ebuild b/app-misc/beagle/beagle-0.3.9-r2.ebuild
index 4402cc818beb..9ac78716c259 100644
--- a/app-misc/beagle/beagle-0.3.9-r2.ebuild
+++ b/app-misc/beagle/beagle-0.3.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.9-r2.ebuild,v 1.8 2010/06/13 02:30:43 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.9-r2.ebuild,v 1.9 2010/07/25 19:19:25 nirbheek Exp $
 
 EAPI=2
 
@@ -62,7 +62,7 @@ RDEPEND="!!sci-libs/beagle
 	)
 	firefox? (
 			|| (
-				>=www-client/mozilla-firefox-1.5
+				>=www-client/firefox-1.5
 				>=www-client/firefox-bin-1.5
 			)
 	)
@@ -139,10 +139,10 @@ src_install() {
 		|| die "Unable to find Beagle Firefox Extension"
 		mv "${WORKDIR}"/beagle "${WORKDIR}"/firefox-beagle
 
-		if has_version '>=www-client/mozilla-firefox-1.5'; then
+		if has_version '>=www-client/firefox-1.5'; then
 			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
 			xpi_install "${WORKDIR}"/firefox-beagle \
-			|| die "xpi install for mozilla-firefox failed!"
+			|| die "xpi install for firefox failed!"
 		fi
 		if has_version '>=www-client/firefox-bin-1.5'; then
 			MOZILLA_FIVE_HOME="/opt/firefox"
diff --git a/app-misc/beagle/beagle-0.3.9-r3.ebuild b/app-misc/beagle/beagle-0.3.9-r3.ebuild
index cd79fd8ddda3..5b015c2f1ab4 100644
--- a/app-misc/beagle/beagle-0.3.9-r3.ebuild
+++ b/app-misc/beagle/beagle-0.3.9-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.9-r3.ebuild,v 1.3 2010/07/12 18:01:11 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.9-r3.ebuild,v 1.4 2010/07/25 19:19:25 nirbheek Exp $
 
 EAPI=2
 
@@ -60,7 +60,7 @@ RDEPEND="!!sci-libs/beagle
 	)
 	firefox? (
 			|| (
-				>=www-client/mozilla-firefox-1.5
+				>=www-client/firefox-1.5
 				>=www-client/firefox-bin-1.5
 			)
 	)
@@ -141,10 +141,10 @@ src_install() {
 		|| die "Unable to find Beagle Firefox Extension"
 		mv "${WORKDIR}"/beagle "${WORKDIR}"/firefox-beagle
 
-		if has_version '>=www-client/mozilla-firefox-1.5'; then
+		if has_version '>=www-client/firefox-1.5'; then
 			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
 			xpi_install "${WORKDIR}"/firefox-beagle \
-			|| die "xpi install for mozilla-firefox failed!"
+			|| die "xpi install for firefox failed!"
 		fi
 		if has_version '>=www-client/firefox-bin-1.5'; then
 			MOZILLA_FIVE_HOME="/opt/firefox"