Remove dead symbolic link before merge; bug #72753.

4 files changed, 22 insertions, 18 deletions

diff --git a/app-text/texi2html/ChangeLog b/app-text/texi2html/ChangeLog
index a1028cc04ae5..fac08582474c 100644
--- a/app-text/texi2html/ChangeLog
+++ b/app-text/texi2html/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/texi2html
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texi2html/ChangeLog,v 1.20 2004/11/11 18:16:19 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texi2html/ChangeLog,v 1.21 2004/12/03 03:30:01 usata Exp $
+
+  03 Dec 2004; Mamoru KOMACHI <usata@gentoo.org> texi2html-1.64.ebuild,
+  texi2html-1.70.ebuild:
+  Remove dead symbolic link before merge; bug #72753.
 
   11 Nov 2004; Markus Rothe <corsair@gentoo.org> texi2html-1.64-r1.ebuild:
   Marked ~ppc64
diff --git a/app-text/texi2html/Manifest b/app-text/texi2html/Manifest
index e60d089155ca..3238e4563e44 100644
--- a/app-text/texi2html/Manifest
+++ b/app-text/texi2html/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f6cb598689d1ed85e31be686c3939a9d ChangeLog 2309
+MD5 1c91f02b2e976ca246397af3ae498c18 ChangeLog 2459
+MD5 dfc97ce22ed330521fbf01b56d97512e texi2html-1.64.ebuild 927
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 MD5 35e45f6a5038e4e12e5e855be9d21af9 texi2html-1.64-r1.ebuild 1035
-MD5 04c42c4a13e7639f46643fa5c6e9782a texi2html-1.64.ebuild 987
-MD5 9fd83ab79f57dc4b8740aab766463d04 texi2html-1.70.ebuild 763
+MD5 f12719e9d511607c04b4bbb3e77b3d44 texi2html-1.70.ebuild 813
 MD5 59e2094b0a438b711cb1687485e580a4 files/digest-texi2html-1.64 66
 MD5 59e2094b0a438b711cb1687485e580a4 files/digest-texi2html-1.64-r1 66
 MD5 6089420893ab2453c94d9874d0707292 files/digest-texi2html-1.70 67
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBogO1HTu7gpaalycRAlgKAKCp2gSEx/4ITqk2TwOHAZP0Rk5E9QCeOz+y
-hHcm/C930yHRMJmmw2m3+UQ=
-=/dDc
+iD8DBQFBr92+VWNWqTUmv+0RAgAoAKCQd5Ltgrl5fBp1slZinWNohBoWcACeMty/
+cKN86cPW3EAXUBYQ9g/YL3M=
+=6lGI
 -----END PGP SIGNATURE-----
diff --git a/app-text/texi2html/texi2html-1.64.ebuild b/app-text/texi2html/texi2html-1.64.ebuild
index 6a71b70d33ab..7392662e8395 100644
--- a/app-text/texi2html/texi2html-1.64.ebuild
+++ b/app-text/texi2html/texi2html-1.64.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texi2html/texi2html-1.64.ebuild,v 1.18 2004/07/01 12:08:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texi2html/texi2html-1.64.ebuild,v 1.19 2004/12/03 03:30:02 usata Exp $
 
 DESCRIPTION="Perl script that converts Texinfo to HTML"
 SRC_URI="http://www.mathematik.uni-kl.de/~obachman/Texi2html/Distrib/${P}.tar.gz"
@@ -15,14 +15,7 @@ DEPEND="virtual/libc
 	>=dev-lang/perl-5.6.1"
 
 src_compile() {
-
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "Configuration Failed"
-
+	econf || die "Configuration Failed"
 	emake || die "Parallel Make Failed"
 
 }
@@ -36,5 +29,8 @@ src_install () {
 
 	dodoc AUTHORS COPYING ChangeLog INSTALL INTRODUCTION NEWS \
 		README TODO
+}
 
+pkg_preinst() {
+	rm -f ${ROOT}usr/bin/texi2html
 }
diff --git a/app-text/texi2html/texi2html-1.70.ebuild b/app-text/texi2html/texi2html-1.70.ebuild
index 63250ee5fe34..7e3f6ea62dd4 100644
--- a/app-text/texi2html/texi2html-1.70.ebuild
+++ b/app-text/texi2html/texi2html-1.70.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texi2html/texi2html-1.70.ebuild,v 1.3 2004/11/22 15:18:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texi2html/texi2html-1.70.ebuild,v 1.4 2004/12/03 03:30:02 usata Exp $
 
 DESCRIPTION="Perl script that converts Texinfo to HTML"
 HOMEPAGE="https://texi2html.cvshome.org/"
@@ -22,3 +22,7 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog INSTALL INTRODUCTION NEWS README TODO
 }
+
+pkg_preinst() {
+	rm -f ${ROOT}usr/bin/texi2html
+}