diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2007-05-01 11:37:14 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2007-05-01 11:37:14 +0000 |
| commit | 19294f245e804f282b3a396f6afb78a43f39c38f (patch) | |
| tree | 21898e8853cbe34844ea96d4564eefc1cd53e44b /dev-java/java-config-wrapper | |
| parent | Added ~ppc64; bug #175865 (diff) | |
| download | historical-19294f245e804f282b3a396f6afb78a43f39c38f.tar.gz historical-19294f245e804f282b3a396f6afb78a43f39c38f.tar.bz2 historical-19294f245e804f282b3a396f6afb78a43f39c38f.zip | |
Cleanup.
Package-Manager: portage-2.1.2.5
Diffstat (limited to 'dev-java/java-config-wrapper')
7 files changed, 10 insertions, 111 deletions
diff --git a/dev-java/java-config-wrapper/ChangeLog b/dev-java/java-config-wrapper/ChangeLog index 903ba32c106c..9083b39ff0ce 100644 --- a/dev-java/java-config-wrapper/ChangeLog +++ b/dev-java/java-config-wrapper/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/java-config-wrapper # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config-wrapper/ChangeLog,v 1.29 2007/05/01 11:33:52 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config-wrapper/ChangeLog,v 1.30 2007/05/01 11:37:14 caster Exp $ + + 01 May 2007; Vlastimil Babka <caster@gentoo.org> + -files/java-config-wrapper-0.12-generation_1_system_vm.patch, + -java-config-wrapper-0.12.ebuild, -java-config-wrapper-0.12-r1.ebuild: + Cleanup. 01 May 2007; Markus Rothe <corsair@gentoo.org> java-config-wrapper-0.13.ebuild: diff --git a/dev-java/java-config-wrapper/Manifest b/dev-java/java-config-wrapper/Manifest index 9f28a4f61510..d98145a11ea9 100644 --- a/dev-java/java-config-wrapper/Manifest +++ b/dev-java/java-config-wrapper/Manifest @@ -1,35 +1,16 @@ -AUX java-config-wrapper-0.12-generation_1_system_vm.patch 1619 RMD160 21cca5ede77887760a2825b7a3e78ca684f17a21 SHA1 c0ebe8a525337428c25a8471860c32ae1a1c13f2 SHA256 c275ac81f9e8d0329237b9a63cf8940c0e11fb329e574f8e4cd6bb0863f48f4a -MD5 de44672e9efce8ddce493ad0ed48e9f1 files/java-config-wrapper-0.12-generation_1_system_vm.patch 1619 -RMD160 21cca5ede77887760a2825b7a3e78ca684f17a21 files/java-config-wrapper-0.12-generation_1_system_vm.patch 1619 -SHA256 c275ac81f9e8d0329237b9a63cf8940c0e11fb329e574f8e4cd6bb0863f48f4a files/java-config-wrapper-0.12-generation_1_system_vm.patch 1619 -DIST java-config-wrapper-0.12.tar.bz2 7808 RMD160 9cfa95dc96039f051f9f7ae034d14209ca2ac180 SHA1 ba9abac07e1113abd7275e67c1fa34ef76a99b70 SHA256 0c50136cc82b180258364272b24d90702760cb05b39bc239e7cb2fef01718003 DIST java-config-wrapper-0.13.tar.bz2 6156 RMD160 bd5ee1e800f87820c2f8a7058e7d1b9ff8cbbee8 SHA1 d0fddf292f486b487756fdc33f96b2d977cd287a SHA256 e1d008c00a2f7ffd7bb5e53a4e4dea6f9c24c1ca7ba2eed84326be9e7f1a2209 -EBUILD java-config-wrapper-0.12-r1.ebuild 725 RMD160 90d835017b3184dca96d043db25ef16081c8e9ef SHA1 ec3e592cb96afeec37d2d98dac24d626e05f7418 SHA256 022e6baa84577f06452fb684e5808f70aefb779eaab5612e0dbe48286297f854 -MD5 537f01d130054858a5b659a13bf52fcd java-config-wrapper-0.12-r1.ebuild 725 -RMD160 90d835017b3184dca96d043db25ef16081c8e9ef java-config-wrapper-0.12-r1.ebuild 725 -SHA256 022e6baa84577f06452fb684e5808f70aefb779eaab5612e0dbe48286297f854 java-config-wrapper-0.12-r1.ebuild 725 -EBUILD java-config-wrapper-0.12.ebuild 589 RMD160 810c7c9343b8b767da1ef7f4087cc2926b934df4 SHA1 9ba1fedd6f8be5d5675033ebd6c1a8b21a75d0af SHA256 3bad9eacc3bdd2049ec89c1c5d7fd60154eff1e8e0fd78b526a522838a03dac8 -MD5 4ee88feb0ce856d28e81133e64bd7cdc java-config-wrapper-0.12.ebuild 589 -RMD160 810c7c9343b8b767da1ef7f4087cc2926b934df4 java-config-wrapper-0.12.ebuild 589 -SHA256 3bad9eacc3bdd2049ec89c1c5d7fd60154eff1e8e0fd78b526a522838a03dac8 java-config-wrapper-0.12.ebuild 589 EBUILD java-config-wrapper-0.13.ebuild 602 RMD160 315d0958a502ac84a023e6161baa6761f1bc1e85 SHA1 7b8dde460777e7231f7c0d1dce519dfa0b73e224 SHA256 77f3081e1f9b98e44d3c5b459493f16992775d4255318528506c6688a6f8e3f8 MD5 d2ae614ccf56c34f8846d8d0f0b09b3b java-config-wrapper-0.13.ebuild 602 RMD160 315d0958a502ac84a023e6161baa6761f1bc1e85 java-config-wrapper-0.13.ebuild 602 SHA256 77f3081e1f9b98e44d3c5b459493f16992775d4255318528506c6688a6f8e3f8 java-config-wrapper-0.13.ebuild 602 -MISC ChangeLog 6426 RMD160 5e0437834a23a9c98b87895cce699a7ee7b038f6 SHA1 5d16364244fdf69be84c9e84a4bc04d3cab3efba SHA256 5ff13077993932c880516c5a83e96972d73efd6f7e0a204676ac3fbc85bb6dbd -MD5 ca9519280a7b2d8d5d4ed787bd9fbe32 ChangeLog 6426 -RMD160 5e0437834a23a9c98b87895cce699a7ee7b038f6 ChangeLog 6426 -SHA256 5ff13077993932c880516c5a83e96972d73efd6f7e0a204676ac3fbc85bb6dbd ChangeLog 6426 +MISC ChangeLog 6625 RMD160 4324f10cf86adfe5d4167225f56d21c20a170b06 SHA1 ecbd17a9e35c2061f5ddb5bfe2910e0790183c03 SHA256 062fd41c64d5d2504391cb410f2bc385db06d3658e9573f04a3443668f91f2d8 +MD5 4494be7e6750b6d4b2b2a447137347ec ChangeLog 6625 +RMD160 4324f10cf86adfe5d4167225f56d21c20a170b06 ChangeLog 6625 +SHA256 062fd41c64d5d2504391cb410f2bc385db06d3658e9573f04a3443668f91f2d8 ChangeLog 6625 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158 -MD5 9017b86641edfde738f748b0aecfde74 files/digest-java-config-wrapper-0.12 271 -RMD160 190ee99f4c6376c7a78a835b1078796a14dc2916 files/digest-java-config-wrapper-0.12 271 -SHA256 c4dd0019991bf5cd61e5980287d67991a224562d93aecb3cafd3f79e4b93686b files/digest-java-config-wrapper-0.12 271 -MD5 9017b86641edfde738f748b0aecfde74 files/digest-java-config-wrapper-0.12-r1 271 -RMD160 190ee99f4c6376c7a78a835b1078796a14dc2916 files/digest-java-config-wrapper-0.12-r1 271 -SHA256 c4dd0019991bf5cd61e5980287d67991a224562d93aecb3cafd3f79e4b93686b files/digest-java-config-wrapper-0.12-r1 271 MD5 c5af777710ceb9dc017efa021b2f15bd files/digest-java-config-wrapper-0.13 271 RMD160 0943c2fcda3e7936d891396f2ec8e01435efc323 files/digest-java-config-wrapper-0.13 271 SHA256 8d96cd4f8daa152db80172931719ba1448699d196f67c4291d8c81f6d3074178 files/digest-java-config-wrapper-0.13 271 diff --git a/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.12 b/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.12 deleted file mode 100644 index 4ed577186fce..000000000000 --- a/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.12 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 39a073be74d730bd618e5a3d4d4b0e23 java-config-wrapper-0.12.tar.bz2 7808 -RMD160 9cfa95dc96039f051f9f7ae034d14209ca2ac180 java-config-wrapper-0.12.tar.bz2 7808 -SHA256 0c50136cc82b180258364272b24d90702760cb05b39bc239e7cb2fef01718003 java-config-wrapper-0.12.tar.bz2 7808 diff --git a/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.12-r1 b/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.12-r1 deleted file mode 100644 index 4ed577186fce..000000000000 --- a/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.12-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 39a073be74d730bd618e5a3d4d4b0e23 java-config-wrapper-0.12.tar.bz2 7808 -RMD160 9cfa95dc96039f051f9f7ae034d14209ca2ac180 java-config-wrapper-0.12.tar.bz2 7808 -SHA256 0c50136cc82b180258364272b24d90702760cb05b39bc239e7cb2fef01718003 java-config-wrapper-0.12.tar.bz2 7808 diff --git a/dev-java/java-config-wrapper/files/java-config-wrapper-0.12-generation_1_system_vm.patch b/dev-java/java-config-wrapper/files/java-config-wrapper-0.12-generation_1_system_vm.patch deleted file mode 100644 index f86fe88ada79..000000000000 --- a/dev-java/java-config-wrapper/files/java-config-wrapper-0.12-generation_1_system_vm.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: src/shell/java-check-environment -=================================================================== ---- src/shell/java-check-environment (revision 2757) -+++ src/shell/java-check-environment (working copy) -@@ -182,18 +182,19 @@ - local this_result=0 - local env="/etc/env.d/20java" - # Make sure a generation-1 VM is set -- if [[ ! -f "${env}" ]]; then -+ if [[ ! -f "${env}" || -z $(java-config-1 -f) ]]; then - qeerror "No Generation-1 System VM is set! (no /etc/env.d/20java)" -- qeerror "Run 'java-config-1 -L' to see a list of available VMs" -- qeerror "Then run 'java-config-1 -S <VM choice>'" -- qeerror "Then run 'env-update && source /etc/profile" -+ local vm_list=$(java-config-1 -L) -+ if [[ ! ${vm_list} =~ "]" ]]; then -+ qeerror "It doesn't look like java-config-1 sees any installed VMs." -+ qeerror "It is most likely because you don't have a 1.4 JDK installed" -+ qeerror "This is required for generation-1 to work properly." -+ qeerror "You will want to emerge =virtual/jdk-1.4*" -+ else -+ java-config-1 -L -+ qeerror "Choose one, and run 'java-config-1 ---set-system-vm <VM choice>'" -+ fi - this_result=1 -- elif [[ -z $(java-config-1 -f) ]]; then -- qeerror "No Generation-1 System VM is set! (no java-config-1 -f output)" -- qeerror "Run 'java-config-1 -L' to see a list of available VMs" -- qeerror "Then run 'java-config-1 -S <VM choice>'" -- qeerror "Then run 'env-update && source /etc/profile" -- this_result=1 - # Make sure the generation-1 VM set is generation-2 compatible, not set long before migration - else - # We need to unset GENERATION, because this ends up being in diff --git a/dev-java/java-config-wrapper/java-config-wrapper-0.12-r1.ebuild b/dev-java/java-config-wrapper/java-config-wrapper-0.12-r1.ebuild deleted file mode 100644 index acb95295e64e..000000000000 --- a/dev-java/java-config-wrapper/java-config-wrapper-0.12-r1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config-wrapper/java-config-wrapper-0.12-r1.ebuild,v 1.1 2006/10/18 03:37:56 nichoj Exp $ - -inherit base eutils -DESCRIPTION="Wrapper for java-config" -HOMEPAGE="http://www.gentoo.org/proj/en/java" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 x86 ~x86-fbsd" -DEPEND="!<dev-java/java-config-1.3" -RDEPEND="app-portage/portage-utils" - -IUSE="" - -# Patch to improve output of generation_1_system_vm -PATCHES="${FILESDIR}/${P}-generation_1_system_vm.patch" - -src_compile() { - :; -} - -src_install() { - dobin src/shell/* -} diff --git a/dev-java/java-config-wrapper/java-config-wrapper-0.12.ebuild b/dev-java/java-config-wrapper/java-config-wrapper-0.12.ebuild deleted file mode 100644 index 6a82b0423d8c..000000000000 --- a/dev-java/java-config-wrapper/java-config-wrapper-0.12.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config-wrapper/java-config-wrapper-0.12.ebuild,v 1.7 2006/10/15 18:24:54 dertobi123 Exp $ - -inherit eutils -DESCRIPTION="Wrapper for java-config" -HOMEPAGE="http://www.gentoo.org/proj/en/java" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 x86 ~x86-fbsd" -DEPEND="!<dev-java/java-config-1.3" -RDEPEND="app-portage/portage-utils" - -IUSE="" - -src_install() { - dobin src/shell/* -} |