Version bump, bug #112104. Changed desktop file and removed old version.

(Portage version: 2.1_pre4)

6 files changed, 49 insertions, 11 deletions

diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index d86aab95b871..cd56c358733f 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,14 @@
 # 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.40 2006/01/25 11:52:23 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.41 2006/01/29 11:47:43 ehmsen Exp $
+
+  29 Jan 2006; Martin Ehmsen <ehmsen@gentoo.org> files/TeXmacs.desktop,
+  -texmacs-1.0.5.2.ebuild, +texmacs-1.0.6.ebuild:
+  Version bump, bug #112104.
+  Changed the path to the TeXmacs icon in the desktop file.
+  Removed old version that was not ported to modular X.
+
+*texmacs-1.0.6 (29 Jan 2006)
 
   25 Jan 2006; Alexandre Buisse <nattfodd@gentoo.org>
   texmacs-1.0.4-r1.ebuild, texmacs-1.0.5.6.ebuild:
diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index d916036d50b3..37bf285ea566 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1,9 +1,27 @@
-MD5 dffe52ad8416808e1d1411327a6a62d1 ChangeLog 6443
-MD5 2d501a8fe39616f98bc65ec3f7343548 files/TeXmacs.desktop 266
+MD5 cbd5ecdfedf1b7b5a463bd0d707fded5 ChangeLog 6741
+RMD160 88a6c104cafe25f7ccc452c8bf14032c541efeb9 ChangeLog 6741
+SHA256 d919e8eb07aa3c8dabeb6ecddc0280904d3659c2b62dac9d18fbf9351997379b ChangeLog 6741
+MD5 235442e11a960e89fe244ad6307eccf5 files/TeXmacs.desktop 267
+RMD160 9c538fb430c4e496a9571e84d0c1622c16279045 files/TeXmacs.desktop 267
+SHA256 f6292ac99e7adc8efd006df2dc458b4f8bc075dd5c4be2b8fdeb30a63198ff08 files/TeXmacs.desktop 267
 MD5 bf93b125609bba4a0caf22c50fd0c084 files/digest-texmacs-1.0.4-r1 146
-MD5 5a26d5f6c64dce62d33f64ab8e62177c files/digest-texmacs-1.0.5.2 145
+RMD160 d1027e41faf1ee5b4ac689885b4a4fb00014a127 files/digest-texmacs-1.0.4-r1 146
+SHA256 bae957e5491b221653634297ccbe6ef34ea8033a7fdd01675c66aca8b48d9486 files/digest-texmacs-1.0.4-r1 146
 MD5 381e39eb44d0fad159f7759dc7d2c27d files/digest-texmacs-1.0.5.6 145
+RMD160 68d43c98825b945867c866747e7e29fbd4da8fd0 files/digest-texmacs-1.0.5.6 145
+SHA256 619cf195eddeb15fae50b18e23c7077e294f7d6d383bb4d6465f0dc9348a9ae5 files/digest-texmacs-1.0.5.6 145
+MD5 350e2714fc9a8f3eb31a48de617cd8e8 files/digest-texmacs-1.0.6 521
+RMD160 9cec39440ae8ff8b38cb377c6a2eae5438adc2e0 files/digest-texmacs-1.0.6 521
+SHA256 c238c221d642c684e5f2273747a5a57b36eae686d9f1bd3e4e860f49b5a2c300 files/digest-texmacs-1.0.6 521
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
+SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
 MD5 de964be28a8616109d60784acce67e04 texmacs-1.0.4-r1.ebuild 1615
-MD5 027888348ddf9c5e52065e92bfbaeba9 texmacs-1.0.5.2.ebuild 1610
+RMD160 6e9ef8edbec2b6923f923ac5175c33d25feefc92 texmacs-1.0.4-r1.ebuild 1615
+SHA256 2781227a8dbd42950d8292c31b36c35b25abd4ab2cb32702eeba2e42dcc09056 texmacs-1.0.4-r1.ebuild 1615
 MD5 fe186cae22126a1e891cd20e335361f6 texmacs-1.0.5.6.ebuild 1763
