From a6894d34c7592570d4bfc3561c650411d65307be Mon Sep 17 00:00:00 2001 From: Karl Trygve Kalleberg Date: Mon, 15 Nov 2004 10:57:58 +0000 Subject: [PATCH] Temporary workaround for merge-time errors with 3.0.1 --- dev-util/ecletex/ChangeLog | 6 +- dev-util/ecletex/Manifest | 17 +-- dev-util/ecletex/ecletex-0.0.2.ebuild | 45 ------- dev-util/ecletex/ecletex-0.0.3.ebuild | 52 +++++--- dev-util/ecletex/files/build.xml-0.0.2 | 127 -------------------- dev-util/ecletex/files/digest-ecletex-0.0.2 | 1 - 6 files changed, 41 insertions(+), 207 deletions(-) delete mode 100644 dev-util/ecletex/ecletex-0.0.2.ebuild delete mode 100644 dev-util/ecletex/files/build.xml-0.0.2 delete mode 100644 dev-util/ecletex/files/digest-ecletex-0.0.2 diff --git a/dev-util/ecletex/ChangeLog b/dev-util/ecletex/ChangeLog index b27b228d1104..4feaab1e3ebc 100644 --- a/dev-util/ecletex/ChangeLog +++ b/dev-util/ecletex/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/ecletex # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/ecletex/ChangeLog,v 1.6 2004/11/03 11:46:07 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/ecletex/ChangeLog,v 1.7 2004/11/15 10:57:58 karltk Exp $ + + 15 Nov 2004; -files/build.xml-0.0.2, + -ecletex-0.0.2.ebuild, ecletex-0.0.3.ebuild: + Compile-time depend on 3.0.0, not any 3.0. 03 Nov 2004; Thomas Matthijs ecletex-0.0.2.ebuild, ecletex-0.0.3.ebuild: diff --git a/dev-util/ecletex/Manifest b/dev-util/ecletex/Manifest index dc3b9c2dedf1..6099afe4223c 100644 --- a/dev-util/ecletex/Manifest +++ b/dev-util/ecletex/Manifest @@ -1,18 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 b644416d4df809b2bc38c9c5b56980e4 ecletex-0.0.3.ebuild 1406 -MD5 505786c5c3eb17bb85f7f6a40e03a69f ecletex-0.0.2.ebuild 1298 -MD5 471106802026ccec803867df9e18360d ChangeLog 730 +MD5 69221c32d6f73a044d8ff481ce92d7e4 ecletex-0.0.3.ebuild 1776 +MD5 a267d40e4f5c92502e454b1c1c53edc7 ChangeLog 884 MD5 a019ed743e7db3b8bcf517a492f1ed03 metadata.xml 496 -MD5 7802436384014c919e4e2d4b632dfa4b files/digest-ecletex-0.0.2 70 MD5 e6f8663a52b0283c846324a27681fbb8 files/digest-ecletex-0.0.3 63 -MD5 e49c48fda4f16e037c3fa8d10f1c882a files/build.xml-0.0.2 7180 MD5 338e7b12c6a7d4317433c04b9b373265 files/build.xml-0.0.3 7181 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFBiMUF/rLF9B432nYRAg3LAJ0abzpsKAF9JuD74msfII/pNDKyhQCgsk3b -EFNyZNaGx9BZ5G92Sc7tvZE= -=5iqt ------END PGP SIGNATURE----- diff --git a/dev-util/ecletex/ecletex-0.0.2.ebuild b/dev-util/ecletex/ecletex-0.0.2.ebuild deleted file mode 100644 index fb0badce8936..000000000000 --- a/dev-util/ecletex/ecletex-0.0.2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/ecletex/ecletex-0.0.2.ebuild,v 1.5 2004/11/03 11:46:07 axxo Exp $ - -DESCRIPTION="LaTeX plugin for Eclipse 3.0 and newer" -HOMEPAGE="http://etex.sf.net" -SRC_URI="mirror://sourceforge/etex/${PN}.${PV}.Source.zip" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~x86 ~ppc" -IUSE="" -DEPEND=">=virtual/jdk-1.4 - =dev-util/eclipse-sdk-3.0* - app-arch/unzip" - -src_unpack() { - unpack ${A} - - mv ecletex ${P} - - ln -s /usr/lib/eclipse-3/plugins ${S}/ext - - echo "temp.folder=dist" > ${S}/build.properties || die "Failed to create build.propertes" - - cp ${FILESDIR}/build.xml-${PV} ${S}/build.xml || die "Failed to add build.xml" -} - -src_compile() { - ant build.jars || die "Failed to build main plugin" - ant ecletexsrc.zip || die "Failed to build source .zip" -} - -src_install() { - local etexdir="/usr/lib/eclipse-3/plugins/ish.ecletex_${PV}" - dodir ${etexdir} - - insinto ${etexdir} - doins ecletexsrc.zip || die "Failed to install source" - doins ecletex.jar || die "Failed to install main plugin" - doins plugin.xml || die "Failed to install plugin.xml" - - for x in codeassist dictionary icons templates ; do - cp -dpR $x ${D}/${etexdir}/ || die "Failed to install directory $x" - done -} diff --git a/dev-util/ecletex/ecletex-0.0.3.ebuild b/dev-util/ecletex/ecletex-0.0.3.ebuild index 18282dfd43af..a4630914be1d 100644 --- a/dev-util/ecletex/ecletex-0.0.3.ebuild +++ b/dev-util/ecletex/ecletex-0.0.3.ebuild @@ -1,31 +1,50 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/ecletex/ecletex-0.0.3.ebuild,v 1.3 2004/11/03 11:46:07 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/ecletex/ecletex-0.0.3.ebuild,v 1.4 2004/11/15 10:57:58 karltk Exp $ + +inherit eclipse-ext + +# karltk: Another Portage feature? +At="${PN}.${PV}.zip" DESCRIPTION="LaTeX plugin for Eclipse 3.0 and newer" HOMEPAGE="http://etex.sf.net" -SRC_URI="mirror://sourceforge/etex/${PN}.${PV}.zip" +SRC_URI="mirror://sourceforge/etex/${At}" LICENSE="BSD" SLOT="0" KEYWORDS="~x86 ~ppc" IUSE="" +# karltk: only compiles against 3.0.0 DEPEND=">=virtual/jdk-1.4 - =dev-util/eclipse-sdk-3.0* + =dev-util/eclipse-sdk-3.0.0* app-arch/unzip" +# karltk: runs against any 3.0.x +RDEPEND=">=virtual/jre-1.4 + =dev-util/eclipse-sdk-3.0*" + +pkg_setup() { + local stagedir=${S}/final/ish.ecletex_${PV} + + eclipse-ext_require-slot 3 || die "No suitable Eclipse found!" +} src_unpack() { mkdir -p ${S} cd ${S} - unpack ${A} + unpack ${At} - cd plugins/ish.ecletex_${PV} + cd plugins/ish.ecletex_${PV} || die "Unpacked file bad" rm ecletex.jar ecletexsrc.zip - ln -s /usr/lib/eclipse-3/plugins ext echo "temp.folder=dist" > build.properties || die "Failed to create build.propertes" cp ${FILESDIR}/build.xml-${PV} build.xml || die "Failed to add build.xml" + local cp=$(eclipse-ext_get-classpath-from-build build.xml) + cp=$(eclipse-ext_resolve-classpath ${cp}) + eclipse-ext_rewrite-classpath ${cp} build.xml + + mkdir -p final/ish.ecletex_${PV} } src_compile() { @@ -33,20 +52,17 @@ src_compile() { ant build.jars || die "Failed to build main plugin" ant ecletexsrc.zip || die "Failed to build source .zip" -} -src_install() { - cd plugins/ish.ecletex_${PV} - - local etexdir="/usr/lib/eclipse-3/plugins/ish.ecletex_${PV}" - dodir ${etexdir} - - insinto ${etexdir} - doins ecletexsrc.zip || die "Failed to install source" - doins ecletex.jar || die "Failed to install main plugin" - doins plugin.xml || die "Failed to install plugin.xml" + cp ecletexsrc.zip ecletex.jar plugin.xml ${stagedir} || \ + die "Failed to copy build products" for x in codeassist dictionary icons templates ; do - cp -dpR $x ${D}/${etexdir}/ || die "Failed to install directory $x" + cp -dpR $x ${stagedir}/ || die "Failed to copy directory $x" done + +} + +src_install() { + eclipse-ext_create-ext-layout source + eclipse-ext_install-plugins ${stagedir} } diff --git a/dev-util/ecletex/files/build.xml-0.0.2 b/dev-util/ecletex/files/build.xml-0.0.2 deleted file mode 100644 index 30f1cb062d92..000000000000 --- a/dev-util/ecletex/files/build.xml-0.0.2 +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dev-util/ecletex/files/digest-ecletex-0.0.2 b/dev-util/ecletex/files/digest-ecletex-0.0.2 deleted file mode 100644 index 344cde4bdf75..000000000000 --- a/dev-util/ecletex/files/digest-ecletex-0.0.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 d012155a9fa12de849de8524f7a88c1e ecletex.0.0.2.Source.zip 1268102 -- 2.26.2