rhill 15/03/14 09:39:07 Modified: vuze-5.3.0.0.ebuild ChangeLog Added: vuze-5.6.0.0.ebuild Log: Long overdue version bump. Drop cache size patch as requested by Bobby Kent. Strip DOS line endings from source to stop upstream from breaking our patches every release. Signed-off-by: Ryan Hill <rh...@gentoo.org> (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 957A8463)
Revision Changes Path 1.2 net-p2p/vuze/vuze-5.3.0.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/vuze/vuze-5.3.0.0.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/vuze/vuze-5.3.0.0.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/vuze/vuze-5.3.0.0.ebuild?r1=1.1&r2=1.2 Index: vuze-5.3.0.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-5.3.0.0.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vuze-5.3.0.0.ebuild 9 Mar 2014 07:38:47 -0000 1.1 +++ vuze-5.3.0.0.ebuild 14 Mar 2015 09:39:07 -0000 1.2 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-5.3.0.0.ebuild,v 1.1 2014/03/09 07:38:47 rhill Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-5.3.0.0.ebuild,v 1.2 2015/03/14 09:39:07 rhill Exp $ EAPI="5" @@ -28,12 +28,12 @@ dev-java/json-simple dev-java/log4j dev-java/swt:3.8[cairo] - >=virtual/jre-1.6" + >=virtual/jre-1.6:*" DEPEND="${RDEPEND} app-arch/unzip dev-util/desktop-file-utils - >=virtual/jdk-1.6" + >=virtual/jdk-1.6:*" PDEPEND="~net-p2p/vuze-coreplugins-${PV}" @@ -55,7 +55,9 @@ } java_prepare() { - epatch "${FILESDIR}"/${P}-cache-size.patch + # upstream likes randomly changing a subset of files to CRLF every release + edos2unix $(find "${S}" -type f -name "*.java") + epatch "${FILESDIR}"/${P}-java5.patch epatch "${FILESDIR}"/${P}-remove-classpath.patch epatch "${FILESDIR}"/${P}-disable-shared-plugins.patch 1.64 net-p2p/vuze/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/vuze/ChangeLog?rev=1.64&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/vuze/ChangeLog?rev=1.64&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/vuze/ChangeLog?r1=1.63&r2=1.64 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- ChangeLog 9 Aug 2014 12:10:15 -0000 1.63 +++ ChangeLog 14 Mar 2015 09:39:07 -0000 1.64 @@ -1,6 +1,17 @@ # ChangeLog for net-p2p/vuze -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.63 2014/08/09 12:10:15 ago Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.64 2015/03/14 09:39:07 rhill Exp $ + +*vuze-5.6.0.0 (14 Mar 2015) + + 14 Mar 2015; Ryan Hill <rh...@gentoo.org> vuze-5.3.0.0.ebuild, + +vuze-5.6.0.0.ebuild, -files/vuze-5.3.0.0-cache-size.patch, + files/vuze-5.3.0.0-java5.patch, files/vuze-5.3.0.0-remove-classpath.patch, + +files/vuze-5.6.0.0-commons-lang-entities.patch, + +files/vuze-5.6.0.0-invalid-characters.patch, files/build.xml: + Long overdue version bump. Drop cache size patch as requested by Bobby Kent. + Strip DOS line endings from source to stop upstream from breaking our patches + every release. 09 Aug 2014; Agostino Sarubbo <a...@gentoo.org> vuze-4.8.1.2-r1.ebuild: Stable for ppc, wrt bug #432146 1.1 net-p2p/vuze/vuze-5.6.0.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/vuze/vuze-5.6.0.0.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/vuze/vuze-5.6.0.0.ebuild?rev=1.1&content-type=text/plain Index: vuze-5.6.0.0.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-5.6.0.0.ebuild,v 1.1 2015/03/14 09:39:07 rhill Exp $ EAPI="5" JAVA_PKG_IUSE="source" inherit eutils fdo-mime java-pkg-2 java-ant-2 versionator MY_PV=$(replace_all_version_separators "") MY_SRC="Vuze_${MY_PV}" DESCRIPTION="BitTorrent client in Java, formerly called Azureus" HOMEPAGE="http://www.vuze.com/"; SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip" LICENSE="GPL-2 BSD" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" # bundles parts of http://www.programmers-friend.org/ # bundles bcprov - 1.37 required but not in the tree RDEPEND=" dev-java/commons-cli dev-java/commons-lang:2.1 dev-java/json-simple dev-java/log4j dev-java/swt:3.8[cairo] >=virtual/jre-1.6:*" DEPEND="${RDEPEND} app-arch/unzip dev-util/desktop-file-utils >=virtual/jdk-1.6:*" PDEPEND="~net-p2p/vuze-coreplugins-${PV}" pkg_pretend() { if ! has_version dev-java/swt:3.8[webkit]; then echo ewarn "dev-java/swt:3.8 was built without webkit support." ewarn "Web features such as Vuze HD Network will be disabled." fi } src_unpack() { mkdir -p "${S}" && cd "${S}" unpack ${A} # build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4 [[ -f build.xml ]] && die "upstream has build.xml again, don't overwrite" cp "${FILESDIR}"/build.xml "${S}" || die "failed to copy build.xml" } java_prepare() { # upstream likes randomly changing a subset of files to CRLF every release edos2unix $(find "${S}" -type f -name "*.java") epatch "${FILESDIR}"/${PN}-5.3.0.0-java5.patch epatch "${FILESDIR}"/${PN}-5.3.0.0-remove-classpath.patch epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-shared-plugins.patch epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-osx.patch epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-updaters.patch epatch "${FILESDIR}"/${PN}-5.3.0.0-unbundle-commons.patch epatch "${FILESDIR}"/${PN}-5.3.0.0-unbundle-json.patch epatch "${FILESDIR}"/${PN}-5.6.0.0-commons-lang-entities.patch epatch "${FILESDIR}"/${PN}-5.6.0.0-invalid-characters.patch # epatch "${FILESDIR}"/${P}-use-jdk-cipher-only.patch # bcprov # OSX / Windows rm "${S}"/org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java rm "${S}"/org/gudy/azureus2/ui/swt/osx/Start.java rm "${S}"/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java # Tree2 file does not compile on linux rm -rf "${S}"/org/eclipse || die # Bundled apache rm -rf "${S}"/org/apache || die # Bundled json rm -rf "${S}"/org/json || die # Bundled bcprov # currently disabled - requires bcprov 1.37 #rm -rf "${S}"/org/bouncycastle || die rm -rf "${S}"/org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die mkdir -p "${S}"/build/libs || die } JAVA_ANT_REWRITE_CLASSPATH="true" EANT_GENTOO_CLASSPATH="swt-3.8,json-simple,log4j,commons-cli-1 commons-lang-2.1" src_compile() { local mem use amd64 && mem="320" use x86 && mem="192" use ppc && mem="192" use ppc64 && mem="256" use sparc && mem="320" 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 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() { ewarn "Running Vuze as root is not supported and may result in untracked" ewarn "updates to shared components and then collisions on updates" echo elog "Vuze was formerly called Azureus and many references to the old name remain." elog elog "After running Vuze for the first time, configuration options will be" elog "placed in '~/.azureus/gentoo.config'." elog elog "If you need to change some startup options, you should modify this file" elog "rather than the startup script. You can enable the console UI by" elog "editing this config file." echo fdo-mime_desktop_database_update } pkg_postrm() { fdo-mime_desktop_database_update }
