Version bump

Package-Manager: portage-2.2_rc67/cvs/Linux i686

6 files changed, 32 insertions, 113 deletions

diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index 4c4fccb69e24..bf28a6eddaba 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/texmacs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.80 2010/02/04 18:13:42 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.81 2010/04/13 14:03:44 grozin Exp $
+
+*texmacs-1.0.7.4 (13 Apr 2010)
+
+  13 Apr 2010; Andrey Grozin <grozin@gentoo.org>
+  -files/texmacs-1.0.6.14-interix.patch, -texmacs-1.0.7.2-r1.ebuild,
+  texmacs-1.0.7.3.ebuild, +texmacs-1.0.7.4.ebuild,
+  +files/texmacs-1.0.7.4-strip.patch:
+  Version bump
 
   04 Feb 2010; Jonathan Callen <abcd@gentoo.org> texmacs-1.0.7.3.ebuild:
   Disable patch - does not apply
diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index f6d7b95f2407..95b6cd945652 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1,22 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX TeXmacs.desktop 268 RMD160 92ca6c7c75a6e1edd671c2e5f766140382107ebb SHA1 f917105f37a16393ff8f6e1be111a9f00733de41 SHA256 9872d60c5080260a3dcc842cf1f74557954b0830b204ffc0e255f7ee52a13825
-AUX texmacs-1.0.6.14-interix.patch 3410 RMD160 d7ccf31b72f937ec0770297db81913cf79dbd95f SHA1 5fb9e5a8d34934ec6cf98c1b48620cf4fea66bf9 SHA256 cb716fb026fe1ea953c41b395c4cb627b9af6457a80a5e11ddeb01ccf74a3032
 AUX texmacs-1.0.7.2-strip.patch 710 RMD160 98f02d72e91fa00785af0702029edab26beb0a18 SHA1 1fff9b3aff919cf2cc48656748eb69d9e9e4af34 SHA256 851e6c9468d2db87d7c19b1041ab94a88dc7894af74edc06dec8f8b4b52eb701
 AUX texmacs-1.0.7.3-strip.patch 710 RMD160 98f02d72e91fa00785af0702029edab26beb0a18 SHA1 1fff9b3aff919cf2cc48656748eb69d9e9e4af34 SHA256 851e6c9468d2db87d7c19b1041ab94a88dc7894af74edc06dec8f8b4b52eb701
+AUX texmacs-1.0.7.4-strip.patch 710 RMD160 98f02d72e91fa00785af0702029edab26beb0a18 SHA1 1fff9b3aff919cf2cc48656748eb69d9e9e4af34 SHA256 851e6c9468d2db87d7c19b1041ab94a88dc7894af74edc06dec8f8b4b52eb701
 DIST TeXmacs-1.0.7.2-src.tar.gz 4763348 RMD160 06c8a9c93f79a576daf365ec229e98229f8563d0 SHA1 f011f4ef2b36b3f6531ecdadf96800105301b45d SHA256 98ca44418f4d4644bdee03add2e2baf18f0839d4d8336189ff4a095329f7a2ba
 DIST TeXmacs-1.0.7.3-src.tar.gz 5269302 RMD160 809dbd35776a3212e598ae3cc7784a555772a4bb SHA1 149357a84ab9294d832f2ec8af33caede3d758b1 SHA256 e0f1cf78d478477342a0e3ade1539f612ef09c07b51bc35fcbc952a492c7d013
+DIST TeXmacs-1.0.7.4-src.tar.gz 5300518 RMD160 07536c10eb0facd489eea3c30706b75f9dedb011 SHA1 553a78be0e2a9a2a4a41f2647103962563d2ad98 SHA256 ecabbd8e3a21adbc1906de9957e439254543c6cabe0008b3f4f40a950071c3bc
 DIST TeXmacs-600dpi-fonts.tar.gz 2899193 RMD160 b5a27a59ed0c178f94836b828d12d3534b506582 SHA1 0a3a279b842b63f55449856690483d07c6e1219c SHA256 e8eeb3c97a1405fd037b0567f683a6d2225d47c7829893b9768bd6c1c707cc81
