From: Vlastimil Babka Date: Mon, 11 Dec 2006 13:13:17 +0000 (+0000) Subject: Fix launcher to make it work. Thanks to everyone in bug #142147, especially Daniel... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=346802074957f1ca116a9e06488da97955c2678b;p=gentoo.git Fix launcher to make it work. Thanks to everyone in bug #142147, especially Daniel Kreßner for identifying the problem and Vlad-Mihai Sima for the correct solution. Package-Manager: portage-2.1.2_rc3-r1 --- diff --git a/app-misc/freemind/Manifest b/app-misc/freemind/Manifest index 961451120098..abac40161e26 100644 --- a/app-misc/freemind/Manifest +++ b/app-misc/freemind/Manifest @@ -1,29 +1,17 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST freemind-src-0_7_1.tar.gz 239660 DIST freemind-src-0_8_0.zip 9857214 RMD160 df7f47aedef7b761c94f938f7c851f0b8ed32e04 SHA1 17c65bdc65b292d7d62fe7a8d633a24c2ad618df SHA256 c28902151f0089ddd1270c662820b6e33a85a686083c53dcfe6dd7205493da78 -DIST freemind-src-0_8_0_RC2.zip 8419253 EBUILD freemind-0.7.1-r1.ebuild 1257 RMD160 0d3e7d091978d7af7f377999dbe355148457466c SHA1 9f0ebaa445958cba557aa4eb69ecb5a54968afce SHA256 20625a3e0378e39e68297c345f7557597d634b084e82502cde38ea84f88ba2c0 MD5 7a532aaf0d10c04e1487ba3931e619df freemind-0.7.1-r1.ebuild 1257 RMD160 0d3e7d091978d7af7f377999dbe355148457466c freemind-0.7.1-r1.ebuild 1257 SHA256 20625a3e0378e39e68297c345f7557597d634b084e82502cde38ea84f88ba2c0 freemind-0.7.1-r1.ebuild 1257 -EBUILD freemind-0.8.0-r1.ebuild 1290 RMD160 a383c6714cb2bc58d2b6634169da8c8acba37ada SHA1 384fab832731ad7dabec487f6a676b3b035ed07f SHA256 106bf005e28a71ed38bd38c874e0228168d8bac7e3f12f55357ba8f1ddb6ef2d -MD5 ff2e2da8d8c1870d9cb124d55e44cd7f freemind-0.8.0-r1.ebuild 1290 -RMD160 a383c6714cb2bc58d2b6634169da8c8acba37ada freemind-0.8.0-r1.ebuild 1290 -SHA256 106bf005e28a71ed38bd38c874e0228168d8bac7e3f12f55357ba8f1ddb6ef2d freemind-0.8.0-r1.ebuild 1290 -EBUILD freemind-0.8.0.ebuild 1363 RMD160 02e980d6fa27dd8b76dcfacec91a8c65a77cb06a SHA1 230b977203555c7ab3f4eeb2f9830d1a6346830b SHA256 00d2007e4961d2a908de714229b33afdaf3c22055d0572eb10de5fec7798cc49 -MD5 e4dcbd64bb3c69f7b2752198caf2af21 freemind-0.8.0.ebuild 1363 -RMD160 02e980d6fa27dd8b76dcfacec91a8c65a77cb06a freemind-0.8.0.ebuild 1363 -SHA256 00d2007e4961d2a908de714229b33afdaf3c22055d0572eb10de5fec7798cc49 freemind-0.8.0.ebuild 1363 -EBUILD freemind-0.8.0_rc2.ebuild 1305 RMD160 932cc7243d62d206e636cdfa4d2ef19c46e313c2 SHA1 0080007b9ef8924d98907447b9e6985ff8b71310 SHA256 4d0a1ca77c365c2330d409f0972eaeecdc83eabe4109ecb9f5baeeca003ff71b -MD5 abcdd13884aa3d16e0ca58122afcfd63 freemind-0.8.0_rc2.ebuild 1305 -RMD160 932cc7243d62d206e636cdfa4d2ef19c46e313c2 freemind-0.8.0_rc2.ebuild 1305 -SHA256 4d0a1ca77c365c2330d409f0972eaeecdc83eabe4109ecb9f5baeeca003ff71b freemind-0.8.0_rc2.ebuild 1305 -MISC ChangeLog 3243 RMD160 5301b056bb32a7e9417f125846ca7782ae709cac SHA1 7ca8e2c21e3fec543bcf08545e9203e5b25b2f36 SHA256 8acc4556c7c9956dcd631f21209cabb2ea71007c1e4595485ee929b191afd76b -MD5 072c741931ca5202e901390382747c43 ChangeLog 3243 -RMD160 5301b056bb32a7e9417f125846ca7782ae709cac ChangeLog 3243 -SHA256 8acc4556c7c9956dcd631f21209cabb2ea71007c1e4595485ee929b191afd76b ChangeLog 3243 +EBUILD freemind-0.8.0-r2.ebuild 1285 RMD160 70c6462af3ba06d7b345d983a6c64b9c4db14fff SHA1 d67a4bae9d5d8f30f338bf29e51568ab394d80c4 SHA256 0170aaf0ed20c7ffb9baf5469716cd2800aa79583f6815da363d9c679a6dc8ee +MD5 badc0369358a0685f4cd22b5291a38b3 freemind-0.8.0-r2.ebuild 1285 +RMD160 70c6462af3ba06d7b345d983a6c64b9c4db14fff freemind-0.8.0-r2.ebuild 1285 +SHA256 0170aaf0ed20c7ffb9baf5469716cd2800aa79583f6815da363d9c679a6dc8ee freemind-0.8.0-r2.ebuild 1285 +MISC ChangeLog 3670 RMD160 ca6376c7f32487bc307438fd5049b77698eab2c6 SHA1 9589002cc185f09c1dfaab38adc7c642eb1def27 SHA256 175ac045a16a9193a155d20fd6f43ba11ce3a45677cc081f1b160fdc2628b113 +MD5 0f5aa2ded12fa5e316be8ad5673c8ac0 ChangeLog 3670 +RMD160 ca6376c7f32487bc307438fd5049b77698eab2c6 ChangeLog 3670 +SHA256 175ac045a16a9193a155d20fd6f43ba11ce3a45677cc081f1b160fdc2628b113 ChangeLog 3670 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -31,19 +19,6 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata MD5 615ccb469eb93e22c5e84358d55e6c0f files/digest-freemind-0.7.1-r1 70 RMD160 d6021de6a622d5b711b54063c317ae902e4f5fe0 files/digest-freemind-0.7.1-r1 70 SHA256 85607ed73f061cb4b2982e5ee859a79aff008b4706d677cd93f8b6d20c890494 files/digest-freemind-0.7.1-r1 70 -MD5 e75fc73afee14840c7adde42fd20c5dc files/digest-freemind-0.8.0 250 -RMD160 4d9c90efc878c55d90451e44f10bd0688ea49f19 files/digest-freemind-0.8.0 250 -SHA256 acb0002f27a8184908bd2dad8b845aa4d86934676addb489fec640e8c47ee47c files/digest-freemind-0.8.0 250 -MD5 e75fc73afee14840c7adde42fd20c5dc files/digest-freemind-0.8.0-r1 250 -RMD160 4d9c90efc878c55d90451e44f10bd0688ea49f19 files/digest-freemind-0.8.0-r1 250 -SHA256 acb0002f27a8184908bd2dad8b845aa4d86934676addb489fec640e8c47ee47c files/digest-freemind-0.8.0-r1 250 -MD5 4aa9844e77246a548def155d68fd8395 files/digest-freemind-0.8.0_rc2 72 -RMD160 0a777bd48eecd4393fce20011c548a75084a78e5 files/digest-freemind-0.8.0_rc2 72 -SHA256 0ca07cf0575f001bae0d2befbf09f9d69ffe6d9ec3e1ebad555052dc40eabb7e files/digest-freemind-0.8.0_rc2 72 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux) - -iD8DBQFFJRb8KRy60XGEcJIRAiqNAJ4loBqmmKPiyKqbOJ8n/N2krAUSAgCfc9ji -bExw5ZNZeTt3cT+tig0OqPw= -=r8Yy ------END PGP SIGNATURE----- +MD5 e75fc73afee14840c7adde42fd20c5dc files/digest-freemind-0.8.0-r2 250 +RMD160 4d9c90efc878c55d90451e44f10bd0688ea49f19 files/digest-freemind-0.8.0-r2 250 +SHA256 acb0002f27a8184908bd2dad8b845aa4d86934676addb489fec640e8c47ee47c files/digest-freemind-0.8.0-r2 250 diff --git a/app-misc/freemind/files/digest-freemind-0.8.0 b/app-misc/freemind/files/digest-freemind-0.8.0 deleted file mode 100644 index 7c621a3caf24..000000000000 --- a/app-misc/freemind/files/digest-freemind-0.8.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c09728e8e0aefe76be4e7648a7a519ce freemind-src-0_8_0.zip 9857214 -RMD160 df7f47aedef7b761c94f938f7c851f0b8ed32e04 freemind-src-0_8_0.zip 9857214 -SHA256 c28902151f0089ddd1270c662820b6e33a85a686083c53dcfe6dd7205493da78 freemind-src-0_8_0.zip 9857214 diff --git a/app-misc/freemind/files/digest-freemind-0.8.0-r1 b/app-misc/freemind/files/digest-freemind-0.8.0-r1 deleted file mode 100644 index 7c621a3caf24..000000000000 --- a/app-misc/freemind/files/digest-freemind-0.8.0-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c09728e8e0aefe76be4e7648a7a519ce freemind-src-0_8_0.zip 9857214 -RMD160 df7f47aedef7b761c94f938f7c851f0b8ed32e04 freemind-src-0_8_0.zip 9857214 -SHA256 c28902151f0089ddd1270c662820b6e33a85a686083c53dcfe6dd7205493da78 freemind-src-0_8_0.zip 9857214 diff --git a/app-misc/freemind/files/digest-freemind-0.8.0_rc2 b/app-misc/freemind/files/digest-freemind-0.8.0_rc2 deleted file mode 100644 index 233b37c72f7f..000000000000 --- a/app-misc/freemind/files/digest-freemind-0.8.0_rc2 +++ /dev/null @@ -1 +0,0 @@ -MD5 eb0daf75a84a1cec5d0b69fda53235eb freemind-src-0_8_0_RC2.zip 8419253 diff --git a/app-misc/freemind/freemind-0.8.0-r1.ebuild b/app-misc/freemind/freemind-0.8.0-r1.ebuild deleted file mode 100644 index 44867e15d415..000000000000 --- a/app-misc/freemind/freemind-0.8.0-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.8.0-r1.ebuild,v 1.1 2006/07/27 14:58:02 nichoj Exp $ - -inherit java-pkg-2 java-ant-2 eutils - -MY_PV=${PV//./_} - -DESCRIPTION="Mind-mapping software written in Java" -HOMEPAGE="http://freemind.sf.net" -SRC_URI="mirror://sourceforge/freemind/${PN}-src-${MY_PV/rc2/RC2}.zip" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc" -# FIXME doesn't like compiling with Java 1.6 for some reason -DEPEND="|| ( - =virtual/jdk-1.4* - =virtual/jdk-1.5* - ) - dev-java/ant-core - app-arch/unzip" -RDEPEND=">=virtual/jre-1.4" -RESTRICT="nomirror" - -S=${WORKDIR}/${PN} - -src_compile() { - eant dist browser $(use_doc doc) -} - -src_install() { - cd ${WORKDIR}/bin/dist - - insinto /opt/${PN}/ - doins -r lib/ browser/ plugins/ - doins -r accessories/ user.properties patterns.xml - - java-pkg_regjar /opt/${PN}/lib/${PN}.jar - - java-pkg_dolauncher ${PN} --jar /opt/${PN}/lib/${PN}.jar - - cp -R ${S}/doc ${D}/opt/${PN} - use doc && java-pkg_dohtml -r doc/ - - into /opt - newbin ${PN}.sh ${PN} - - mv ${S}/images/FreeMindWindowIcon.png ${S}/images/freemind.png - doicon ${S}/images/freemind.png - - make_desktop_entry freemind Freemind freemind.png Utility -} - diff --git a/app-misc/freemind/freemind-0.8.0.ebuild b/app-misc/freemind/freemind-0.8.0.ebuild deleted file mode 100644 index b8eee2ab7f42..000000000000 --- a/app-misc/freemind/freemind-0.8.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.8.0.ebuild,v 1.2 2006/03/24 08:27:37 lu_zero Exp $ - -inherit java-pkg eutils - -MY_PV=${PV//./_} - -DESCRIPTION="Mind-mapping software written in Java" -HOMEPAGE="http://freemind.sf.net" -SRC_URI="mirror://sourceforge/freemind/${PN}-src-${MY_PV/rc2/RC2}.zip" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc jikes" -DEPEND=">=virtual/jdk-1.4 - dev-java/ant-core - jikes? ( dev-java/jikes ) - app-arch/unzip" -RDEPEND=">=virtual/jre-1.4" -RESTRICT="nomirror" - -S=${WORKDIR}/${PN} - -src_compile() { - local antflags="dist browser" - use jikes && antflags="${antflags} -Dbuild.compiler=jikes" - use doc && antflags="${antflags} doc" - ant ${antflags} || die "Compiling failed!" -} - -src_install() { - cd ${WORKDIR}/bin/dist - - insinto /opt/${PN}/ - doins -r lib/ browser/ plugins/ - doins -r accessories/ user.properties patterns.xml - - echo "#!/bin/sh" > ${PN}.sh - echo "cd /opt/${PN}" >> ${PN}.sh - echo "java -jar lib/${PN}.jar" >> ${PN}.sh - - cp -R ${S}/doc ${D}/opt/${PN} - use doc && java-pkg_dohtml -r doc/ - - into /opt - newbin ${PN}.sh ${PN} - - mv ${S}/images/FreeMindWindowIcon.png ${S}/images/freemind.png - doicon ${S}/images/freemind.png - - make_desktop_entry freemind Freemind freemind.png Utility -} - diff --git a/app-misc/freemind/freemind-0.8.0_rc2.ebuild b/app-misc/freemind/freemind-0.8.0_rc2.ebuild deleted file mode 100644 index 4eeb9d1ed190..000000000000 --- a/app-misc/freemind/freemind-0.8.0_rc2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.8.0_rc2.ebuild,v 1.5 2005/09/16 03:03:28 mr_bones_ Exp $ - -inherit java-pkg eutils - -MY_PV=${PV//./_} - -DESCRIPTION="Mind-mapping software written in Java" -HOMEPAGE="http://freemind.sf.net" -SRC_URI="mirror://sourceforge/freemind/${PN}-src-${MY_PV/rc2/RC2}.zip" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" -IUSE="doc jikes" -DEPEND=">=virtual/jdk-1.4 - dev-java/ant-core - jikes? ( dev-java/jikes ) - app-arch/unzip" -RDEPEND=">=virtual/jre-1.4" -RESTRICT="nomirror" - -S=${WORKDIR}/${PN} - -src_compile() { - local antflags="jar browser" - use jikes && antflags="${antflags} -Dbuild.compiler=jikes" - use doc && antflags="${antflags} doc" - ant ${antflags} || die "Compiling failed!" -} - -src_install() { - cd ${WORKDIR}/bin/dist - - insinto /opt/${PN}/lib - doins lib/*.jar browser/*.jar - - echo "#!/bin/sh" > ${PN}.sh - echo "cd /opt/${PN}" >> ${PN}.sh - echo "java -jar lib/${PN}.jar" >> ${PN}.sh - - cp -R ${S}/doc ${D}/opt/${PN} - use doc && java-pkg_dohtml -r doc/ - - into /opt - newbin ${PN}.sh ${PN} - - mv ${S}/images/FreeMindWindowIcon.png ${S}/images/freemind.png - doicon ${S}/images/freemind.png - - make_desktop_entry freemind Freemind freemind.png Utility -} -