Switched virtual/tetex -> virtual/latex-base (see bug #222501).

Package-Manager: portage-2.1.5_rc10

3 files changed, 21 insertions, 15 deletions

diff --git a/sci-mathematics/nusmv/ChangeLog b/sci-mathematics/nusmv/ChangeLog
index e7a8113388e8..e63e0a3ef5b3 100644
--- a/sci-mathematics/nusmv/ChangeLog
+++ b/sci-mathematics/nusmv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-mathematics/nusmv
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/nusmv/ChangeLog,v 1.2 2007/02/22 01:29:59 jokey Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/nusmv/ChangeLog,v 1.3 2008/05/18 17:10:18 markusle Exp $
+
+  18 May 2008; Markus Dittrich <markusle@gentoo.org> nusmv-2.3.1.ebuild:
+  Switched virtual/tetex -> virtual/latex-base (see bug #222501).
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/sci-mathematics/nusmv/Manifest b/sci-mathematics/nusmv/Manifest
index b6133a132c5d..a25267c45e33 100644
--- a/sci-mathematics/nusmv/Manifest
+++ b/sci-mathematics/nusmv/Manifest
@@ -1,6 +1,6 @@
 AUX MiniSat_v1.14-optimizedlib.patch 1112 RMD160 9ae63aef1b74fac1bad9ee62049460856b5c5982 SHA1 7a2ee88eef0591690a2a728c07b68fdd882addda SHA256 21016b1ce69553c058385afa93f13248dbdc398c7968609d86dd9b707e227bfb
 DIST MiniSat_v1.14_src.zip 29428 RMD160 d5f0dc611a6116128d9a404f9045e02b185958b4 SHA1 266536cf5e5e77aa0478b98869bcd67ac1a523b6 SHA256 8e5e0ee84a770dcb3abd6fc65ed4aef938f9ffabca5ddc8a739029f7fb58a8f5
 DIST NuSMV-2.3.1.tar.gz 2590944 RMD160 74f00e1c29dabe98e04cf0d652b92d63a73b07dc SHA1 588d3b43f136273176f4a6056b474f9d872b977b SHA256 b8ba0f29afafdfdef8c30f722eead3ef6cbb17e4bfe5563240a01d8a99dbbf68
-EBUILD nusmv-2.3.1.ebuild 3226 RMD160 0ca1e64dcca0b6d6144093f70c5422230e39051a SHA1 88eaa7559712b269d2910d744b24208fee63c087 SHA256 9c4224c7c32b83a6fe522c9cc1cf0c15fa12762fa720e7ff160950ea075ed0f7
-MISC ChangeLog 596 RMD160 cefe97113619b28c2e752f936bc5e6151d1897c9 SHA1 070e7d0b8036eb940701f186ad3541577fa6efc2 SHA256 9dc7ae8fc85d4dbf0ef944c533a2e023dc6423c7288853330955bc6feadbccc1
+EBUILD nusmv-2.3.1.ebuild 3334 RMD160 2d574066687dbeea21bdfb60f4ddb44ad1b2c904 SHA1 bc224f20802c0eccea8563a7c1534480217f4b90 SHA256 df4ebda1804abd2cde185fe1ecd062c5bbeef322ffb0859d8b91dda0b4186d74
+MISC ChangeLog 739 RMD160 60fbd4e6b3d25534d68756898fd7d999ed0bb68a SHA1 0393c6ffba0bb912ec11b12e59ae9c931b895c30 SHA256 59bf129e5e9c5c017bcad2b5bdbbe0d5c0e0cec90936186b1e85d6c54a53ecbd
 MISC metadata.xml 231 RMD160 8f84973eaebda75204435889dbc7c24625066f2e SHA1 0f7b69677f55597d4ff59b31dabed5a543875ef0 SHA256 f84a829a9b8fcf07a58c2f5d493c7263c6d79a113de6c73766203a3aba0324df
diff --git a/sci-mathematics/nusmv/nusmv-2.3.1.ebuild b/sci-mathematics/nusmv/nusmv-2.3.1.ebuild
index b0a8407c2977..0450ddd2eb83 100644
--- a/sci-mathematics/nusmv/nusmv-2.3.1.ebuild
+++ b/sci-mathematics/nusmv/nusmv-2.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/nusmv/nusmv-2.3.1.ebuild,v 1.1 2006/04/02 11:40:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/nusmv/nusmv-2.3.1.ebuild,v 1.2 2008/05/18 17:10:18 markusle Exp $
 
 inherit eutils toolchain-funcs
 
@@ -33,12 +33,15 @@ SRC_URI="mirror://gentoo/${NUSMV_A}
 		minisat? ( mirror://gentoo/${MINISAT_A} )"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE="minisat examples"
 RDEPEND="virtual/libc
 		dev-libs/expat"
 DEPEND="${RDEPEND}
-		virtual/tetex
+		virtual/latex-base
+		|| ( ( dev-texlive/texlive-latexextra )
+			app-text/tetex
+			app-text/ptex )
 		virtual/ghostscript
 		www-client/lynx
 		dev-lang/perl"
@@ -50,10 +53,10 @@ S="${NUSMV_S}"
 src_unpack() {
 	unpack ${NUSMV_A}
 	if use minisat; then
-		cd ${WORKDIR}/${NUSMV_P}/MiniSat
+		cd "${WORKDIR}"/${NUSMV_P}/MiniSat
 		unpack ${MINISAT_A}
 		epatch ${MINISAT_P}_nusmv.patch
-		epatch ${FILESDIR}/${MINISAT_P}-optimizedlib.patch
+		epatch "${FILESDIR}"/${MINISAT_P}-optimizedlib.patch
 	fi
 	for i in ${NUSMV_S}/doc/{user-man,tutorial}/Makefile.in ; do
 		sed -i.orig \
@@ -69,7 +72,7 @@ src_compile() {
 		# do NOT merge these targets
 		emake COPTIMIZE="${CFLAGS}" r || die "Failed to build minisat bin"
 		emake COPTIMIZE="${CFLAGS}" lr || die "Failed to build minisat lib"
-		ln -sf ${MINISAT_S} ${WORKDIR}/${NUSMV_P}/${MINISAT_P}
+		ln -sf ${MINISAT_S} "${WORKDIR}"/${NUSMV_P}/${MINISAT_P}
 	fi
 
 	cd ${CUDD_S}
@@ -99,19 +102,19 @@ src_install() {
 	cd ${NUSMV_S}
 	emake DESTDIR="${D}" install || die "emake install failed"
 	# duplicate items
-	rm -f ${D}/usr/share/nusmv/{LGPL-2.1,README*,NEWS}
+	rm -f "${D}"/usr/share/nusmv/{LGPL-2.1,README*,NEWS}
 	# real docs
 	dodoc README* NEWS AUTHORS
 	dodoc doc/tutorial/tutorial.pdf
 	dodoc doc/user-man/nusmv.pdf
 
 	# move package-installed docs
-	mv ${D}/usr/share/nusmv/doc/* ${D}/usr/share/doc/${PF}/
-	rmdir ${D}/usr/share/nusmv/doc
+	mv "${D}"/usr/share/nusmv/doc/* "${D}"/usr/share/doc/${PF}/
+	rmdir "${D}"/usr/share/nusmv/doc
 
 	# clean out examples if not needed
 	if use !examples ; then
-		rm -rf ${D}/usr/share/nusmv/examples || die "Failed to remove examples"
+		rm -rf "${D}"/usr/share/nusmv/examples || die "Failed to remove examples"
 	fi
 }