Revbump to add missing ChangeLog.txt to the jar file. Fixes bug #302058 by Hanno Meyer-Thurow <h.mth@web.de>.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

3 files changed, 162 insertions, 2 deletions

diff --git a/net-p2p/vuze/ChangeLog b/net-p2p/vuze/ChangeLog
index 58e33f242f49..ab32d7a3b8a9 100644
--- a/net-p2p/vuze/ChangeLog
+++ b/net-p2p/vuze/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/vuze
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.29 2010/02/12 09:43:21 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.30 2010/02/21 16:16:02 caster Exp $
+
+*vuze-4.3.1.4-r1 (21 Feb 2010)
+
+  21 Feb 2010; Vlastimil Babka <caster@gentoo.org> +vuze-4.3.1.4-r1.ebuild:
+  Revbump to add missing ChangeLog.txt to the jar file. Fixes bug #302058 by
+  Hanno Meyer-Thurow <h.mth@web.de>.
 
 *vuze-4.3.1.4 (12 Feb 2010)
 
diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index 76a54417bd67..c7ac44b33b21 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -19,6 +19,7 @@ EBUILD vuze-4.2.0.2.ebuild 4637 RMD160 26d3d665d7d11386e35431a45a4c279cf90836e7
 EBUILD vuze-4.2.0.8.ebuild 4718 RMD160 945deb4aa3a76b0e774b1e89c569889433f188a3 SHA1 7f71180f4ebefa0eec1ba331401b88a19bd23ad5 SHA256 305fc14cc9aa4bbe86bfc483ca10e6968b2f6d64ae54188cf2cd98a04de516ed
 EBUILD vuze-4.3.0.6.ebuild 4721 RMD160 c72560aacea84d63033184a0a30e0eac90487134 SHA1 609fbcf024352f57d8612fd833bf515fe14c4db9 SHA256 faf7e98f879abfb71220eed3580db15940598afe71eddc93ae32be67b0e61148
 EBUILD vuze-4.3.1.2.ebuild 4720 RMD160 bd4645079d423d0026b0caf3ab8bc51a926337db SHA1 d548587da65c06d906133cf0fcda850d0336fc2b SHA256 7cd2dc82ab32c3eaa29dfff45378dd83ea443b1efd6245a35c969a696c1266d9
+EBUILD vuze-4.3.1.4-r1.ebuild 4926 RMD160 7f1ad27f725006e982e9ac169e95b8156171cb60 SHA1 52d9ec00c634b653480aa8675ee40d63d5f2e54b SHA256 afab108fa15a815b8ec54ec512e714c8a99f9733f7bb2c9fb3e99fe326bc7318
 EBUILD vuze-4.3.1.4.ebuild 4720 RMD160 d343820970d048a0b56ade17f8138fb52d1fe48e SHA1 e61cb547367273b37d7f452cf852fbf2227b6d46 SHA256 3f28e859fafe6835630c59d1707de4cfdaaf153455effcb2e4ac36fef1c58f2a
