pkgmove from mozilla-thunderbird -> thunderbird. Also update metadata.xml for this...

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/app-misc/beagle/ChangeLog b/app-misc/beagle/ChangeLog
index 6fcaffe7831ebccb8a440cb3fe5862ffba0e6f0f..5df20929167561c20dbf5d9e41c9d91dcd6eff59 100644 (file)
--- a/app-misc/beagle/ChangeLog
+++ b/app-misc/beagle/ChangeLog
@@ -1,6 +1,11 @@
 # 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.108 2010/05/16 17:45:54 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.109 2010/06/13 02:30:43 nirbheek Exp $
+
+  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:

diff --git a/app-misc/beagle/Manifest b/app-misc/beagle/Manifest
index bbb1b4ba876a0538823eb74d47c4849354f64c63..09677c08183e9f2fc362f8f663b0ac5f614ec7e0 100644 (file)
--- a/app-misc/beagle/Manifest
+++ b/app-misc/beagle/Manifest
@@ -3,7 +3,7 @@ AUX beagle-0.3.9-sqlite.patch 2749 RMD160 0815f0e79981e10673e2f1a7451143f93598d8
 AUX beagle-log-level-warn.patch 2014 RMD160 444a772662d0cf1e2b32865c87ad8308c36537c2 SHA1 7b4abc9699922c3d681b3283ca9dc2dfe0710e88 SHA256 1f8664518210dfd54ea0e229cff30cc7e41dd0651ad5ed5f608afecb49afc48e
 AUX crawl-portage 295 RMD160 979f70ae6172ffbbba21fcf8ab22964d10bf6b1a SHA1 6c8da69912829a6dd8f1bdcacc3d59acb31a9f63 SHA256 14b8423c0590ce9bc8b43ee75b7c51c02ec46031d89baeee8c0100bdc6adb31b
 DIST beagle-0.3.9.tar.bz2 1895453 RMD160 f8e26ceeea50e33b04837e1d22f1a6f18fa84c1a SHA1 5fdba6ffd4a210076a954cc22f5b940705b71a6e SHA256 4252710247809df393f318450a391298fa57a3ad7b6043962734997035caf488
-EBUILD beagle-0.3.9-r1.ebuild 5786 RMD160 0436c8209fa2a7b5ecaf83ef346cbb0a42fa144c SHA1 0d4beb07806f4d67be9a79158083db8f944bb6e5 SHA256 ef06937283dcc8a1620b67cbd738127223a5456e3964e0ee7ea243eb3ba4eeb1
-EBUILD beagle-0.3.9-r2.ebuild 5813 RMD160 add87237df8b7cc089953cdeda11c943bcaff349 SHA1 21cff4b20cb331dd8697abd9c619cc205848aec8 SHA256 fda72ebc03a657b94c40733110d7749b0de5556f9ce593b8ce35540440438fa7
-MISC ChangeLog 18627 RMD160 e1bcff2383a758857390e80b24d7a778472ce85a SHA1 c7a904e6760f25dbbf2024c244522d2b56f8437b SHA256 e4f81d83566730920732165a5b7f5765cfdf2e3d8df410f2921c68784e8e15b3
-MISC metadata.xml 2635 RMD160 04de0c5e6bb7c6610c2a611fc421fd04b3b14332 SHA1 c572b7e74e85c852156ec59ff41d35756c58d0e5 SHA256 d64623a36f93a4207d15850e4ceb8ae275eeb99f9f2e1c477cb1f126050cfff6
+EBUILD beagle-0.3.9-r1.ebuild 5762 RMD160 576a0ad3875626b378660ed5d4a2449af71674eb SHA1 7cc359425ab4479b507ec3760fba0acf30a7ed21 SHA256 5d84d2391b7302505361d3806cc78cd306d4ee8e3d883ab07c99c75a70d1dd94
+EBUILD beagle-0.3.9-r2.ebuild 5789 RMD160 9bf21345446f0a525ce1c0aecf10204cd1c11517 SHA1 e1dd3c8f7e1a16b716873dbe66678f875b0326cb SHA256 73e9c6b5088321999b8a45399f1ba40d5a462766329efbd018edba0a01523656
+MISC ChangeLog 18873 RMD160 b16723a5187390825996487c204c30f0ae060edc SHA1 25cb1697ad0cbb60da83cf350cd95669c05b0627 SHA256 6914e5af87f80b8251ca283035a0827010787f1be8d7a4eec6adc0205a15599b
+MISC metadata.xml 2611 RMD160 4c2e2865ef555765efbf7f6a284e63263aeffe04 SHA1 fa1a82f00554fac9b6739bd058a7d61fc16ec994 SHA256 3dd195d6ac9368471460dd0289f1c67cd1bd7c6d78f8084abd636b2b48945964