-EBUILD texmacs-1.0.7.2-r1.ebuild 1710 RMD160 5d3a82597f0ad07269d8647c499c3ad105266905 SHA1 7a0d5dc5b08a06f0aee3218ff2a61963e2f7f1b4 SHA256 6a5ff52064dde3c8c9f2a2e4cbc70bcfe33aaf41d8799035086cd6eb2d761d2d
 EBUILD texmacs-1.0.7.2.ebuild 1503 RMD160 8c6f916dcf74a204d4debfbaedd76cec573303ba SHA1 6a54a8ca64da6cbb18073401f9111163ddce3417 SHA256 ed6df98243897084235a9b1751309b94228456b23af77ea2f63ebac6c8aaf1e7
-EBUILD texmacs-1.0.7.3.ebuild 1840 RMD160 dddfe00154b5e121f5229c6ad2ba36f9d97a4344 SHA1 90b567cc57e0592a33da4729f7c8b4e4d1fbe3b3 SHA256 2c04bafba4c9bc2a7cdc793cb257ca19c94a05ca9e6474a42c0dd58da69fca64
-MISC ChangeLog 12810 RMD160 07b58dc64ad8144642954097fc3e286f71f630c6 SHA1 acf42a40e0bcf9b6df070e9f334d2c79a4523e79 SHA256 86c70961cb8014859786db3554e5af291061c4b81518550ed5adca1974072ae2
+EBUILD texmacs-1.0.7.3.ebuild 1747 RMD160 3d1b2022eac566a2c52ca7ed056e3a4d9a464754 SHA1 34668004ee50c717dee52b451b96f0bfea485fdd SHA256 8dd860188c23104e88b0cfc4976c5a620b6ae00cd722ae534f4c435bc01ef74d
+EBUILD texmacs-1.0.7.4.ebuild 1747 RMD160 ea328d9808d1e70f1d2d943c1f5790b47767789a SHA1 6d269aef72978f360c9ec8cad17d0488ee3cff16 SHA256 e24b8fa9262adf49affcfc8fda0e19c66d43486c2ee271b282f54785008e2e05
+MISC ChangeLog 13067 RMD160 0725f15f4025e731eb529855aa1d2fec9917e617 SHA1 7a58b8a8ee8d9501a4d858f739923111a1d74d92 SHA256 8c10d1644728b8a44230469baf899f50f6cc8faff5e6154a7c1784a5acc457f1
 MISC metadata.xml 346 RMD160 2c1ba8a5aa56c0547c8ca42baca77d46bdd5e6e7 SHA1 1fd3a62650f23d156dac006d2051b3fb22e57057 SHA256 992c947e112a6a4244e57336294ce5020079f90612f2d0093879a85814928813
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktrDmkACgkQOypDUo0oQOr5TwCgta3o3POqA8cdPuKHTJImQKFF
-J9oAnR+sww8gZMR/IX52jFoCaIdBCIix
-=Tld/
------END PGP SIGNATURE-----
diff --git a/app-office/texmacs/files/texmacs-1.0.6.14-interix.patch b/app-office/texmacs/files/texmacs-1.0.6.14-interix.patch
deleted file mode 100644
index 206117feee44..000000000000
--- a/app-office/texmacs/files/texmacs-1.0.6.14-interix.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -ru TeXmacs-1.0.6.14-src.orig/Makefile.in TeXmacs-1.0.6.14-src/Makefile.in
---- TeXmacs-1.0.6.14-src.orig/Makefile.in	2008-04-15 10:19:35 +0200
-+++ TeXmacs-1.0.6.14-src/Makefile.in	2008-04-15 10:57:50 +0200
-@@ -24,6 +24,7 @@
- MKDIR = mkdir -p
- RM = rm -f
- CP = cp -r -f
-+CPF= cp -f
- MV = mv -f
- LN = ln -f
- CHMOD = @CONFIG_CHMOD@
-@@ -123,12 +124,12 @@
- 	$(MKDIR) $(DESTDIR)$(tmbin)
- 	$(MKDIR) $(DESTDIR)$(tmbin)/bin
- 	$(MKDIR) $(DESTDIR)$(tmbin)/lib
--	$(CP) $(tmdir)/bin/texmacs.bin $(DESTDIR)$(tmbin)/bin
--	$(CP) $(tmdir)/bin/tm_gs $(DESTDIR)$(tmbin)/bin
--	$(CP) $(tmdir)/plugins/*/bin/* $(DESTDIR)$(tmbin)/bin
--	$(CP) $(tmdir)/plugins/*/lib/*.$(so) $(DESTDIR)$(tmbin)/lib 2>/dev/null || :
-+	$(CPF) $(tmdir)/bin/texmacs.bin $(DESTDIR)$(tmbin)/bin
-+	$(CPF) $(tmdir)/bin/tm_gs $(DESTDIR)$(tmbin)/bin
-+	$(CPF) $(tmdir)/plugins/*/bin/* $(DESTDIR)$(tmbin)/bin
-+	$(CPF) $(tmdir)/plugins/*/lib/*.$(so) $(DESTDIR)$(tmbin)/lib 2>/dev/null || :
- 	$(STRIP) $(DESTDIR)$(tmbin)/bin/texmacs.bin
--	$(CP) $(tmdir)/lib/*.$(so) $(DESTDIR)$(tmbin)/lib 2>/dev/null || :
-+	$(CPF) $(tmdir)/lib/*.$(so) $(DESTDIR)$(tmbin)/lib 2>/dev/null || :
- 	$(STRIP) $(DESTDIR)$(tmbin)/lib/*.$(so) 2>/dev/null || :
- 	$(CHMOD) 755 $(DESTDIR)$(tmbin)/bin/*
- 	$(CHMOD) 755 $(DESTDIR)$(tmbin)/lib/*.$(so) 2>/dev/null || :
-diff -ru TeXmacs-1.0.6.14-src.orig/plugins/maple/src/tm_maple_5.cpp TeXmacs-1.0.6.14-src/plugins/maple/src/tm_maple_5.cpp
---- TeXmacs-1.0.6.14-src.orig/plugins/maple/src/tm_maple_5.cpp	2008-04-15 10:19:36 +0200
-+++ TeXmacs-1.0.6.14-src/plugins/maple/src/tm_maple_5.cpp	2008-04-15 10:46:44 +0200
-@@ -10,6 +10,10 @@
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- ******************************************************************************/
- 
-+#ifdef __INTERIX
-+# define _ALL_SOURCE
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -272,7 +276,9 @@
-   killpg (pid, sig);
-   cout << DATA_END; // << DATA_END << DATA_END;
-   signal (sig, maple_interrupt);
-+  #ifndef __INTERIX
-   siginterrupt (sig, 1);
-+  #endif
- }
- 
- /******************************************************************************
-@@ -328,7 +334,9 @@
-     in= tochild [OUT];
-     close (tochild [IN]);
-     signal (SIGINT, maple_interrupt);
-+	#ifndef __INTERIX
-     siginterrupt (SIGINT, 1);
-+	#endif
-     init_maple ();
-     while (true) {
-       maple_input ();
-diff -ru TeXmacs-1.0.6.14-src.orig/src/System/Link/socket_link.cpp TeXmacs-1.0.6.14-src/src/System/Link/socket_link.cpp
---- TeXmacs-1.0.6.14-src.orig/src/System/Link/socket_link.cpp	2008-04-15 11:04:56 +0200
-+++ TeXmacs-1.0.6.14-src/src/System/Link/socket_link.cpp	2008-04-15 09:34:14 +0200
-@@ -31,6 +31,10 @@
- #include <sys/misc.h>
- #endif
- 
-+#ifdef __INTERIX
-+# include <arpa/inet.h>
-+#endif
-+
- hashset<pointer> socket_link_set;
- 
- /******************************************************************************
-diff -ru TeXmacs-1.0.6.14-src.orig/src/System/Link/socket_server.cpp TeXmacs-1.0.6.14-src/src/System/Link/socket_server.cpp
---- TeXmacs-1.0.6.14-src.orig/src/System/Link/socket_server.cpp	2008-04-15 11:04:56 +0200
-+++ TeXmacs-1.0.6.14-src/src/System/Link/socket_server.cpp	2008-04-15 09:34:14 +0200
-@@ -22,6 +22,10 @@
- #include <arpa/inet.h>
- #include <sys/wait.h>
- 
-+#ifdef __INTERIX
-+# include <sys/time.h>
-+#endif
-+
- hashset<pointer> socket_server_set;
- 
- /******************************************************************************
diff --git a/app-office/texmacs/files/texmacs-1.0.7.4-strip.patch b/app-office/texmacs/files/texmacs-1.0.7.4-strip.patch
new file mode 100644
index 000000000000..b6e660eac900
--- /dev/null
+++ b/app-office/texmacs/files/texmacs-1.0.7.4-strip.patch
@@ -0,0 +1,14 @@
+Index: TeXmacs-1.0.7.1-src/Makefile.in
+===================================================================
+--- TeXmacs-1.0.7.1-src.orig/Makefile.in
++++ TeXmacs-1.0.7.1-src/Makefile.in
+@@ -130,9 +130,7 @@ INSTALL:
+ 	$(CP) $(tmdir)/bin/tm_gs $(DESTDIR)$(tmbin)/bin
+ 	$(CP) $(tmdir)/plugins/*/bin/* $(DESTDIR)$(tmbin)/bin
+ 	$(CP) $(tmdir)/plugins/*/lib/*.$(so) $(DESTDIR)$(tmbin)/lib 2>/dev/null || :
+-	$(STRIP) $(DESTDIR)$(tmbin)/bin/texmacs.bin
+ 	$(CP) $(tmdir)/lib/*.$(so) $(DESTDIR)$(tmbin)/lib 2>/dev/null || :
+-	$(STRIP) $(DESTDIR)$(tmbin)/lib/*.$(so) 2>/dev/null || :
+ 	$(CHMOD) 755 $(DESTDIR)$(tmbin)/bin/*
+ 	$(CHMOD) 755 $(DESTDIR)$(tmbin)/lib/*.$(so) 2>/dev/null || :
+ 	$(RM) $(DESTDIR)$(tmbin)/lib/*.a
diff --git a/app-office/texmacs/texmacs-1.0.7.3.ebuild b/app-office/texmacs/texmacs-1.0.7.3.ebuild
index afcdce8e1e69..69e1620c1b35 100644
--- a/app-office/texmacs/texmacs-1.0.7.3.ebuild
+++ b/app-office/texmacs/texmacs-1.0.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.3.ebuild,v 1.4 2010/02/04 18:13:42 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.3.ebuild,v 1.5 2010/04/13 14:03:44 grozin Exp $
 EAPI=2
 inherit autotools
 MY_P=${P/tex/TeX}-src
@@ -44,9 +44,6 @@ src_prepare() {
 	# don't strip
 	epatch "${FILESDIR}"/${P}-strip.patch
 
-	# Patch does not apply - disable for now
-	#epatch "${FILESDIR}"/${PN}-1.0.6.14-interix.patch
-
 	eautoreconf
 }
 
diff --git a/app-office/texmacs/texmacs-1.0.7.2-r1.ebuild b/app-office/texmacs/texmacs-1.0.7.4.ebuild
index 5a9fc711ba57..0c07b9bfb1ee 100644
--- a/app-office/texmacs/texmacs-1.0.7.2-r1.ebuild
+++ b/app-office/texmacs/texmacs-1.0.7.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.2-r1.ebuild,v 1.2 2009/12/26 17:26:26 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.4.ebuild,v 1.1 2010/04/13 14:03:44 grozin Exp $
 EAPI=2
 inherit autotools
 MY_P=${P/tex/TeX}-src
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.texmacs.org/"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="imlib jpeg netpbm -qt4 svg spell"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-scheme/guile[deprecated]
 	virtual/latex-base