From: Petteri Räty Date: Sat, 10 Feb 2007 21:15:44 +0000 (+0000) Subject: Made the launcher handle upgrades from 2.3* better. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5fcd64ab91c81d5ed34c6349a86bdf6e323c620b;p=gentoo.git Made the launcher handle upgrades from 2.3* better. Package-Manager: portage-2.1.2-r9 --- diff --git a/net-p2p/azureus/ChangeLog b/net-p2p/azureus/ChangeLog index c333533fafff..1e4115625c9d 100644 --- a/net-p2p/azureus/ChangeLog +++ b/net-p2p/azureus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-p2p/azureus # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.38 2007/02/10 15:40:41 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.39 2007/02/10 21:15:44 betelgeuse Exp $ + + 10 Feb 2007; Petteri Räty + files/azureus-2.5.0.0-pre: + Made the launcher handle upgrades from 2.3* better. 10 Feb 2007; nixnut azureus-2.5.0.0-r3.ebuild: Stable on ppc wrt bug 113389 diff --git a/net-p2p/azureus/Manifest b/net-p2p/azureus/Manifest index c857ae4bb391..3351a4205159 100644 --- a/net-p2p/azureus/Manifest +++ b/net-p2p/azureus/Manifest @@ -1,7 +1,10 @@ -AUX azureus-2.5.0.0-pre 1548 RMD160 429d4ef1efa04fcaff006d9cef2d30e260a025fd SHA1 50b08351366e2e487ab2380d2dbed46bc5d24c6a SHA256 2142ac7cc484687592b54f705c842f089624e9162e7f346df0f8564f866af5e5 -MD5 75eb3e8d918b563225c50ad77ce89a4b files/azureus-2.5.0.0-pre 1548 -RMD160 429d4ef1efa04fcaff006d9cef2d30e260a025fd files/azureus-2.5.0.0-pre 1548 -SHA256 2142ac7cc484687592b54f705c842f089624e9162e7f346df0f8564f866af5e5 files/azureus-2.5.0.0-pre 1548 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX azureus-2.5.0.0-pre 1850 RMD160 c3741fe1f8218bc2aeee10aba517ded690e99d0a SHA1 1955762d9131521583797c89527856158849d92f SHA256 aae3963e55330eb292176052a2cd72b8a9c322fd63fb71bb0fe6456df7d329e5 +MD5 feedf8845d1ceea0e57dd6db478b3a69 files/azureus-2.5.0.0-pre 1850 +RMD160 c3741fe1f8218bc2aeee10aba517ded690e99d0a files/azureus-2.5.0.0-pre 1850 +SHA256 aae3963e55330eb292176052a2cd72b8a9c322fd63fb71bb0fe6456df7d329e5 files/azureus-2.5.0.0-pre 1850 AUX azureus.desktop 187 RMD160 cac95c806249109465c33b88e2797fb3016c26c8 SHA1 4189055b0291d40e34167321939edd897ddf0e24 SHA256 45494d84a649b41fb7f760290b6711e238434b67355e7da29c9dc66f28d47ac6 MD5 a6f0391622b0865f5227a1be6802c3e5 files/azureus.desktop 187 RMD160 cac95c806249109465c33b88e2797fb3016c26c8 files/azureus.desktop 187 @@ -34,6 +37,26 @@ AUX fedora-2.5.0.0/azureus-remove-win32-osx-platforms.patch 1205 RMD160 84682f22 MD5 3c5862f1afbf48b4006a91247358e916 files/fedora-2.5.0.0/azureus-remove-win32-osx-platforms.patch 1205 RMD160 84682f22471425f74dd5710d331f50341ef1a26d files/fedora-2.5.0.0/azureus-remove-win32-osx-platforms.patch 1205 SHA256 babb97a8005b936b2ee127dd72f3534d47d33af803811a7041130fecd3fdbd3d files/fedora-2.5.0.0/azureus-remove-win32-osx-platforms.patch 1205 +AUX fedora-2.5.0.4/azureus-cache-size.patch 578 RMD160 767c48837a762f99bd36f841a178e19c765390e8 SHA1 c389d6e7d14d9352786adef624251ce43e47e574 SHA256 c929ca71e2a2435127eeb4a42f0a8c6a000f9130c240cf72f13ba000f1fb1548 +MD5 eb0038e89f3506fde9b807ac4860cc3e files/fedora-2.5.0.4/azureus-cache-size.patch 578 +RMD160 767c48837a762f99bd36f841a178e19c765390e8 files/fedora-2.5.0.4/azureus-cache-size.patch 578 +SHA256 c929ca71e2a2435127eeb4a42f0a8c6a000f9130c240cf72f13ba000f1fb1548 files/fedora-2.5.0.4/azureus-cache-size.patch 578 +AUX fedora-2.5.0.4/azureus-no-restart.patch 963 RMD160 26eac3be6eae519edababab37854ed0842d381f8 SHA1 0e1ee891ab9309194e99d1e8f83c34627e4c45bd SHA256 a70ca7d7d01b7e985f5675f29846440fe36d3e973b42434abb0e3d0bbf80cff2 +MD5 37be403097f91a08588e6229458385f4 files/fedora-2.5.0.4/azureus-no-restart.patch 963 +RMD160 26eac3be6eae519edababab37854ed0842d381f8 files/fedora-2.5.0.4/azureus-no-restart.patch 963 +SHA256 a70ca7d7d01b7e985f5675f29846440fe36d3e973b42434abb0e3d0bbf80cff2 files/fedora-2.5.0.4/azureus-no-restart.patch 963 +AUX fedora-2.5.0.4/azureus-remove-manifest-classpath.patch 544 RMD160 ad85fef763c0f575620abe61971843e709393f4a SHA1 be72aa325e87deb6c81e99585995ad592e1672b7 SHA256 7c42ac19d92ab584cc7ef546ee4dc903561647219101c942ce991c5570c890be +MD5 3d7c9b3023f4773d27696560fe1fa050 files/fedora-2.5.0.4/azureus-remove-manifest-classpath.patch 544 +RMD160 ad85fef763c0f575620abe61971843e709393f4a files/fedora-2.5.0.4/azureus-remove-manifest-classpath.patch 544 +SHA256 7c42ac19d92ab584cc7ef546ee4dc903561647219101c942ce991c5570c890be files/fedora-2.5.0.4/azureus-remove-manifest-classpath.patch 544 +AUX fedora-2.5.0.4/azureus-remove-win32-PlatformManagerUpdateChecker.patch 610 RMD160 c3553b56ce21aabfe305de21480d5f9177394e3f SHA1 397b10da19f0b551e5f49244fa9de1829140992e SHA256 8d02f503eec5a9b0874b657dc27a6ed4bd4ac1b1127e5cf70e316c024df3339c +MD5 c21af6f21682966b89e88a39b0c2f45a files/fedora-2.5.0.4/azureus-remove-win32-PlatformManagerUpdateChecker.patch 610 +RMD160 c3553b56ce21aabfe305de21480d5f9177394e3f files/fedora-2.5.0.4/azureus-remove-win32-PlatformManagerUpdateChecker.patch 610 +SHA256 8d02f503eec5a9b0874b657dc27a6ed4bd4ac1b1127e5cf70e316c024df3339c files/fedora-2.5.0.4/azureus-remove-win32-PlatformManagerUpdateChecker.patch 610 +AUX fedora-2.5.0.4/azureus-remove-win32-osx-platforms.patch 1550 RMD160 027a7ed97d182e1d5fde1b8d07585b1f8a52f19f SHA1 7fa035fbbd4321d3aaa1727f9fb55a4b2f651be1 SHA256 bb4fb65f7678bd711d7eb8cd5ab914a01b151429c95ee6350d7727435d3d879a +MD5 ab96c7670004baf1457702756d196fcd files/fedora-2.5.0.4/azureus-remove-win32-osx-platforms.patch 1550 +RMD160 027a7ed97d182e1d5fde1b8d07585b1f8a52f19f files/fedora-2.5.0.4/azureus-remove-win32-osx-platforms.patch 1550 +SHA256 bb4fb65f7678bd711d7eb8cd5ab914a01b151429c95ee6350d7727435d3d879a files/fedora-2.5.0.4/azureus-remove-win32-osx-platforms.patch 1550 DIST Azureus_2.5.0.0_source.zip 5856328 RMD160 7ec7e6ccb570651a655f6077d4b323a4d3b8fcb0 SHA1 4dfc99ace9f0755de3fe264c70c897c87ba844c1 SHA256 64aa4150bb8036f11e5207a602253431d46578ce9cd3b62732b0ae0f555a08c4 DIST Azureus_2.5.0.2_source.zip 6623693 RMD160 fbbc59b31ffd13ec5306933d30bd617c75a998e0 SHA1 a9482efdbeea8d2c1a0cadc4860b8ac2ea2f36d8 SHA256 497f61f87b7d6b5ab6f3da81f13c46d47ddb94260347eea9fa1c20fcb663072a DIST azureus_2.5.0.4_source.zip 6482560 RMD160 c4f245abf19a963e077b354fccd6a04547c741b1 SHA1 46ec8c12d27374d935a4ee9b40be464d111cbda5 SHA256 9ae32cbf88baf04b0e17456e92bc2634dd54e890dbece7211a83318b96d1b081 @@ -53,10 +76,10 @@ EBUILD azureus-2.5.0.4.ebuild 4259 RMD160 68a5fde8bf371b2c0f4447670a7dbc43035d59 MD5 9df3bbfe9ced1f07103c610c183e504e azureus-2.5.0.4.ebuild 4259 RMD160 68a5fde8bf371b2c0f4447670a7dbc43035d5995 azureus-2.5.0.4.ebuild 4259 SHA256 761f198f5d58da221ed0a72ce5df3d131a4b1e1793e13c017a9faa10311478d1 azureus-2.5.0.4.ebuild 4259 -MISC ChangeLog 8478 RMD160 a9df2e9279a27c12052f30b65cfa3ed8bb001b7f SHA1 05a37bb14fba432192cba1faf7ce392eefcfeacd SHA256 1283d406c40444dfc47bfbf03064bfb6bd558ddf3ff83bf66a376390fb739ff0 -MD5 b20f42ec270b055dbfd85d619d7cc9b3 ChangeLog 8478 -RMD160 a9df2e9279a27c12052f30b65cfa3ed8bb001b7f ChangeLog 8478 -SHA256 1283d406c40444dfc47bfbf03064bfb6bd558ddf3ff83bf66a376390fb739ff0 ChangeLog 8478 +MISC ChangeLog 8619 RMD160 67d76cb7b1b52bd8a4c33ee17d6460eecdc7549e SHA1 e26cc2544cd00dc34d2c56c330ddbc1ebda53eea SHA256 a6a42ce2c300b9a07cfba6226707e8ff012a47e744742ce31b20f788ec6eec14 +MD5 7969e6af83eba17e7a4b5eef61750b4f ChangeLog 8619 +RMD160 67d76cb7b1b52bd8a4c33ee17d6460eecdc7549e ChangeLog 8619 +SHA256 a6a42ce2c300b9a07cfba6226707e8ff012a47e744742ce31b20f788ec6eec14 ChangeLog 8619 MISC metadata.xml 295 RMD160 544181b2b7e8b0d688b57a7290a362f3d2686f58 SHA1 f3aea2718d0f8b93e91c9fddd328b5108ce2bf53 SHA256 a96064243aa67bd00e443fd98621e45910882d3790467f8b0a837b694a351307 MD5 315f038f311b0cb987f793266b9f5f2a metadata.xml 295 RMD160 544181b2b7e8b0d688b57a7290a362f3d2686f58 metadata.xml 295 @@ -73,3 +96,10 @@ SHA256 27302031f01da5c7d8efcbb66b64c369c83bd487f9cc35097b7e12c1023148a8 files/di MD5 5f9475c83b5dc85ff00804857bb5d525 files/digest-azureus-2.5.0.4 262 RMD160 3e3f22f5dc0512b8044a11f388a7e540fdebdddc files/digest-azureus-2.5.0.4 262 SHA256 b1bf328abef9e68ee1df0a5087bffa4e54b5fcba2f2f7823a1980ddd4f952266 files/digest-azureus-2.5.0.4 262 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFFzjYOcxLzpIGCsLQRAhkUAJ9EBfma8bHe4GIJqP20qxrlH29o4gCfYmTn +OZIlX8n/nOvHXcw/ggd0w4A= +=RviF +-----END PGP SIGNATURE----- diff --git a/net-p2p/azureus/files/azureus-2.5.0.0-pre b/net-p2p/azureus/files/azureus-2.5.0.0-pre index 40a21949643f..505a7e704df3 100644 --- a/net-p2p/azureus/files/azureus-2.5.0.0-pre +++ b/net-p2p/azureus/files/azureus-2.5.0.0-pre @@ -22,20 +22,13 @@ ${olddotazudir} is deprecated and you can delete this directory. END fi -if [[ -f "${gentoocfg}" ]] ; then - . "${gentoocfg}" - echo "using ${gentoocfg}" -elif [[ -f "${oldgentoocfg}" ]]; then - . "${oldgentoocfg}" - echo "using ${oldgentoocfg}" -else +create_initial_config() { if [[ ! -e "${dotazudir}" ]] ; then mkdir "${dotazudir}" echo "Creating ${dotazudir}" fi - # Setup defaults - UI="swt" + [[ ${UI} ]] && UI="swt" echo "Creating ${gentoocfg}" @@ -49,18 +42,34 @@ UI="${UI}" # Options you want to pass to the java binary JAVA_OPTIONS="" END +} +if [[ -f "${gentoocfg}" ]] ; then + . "${gentoocfg}" + echo "using ${gentoocfg}" +elif [[ -f "${oldgentoocfg}" ]]; then + . "${oldgentoocfg}" + echo "using ${oldgentoocfg}" +else + create_initial_config fi -if [[ -n "${UI_OPTIONS}" ]]; then +if [[ -z "${UI}" && -n "${UI_OPTIONS}" ]]; then echo '${UI_OPTIONS} is no longer supported. ${UI} should be used instead instead' > /dev/stderr - echo 'Unsetting ${UI_OPTIONS}' + echo 'Unsetting ${UI_OPTIONS} and trying to migrate to ${UI}' > /dev/stderr + if [[ ${UI_OPTIONS} = *--ui=console* ]]; then + UI=console + elif [[ ${UI_OPTIONS} = *--ui=swt* ]]; then + UI=swt + else + echo 'Could not make $UI from $UI_OPTIONS' > /dev/stderr + fi unset UI_OPTIONS fi if [[ -z "${UI}" ]]; then - echo '$UI not set adding UI="swt" to your ' ${gentoocfg} - echo 'UI="swt"' >> ${gentoocfg} + echo '$UI not set defaulting to swt' > /dev/stderr UI="swt" fi +[[ ! -e "${dotazudir}" ]] && create_initial_config