Fix icon, update DESCRIPTION and postinst messages, add azureus symlink.

(Portage version: 2.2_rc23/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 16 insertions, 9 deletions

diff --git a/net-p2p/vuze/ChangeLog b/net-p2p/vuze/ChangeLog
index 4b2a660c094b..b84a8161ab88 100644
--- a/net-p2p/vuze/ChangeLog
+++ b/net-p2p/vuze/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/azureus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.2 2009/02/06 11:56:14 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.3 2009/02/06 12:06:46 caster Exp $
+
+  06 Feb 2009; Vlastimil Babka <caster@gentoo.org> -files/azureus.png,
+  +files/vuze.png, vuze-3.0.4.2-r1.ebuild, vuze-4.0.0.4.ebuild:
+  Fix icon, update DESCRIPTION and postinst messages, add azureus symlink.
 
 *vuze-4.0.0.4 (06 Feb 2009)
 
diff --git a/net-p2p/vuze/files/azureus.png b/net-p2p/vuze/files/vuze.png
index 4fa36bf9185c..4fa36bf9185c 100644
--- a/net-p2p/vuze/files/azureus.png
+++ b/net-p2p/vuze/files/vuze.png
diff --git a/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild b/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild
index d65b1fb773c3..4f3ffb51cad8 100644
--- a/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild
+++ b/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild,v 1.1 2009/02/06 11:46:35 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild,v 1.2 2009/02/06 12:06:46 caster Exp $
 
 ###
 ### @Todo The new Azureus gui requires swt built with embedded mozilla support,
@@ -106,7 +106,7 @@ src_install() {
 	# https://bugs.gentoo.org/show_bug.cgi?id=204132
 	java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
 
-	doicon "${FILESDIR}/azureus.png"
+	doicon "${FILESDIR}/vuze.png"
 	domenu "${FILESDIR}/vuze.desktop"
 
 	use source && java-pkg_dosrc "${S}"/{com,edu,org}
diff --git a/net-p2p/vuze/vuze-4.0.0.4.ebuild b/net-p2p/vuze/vuze-4.0.0.4.ebuild
index 00ba727d8822..89e6befb5c21 100644
--- a/net-p2p/vuze/vuze-4.0.0.4.ebuild
+++ b/net-p2p/vuze/vuze-4.0.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.0.0.4.ebuild,v 1.1 2009/02/06 11:56:14 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.0.0.4.ebuild,v 1.2 2009/02/06 12:06:46 caster Exp $
 
 EAPI=2
 
@@ -24,7 +24,7 @@ UPNPAV_DIST=${UPNPAV_N}_${UPNPAV_V}.zip
 
 ALLPLUGINS_URL="http://azureus.sourceforge.net/plugins"
 
-DESCRIPTION="BitTorrent client in Java, now called Vuze"
+DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
 HOMEPAGE="http://www.vuze.com/"
 SRC_URI="mirror://sourceforge/azureus/${MAIN_DIST}
 	${ALLPLUGINS_URL}/${PLUGINS_DIST}
@@ -111,6 +111,7 @@ src_install() {
 		--main org.gudy.azureus2.ui.common.Main -pre "${FILESDIR}/${PN}-4.1.0.0-pre" \
 		--java_args '-Dazureus.install.path=/usr/share/vuze/ ${JAVA_OPTIONS}' \
 		--pkg_args '--ui=${UI}'
+	dosym vuze /usr/bin/azureus
 
 	insinto /usr/share/${PN}/
 	doins -r "${WORKDIR}/plugins"
@@ -129,23 +130,25 @@ pkg_postinst() {
 	### @Todo We should probably deactivate auto-update it by default,
 	###       or even remove the option - bug #218959
 	###
-	ewarn "Running Azureus as root is not supported and may result in untracked"
+	ewarn "Running Vuze as root is not supported and may result in untracked"
 	ewarn "updates to shared components and then collisions on updates via portage"
 
+	elog "Vuze has been formerly called Azureus and many references to the old name remain."
+	elog
 	elog "Since version 4.0.0.2, plugins that are normally bundled by upstream"
 	elog "(and auto-installed in each user's ~/.azureus if not bundled)"
 	elog "are now installed into shared plugin directory by the ebuild."
 	elog "Users are recommended to delete the following plugin copies:"
 	elog "~/.azureus/plugins/{${PLUGINS_N},${RATING_N},${UPDATER_N},${UPNPAV_N}}"
 	elog
-	elog "Azureus may warn that shared plugin dir is not writable, that's fine."
+	elog "Vuze may warn that shared plugin dir is not writable, that's fine."
 	elog "It may also attempt to update some these plugins and fail to write."
 	elog "In that case look for or fill a bump bug in bugs.gentoo.org"
 	elog
 	elog "We plan to disable updater for shared components and plugins."
 	elog "See progress in bug #218959, patches welcome."
 	elog
-	elog "After running azureus for the first time, configuration"
+	elog "After running Vuze for the first time, configuration"
 	elog "options will be placed in '~/.azureus/gentoo.config'."
 	elog "If you need to change some startup options, you should"
 	elog "modify this file, rather than the startup script."
@@ -155,7 +158,7 @@ pkg_postinst() {
 	elog "1: Tools > Options > Interface > Start > Display Vuze UI Chooser"
 	elog "2: Toolbar (right-hand side)"
 	elog
-	elog "If you have problems starting Azureus, try starting it"
+	elog "If you have problems starting Vuze, try starting it"
 	elog "from the command line to look at debugging output."
 
 	fdo-mime_desktop_database_update