-MISC ChangeLog 21893 RMD160 6fa0f1e6390dc11cba2ef5dd7854709d1cf62921 SHA1 03db80931f50c7254a9547563bd51e20423313ae SHA256 cd4e03dd4c61ecf7b8c40d6ed38a71e2039c46fff3a669eccd74754b011dd03a
+MISC ChangeLog 22116 RMD160 70283a028e3b503c6bfb8e3bed4661a05853ee28 SHA1 aa07cc9b679b13418904f483aa21cc3ff29c8be4 SHA256 fd9465c6fe700e9af7fbfc3f6c361bd276ca028bed3f3d2df416bf8aa0b7adac
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
diff --git a/net-p2p/vuze/vuze-4.3.1.4-r1.ebuild b/net-p2p/vuze/vuze-4.3.1.4-r1.ebuild
new file mode 100644
index 000000000000..55367b75fb4b
--- /dev/null
+++ b/net-p2p/vuze/vuze-4.3.1.4-r1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.3.1.4-r1.ebuild,v 1.1 2010/02/21 16:16:02 caster Exp $
+
+EAPI=2
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils fdo-mime java-pkg-2 java-ant-2
+
+PATCHSET_VER="4.3.1.2"
+PATCHSET_DIR="${PN}-${PATCHSET_VER}-gentoo-patches"
+PATCHSET="${PATCHSET_DIR}.tar.bz2"
+SRC_TARBALL="Vuze_${PV}_source.zip"
+
+DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
+HOMEPAGE="http://www.vuze.com/"
+SRC_URI="mirror://sourceforge/azureus/${SRC_TARBALL}
+	mirror://gentoo/${PATCHSET}"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+# bundles parts of commons-lang, but modified
+# bundles parts of http://www.programmers-friend.org/
+RDEPEND="
+	dev-java/json-simple:0
+	>=dev-java/bcprov-1.35:0
+	>=dev-java/commons-cli-1.0:1
+	>=dev-java/log4j-1.2.8:0
+	dev-java/swt:3.5[cairo,xulrunner]
+	!net-p2p/azureus-bin
+	>=virtual/jre-1.5"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-util/desktop-file-utils
+	>=virtual/jdk-1.5"
+
+PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
+
+src_unpack() {
+	unpack ${PATCHSET}
+	mkdir "${S}" && cd "${S}" || die
+	unpack ${SRC_TARBALL}
+}
+
+java_prepare() {
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PATCHSET_DIR}/"
+
+	### Removes OS X files and entries.
+	rm -rv "org/gudy/azureus2/platform/macosx" \
+		   "org/gudy/azureus2/ui/swt/osx" || die
+
+	### Removes Windows files.
+	rm -v ./org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java || die
+
+	### Removes test files.
+	rm -rv "org/gudy/azureus2/ui/swt/test" \
+		org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
+
+	### Removes bouncycastle (we use our own bcprov).
+	rm -rv "org/bouncycastle" || die
+
+	### Removes bundled json
+	rm -rv "org/json" || die
+
+	mkdir -p build/libs || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="swt-3.5,bcprov,json-simple,log4j,commons-cli-1"
+
+src_compile() {
+	local mem
+	use amd64 && mem="256"
+	use x86   && mem="192"
+	use ppc   && mem="192"
+	use ppc64 && mem="256"
+	export ANT_OPTS="-Xmx${mem}m"
+	java-pkg-2_src_compile
+
+	# bug #302058 - build.xml excludes .txt but upstream jar has it...
+	jar uf dist/Azureus2.jar ChangeLog.txt || die
+}
+
+src_install() {
+	java-pkg_dojar dist/Azureus2.jar
+	dodoc ChangeLog.txt || die
+
+	java-pkg_dolauncher "${PN}" \
+		--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
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=204132
+	java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
+
+	newicon "${S}"/org/gudy/azureus2/ui/icons/a32.png vuze.png
+	domenu "${FILESDIR}/${PN}.desktop"
+
+	use source && java-pkg_dosrc "${S}"/{com,edu,org}
+}
+
+pkg_postinst() {
+	###
+	### @Todo We should probably deactivate auto-update it by default,
+	###       or even remove the option - bug #218959
+	###
+	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.1.0.0, 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 vuze-coreplugins ebuild."
+	elog
+	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 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."
+	elog "Using this config file you can start the console UI."
+	elog
+	elog "To switch from classic UI to Vuze use"
+	elog "1: Tools > Options > Interface > Start > Display Vuze UI Chooser"
+	elog "2: Toolbar (right-hand side)"
+	elog
+	elog "If you have problems starting Vuze, try starting it"
+	elog "from the command line to look at debugging output."
+	elog
+	elog "If vuze crashes with sun-jdk or icedtea and crash log includes CompileTask"
+	elog "add this line to the end of your ~/.axureus/gentoo.config file:"
+	local opts='-XX:CompileCommand=exclude,com/aelitis/net/udp/uc/impl/PRUDPPacketHandlerImpl$5,runSupport'
+	elog "JAVA_OPTIONS='${opts}'"
+	elog "This is a workaround for a bug in the JDK, see https://bugs.gentoo.org/show_bug.cgi?id=259884"
+
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}