Temporary workaround for merge-time errors with 3.0.1

5 files changed, 39 insertions, 192 deletions

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; <karltk@gentoo.org> -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 <axxo@gentoo.org> ecletex-0.0.2.ebuild,
   ecletex-0.0.3.ebuild:
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="ish.ecletex" default="build.jars" basedir=".">
-
-	<property name="bootclasspath" value=""/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="javacFailOnError" value="true"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="true"/>
-	<property name="javacSource" value="1.4"/>
-	<property name="javacTarget" value="1.4"/>
-
-	<target name="init" depends="properties">
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<property name="build.result.folder" value="${basedir}"/>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: ish.ecletex for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<zip zipfile="${plugin.destination}/ish.ecletex_0.0.2.jar" basedir="${temp.folder}/ish.ecletex_0.0.2" filesonly="false" whenempty="skip"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/ish.ecletex_0.0.2"/>
-		<copy todir="${destination.temp.folder}/ish.ecletex_0.0.2">
-			<fileset dir="${build.result.folder}" includes="plugin.xml,ecletex.jar,icons/,codeassist/,dictionary/,templates/"			/>
-		</copy>
-		<copy todir="${destination.temp.folder}/ish.ecletex_0.0.2">
-			<fileset dir="${basedir}" includes="plugin.xml,ecletex.jar,icons/,codeassist/,dictionary/,templates/"			/>
-		</copy>
-	</target>
-
-	<target name="ecletex.jar" depends="init" unless="ecletex.jar" description="Create jar: ecletex.jar.">
-		<delete dir="${temp.folder}/ecletex.jar.bin"/>
-		<mkdir dir="${temp.folder}/ecletex.jar.bin"/>
-		<!-- compile the source code -->
-		<javac destdir="${temp.folder}/ecletex.jar.bin" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="ext/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pi.jar;ext/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt.jar;ext/org.eclipse.core.boot_3.0.0/boot.jar;ext/org.eclipse.core.runtime_3.0.0/runtime.jar;;ext/org.eclipse.osgi_3.0.0/osgi.jar;ext/org.eclipse.osgi_3.0.0/core.jar;ext/org.eclipse.osgi_3.0.0/resolver.jar;ext/org.eclipse.osgi_3.0.0/defaultAdaptor.jar;ext/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar;ext/org.eclipse.osgi_3.0.0/console.jar;ext/org.eclipse.osgi.services_3.0.0/services.jar;ext/org.eclipse.osgi.util_3.0.0/util.jar;ext/org.eclipse.ui_3.0.0/ui.jar;ext/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar;ext/org.eclipse.update.configurator_3.0.0/configurator.jar;ext/org.eclipse.help_3.0.0/help.jar;;ext/org.eclipse.jface_3.0.0/jface.jar;ext/org.eclipse.ui.workbench_3.0.0/compatibility.jar;ext/org.eclipse.ui.workbench_3.0.0/workbench.jar;ext/org.eclipse.ui.workbench.compatibility_3.0.0/compatibility.jar;ext/org.eclipse.ui.workbench.compatibility_3.0.0/workbench.jar;ext/org.eclipse.jface.text_3.0.0/jfacetext.jar;ext/org.eclipse.text_3.0.0/text.jar;ext/org.eclipse.ui.editors_3.0.0/editors.jar;ext/org.eclipse.ui.ide_3.0.0/ide.jar;ext/org.eclipse.core.resources_3.0.0/resources.jar;ext/org.eclipse.ui.views_3.0.0/views.jar;ext/org.eclipse.update.core_3.0.0/updatecore.jar;ext/org.eclipse.ui.workbench.texteditor_3.0.0/texteditor.jar;ext/org.eclipse.core.filebuffers_3.0.0/filebuffers.jar;ext/org.eclipse.ui.forms_3.0.0/forms.jar" source="${javacSource}" target="${javacTarget}"		>
-		<!--  -->
-			<src path="src/"			/>
-		</javac>
-		<!-- copy necessary resources -->
-		<copy todir="${temp.folder}/ecletex.jar.bin">
-			<fileset dir="src/" excludes="**/*.java"			/>
-		</copy>
-		<mkdir dir="${build.result.folder}"/>
-		<jar jarfile="${build.result.folder}/ecletex.jar" basedir="${temp.folder}/ecletex.jar.bin"/>
-		<delete dir="${temp.folder}/ecletex.jar.bin"/>
-	</target>
-
-	<target name="ecletexsrc.zip" depends="init" unless="ecletexsrc.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<zip zipfile="${build.result.folder}/ecletexsrc.zip" filesonly="false" whenempty="skip">
-			<fileset dir="src/" includes="**/*.java"			/>
-		</zip>
-	</target>
-
-	<target name="build.jars" depends="init" description="Build all the jars for the plug-in: ish.ecletex.">
-		<available property="ecletex.jar" file="${build.result.folder}/ecletex.jar"/>
-		<antcall target="ecletex.jar"/>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="ecletexsrc.zip" file="${build.result.folder}/ecletexsrc.zip"/>
-		<antcall target="ecletexsrc.zip"/>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/ish.ecletex_0.0.2"/>
-		<copy file="${build.result.folder}/ecletexsrc.zip" todir="${destination.temp.folder}/ish.ecletex_0.0.2"/>
-		<copy todir="${destination.temp.folder}/ish.ecletex_0.0.2">
-			<fileset dir="${basedir}" includes="plugin.xml,build.xml,codeassist/,dictionary/,icons/,src/,templates/,build.properties,.classpath,.project,.template"			/>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/ish.ecletex_0.0.2"/>
-		<copy file="${temp.folder}/ecletex.jar.bin.log" todir="${destination.temp.folder}/ish.ecletex_0.0.2"/>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: ish.ecletex of all the zips, jars and logs created.">
-		<delete file="${build.result.folder}/ecletex.jar"/>
-		<delete file="${build.result.folder}/ecletexsrc.zip"/>
-		<delete file="${plugin.destination}/ish.ecletex_0.0.2.jar"/>
-		<delete file="${plugin.destination}/ish.ecletex_0.0.2.zip"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="E:/EclipseM8/workspace/ecletex/" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: ish.ecletex.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}" includes="**/*.bin.log"			/>
-		</delete>
-		<zip zipfile="${plugin.destination}/ish.ecletex_0.0.2.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-</project>
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