From 0b83cfe91678e033992d44d13797c3d604117d19 Mon Sep 17 00:00:00 2001
From: Alexandre Buisse <nattfodd@gentoo.org>
Date: Wed, 25 Jan 2006 11:52:23 +0000
Subject: Modular X porting. Package-Manager: portage-2.1_pre3-r1

---
 app-office/texmacs/ChangeLog               |  6 +++++-
 app-office/texmacs/Manifest                |  6 +++---
 app-office/texmacs/texmacs-1.0.4-r1.ebuild | 12 ++++++++++--
 app-office/texmacs/texmacs-1.0.5.6.ebuild  | 12 ++++++++++--
 4 files changed, 28 insertions(+), 8 deletions(-)

(limited to 'app-office/texmacs')

diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index 7d97a0fa382b..d86aab95b871 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/texmacs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.39 2006/01/02 19:36:22 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.40 2006/01/25 11:52:23 nattfodd Exp $
+
+  25 Jan 2006; Alexandre Buisse <nattfodd@gentoo.org>
+  texmacs-1.0.4-r1.ebuild, texmacs-1.0.5.6.ebuild:
+  Modular X porting.
 
   02 Jan 2006; Alexandre Buisse <nattfodd@gentoo.org>
   texmacs-1.0.4-r1.ebuild, texmacs-1.0.5.2.ebuild, texmacs-1.0.5.6.ebuild:
diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index 1cbd1571c875..d916036d50b3 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1,9 +1,9 @@
-MD5 1b5a518e3da4938437e6e7e494122655 ChangeLog 6316
+MD5 dffe52ad8416808e1d1411327a6a62d1 ChangeLog 6443
 MD5 2d501a8fe39616f98bc65ec3f7343548 files/TeXmacs.desktop 266
 MD5 bf93b125609bba4a0caf22c50fd0c084 files/digest-texmacs-1.0.4-r1 146
 MD5 5a26d5f6c64dce62d33f64ab8e62177c files/digest-texmacs-1.0.5.2 145
 MD5 381e39eb44d0fad159f7759dc7d2c27d files/digest-texmacs-1.0.5.6 145
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 936266f0ce4b2ff9ff2a087570dd9022 texmacs-1.0.4-r1.ebuild 1462
+MD5 de964be28a8616109d60784acce67e04 texmacs-1.0.4-r1.ebuild 1615
 MD5 027888348ddf9c5e52065e92bfbaeba9 texmacs-1.0.5.2.ebuild 1610
-MD5 5ab585207cb80fe81feb5e7f2d2c155e texmacs-1.0.5.6.ebuild 1610
+MD5 fe186cae22126a1e891cd20e335361f6 texmacs-1.0.5.6.ebuild 1763
diff --git a/app-office/texmacs/texmacs-1.0.4-r1.ebuild b/app-office/texmacs/texmacs-1.0.4-r1.ebuild
index 54993eac8166..48e41b979322 100644
--- a/app-office/texmacs/texmacs-1.0.4-r1.ebuild
+++ b/app-office/texmacs/texmacs-1.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.4-r1.ebuild,v 1.5 2006/01/02 19:36:22 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.4-r1.ebuild,v 1.6 2006/01/25 11:52:23 nattfodd Exp $
 
 inherit flag-o-matic
 
@@ -21,10 +21,18 @@ KEYWORDS="x86 ppc alpha sparc"
 RDEPEND="virtual/tetex
 	>=dev-util/guile-1.4
 	>=sys-apps/sed-4
-	virtual/x11
+	media-libs/freetype
+	sys-devel/libtool
+	|| ( ( x11-libs/libX11
+		   x11-libs/libICE )
+	    virtual/x11
+	)
+	media-libs/imlib2
 	spell? ( >=app-text/ispell-3.2 )"
 
 DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto
+		 virtual/x11 )
 	virtual/ghostscript"
 
 src_compile() {
diff --git a/app-office/texmacs/texmacs-1.0.5.6.ebuild b/app-office/texmacs/texmacs-1.0.5.6.ebuild
index c4858f435d61..edc3101831c4 100644
--- a/app-office/texmacs/texmacs-1.0.5.6.ebuild
+++ b/app-office/texmacs/texmacs-1.0.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.5.6.ebuild,v 1.2 2006/01/02 19:36:22 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.5.6.ebuild,v 1.3 2006/01/25 11:52:23 nattfodd Exp $
 
 # although flag-o-matic functions in portage, we should inherit it
 inherit flag-o-matic
@@ -22,10 +22,18 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 RDEPEND="virtual/tetex
 	>=dev-util/guile-1.4
 	>=sys-apps/sed-4
-	virtual/x11
+	media-libs/freetype
+	sys-devel/libtool
+	|| ( ( x11-libs/libX11
+		   x11-libs/libICE )
+		virtual/x11
+	)
+	media-libs/imlib2
 	spell? ( >=app-text/ispell-3.2 )"
 
 DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto
+	     virtual/x11 )
 	virtual/ghostscript"
 
 src_compile() {
-- 
cgit v1.2.3-65-gdbad