Fix use invocation and clean up ebuilds

3 files changed, 54 insertions, 67 deletions

diff --git a/dev-tex/preview-latex/ChangeLog b/dev-tex/preview-latex/ChangeLog
index 18596d499758..7d93c39b8345 100644
--- a/dev-tex/preview-latex/ChangeLog
+++ b/dev-tex/preview-latex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tex/preview-latex
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/preview-latex/ChangeLog,v 1.3 2004/05/17 13:58:06 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/preview-latex/ChangeLog,v 1.4 2004/06/09 13:42:28 agriffis Exp $
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> preview-latex-0.7.8.ebuild,
+  preview-latex-0.8.1.ebuild:
+  Fix use invocation and clean up ebuilds
 
 *preview-latex-0.8.1 (17 May 2004)
 
diff --git a/dev-tex/preview-latex/preview-latex-0.7.8.ebuild b/dev-tex/preview-latex/preview-latex-0.7.8.ebuild
index 4910618db758..fd1b54b2d1e6 100644
--- a/dev-tex/preview-latex/preview-latex-0.7.8.ebuild
+++ b/dev-tex/preview-latex/preview-latex-0.7.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/preview-latex/preview-latex-0.7.8.ebuild,v 1.2 2004/03/22 16:21:22 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/preview-latex/preview-latex-0.7.8.ebuild,v 1.3 2004/06/09 13:42:28 agriffis Exp $
 
 inherit latex-package elisp-common
 
