The patch has been applied upstream (without changing the version number)

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@607 32389bae-6d03-0410-99cf-db05cde120eb

4 files changed, 11 insertions, 30 deletions

diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index e276caff0..3e0f461df 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -2,21 +2,17 @@ AUX TeXmacs.desktop 267 RMD160 9c538fb430c4e496a9571e84d0c1622c16279045 SHA1 bac
 MD5 235442e11a960e89fe244ad6307eccf5 files/TeXmacs.desktop 267
 RMD160 9c538fb430c4e496a9571e84d0c1622c16279045 files/TeXmacs.desktop 267
 SHA256 f6292ac99e7adc8efd006df2dc458b4f8bc075dd5c4be2b8fdeb30a63198ff08 files/TeXmacs.desktop 267
-AUX texmacs-1.0.6.10.patch 563 RMD160 d5b3b40d34884e74b51a7dcefe1ef045cdd8b56f SHA1 e05c1ad25092c0fd69ca736f9093f061a17bdd5d SHA256 814d4ed1d9c73f4b94794a3edab4d9aa34f4b4ae5cf52c9eb8766b954972e6b0
-MD5 88f2c8e056a44689292f2f3f3a02fe0d files/texmacs-1.0.6.10.patch 563
-RMD160 d5b3b40d34884e74b51a7dcefe1ef045cdd8b56f files/texmacs-1.0.6.10.patch 563
-SHA256 814d4ed1d9c73f4b94794a3edab4d9aa34f4b4ae5cf52c9eb8766b954972e6b0 files/texmacs-1.0.6.10.patch 563
 AUX texmacs-maxima-5.12.0.patch 1439 RMD160 a62e46f407e60aa8d0185203694d48fdafcdffdc SHA1 7857ff69b9ca2dbbee7fcaad6275a90b8112b677 SHA256 301d1e4811f5a795d6e539f9e853bfdd986dfe747456a8b87fa2fa6069fda67c
 MD5 7f32feff0d9a92c9f84ed285c6c9f957 files/texmacs-maxima-5.12.0.patch 1439
 RMD160 a62e46f407e60aa8d0185203694d48fdafcdffdc files/texmacs-maxima-5.12.0.patch 1439
 SHA256 301d1e4811f5a795d6e539f9e853bfdd986dfe747456a8b87fa2fa6069fda67c files/texmacs-maxima-5.12.0.patch 1439
-DIST TeXmacs-1.0.6.10-src.tar.gz 4167982 RMD160 05320667c7af0e182b3aeb3244f411194dc5ca44 SHA1 c55636f113d86e512b964b52510f48d7edacef45 SHA256 09eea2fa2f323e4e1ede4fb75fb4c987f190c9866ac93ee817075d8c5070c2bb
+DIST TeXmacs-1.0.6.10-src.tar.gz 4167490 RMD160 11ce6db065e6d7a060fecdd10e726320f88a11e6 SHA1 0774bded87ff0fa373e048aeac91f171db95e151 SHA256 59b823f2df27d635e3497b743ded85ef3af12c0fb783e1fc880465a3a0e93edb
 DIST TeXmacs-1.0.6.9-src.tar.gz 3840213 RMD160 506f65b65a934f94737e4d190cc8317e74622f38 SHA1 9b038e353efcfba6e3f24d108a6c94e837191fb0 SHA256 87472e49639bfd635255df1b0c26aa6b28a80dca0782d782d263f184958a47d7
 DIST TeXmacs-600dpi-fonts.tar.gz 2899193 RMD160 b5a27a59ed0c178f94836b828d12d3534b506582 SHA1 0a3a279b842b63f55449856690483d07c6e1219c SHA256 e8eeb3c97a1405fd037b0567f683a6d2225d47c7829893b9768bd6c1c707cc81
-EBUILD texmacs-1.0.6.10.ebuild 1954 RMD160 b74f0f04ac4d8a784ec867c4cfc5bd27ad3bfeb2 SHA1 7b89de14aca3b2dd34532b821266620fa2699bc9 SHA256 7a9f7598fca4777d2f66b756abe0407799103db2986239307bf21e0f063ab66f
-MD5 0fc49252e0cf216ea30df4075f3ac1e0 texmacs-1.0.6.10.ebuild 1954
-RMD160 b74f0f04ac4d8a784ec867c4cfc5bd27ad3bfeb2 texmacs-1.0.6.10.ebuild 1954
-SHA256 7a9f7598fca4777d2f66b756abe0407799103db2986239307bf21e0f063ab66f texmacs-1.0.6.10.ebuild 1954
+EBUILD texmacs-1.0.6.10.ebuild 1890 RMD160 679048337b21750dbd0061a245c4493b14cb5d3f SHA1 be9ab7487bed329e7894831b4d35e4a5364d13d7 SHA256 50027b5bdf72fb944ae478c738c385b44e9774d8e0763876366866503f9f669a
+MD5 dff62f7301c9f5382764be47d5dcf410 texmacs-1.0.6.10.ebuild 1890
+RMD160 679048337b21750dbd0061a245c4493b14cb5d3f texmacs-1.0.6.10.ebuild 1890
+SHA256 50027b5bdf72fb944ae478c738c385b44e9774d8e0763876366866503f9f669a texmacs-1.0.6.10.ebuild 1890
 EBUILD texmacs-1.0.6.9-r1.ebuild 1969 RMD160 3789df2462fdd1945c77517f7e6ef2038747ded1 SHA1 941b6dbb862d60b189c9db251a0b6fce8e8c13e5 SHA256 2a661ef02518f070e55fd45ca0f0e2cbdafb2e586a6c243323bf959985c39bfa
 MD5 9e6a477f772679466789d80fe18e7f20 texmacs-1.0.6.9-r1.ebuild 1969
 RMD160 3789df2462fdd1945c77517f7e6ef2038747ded1 texmacs-1.0.6.9-r1.ebuild 1969
