Fixed libtool and symlink problems on MacOS, bug #106886.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 37 insertions, 17 deletions

diff --git a/app-text/tetex/ChangeLog b/app-text/tetex/ChangeLog
index fd6f0a31a413..23ea97e29c93 100644
--- a/app-text/tetex/ChangeLog
+++ b/app-text/tetex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/tetex
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.122 2006/04/10 10:43:52 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.123 2006/04/13 20:42:56 ehmsen Exp $
+
+  13 Apr 2006; Martin Ehmsen <ehmsen@gentoo.org>
+  files/tetex-3.0-kpathsea-pic.patch, tetex-3.0_p1-r3.ebuild:
+  Fixed libtool and symlink problems on MacOS, bug #106886.
 
 *tetex-3.0_p1-r3 (10 Apr 2006)
 
diff --git a/app-text/tetex/Manifest b/app-text/tetex/Manifest
index 3ddbd7309f83..9f4c2f284131 100644
--- a/app-text/tetex/Manifest
+++ b/app-text/tetex/Manifest
@@ -1,6 +1,6 @@
-MD5 17bf76ddfed33a19c6a9e0c485ca5905 ChangeLog 22324
-RMD160 8cea0b21316e76f1434a1679dc1120b17b845e1b ChangeLog 22324
-SHA256 4cf69f356d86fe2a29037cace03a500d56d95b414e901bb56e94d09f541e1839 ChangeLog 22324
+MD5 34dddd6b5e0cdec3141239eabc75da79 ChangeLog 22496
+RMD160 518b1cf13d99e6df6f58d86a2b6fe05dfab201f4 ChangeLog 22496
+SHA256 ec5d6013b742ac2c7473808fdc41a6b430d8dff6c76bae4abf0c8a466f7b9aa9 ChangeLog 22496
 MD5 22d6dcce2ae5229c5ba109e6638041ef files/digest-tetex-2.0.2-r5 1030
 RMD160 2575064189200d3d022f6a39736291f7757a862e files/digest-tetex-2.0.2-r5 1030
 SHA256 6c98bb9cfb053bd9cf0bb0fedb62459df5500fcb1c6e91d8625208574f4a773e files/digest-tetex-2.0.2-r5 1030
@@ -49,9 +49,9 @@ SHA256 356293ef8f95b444dfa98d052aa3fd58f03d9baf916ce462b712fd1dfec81b8d files/te
 MD5 b15d18a85d673070c4b9ac48ebc586ed files/tetex-3.0-epstopdf-wrong-rotation.patch 521
 RMD160 214286fa8333858a5627b8f88c6d540401ce2217 files/tetex-3.0-epstopdf-wrong-rotation.patch 521
 SHA256 10f1987f03fc28d1cb5d13c090f0c508c1517c6acb02c65d91c93a0e8a01f683 files/tetex-3.0-epstopdf-wrong-rotation.patch 521
-MD5 0e727f58dac2997f22e90f51b2d79da3 files/tetex-3.0-kpathsea-pic.patch 1590
-RMD160 4e80561168669905179f5baccb188d6083d5c3a8 files/tetex-3.0-kpathsea-pic.patch 1590
-SHA256 38b7f46f581f37147fd2796cb58ea97336d6d34059ace64e0ca3971c28eea3a8 files/tetex-3.0-kpathsea-pic.patch 1590
+MD5 e0539cca3a5ca1d4fa97b3eab9ec7b28 files/tetex-3.0-kpathsea-pic.patch 1791
+RMD160 fa09f68ae3ff8fd797da0bd8ae90349651495b60 files/tetex-3.0-kpathsea-pic.patch 1791
+SHA256 3d79591f41dc66df2885075bad34d002abc2ed5e83fa759c070bb0c5f184afa8 files/tetex-3.0-kpathsea-pic.patch 1791
 MD5 c7d5fd4cce846a7f7e5845ede7b839c9 files/tetex-3.0_p1-amd64-xdvik-wp.patch 847
 RMD160 e43bb9467e2e2ee072e7b77c755ec91c5a78e515 files/tetex-3.0_p1-amd64-xdvik-wp.patch 847
 SHA256 f5dd9e2d2f74591370661992a082c4db92648eab6057435d0a8d377457571bef files/tetex-3.0_p1-amd64-xdvik-wp.patch 847
@@ -118,9 +118,9 @@ SHA256 1813db576d5d14618e173359bc4ae471d7d99bee6a48cb46ca54af2668c45968 tetex-3.
 MD5 9dc39f05df64262c13e1b1fbff5116bd tetex-3.0_p1-r2.ebuild 2048
 RMD160 a2fc313639b24b6ea4355d0462af8cd4b701025b tetex-3.0_p1-r2.ebuild 2048
 SHA256 4bc970255e34acf27c343f80fcf756d4d127a477df483882b4a11b72631bfbb6 tetex-3.0_p1-r2.ebuild 2048