@@ -25,27 +25,22 @@ src_unpack() {
 }
 
 src_compile() {
-	if [ "`use emacs`" -a "`use xemacs`" ] ; then
-		econf --with-emacs \
-			--with-lispdir=${D}/usr/share/emacs/site-lisp/${PN} \
-			|| die
-		emake || die
-		cd ${T}
-		econf --with-xemacs \
-			--with-packagedir=${D}/usr/lib/xemacs/site-packages \
-			|| die
-		emake || die
-	elif [ "`use emacs`" -o "`use xemacs`" ] ; then
-		local myconf
-		if [ "`use emacs`" ] ; then
-			myconf="--with-emacs
-				--with-lispdir=${D}/usr/share/emacs/site-lisp/${PN}"
-		elif [ "`use xemacs`" ] ; then
-			myconf="--with-xemacs
-				--with-packagedir=${D}/usr/lib/xemacs/site-packages"
+	local myconf
+
+	if use emacs || use xemacs; then
+		if use emacs; then
+			econf --with-emacs \
+				--with-lispdir=${D}/usr/share/emacs/site-lisp/${PN} \
+				|| die
+			emake || die
+		fi
+		if use xemacs; then
+			cd ${T}
+			econf --with-xemacs \
+				--with-packagedir=${D}/usr/lib/xemacs/site-packages \
+				|| die
+			emake || die
 		fi
-		econf ${myconf} || die
-		emake || die
 	else
 		econf || die
 		emake || die
@@ -53,22 +48,19 @@ src_compile() {
 }
 
 src_install() {
-	# hack.- we cant call texhash within the make install because of sandbox violations
-	# doing it later by hand
-	if [ "`use emacs`" -a "`use xemacs`" ] ; then
-		einstall texmfdir=${D}${TEXMF} TEXHASH=/bin/true || die
-		pushd ${T}
-		einstall texmfdir=${D}${TEXMF} TEXHASH=/bin/true || die
-		popd
-	else
-		einstall texmfdir=${D}${TEXMF} TEXHASH=/bin/true || die
-	fi
+	# hack.- we cant call texhash within the make install because of
+	# sandbox violations. doing it later by hand
+	einstall texmfdir=${D}${TEXMF} TEXHASH=/bin/true || die
+	dodoc ChangeLog FAQ INSTALL PROBLEMS README RELEASE TODO doc/preview-latex.dvi
 
-	if [ -n "`use emacs`" ] ; then
+	if use emacs ; then
 		elisp-site-file-install ${FILESDIR}/60preview-latex-gentoo.el
 	fi
 
-	dodoc ChangeLog FAQ INSTALL PROBLEMS README RELEASE TODO doc/preview-latex.dvi
+	if use xemacs; then
+		cd ${T}
+		einstall texmfdir=${D}${TEXMF} TEXHASH=/bin/true || die
+	fi
 }
 
 pkg_postinst() {
diff --git a/dev-tex/preview-latex/preview-latex-0.8.1.ebuild b/dev-tex/preview-latex/preview-latex-0.8.1.ebuild
index 7b000a51038c..b9f5128813cc 100644
--- a/dev-tex/preview-latex/preview-latex-0.8.1.ebuild
+++ b/dev-tex/preview-latex/preview-latex-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/preview-latex/preview-latex-0.8.1.ebuild,v 1.1 2004/05/17 13:58:06 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/preview-latex/preview-latex-0.8.1.ebuild,v 1.2 2004/06/09 13:42:28 agriffis Exp $
 
 inherit latex-package elisp-common
 
@@ -27,29 +27,23 @@ src_unpack() {
 }
 
 src_compile() {
+	local myconf
 	export LC_ALL=en_US.ISO8859-1
 
-	if [ "`use emacs`" -a "`use xemacs`" ] ; then
-		econf --with-emacs \
-			--with-lispdir=${D}/usr/share/emacs/site-lisp/${PN} \
-			|| die
-		emake || die
-		cd ${T}
-		econf --with-xemacs \
-			--with-packagedir=${D}/usr/lib/xemacs/site-packages \
-			|| die
-		emake || die
-	elif [ "`use emacs`" -o "`use xemacs`" ] ; then
-		local myconf
-		if [ "`use emacs`" ] ; then
-			myconf="--with-emacs
-				--with-lispdir=${D}/usr/share/emacs/site-lisp/${PN}"
-		elif [ "`use xemacs`" ] ; then
-			myconf="--with-xemacs
-				--with-packagedir=${D}/usr/lib/xemacs/site-packages"
+	if use emacs || use xemacs; then
+		if use emacs; then
+			econf --with-emacs \
+				--with-lispdir=${D}/usr/share/emacs/site-lisp/${PN} \
+				|| die
+			emake || die
+		fi
+		if use xemacs; then
+			cd ${T}
+			econf --with-xemacs \
+				--with-packagedir=${D}/usr/lib/xemacs/site-packages \
+				|| die
+			emake || die
 		fi
-		econf ${myconf} || die
-		emake || die
 	else
 		econf || die
 		emake || die
@@ -57,22 +51,19 @@ src_compile() {
 }
 
 src_install() {
-	# hack.- we cant call texhash within the make install because of sandbox violations
-	# doing it later by hand
-	if [ "`use emacs`" -a "`use xemacs`" ] ; then
-		einstall texmfdir=${D}${TEXMF} TEXHASH=/bin/true || die
-		pushd ${T}
-		einstall texmfdir=${D}${TEXMF} TEXHASH=/bin/true || die
-		popd
-	else
-		einstall texmfdir=${D}${TEXMF} TEXHASH=/bin/true || die
-	fi
+	# hack.- we cant call texhash within the make install because of
+	# sandbox violations. doing it later by hand
+	einstall texmfdir=${D}${TEXMF} TEXHASH=/bin/true || die
+	dodoc ChangeLog FAQ INSTALL PROBLEMS README RELEASE TODO doc/preview-latex.dvi
 
-	if [ -n "`use emacs`" ] ; then
+	if use emacs ; then
 		elisp-site-file-install ${FILESDIR}/60preview-latex-gentoo.el
 	fi
 
-	dodoc ChangeLog FAQ INSTALL PROBLEMS README RELEASE TODO doc/preview-latex.dvi
+	if use xemacs; then
+		cd ${T}
+		einstall texmfdir=${D}${TEXMF} TEXHASH=/bin/true || die
+	fi
 }
 
 pkg_postinst() {