Fixed compile error with tetex-beta (>=tetex-2.96 and >=ptex-3.1.4.20041026). This closes bug #70152.

4 files changed, 59 insertions, 34 deletions

diff --git a/app-text/jadetex/ChangeLog b/app-text/jadetex/ChangeLog
index cada8bd86f61..4325a3aa1f0c 100644
--- a/app-text/jadetex/ChangeLog
+++ b/app-text/jadetex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/jadetex
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jadetex/ChangeLog,v 1.18 2004/09/03 19:31:21 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jadetex/ChangeLog,v 1.19 2004/11/07 06:43:19 usata Exp $
+
+  07 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> jadetex-3.12.ebuild,
+  jadetex-3.13.ebuild:
+  Fixed compile error with tetex-beta (>=tetex-2.96 and
+  >=ptex-3.1.4.20041026). This closes bug #70152.
 
 *jadetex-3.13 (04 Sep 2004)
 
diff --git a/app-text/jadetex/Manifest b/app-text/jadetex/Manifest
index cb295191341e..26beab8b9146 100644
--- a/app-text/jadetex/Manifest
+++ b/app-text/jadetex/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d2546db7a5ddd169b420f778b461f4ac ChangeLog 1826
-MD5 ffcadcd3c0c676e611160a40e9844484 jadetex-3.12.ebuild 1002
-MD5 6ca3d52b74125749bafdb497675d6d0d jadetex-3.13.ebuild 1011
+MD5 9cbe47bdc0741d0bba2cc2d38104d6dc ChangeLog 2026
+MD5 2378fc0aee75b0f333fc320358744ba7 jadetex-3.12.ebuild 1317
+MD5 a4775028609bb712a04c5cb74e13d7f4 jadetex-3.13.ebuild 1326
 MD5 7f0d22d26d92eaab7fdf9912e1a4c323 files/digest-jadetex-3.12 64
 MD5 b56f5e66f8ca0a50bd3c1af5153d60fe files/digest-jadetex-3.13 64
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBUMbbHTu7gpaalycRAul/AKDCEaiALs2GeVuUvN6Bby2mzBxtAQCaA4Xt
-IFB6LV4rAPxNIz7ZVTtSchw=
-=AWcD
+iD8DBQFBjcKLVWNWqTUmv+0RAlyIAJ0R9tPmPKzN3YE9cOIfYMVugydUVACfbKdk
+tjJUGjOoE9nSlCN3UKBH+nw=
+=K9/y
 -----END PGP SIGNATURE-----
diff --git a/app-text/jadetex/jadetex-3.12.ebuild b/app-text/jadetex/jadetex-3.12.ebuild
index 6f5deb01aea0..4398c08de450 100644
--- a/app-text/jadetex/jadetex-3.12.ebuild
+++ b/app-text/jadetex/jadetex-3.12.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jadetex/jadetex-3.12.ebuild,v 1.24 2004/09/22 00:27:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jadetex/jadetex-3.12.ebuild,v 1.25 2004/11/07 06:43:19 usata Exp $
+
+inherit latex-package
 
 DESCRIPTION="TeX macros used by Jade TeX output"
 HOMEPAGE="http://jadetex.sourceforge.net/"
@@ -11,13 +13,24 @@ SLOT="0"
 KEYWORDS="alpha arm amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND=">=app-text/openjade-1.3.1
-	virtual/tetex"
+# virtual/tetex comes from latex-package
+DEPEND=">=app-text/openjade-1.3.1"
+
+has_tetex_3() {
+	if has_version '>=app-text/tetex-2.96' || has_version '>=app-text/ptex-3.1.4.20041026' ; then
+		true
+	else
+		false
+	fi
+}
 
 src_compile() {
 	addwrite /usr/share/texmf/ls-R
 	addwrite /usr/share/texmf/fonts
 	addwrite /var/cache/fonts
+
+	has_tetex_3 && sed -i -e "s:tex -ini:latex -ini:" Makefile || die
+
 	emake || die
 }
 
@@ -33,16 +46,13 @@ src_install() {
 	doman *.1
 
 	dodir /usr/bin
-	dosym /usr/bin/virtex /usr/bin/jadetex
-	dosym /usr/bin/pdfvirtex /usr/bin/pdfjadetex
+	if has_tetex_3 ; then
+		dosym /usr/bin/latex /usr/bin/jadetex
+		dosym /usr/bin/pdftex /usr/bin/pdfjadetex
+	else
+		dosym /usr/bin/virtex /usr/bin/jadetex
+		dosym /usr/bin/pdfvirtex /usr/bin/pdfjadetex
+	fi
 
 	dohtml -r doc/*
 }
-
-pkg_postinst () {
-	mktexlsr
-}
-
-pkg_postrm () {
-	mktexlsr
-}
diff --git a/app-text/jadetex/jadetex-3.13.ebuild b/app-text/jadetex/jadetex-3.13.ebuild
index b652070ad3b3..016d6d73356e 100644
--- a/app-text/jadetex/jadetex-3.13.ebuild
+++ b/app-text/jadetex/jadetex-3.13.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jadetex/jadetex-3.13.ebuild,v 1.2 2004/09/22 00:27:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jadetex/jadetex-3.13.ebuild,v 1.3 2004/11/07 06:43:19 usata Exp $
+
+inherit latex-package
 
 DESCRIPTION="TeX macros used by Jade TeX output"
 HOMEPAGE="http://jadetex.sourceforge.net/"
@@ -11,13 +13,24 @@ SLOT="0"
 KEYWORDS="~alpha ~arm ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND=">=app-text/openjade-1.3.1
-	virtual/tetex"
+# virtual/tetex comes from latex-package
+DEPEND=">=app-text/openjade-1.3.1"
+
+has_tetex_3() {
+	if has_version '>=app-text/tetex-2.96' || has_version '>=app-text/ptex-3.1.4.20041026' ; then
+		true
+	else
+		false
+	fi
+}
 
 src_compile() {
 	addwrite /usr/share/texmf/ls-R
 	addwrite /usr/share/texmf/fonts
 	addwrite /var/cache/fonts
+
+	has_tetex_3 && sed -i -e "s:tex -ini:latex -ini:" Makefile || die
+
 	emake || die
 }
 
@@ -33,16 +46,13 @@ src_install() {
 	doman *.1
 
 	dodir /usr/bin
-	dosym /usr/bin/virtex /usr/bin/jadetex
-	dosym /usr/bin/pdfvirtex /usr/bin/pdfjadetex
+	if has_tetex_3 ; then
+		dosym /usr/bin/latex /usr/bin/jadetex
+		dosym /usr/bin/pdftex /usr/bin/pdfjadetex
+	else
+		dosym /usr/bin/virtex /usr/bin/jadetex
+		dosym /usr/bin/pdfvirtex /usr/bin/pdfjadetex
+	fi
 
 	dohtml -r doc/*
 }
-
-pkg_postinst () {
-	mktexlsr
-}
-
-pkg_postrm () {
-	mktexlsr
-}