[gentoo-commits] gentoo-x86 commit in net-p2p/vuze: vuze-4.2.0.2.ebuild vuze-4.2.0.4-r1.ebuild vuze-4.2.0.8.ebuild vuze-3.0.4.2-r1.ebuild ChangeLog vuze-4.1.0.4.ebuild vuze-4.2.0.2-r1.ebuild vuze-4.2.0.4.ebuild

[Vlastimil Babka (caster)]

caster      09/09/29 05:36:35

  Modified:             vuze-4.2.0.2.ebuild vuze-4.2.0.4-r1.ebuild
                        vuze-3.0.4.2-r1.ebuild ChangeLog
                        vuze-4.1.0.4.ebuild
  Added:                vuze-4.2.0.8.ebuild
  Removed:              vuze-4.2.0.2-r1.ebuild vuze-4.2.0.4.ebuild
  Log:
  Version bump. Cleanup files, move patchsets to distfiles.
  (Portage version: 2.2_rc40/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  net-p2p/vuze/vuze-4.2.0.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/vuze-4.2.0.2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/vuze-4.2.0.2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/vuze-4.2.0.2.ebuild?r1=1.3&r2=1.4

Index: vuze-4.2.0.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.2.0.2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vuze-4.2.0.2.ebuild	4 Jul 2009 14:33:53 -0000	1.3
+++ vuze-4.2.0.2.ebuild	29 Sep 2009 05:36:34 -0000	1.4
@@ -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.2.0.2.ebuild,v 1.3 2009/07/04 14:33:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.2.0.2.ebuild,v 1.4 2009/09/29 05:36:34 caster Exp $
 
 EAPI=2
 
@@ -8,9 +8,12 @@
 
 inherit eutils fdo-mime java-pkg-2 java-ant-2
 
+PATCHSET_VER="4.2.0.0"
+
 DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
 HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/Vuze_${PV}_source.zip"
+SRC_URI="mirror://sourceforge/azureus/Vuze_${PV}_source.zip
+	mirror://gentoo/${PN}-${PATCHSET_VER}-gentoo-patches.tar.bz2"
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
@@ -44,8 +47,8 @@
 	[[ -f build.xml ]] && die "upstream has build.xml again, don't overwrite"
 	cp "${FILESDIR}/build.xml" . || die "failed to copy build.xml"
 
-	epatch "${FILESDIR}/patches-4.2.0.0/0001-remove-osx-platform.patch"
-	epatch "${FILESDIR}/patches-4.2.0.0/0002-use-jdk-cipher-only.patch"
+	epatch "${S}/${PN}-${PATCHSET_VER}-gentoo-patches/0001-remove-osx-platform.patch"
+	epatch "${S}/${PN}-${PATCHSET_VER}-gentoo-patches/0002-use-jdk-cipher-only.patch"
 
 	### Removes OS X files and entries.
 	rm -rv "org/gudy/azureus2/platform/macosx" \



1.2                  net-p2p/vuze/vuze-4.2.0.4-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/vuze-4.2.0.4-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/vuze-4.2.0.4-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/vuze-4.2.0.4-r1.ebuild?r1=1.1&r2=1.2

Index: vuze-4.2.0.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.2.0.4-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vuze-4.2.0.4-r1.ebuild	19 Jul 2009 10:31:47 -0000	1.1
+++ vuze-4.2.0.4-r1.ebuild	29 Sep 2009 05:36:34 -0000	1.2
@@ -1,16 +1,19 @@
 # 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.2.0.4-r1.ebuild,v 1.1 2009/07/19 10:31:47 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.2.0.4-r1.ebuild,v 1.2 2009/09/29 05:36:34 caster Exp $
 
 EAPI=2
 
 JAVA_PKG_IUSE="source"
 
+PATCHSET_VER="4.2.0.0"
+
 inherit eutils fdo-mime java-pkg-2 java-ant-2
 
 DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
 HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/Vuze_${PV}_source.zip"
+SRC_URI="mirror://sourceforge/azureus/Vuze_${PV}_source.zip
+	mirror://gentoo/${PN}-${PATCHSET_VER}-gentoo-patches.tar.bz2"
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
@@ -46,9 +49,7 @@
 	[[ -f build.xml ]] && die "upstream has build.xml again, don't overwrite"
 	cp "${FILESDIR}/build.xml" . || die "failed to copy build.xml"
 
-	epatch "${FILESDIR}/patches-4.2.0.0/0001-remove-osx-platform.patch"
-	epatch "${FILESDIR}/patches-4.2.0.0/0002-use-jdk-cipher-only.patch"
-	epatch "${FILESDIR}/patches-4.2.0.0/0003-disable-core-updater.patch"
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${S}/${PN}-${PATCHSET_VER}-gentoo-patches/"
 
 	### Removes OS X files and entries.
 	rm -rv "org/gudy/azureus2/platform/macosx" \



1.4                  net-p2p/vuze/vuze-3.0.4.2-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild?r1=1.3&r2=1.4

Index: vuze-3.0.4.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vuze-3.0.4.2-r1.ebuild	4 Mar 2009 18:26:43 -0000	1.3
+++ vuze-3.0.4.2-r1.ebuild	29 Sep 2009 05:36:34 -0000	1.4
@@ -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.3 2009/03/04 18:26:43 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-3.0.4.2-r1.ebuild,v 1.4 2009/09/29 05:36:34 caster Exp $
 
 ###
 ### @Todo The new Azureus gui requires swt built with embedded mozilla support,
@@ -19,9 +19,12 @@
 
 inherit eutils fdo-mime java-pkg-2 java-ant-2
 
+PATCHSET_VER="3.0.3.4"
+
 DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
 HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/Azureus_${PV}_source.zip"
+SRC_URI="mirror://sourceforge/azureus/Azureus_${PV}_source.zip
+	mirror://gentoo/${PN}-${PATCHSET_VER}-gentoo-patches.tar.bz2"
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
@@ -52,7 +55,7 @@
 	unpack ${A}
 
 	### Patches Azureus to use bcprov,
-	EPATCH_SUFFIX="patch" epatch "${FILESDIR}/patches-3.0.3.4"
+	EPATCH_SUFFIX="patch" epatch "${S}/${PN}-${PATCHSET_VER}-gentoo-patches/"
 
 	### Remove an unit test we never run
 	rm -v ./org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
@@ -92,7 +95,7 @@
 
 	java-pkg_dolauncher "${PN}" \
 		--main "org.gudy.azureus2.ui.common.Main" \
-		-pre "${FILESDIR}/${PN}-2.5.0.0-pre"      \
+		-pre "${FILESDIR}/${PN}-4.1.0.0-pre"      \
 		--java_args '-Dazureus.install.path=${HOME}/.azureus/ ${JAVA_OPTIONS}' \
 		--pkg_args '--ui=${UI}'
 	dosym vuze /usr/bin/azureus
@@ -100,7 +103,7 @@
 	# https://bugs.gentoo.org/show_bug.cgi?id=204132
 	java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
 
-	doicon "${FILESDIR}/vuze.png"
+	newicon "${S}"/org/gudy/azureus2/ui/icons/a32.png vuze.png
 	domenu "${FILESDIR}/vuze.desktop"
 
 	use source && java-pkg_dosrc "${S}"/{com,edu,org}



1.21                 net-p2p/vuze/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/ChangeLog?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/ChangeLog?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/ChangeLog?r1=1.20&r2=1.21

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ChangeLog	19 Jul 2009 10:31:47 -0000	1.20
+++ ChangeLog	29 Sep 2009 05:36:34 -0000	1.21
@@ -1,6 +1,27 @@
 # ChangeLog for net-p2p/vuze
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.20 2009/07/19 10:31:47 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.21 2009/09/29 05:36:34 caster Exp $
+
+*vuze-4.2.0.8 (28 Sep 2009)
+
+  28 Sep 2009; Vlastimil Babka <caster@g.o>
+  -files/patches-3.0.3.4/01_all_remove-osx-and-win32-AzureusRestarterImpl.pa
+  tch,
+  -files/patches-3.0.3.4/02_all_remove-win32-TorrentListViewsUtils.patch,
+  -files/patches-3.0.3.4/03_all_remove-win32-PlatformManagerPluginDelegate.p
+  atch,
+  -files/patches-3.0.3.4/04_all_remove-osx-and-win32-PlatformManagerFactory.
+  patch,
+  -files/patches-3.0.3.4/azureus_all_modify-for-use-with-bcprov.patch,
+  vuze-3.0.4.2-r1.ebuild, -files/patches-4.1.0.0/remove-osx-platform.diff,
+  -files/patches-4.1.0.0/tableimpl-remove-win32-import.diff,
+  -files/patches-4.1.0.0/use-jdk-cipher-only.diff, vuze-4.1.0.4.ebuild,
+  -files/patches-4.2.0.0/0001-remove-osx-platform.patch,
+  -files/patches-4.2.0.0/0002-use-jdk-cipher-only.patch,
+  -files/patches-4.2.0.0/0003-disable-core-updater.patch,
+  vuze-4.2.0.2.ebuild, -vuze-4.2.0.2-r1.ebuild, -vuze-4.2.0.4.ebuild,
+  vuze-4.2.0.4-r1.ebuild, +vuze-4.2.0.8.ebuild, -files/vuze.png:
+  Version bump. Cleanup files, move patchsets to distfiles.
 
 *vuze-4.2.0.4-r1 (19 Jul 2009)
 



1.6                  net-p2p/vuze/vuze-4.1.0.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/vuze-4.1.0.4.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/vuze-4.1.0.4.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/vuze-4.1.0.4.ebuild?r1=1.5&r2=1.6

Index: vuze-4.1.0.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.1.0.4.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vuze-4.1.0.4.ebuild	27 Apr 2009 00:10:01 -0000	1.5
+++ vuze-4.1.0.4.ebuild	29 Sep 2009 05:36:34 -0000	1.6
@@ -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.1.0.4.ebuild,v 1.5 2009/04/27 00:10:01 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.1.0.4.ebuild,v 1.6 2009/09/29 05:36:34 caster Exp $
 
 EAPI=2
 
@@ -8,9 +8,12 @@
 
 inherit eutils fdo-mime java-pkg-2 java-ant-2
 
+PATCHSET_VER="4.1.0.0"
+
 DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
 HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/Vuze_${PV}_source.zip"
+SRC_URI="mirror://sourceforge/azureus/Vuze_${PV}_source.zip
+	mirror://gentoo/${PN}-${PATCHSET_VER}-gentoo-patches.tar.bz2"
 LICENSE="GPL-2 BSD"
 
 SLOT="0"
@@ -44,9 +47,7 @@
 	[[ -f build.xml ]] && die "upstream has build.xml again, don't overwrite"
 	cp "${FILESDIR}/build.xml" . || die "failed to copy build.xml"
 
-	epatch "${FILESDIR}/patches-4.1.0.0/use-jdk-cipher-only.diff"
-	epatch "${FILESDIR}/patches-4.1.0.0/remove-osx-platform.diff"
-	epatch "${FILESDIR}/patches-4.1.0.0/tableimpl-remove-win32-import.diff"
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${S}/${PN}-${PATCHSET_VER}-gentoo-patches/"
 
 	### Removes OS X files and entries.
 	rm -rv "org/gudy/azureus2/platform/macosx" \



1.1                  net-p2p/vuze/vuze-4.2.0.8.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/vuze-4.2.0.8.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/vuze-4.2.0.8.ebuild?rev=1.1&content-type=text/plain

Index: vuze-4.2.0.8.ebuild
===================================================================
# 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.2.0.8.ebuild,v 1.1 2009/09/29 05:36:34 caster Exp $

EAPI=2

JAVA_PKG_IUSE="source"

inherit eutils fdo-mime java-pkg-2 java-ant-2

PATCHSET_VER="4.2.0.8"

DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
HOMEPAGE="http://www.vuze.com/"
SRC_URI="mirror://sourceforge/azureus/Vuze_${PV}_source.zip
	mirror://gentoo/${PN}-${PATCHSET_VER}-gentoo-patches.tar.bz2"
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() {
	mkdir "${S}" && cd "${S}" || die
	default
}

java_prepare() {
	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${S}/${PN}-${PATCHSET_VER}-gentoo-patches/"

	### 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
}

src_install() {
	java-pkg_dojar dist/*.jar || die "dojar failed"
	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."

	fdo-mime_desktop_database_update
}

pkg_postrm() {
	fdo-mime_desktop_database_update
}