pkgmove from mozilla-thunderbird -> thunderbird. Also update metadata.xml for this and previous pkgmoves (fx-bin, tbd-bin)

(Portage version: 2.1.8.3/cvs/Linux i686)

4 files changed, 17 insertions, 12 deletions

diff --git a/app-misc/beagle/ChangeLog b/app-misc/beagle/ChangeLog
index 6fcaffe7831e..5df209291675 100644
--- 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/beagle-0.3.9-r1.ebuild b/app-misc/beagle/beagle-0.3.9-r1.ebuild
index ebe7d2e3721b..3aaa99b761d5 100644
--- 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 955e6f7c80fc..4402cc818beb 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.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 2a4770c9fd16..aafcb65f8b85 100644
--- 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