@@ -29,9 +25,9 @@ MISC metadata.xml 447 RMD160 e29f6d98fb4ed38a56ef9415b5ce356f7660b8b5 SHA1 45c58
 MD5 97b4c157ab6219cb08b82945f14b5aa3 metadata.xml 447
 RMD160 e29f6d98fb4ed38a56ef9415b5ce356f7660b8b5 metadata.xml 447
 SHA256 65665d792841d785709329fb8d2770006cc9888a992b0ce64f5572f4b25520ab metadata.xml 447
-MD5 c9f645a3ed3557047789c706dd09f256 files/digest-texmacs-1.0.6.10 530
-RMD160 046b502bf74067eecb619e7ad52475527133eaaa files/digest-texmacs-1.0.6.10 530
-SHA256 bf3506a67428d50387d0fd3c34ba108d8e7977384d51a8e99f362cd4f7e16564 files/digest-texmacs-1.0.6.10 530
+MD5 6f40bf7879948acd61a9b93c4b397f50 files/digest-texmacs-1.0.6.10 530
+RMD160 83f94843359120baa885b5ca11912c53815a37c6 files/digest-texmacs-1.0.6.10 530
+SHA256 b04276d699c3771652d07d71be0ec5a6fb903077ceb05b3ede10bf7af271d4d4 files/digest-texmacs-1.0.6.10 530
 MD5 cad5a522fd0acd6b223fd2806f99c1f1 files/digest-texmacs-1.0.6.9-r1 527
 RMD160 2646c1f5f096a322e27815d1e2287e8284924c28 files/digest-texmacs-1.0.6.9-r1 527
 SHA256 3f0db3e4eebfbfe0409bf1044a035886923bb8b70319fd1e724b7191a1d485e2 files/digest-texmacs-1.0.6.9-r1 527
diff --git a/app-office/texmacs/files/digest-texmacs-1.0.6.10 b/app-office/texmacs/files/digest-texmacs-1.0.6.10
index e9de8e63d..325a7d015 100644
--- a/app-office/texmacs/files/digest-texmacs-1.0.6.10
+++ b/app-office/texmacs/files/digest-texmacs-1.0.6.10
@@ -1,6 +1,6 @@
-MD5 5b5dbd678529bf346e1b67059bda7b57 TeXmacs-1.0.6.10-src.tar.gz 4167982
-RMD160 05320667c7af0e182b3aeb3244f411194dc5ca44 TeXmacs-1.0.6.10-src.tar.gz 4167982
-SHA256 09eea2fa2f323e4e1ede4fb75fb4c987f190c9866ac93ee817075d8c5070c2bb TeXmacs-1.0.6.10-src.tar.gz 4167982
+MD5 073a2de1448b24ef215d6d0d39139dc8 TeXmacs-1.0.6.10-src.tar.gz 4167490
+RMD160 11ce6db065e6d7a060fecdd10e726320f88a11e6 TeXmacs-1.0.6.10-src.tar.gz 4167490
+SHA256 59b823f2df27d635e3497b743ded85ef3af12c0fb783e1fc880465a3a0e93edb TeXmacs-1.0.6.10-src.tar.gz 4167490
 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/files/texmacs-1.0.6.10.patch b/app-office/texmacs/files/texmacs-1.0.6.10.patch
deleted file mode 100644
index c64e17481..000000000
--- a/app-office/texmacs/files/texmacs-1.0.6.10.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --recursive -U2 TeXmacs-1.0.6.10-src.orig/src/Typeset/Boxes/Modifier/change_boxes.cpp TeXmacs-1.0.6.10-src/src/Typeset/Boxes/Modifier/change_boxes.cpp
---- TeXmacs-1.0.6.10-src.orig/src/Typeset/Boxes/Modifier/change_boxes.cpp	2007-05-14 13:54:35.000000000 +0700
-+++ TeXmacs-1.0.6.10-src/src/Typeset/Boxes/Modifier/change_boxes.cpp	2007-05-16 05:59:55.000000000 +0700
-@@ -325,5 +325,5 @@
-     finalize ();
-   }
--  inline remember_box_rep::~remember_box_rep () {
-+  inline ~remember_box_rep () {
-     if (logs_ptr != NULL) {
-       rectangles& logs= *logs_ptr;
diff --git a/app-office/texmacs/texmacs-1.0.6.10.ebuild b/app-office/texmacs/texmacs-1.0.6.10.ebuild
index 31ec99719..ad4ab86cc 100644
--- a/app-office/texmacs/texmacs-1.0.6.10.ebuild
+++ b/app-office/texmacs/texmacs-1.0.6.10.ebuild
@@ -44,11 +44,6 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${P}.patch"
-}
-
 src_compile() {
 
 	# we're not trusting texmacs optimisations here, so