-MD5 fd01164aca4f82e07305301f8a67b41f tetex-3.0_p1-r3.ebuild 2542
-RMD160 0fb03ed6359c899908a892bed602ab8611d2cd32 tetex-3.0_p1-r3.ebuild 2542
-SHA256 dab68835d8eda44b90e1d67e526d065fe95e1b4e456a7070d4aea714583905d5 tetex-3.0_p1-r3.ebuild 2542
+MD5 a6e1410335f7e2cdcbe63c660bd731a7 tetex-3.0_p1-r3.ebuild 2672
+RMD160 b772771516c1af0ae0478c9f0b18502b843ba92b tetex-3.0_p1-r3.ebuild 2672
+SHA256 bf4275dee00c5cb9f223a8e9b7ad4911ee62eb426c626df8e76460a5894b93e3 tetex-3.0_p1-r3.ebuild 2672
 MD5 467bf2a28918cd5c1d37567b876676a2 tetex-3.0_p1.ebuild 1532
 RMD160 7f0cceb24432117e04b604d984e9745a4c7fa6e3 tetex-3.0_p1.ebuild 1532
 SHA256 29f09528b05fa7b1fff951265b93eb0f034e11b1a14e61cab30277f9c6bd3555 tetex-3.0_p1.ebuild 1532
diff --git a/app-text/tetex/files/tetex-3.0-kpathsea-pic.patch b/app-text/tetex/files/tetex-3.0-kpathsea-pic.patch
index 04fc9d462243..6dc3ab0a16e0 100644
--- a/app-text/tetex/files/tetex-3.0-kpathsea-pic.patch
+++ b/app-text/tetex/files/tetex-3.0-kpathsea-pic.patch
@@ -1,38 +1,50 @@
 diff --exclude-from=/home/dang/.diffrc -u -ruN tetex-src-3.0.orig/texk/kpathsea/configure tetex-src-3.0/texk/kpathsea/configure
 --- tetex-src-3.0.orig/texk/kpathsea/configure	2005-02-06 13:27:03.000000000 -0500
 +++ tetex-src-3.0/texk/kpathsea/configure	2005-09-09 00:25:48.000000000 -0400
-@@ -5546,7 +5546,7 @@
+@@ -5546,7 +5546,11 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
 -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++if [ ${USERLAND} -eq "Darwin" ]; then
++LIBTOOL='glibtool'
++else
 +LIBTOOL='libtool'
++fi
  
  # Prevent multiple expansion
  
 diff --exclude-from=/home/dang/.diffrc -u -ruN tetex-src-3.0.orig/texk/libtool.m4 tetex-src-3.0/texk/libtool.m4
 --- tetex-src-3.0.orig/texk/libtool.m4	2003-02-15 08:03:23.000000000 -0500
 +++ tetex-src-3.0/texk/libtool.m4	2005-09-09 00:17:12.000000000 -0400
-@@ -30,8 +30,8 @@
+@@ -30,8 +30,12 @@
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
 -# Always use our own libtool.
 -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 +# Use the system libtool
++if [ ${USERLAND} -eq "Darwin" ]; then
++LIBTOOL='glibtool'
++else
 +LIBTOOL='libtool'
++fi
  AC_SUBST(LIBTOOL)dnl
  
  # Prevent multiple expansion
 diff --exclude-from=/home/dang/.diffrc -u -ruN tetex-src-3.0.orig/texk/make/common.mk tetex-src-3.0/texk/make/common.mk
 --- tetex-src-3.0.orig/texk/make/common.mk	2004-08-06 14:40:50.000000000 -0400
 +++ tetex-src-3.0/texk/make/common.mk	2005-09-09 15:02:35.000000000 -0400
-@@ -12,7 +12,7 @@
+@@ -12,7 +12,11 @@
  LDFLAGS = @LDFLAGS@ $(XLDFLAGS)
  
  # Kpathsea needs this for compiling, programs need it for linking.
 -LIBTOOL = $(SHELL) $(kpathsea_parent)/libtool
-+LIBTOOL = libtool
++ifeq ($(USERLAND),Darwin)
++LIBTOOL='glibtool'
++else
++LIBTOOL='libtool'
++endif
  
  # You can change [X]CPPFLAGS, [X]CFLAGS, or [X]DEFS, but
  # please don't change ALL_CPPFLAGS or ALL_CFLAGS.
diff --git a/app-text/tetex/tetex-3.0_p1-r3.ebuild b/app-text/tetex/tetex-3.0_p1-r3.ebuild
index 8b78f6cf17b8..55869a2f1c72 100644
--- a/app-text/tetex/tetex-3.0_p1-r3.ebuild
+++ b/app-text/tetex/tetex-3.0_p1-r3.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-text/tetex/tetex-3.0_p1-r3.ebuild,v 1.1 2006/04/10 10:43:52 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-3.0_p1-r3.ebuild,v 1.2 2006/04/13 20:42:56 ehmsen Exp $
 
 inherit tetex-3 flag-o-matic versionator virtualx
 
@@ -84,8 +84,12 @@ src_install() {
 	keepdir /usr/share/texmf-site
 
 	# virtex was removed from tetex-3
-	dosym /usr/bin/tex /usr/bin/virtex
-	dosym /usr/bin/pdftex /usr/bin/pdfvirtex
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets, bug #106886.
+	cd ${D}/usr/bin/
+	ln -snf tex virtex
+	ln -snf pdftex pdfvirtex
 }
 
 pkg_postinst() {