diff --git a/app-misc/beagle/beagle-0.3.9-r1.ebuild b/app-misc/beagle/beagle-0.3.9-r1.ebuild
index ebe7d2e3721b358d1fe1692fdc628b5b2c937fcf..3aaa99b761d5909a035518237d67dd68beeba4a1 100644 (file)
--- a/app-misc/beagle/beagle-0.3.9-r1.ebuild
+++ b/app-misc/beagle/beagle-0.3.9-r1.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-r1.ebuild,v 1.10 2010/05/16 17:45:54 nirbheek Exp $
+# $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
 
@@ -56,7 +56,7 @@ RDEPEND="!!sci-libs/beagle
        galago? ( >=dev-dotnet/galago-sharp-0.5.0 )
        thunderbird? (
                        || (
-                               >=mail-client/mozilla-thunderbird-1.5
+                               >=mail-client/thunderbird-1.5
                                >=mail-client/thunderbird-bin-1.5
                        )
        )
@@ -155,10 +155,10 @@ src_install() {
                || die "Unable to find Beagle Thunderbird Extension"
                mv "${WORKDIR}"/beagle "${WORKDIR}"/thunderbird-beagle
 
-               if has_version '>=mail-client/mozilla-thunderbird-1.5'; then
+               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 mozilla-thunderbird failed!"
+                       || die "xpi install for thunderbird failed!"
                fi
                if has_version '>=mail-client/thunderbird-bin-1.5'; then
                        MOZILLA_FIVE_HOME="/opt/thunderbird"

diff --git a/app-misc/beagle/beagle-0.3.9-r2.ebuild b/app-misc/beagle/beagle-0.3.9-r2.ebuild
index 955e6f7c80fc524d0d06b193db7134baae2c74f9..4402cc818beb363c9dcdc27012dd8725dec1a476 100644 (file)
--- 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.7 2010/05/16 17:45:54 nirbheek Exp $
+# $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 $
 
 EAPI=2
 
@@ -56,7 +56,7 @@ RDEPEND="!!sci-libs/beagle
        galago? ( >=dev-dotnet/galago-sharp-0.5.0 )
        thunderbird? (
                        || (
-                               >=mail-client/mozilla-thunderbird-1.5
+                               >=mail-client/thunderbird-1.5
                                >=mail-client/thunderbird-bin-1.5
                        )
        )
@@ -156,10 +156,10 @@ src_install() {
                || die "Unable to find Beagle Thunderbird Extension"
                mv "${WORKDIR}"/beagle "${WORKDIR}"/thunderbird-beagle
 
-               if has_version '>=mail-client/mozilla-thunderbird-1.5'; then
+               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 mozilla-thunderbird failed!"
+                       || die "xpi install for thunderbird failed!"
                fi
                if has_version '>=mail-client/thunderbird-bin-1.5'; then
                        MOZILLA_FIVE_HOME="/opt/thunderbird"

diff --git a/app-misc/beagle/metadata.xml b/app-misc/beagle/metadata.xml
index 2a4770c9fd16700371188b4808687f8505baab30..aafcb65f8b85442ac48297c7c5fba9fb2904b863 100644 (file)
--- a/app-misc/beagle/metadata.xml
+++ b/app-misc/beagle/metadata.xml
@@ -24,7 +24,7 @@
                        websites you visit.</flag>
                <flag name='firefox'>Compiles and installs the extension for either
                        <pkg>www-client/mozilla-firefox</pkg> or
-                       <pkg>www-client/mozilla-firefox-bin</pkg>. This extension helps
+                       <pkg>www-client/firefox-bin</pkg>. This extension helps
                        Beagle index the websites you visit.</flag>
                <flag name='galago'>Allows Beagle to get status information from
                        applications such as Pidgin to show in the search results.</flag>
@@ -40,8 +40,8 @@
                        <pkg>app-office/gnumeric</pkg>(ssindex). These allow Beagle to index 
                        MS Powerpoint, Word, and Spreadsheet Documents.</flag>
                <flag name='thunderbird'>Compiles and installs the extension for either
-                       <pkg>mail-client/mozilla-thunderbird</pkg> or
-                       <pkg>mail-client/mozilla-thunderbird-bin</pkg>. This extension helps
+                       <pkg>mail-client/thunderbird</pkg> or
+                       <pkg>mail-client/thunderbird-bin</pkg>. This extension helps
                        Beagle index your mails.</flag>
                <flag name='xscreensaver'>Allow Beagle to detect when the screensaver is
                        switched on. This allows Beagle to use more resources and index faster