From 18e4b681bf068bf2f67649dbb48c08c2fd84d594 Mon Sep 17 00:00:00 2001 From: Petteri Räty Date: Mon, 2 Jan 2006 21:24:54 +0000 Subject: Specifying --ui=console in ~/.Azureus/gentoo.config now actually works. Fixes bug #117475. Thanks to Rasmus Faber for the fix. (Portage version: 2.0.54) --- net-p2p/azureus/ChangeLog | 12 ++- net-p2p/azureus/Manifest | 18 +--- net-p2p/azureus/azureus-2.3.0.6-r1.ebuild | 107 ++++++++++++++++++++++++ net-p2p/azureus/azureus-2.3.0.6.ebuild | 107 ------------------------ net-p2p/azureus/files/azureus-gentoo-2.3.0.6.sh | 10 +-- net-p2p/azureus/files/digest-azureus-2.3.0.6 | 1 - net-p2p/azureus/files/digest-azureus-2.3.0.6-r1 | 1 + 7 files changed, 126 insertions(+), 130 deletions(-) create mode 100644 net-p2p/azureus/azureus-2.3.0.6-r1.ebuild delete mode 100644 net-p2p/azureus/azureus-2.3.0.6.ebuild delete mode 100644 net-p2p/azureus/files/digest-azureus-2.3.0.6 create mode 100644 net-p2p/azureus/files/digest-azureus-2.3.0.6-r1 (limited to 'net-p2p/azureus') diff --git a/net-p2p/azureus/ChangeLog b/net-p2p/azureus/ChangeLog index a1b0877e7402..a91ff4ea8cb7 100644 --- a/net-p2p/azureus/ChangeLog +++ b/net-p2p/azureus/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-p2p/azureus -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.13 2005/11/30 22:05:59 betelgeuse Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.14 2006/01/02 21:24:54 betelgeuse Exp $ + +*azureus-2.3.0.6-r1 (02 Jan 2006) + + 02 Jan 2006; Petteri Räty + files/azureus-gentoo-2.3.0.6.sh, -azureus-2.3.0.6.ebuild, + +azureus-2.3.0.6-r1.ebuild: + Specifying --ui=console in ~/.Azureus/gentoo.config now actually works. + Fixes bug #117475. Thanks to Rasmus Faber for the fix. 30 Nov 2005; Petteri Räty files/azureus-gentoo-2.3.0.6.sh, metadata.xml: diff --git a/net-p2p/azureus/Manifest b/net-p2p/azureus/Manifest index 8ca192bfc73a..06b3c235edf6 100644 --- a/net-p2p/azureus/Manifest +++ b/net-p2p/azureus/Manifest @@ -1,26 +1,16 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 9611b5351c6cb50a649652aa869048e2 ChangeLog 2312 +MD5 001f139fe28ee3a3b6ead14934edf28e ChangeLog 2642 MD5 ff3e702ff946e17b534a1a0971cab592 azureus-2.2.0.0-r1.ebuild 2345 MD5 0aee5632d7755d629ae59035e6e59f92 azureus-2.3.0.4.ebuild 2603 -MD5 d6e296fcd97d1e4b84db63ef7d1f61e9 azureus-2.3.0.6.ebuild 3522 +MD5 b7492eddfd7d7152f8f10ac94bc73af0 azureus-2.3.0.6-r1.ebuild 3522 MD5 21218e1a7c134f02c8e42bcb63375e74 files/SWTThread.java 2549 MD5 e3cc00baa30d499993d4f65e56ad03bc files/UpdaterPatcher.java 2523 MD5 6d60bd5e1461cf5f8bc467794e6a1827 files/azureus-gentoo-2.3.0.4.sh 1008 -MD5 74f798a09be3542c8bdfdc7d219c6d73 files/azureus-gentoo-2.3.0.6.sh 1125 +MD5 ae8ab7ed5a0f10a013f72fdc7342cb71 files/azureus-gentoo-2.3.0.6.sh 1104 MD5 77d299aef0633c501b998f3ec0c1f0c9 files/azureus-gentoo.sh 1010 MD5 70c17db47c9a596929112714f82ac010 files/azureus.desktop 153 MD5 2d3136c60488dd51bef012cbcb59201b files/azureus.png 743 MD5 3ae1e81c8450fa93040e4e97a1311d88 files/build.xml 661 MD5 67821fe5d66efda508803dfa3a87b967 files/digest-azureus-2.2.0.0-r1 134 MD5 29bddb8c1c68b6c8cb4fd46b070b7a2d files/digest-azureus-2.3.0.4 134 -MD5 54e557185ba087a7b67c5fd0600fef12 files/digest-azureus-2.3.0.6 72 +MD5 54e557185ba087a7b67c5fd0600fef12 files/digest-azureus-2.3.0.6-r1 72 MD5 0d0384a2c9c3495944bd250aac2fd8a0 metadata.xml 276 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDji2QQiJ/wx066S4RAtnHAKCETPgIIsImypRA6c1rZ9WwXBeh4gCdGkvF -AhGWTQmLarflIyLRTTNO4RY= -=VRBa ------END PGP SIGNATURE----- diff --git a/net-p2p/azureus/azureus-2.3.0.6-r1.ebuild b/net-p2p/azureus/azureus-2.3.0.6-r1.ebuild new file mode 100644 index 000000000000..022a1c2c6ee3 --- /dev/null +++ b/net-p2p/azureus/azureus-2.3.0.6-r1.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/azureus-2.3.0.6-r1.ebuild,v 1.1 2006/01/02 21:24:54 betelgeuse Exp $ + +inherit eutils java-pkg + +DESCRIPTION="Azureus - Java BitTorrent Client" +HOMEPAGE="http://azureus.sourceforge.net/" +SRC_URI="mirror://sourceforge/azureus/Azureus_${PV}_source.zip" +LICENSE="GPL-2 BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +IUSE="source" + +RDEPEND=">=virtual/jre-1.4 + >=dev-java/swt-3.0-r2 + >=dev-java/log4j-1.2.8 + >=dev-java/commons-cli-1.0 + dev-java/junit + !net-p2p/azureus-bin" +DEPEND=">=virtual/jdk-1.4 + ${RDEPEND} + >=dev-java/ant-core-1.6.2 + >=app-arch/unzip-5.0" + +S=${WORKDIR}/${PN} + +src_unpack() { + mkdir ${S} + cd ${S} + unpack ${A} +# cp ${FILESDIR}/build.xml ${S} || die "cp build.xml failed" + + #cp -f ${FILESDIR}/SWTThread.java \ + # ${S}/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java \ + # || die "cp SWTThread.java failed!" + + #removing osx files and entries + rm -fr org/gudy/azureus2/ui/swt/osx org/gudy/azureus2/ui/swt/test org/gudy/azureus2/platform/macosx/access + +# cp ${FILESDIR}/UpdaterPatcher.java ${S}/org/gudy/azureus2/update/ \ +# || die "cp UpdaterPatrcher.java failed" + + mkdir -p build/libs + cd build/libs + java-pkg_jar-from log4j + java-pkg_jar-from commons-cli-1 + java-pkg_jar-from swt-3 + java-pkg_jar-from junit +} + +src_compile() { + # Figure out correct boot classpath for IBM jdk. + if [ ! -z "$(java-config --java-version | grep IBM)" ] ; then + # IBM JRE + ant_extra_opts="-Dbootclasspath=$(java-config --jdk-home)/jre/lib/core.jar:$(java-config --jdk-home)/jre/lib/xml.jar:$(java-config --jdk-home)/jre/lib/graphics.jar" + fi + + # Fails to build on amd64 without this + ANT_OPTS="${ANT_OPTS} -Xmx1g" \ + ant -q -q ${ant_extra_opts} jar \ + || die "ant build failed" +} + +src_install() { + java-pkg_newjar dist/Azureus2.jar azureus.jar || die "doins jar failed" + + # copying the shell script to run the app + newbin ${FILESDIR}/azureus-gentoo-${PV}.sh azureus \ + || die "Creating launcher failed." + + doicon "${FILESDIR}/azureus.png" + insinto /usr/share/applications + doins "${FILESDIR}/azureus.desktop" + use source && java-pkg_dosrc ${S}/{com,org} +} + +pkg_postinst() { + echo + einfo "Due to the nature of the portage system, we recommend" + einfo "that users check portage for new versions of Azureus" + einfo "instead of attempting to use the auto-update feature." + einfo "You can disable auto-update in" + einfo "Tools->Options...->Interface->Start" + echo + einfo "After running azureus for the first time, configuration" + einfo "options will be placed in ~/.Azureus/gentoo.config" + einfo "It is recommended that you modify this file rather than" + einfo "the azureus startup script directly." + echo + einfo "As of this version, the new ui type 'console' is supported," + einfo "and this may be set in ~/.Azureus/gentoo.config." + echo + ewarn "If you are upgrading, and the menu in azureus has entries like" + ewarn "\"!MainWindow.menu.transfers!\" then you have a stray" + ewarn "MessageBundle.properties file," + ewarn "and you may safely delete ~/.Azureus/MessagesBundle.properties" + echo + einfo "It's recommended to use sun-java in version 1.5 or later." + einfo "If you'll notice any problems running azureus and you've" + einfo "got older java, try to upgrade it. Just remember not to set" + einfo "a 1.5 jdk as the system jdk or things will break." + echo + ewarn "Please, do not run azureus as root!" + ewarn "Azureus has not been developed for multi-user environments!" +} diff --git a/net-p2p/azureus/azureus-2.3.0.6.ebuild b/net-p2p/azureus/azureus-2.3.0.6.ebuild deleted file mode 100644 index 6a6e52d15be4..000000000000 --- a/net-p2p/azureus/azureus-2.3.0.6.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/azureus-2.3.0.6.ebuild,v 1.1 2005/11/26 17:32:38 betelgeuse Exp $ - -inherit eutils java-pkg - -DESCRIPTION="Azureus - Java BitTorrent Client" -HOMEPAGE="http://azureus.sourceforge.net/" -SRC_URI="mirror://sourceforge/azureus/Azureus_${PV}_source.zip" -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="source" - -RDEPEND=">=virtual/jre-1.4 - >=dev-java/swt-3.0-r2 - >=dev-java/log4j-1.2.8 - >=dev-java/commons-cli-1.0 - dev-java/junit - !net-p2p/azureus-bin" -DEPEND=">=virtual/jdk-1.4 - ${RDEPEND} - >=dev-java/ant-core-1.6.2 - >=app-arch/unzip-5.0" - -S=${WORKDIR}/${PN} - -src_unpack() { - mkdir ${S} - cd ${S} - unpack ${A} -# cp ${FILESDIR}/build.xml ${S} || die "cp build.xml failed" - - #cp -f ${FILESDIR}/SWTThread.java \ - # ${S}/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java \ - # || die "cp SWTThread.java failed!" - - #removing osx files and entries - rm -fr org/gudy/azureus2/ui/swt/osx org/gudy/azureus2/ui/swt/test org/gudy/azureus2/platform/macosx/access - -# cp ${FILESDIR}/UpdaterPatcher.java ${S}/org/gudy/azureus2/update/ \ -# || die "cp UpdaterPatrcher.java failed" - - mkdir -p build/libs - cd build/libs - java-pkg_jar-from log4j - java-pkg_jar-from commons-cli-1 - java-pkg_jar-from swt-3 - java-pkg_jar-from junit -} - -src_compile() { - # Figure out correct boot classpath for IBM jdk. - if [ ! -z "$(java-config --java-version | grep IBM)" ] ; then - # IBM JRE - ant_extra_opts="-Dbootclasspath=$(java-config --jdk-home)/jre/lib/core.jar:$(java-config --jdk-home)/jre/lib/xml.jar:$(java-config --jdk-home)/jre/lib/graphics.jar" - fi - - # Fails to build on amd64 without this - ANT_OPTS="${ANT_OPTS} -Xmx1g" \ - ant -q -q ${ant_extra_opts} jar \ - || die "ant build failed" -} - -src_install() { - java-pkg_newjar dist/Azureus2.jar azureus.jar || die "doins jar failed" - - # copying the shell script to run the app - newbin ${FILESDIR}/azureus-gentoo-${PV}.sh azureus \ - || die "Creating launcher failed." - - doicon "${FILESDIR}/azureus.png" - insinto /usr/share/applications - doins "${FILESDIR}/azureus.desktop" - use source && java-pkg_dosrc ${S}/{com,org} -} - -pkg_postinst() { - echo - einfo "Due to the nature of the portage system, we recommend" - einfo "that users check portage for new versions of Azureus" - einfo "instead of attempting to use the auto-update feature." - einfo "You can disable auto-update in" - einfo "Tools->Options...->Interface->Start" - echo - einfo "After running azureus for the first time, configuration" - einfo "options will be placed in ~/.Azureus/gentoo.config" - einfo "It is recommended that you modify this file rather than" - einfo "the azureus startup script directly." - echo - einfo "As of this version, the new ui type 'console' is supported," - einfo "and this may be set in ~/.Azureus/gentoo.config." - echo - ewarn "If you are upgrading, and the menu in azureus has entries like" - ewarn "\"!MainWindow.menu.transfers!\" then you have a stray" - ewarn "MessageBundle.properties file," - ewarn "and you may safely delete ~/.Azureus/MessagesBundle.properties" - echo - einfo "It's recommended to use sun-java in version 1.5 or later." - einfo "If you'll notice any problems running azureus and you've" - einfo "got older java, try to upgrade it. Just remember not to set" - einfo "a 1.5 jdk as the system jdk or things will break." - echo - ewarn "Please, do not run azureus as root!" - ewarn "Azureus has not been developed for multi-user environments!" -} diff --git a/net-p2p/azureus/files/azureus-gentoo-2.3.0.6.sh b/net-p2p/azureus/files/azureus-gentoo-2.3.0.6.sh index e1ed5e197fcd..5ece29941182 100644 --- a/net-p2p/azureus/files/azureus-gentoo-2.3.0.6.sh +++ b/net-p2p/azureus/files/azureus-gentoo-2.3.0.6.sh @@ -24,10 +24,8 @@ else # Create the config file cat > ${gentoocfg} <' # When selecting multiple, use '--uis=,' @@ -42,5 +40,5 @@ fi cd ${dotazudir} CLASSPATH=$(java-config -p junit,log4j,commons-cli-1,swt-3,azureus) -exec $(java-config --java) -cp $CLASSPATH -Djava.library.path=$(java-config -i swt-3) \ - ${JAVA_OPTIONS} org.gudy.azureus2.ui.swt.Main "${@}" +exec $(java-config --java) -cp ${CLASSPATH} -Djava.library.path=$(java-config -i swt-3) \ + ${JAVA_OPTIONS} org.gudy.azureus2.ui.common.Main ${UI_OPTIONS} "${@}" diff --git a/net-p2p/azureus/files/digest-azureus-2.3.0.6 b/net-p2p/azureus/files/digest-azureus-2.3.0.6 deleted file mode 100644 index 82688fc1f438..000000000000 --- a/net-p2p/azureus/files/digest-azureus-2.3.0.6 +++ /dev/null @@ -1 +0,0 @@ -MD5 d02357ee2917482fee1174a0dc549c5e Azureus_2.3.0.6_source.zip 4773566 diff --git a/net-p2p/azureus/files/digest-azureus-2.3.0.6-r1 b/net-p2p/azureus/files/digest-azureus-2.3.0.6-r1 new file mode 100644 index 000000000000..82688fc1f438 --- /dev/null +++ b/net-p2p/azureus/files/digest-azureus-2.3.0.6-r1 @@ -0,0 +1 @@ +MD5 d02357ee2917482fee1174a0dc549c5e Azureus_2.3.0.6_source.zip 4773566 -- cgit v1.2.3-65-gdbad