Removed inherit eutils and flag-o-matic since epatch and filter-flags are now part of portage. Also moved filter-flags to src_compile() to kill "has_version() in global scope" warning.

4 files changed, 19 insertions, 14 deletions

diff --git a/app-text/tetex/ChangeLog b/app-text/tetex/ChangeLog
index b2bdc03ca458..e4932bca6c5f 100644
--- a/app-text/tetex/ChangeLog
+++ b/app-text/tetex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/tetex
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.54 2004/01/11 22:39:02 gmsoft Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.55 2004/02/21 12:17:18 usata Exp $
+
+  21 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> tetex-1.0.7-r13.ebuild,
+  tetex-2.0.2-r1.ebuild, tetex-2.0.2-r3.ebuild:
+  Removed inherit eutils and flag-o-matic since epatch and filter-flags
+  are now part of portage.  Also moved filter-flags to src_compile() to
+  kill "has_version() in global scope" warning.
 
   31 Dec 2003; Mike Gardiner <obz@gentoo.org> tetex-2.0.2-r1.ebuild,
   tetex-2.0.2-r3.ebuild:
diff --git a/app-text/tetex/tetex-1.0.7-r13.ebuild b/app-text/tetex/tetex-1.0.7-r13.ebuild
index dcc7bf469e2a..4b414d7b6071 100644
--- a/app-text/tetex/tetex-1.0.7-r13.ebuild
+++ b/app-text/tetex/tetex-1.0.7-r13.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-1.0.7-r13.ebuild,v 1.7 2003/12/10 07:33:57 seemant Exp $
-
-inherit flag-o-matic eutils
-filter-flags "-fstack-protector"
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-1.0.7-r13.ebuild,v 1.8 2004/02/21 12:17:18 usata Exp $
 
 TEXMFSRC="teTeX-texmf-gg-1.0.3.tar.bz2"
 S=${WORKDIR}/teTeX-1.0
@@ -21,6 +18,7 @@ LICENSE="GPL-2"
 IUSE="X"
 
 DEPEND="!app-text/ptex
+	!app-text/cstetex
 	sys-apps/ed
 	X? ( virtual/x11 )
 	>=media-libs/libpng-1.2.1
@@ -84,6 +82,8 @@ src_unpack() {
 
 src_compile() {
 
+	filter-flags "-fstack-protector"
+
 	local myconf=""
 	use X \
 		&& myconf="--with-x" \
diff --git a/app-text/tetex/tetex-2.0.2-r1.ebuild b/app-text/tetex/tetex-2.0.2-r1.ebuild
index 795545127664..ec3cbc2d5437 100644
--- a/app-text/tetex/tetex-2.0.2-r1.ebuild
+++ b/app-text/tetex/tetex-2.0.2-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r1.ebuild,v 1.10 2003/12/31 04:15:20 obz Exp $
-
-inherit eutils flag-o-matic
-filter-flags "-fstack-protector"
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r1.ebuild,v 1.11 2004/02/21 12:17:18 usata Exp $
 
 IUSE="X"
 
@@ -68,6 +65,8 @@ src_unpack() {
 
 src_compile() {
 
+	filter-flags "-fstack-protector"
+
 	econf \
 		--datadir=${S} \
 		--with-system-wwwlib \
diff --git a/app-text/tetex/tetex-2.0.2-r3.ebuild b/app-text/tetex/tetex-2.0.2-r3.ebuild
index 06d16b5d3ff1..08a6fd75c820 100644
--- a/app-text/tetex/tetex-2.0.2-r3.ebuild
+++ b/app-text/tetex/tetex-2.0.2-r3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r3.ebuild,v 1.4 2004/01/11 22:39:02 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r3.ebuild,v 1.5 2004/02/21 12:17:18 usata Exp $
 
 inherit tetex
 
 DESCRIPTION="a complete TeX distribution"
 HOMEPAGE="http://tug.org/teTeX/"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha hppa ~amd64 ~ia64"
+KEYWORDS="x86 ~ppc ~sparc alpha hppa ~amd64 ~ia64"
 
 src_unpack() {
 	tetex_src_unpack