+RMD160 bfed83e7402ddee8c918b4ffabc3936bcfdaec9f texmacs-1.0.5.6.ebuild 1763
+SHA256 30da391a90d027b4fdbea2fcf0b3d6a58dc12024ceda8715f0893159b8f3d0fa texmacs-1.0.5.6.ebuild 1763
+MD5 3ac113337b819c8ee76e5367fae2546a texmacs-1.0.6.ebuild 1658
+RMD160 8d4fc8e2f5f1e733e0c6aa4f2a8acd1e7e89363b texmacs-1.0.6.ebuild 1658
+SHA256 c351a1cc24bfb8af3f995f3307a49ed4607e8a6785042b31a669bb7efd0513c5 texmacs-1.0.6.ebuild 1658
diff --git a/app-office/texmacs/files/TeXmacs.desktop b/app-office/texmacs/files/TeXmacs.desktop
index 1f5e19d09531..f51ffe60412b 100644
--- a/app-office/texmacs/files/TeXmacs.desktop
+++ b/app-office/texmacs/files/TeXmacs.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Version=1.0
 Type=Application
 Exec=texmacs
-Icon=/usr/share/TeXmacs/misc/images/tm_gnu1.png
+Icon=/usr/share/TeXmacs/misc/pixmaps/TeXmacs.xpm
 Name=TeXmacs
 GenericName=Scientific Word Processor
 Comment=A scientific word processing application.
diff --git a/app-office/texmacs/files/digest-texmacs-1.0.5.2 b/app-office/texmacs/files/digest-texmacs-1.0.5.2
deleted file mode 100644
index 7ca5500c3ae1..000000000000
--- a/app-office/texmacs/files/digest-texmacs-1.0.5.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d0f55012f7ff5b2f47cfc823a319eb13 TeXmacs-1.0.5.2-src.tar.gz 2920765
-MD5 945dfd3f76b20082aeea8131d87a260f TeXmacs-600dpi-fonts.tar.gz 2899193
diff --git a/app-office/texmacs/files/digest-texmacs-1.0.6 b/app-office/texmacs/files/digest-texmacs-1.0.6
new file mode 100644
index 000000000000..dbf983a3b8ab
--- /dev/null
+++ b/app-office/texmacs/files/digest-texmacs-1.0.6
@@ -0,0 +1,6 @@
+MD5 7b0a3896fd17cf2e993aa77d15bb6240 TeXmacs-1.0.6-src.tar.gz 3617687
+RMD160 c7825cd81eee2f76864ae6559fecb2e8ac45ebd5 TeXmacs-1.0.6-src.tar.gz 3617687
+SHA256 27734426db5f678a122eb765299e4050361bb59e15b5705b2e8eafef48d0bc16 TeXmacs-1.0.6-src.tar.gz 3617687
+MD5 945dfd3f76b20082aeea8131d87a260f TeXmacs-600dpi-fonts.tar.gz 2899193
+RMD160 b5a27a59ed0c178f94836b828d12d3534b506582 TeXmacs-600dpi-fonts.tar.gz 2899193
+SHA256 e8eeb3c97a1405fd037b0567f683a6d2225d47c7829893b9768bd6c1c707cc81 TeXmacs-600dpi-fonts.tar.gz 2899193
diff --git a/app-office/texmacs/texmacs-1.0.5.2.ebuild b/app-office/texmacs/texmacs-1.0.6.ebuild
index 8540862dbee5..cbab609eba24 100644
--- a/app-office/texmacs/texmacs-1.0.5.2.ebuild
+++ b/app-office/texmacs/texmacs-1.0.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.2.ebuild,v 1.2 2006/01/02 19:36:22 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.6.ebuild,v 1.1 2006/01/29 11:47:43 ehmsen Exp $
 
 # although flag-o-matic functions in portage, we should inherit it
 inherit flag-o-matic
@@ -17,15 +17,23 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="spell static"
 # TeXmacs 1.0.X-r? -> stable release, TeXmacs 1.0.X.Y -> development release
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
+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() {