Fixes #81272.

(Portage version: 2.0.51-r13)

2 files changed, 12 insertions, 48 deletions

diff --git a/dev-util/ecletex/ChangeLog b/dev-util/ecletex/ChangeLog
index 1953861aee4d..416b35f52431 100644
--- a/dev-util/ecletex/ChangeLog
+++ b/dev-util/ecletex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/ecletex
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ecletex/ChangeLog,v 1.9 2005/02/10 23:53:52 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ecletex/ChangeLog,v 1.10 2005/02/13 01:28:48 karltk Exp $
+
+  13 Feb 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+  ecletex-0.0.3.ebuild:
+  Complete fix for #81272. Would benefit from some testing.
 
   11 Feb 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
   +files/build.properties-0.0.3, files/build.xml-0.0.3,
diff --git a/dev-util/ecletex/ecletex-0.0.3.ebuild b/dev-util/ecletex/ecletex-0.0.3.ebuild
index 184e793918aa..f3e6cded7850 100644
--- a/dev-util/ecletex/ecletex-0.0.3.ebuild
+++ b/dev-util/ecletex/ecletex-0.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.6 2005/02/11 23:18:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ecletex/ecletex-0.0.3.ebuild,v 1.7 2005/02/13 01:28:48 karltk Exp $
 
 inherit eclipse-ext
 
@@ -23,51 +23,10 @@ RDEPEND=">=virtual/jre-1.4
 	=dev-util/eclipse-sdk-3.0*"
 
 pkg_setup() {
-	local stagedir=${S}/final/ish.ecletex_${PV}
-
+	stagedir=${S}/final/ish.ecletex_${PV}
 	eclipse-ext_require-slot 3 || die "No suitable Eclipse found!"
 }
 
-get-classpath() {
-
-	local file=$1
-	local envvar="classpath"
-
-	if [ "$1" == "build.properties" ] ; then
-		if [ ! -z "$2" ] ; then
-			envvar="$2"
-		fi
-	fi
-
-	echo "$(cat ${FILESDIR}/build.properties-${PV} | sed "s/.*=//" | tr ';' ' ')"
-}
-
-get-plugin-name() {
-
-	echo $1 | sed -r "s/(.*)_[0-9.]+/\1/"
-}
-
-resolve-jars() {
-
-	eclipse_dir=/usr/lib/eclipse-3
-
-	local resolved=""
-
-	for x in $1 ; do
-		local jarfile=$(basename $x)
-		local plugindir=$(basename $(dirname $x))
-		local name="$(get-plugin-name $plugindir)"
-		local x=$(echo ${eclipse_dir}/plugins/${name}_*/${jarfile})
-		if [ -f ${x} ] ; then
-			resolved="${resolved}:$x"
-		else
-			:
-			#echo "Warning: did not find ${name}"
-		fi
-	done
-	echo ${resolved}
-}
-
 src_unpack() {
 	mkdir -p ${S}
 	cd ${S}
@@ -81,16 +40,17 @@ src_unpack() {
 
 	cp ${FILESDIR}/build.xml-${PV} build.xml || die "Failed to add build.xml"
 
-	x="$(get-classpath build.properties)"
-	y=$(resolve-jars "$x")
+	x="$(eclipse-ext_get-classpath build.properties)"
+	y=$(eclipse-ext_resolve-jars "$x")
 
 	echo "classpath = $y" > build.properties
 
-
-	mkdir -p final/ish.ecletex_${PV}
+	
+	mkdir -p ${stagedir}
 }
 
 src_compile() {
+
 	cd plugins/ish.ecletex_${PV}
 
 	ant build.jars || die "Failed to build main plugin"