Replacing darwin patch with compiler patch as per bug #105051.

Package-Manager: portage-2.0.51.22-r3

5 files changed, 29 insertions, 20 deletions

diff --git a/app-text/html2text/ChangeLog b/app-text/html2text/ChangeLog
index 2ef5cd8a3b3d..059c92c266ac 100644
--- a/app-text/html2text/ChangeLog
+++ b/app-text/html2text/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/html2text
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/html2text/ChangeLog,v 1.23 2005/09/10 06:00:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/html2text/ChangeLog,v 1.24 2005/10/16 08:56:07 grobian Exp $
+
+  16 Oct 2005; Fabian Groffen <grobian@gentoo.org>
+  +files/html2text-1.3.2-compiler.patch,
+  -files/html2text-1.3.2-darwin.patch, html2text-1.3.2.ebuild:
+  Replacing darwin patch with compiler patch as per bug #105051.  Thanks to
+  Arnaud Launay <asl [at} launey.org> for the patch.
 
   09 Sep 2005; Aron Griffis <agriffis@gentoo.org> html2text-1.3.2.ebuild:
   Mark 1.3.2 stable on alpha
diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index afa05acdcb97..8a8c1c3df0f7 100644
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@@ -1,8 +1,8 @@
-MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 cc3628c0015ddbc8d237a1f04d945ce6 html2text-1.3.2.ebuild 965
-MD5 4e66c8ec757ab57f7e82c566b17794d3 ChangeLog 2772
+MD5 77f75c244e62206cd73947e45efda5c9 html2text-1.3.2.ebuild 966
 MD5 d119d3855705397458841d4e537f653d html2text-1.3.1.ebuild 918
-MD5 a6cfcb22a1966dd02fbebcaeb77d191c files/html2text-gcc3.3.patch 26518
-MD5 d6d204607fbd0d3e41bcd6983ad09e46 files/digest-html2text-1.3.2 67
-MD5 a0eaffe187b007804fabed11983f42ab files/html2text-1.3.2-darwin.patch 282
+MD5 b2958b89bce74f949eacf12858009359 ChangeLog 3056
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 MD5 821cb2c304f248bddc5badca9704b671 files/digest-html2text-1.3.1 67
+MD5 d6d204607fbd0d3e41bcd6983ad09e46 files/digest-html2text-1.3.2 67
+MD5 e2a2e79186f7c17498fe5f503be8a7e9 files/html2text-1.3.2-compiler.patch 344
+MD5 a6cfcb22a1966dd02fbebcaeb77d191c files/html2text-gcc3.3.patch 26518
diff --git a/app-text/html2text/files/html2text-1.3.2-compiler.patch b/app-text/html2text/files/html2text-1.3.2-compiler.patch
new file mode 100644
index 000000000000..ede0e7b57069
--- /dev/null
+++ b/app-text/html2text/files/html2text-1.3.2-compiler.patch
@@ -0,0 +1,14 @@
+--- configure.old	2005-10-14 16:37:15.000000000 +0200
++++ html2text-1.3.2/configure	2005-10-14 16:41:51.000000000 +0200
+@@ -38,7 +38,10 @@
+ }
+ EOF
+ CXX=unknown;
+-for i in "CC" "g++" "cc" "$CC"; do
++if test "x$CC" = "x"; then
++	CC='CC'
++fi
++for i in "g++" "cc" "$CC" "CC"; do
+   if $i -c $tmp_file.C 2>/dev/null; then
+     CXX="$i";
+     break;
diff --git a/app-text/html2text/files/html2text-1.3.2-darwin.patch b/app-text/html2text/files/html2text-1.3.2-darwin.patch
deleted file mode 100644
index fb7e3e0cc2bc..000000000000
--- a/app-text/html2text/files/html2text-1.3.2-darwin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2004-01-12 09:47:15 -0600
-+++ html2text-1.3.2/configure	2005-08-30 20:21:19 -0500
-@@ -38,7 +38,7 @@
- }
- EOF
- CXX=unknown;
--for i in "CC" "g++" "cc" "$CC"; do
-+for i in "$CC" "g++" "cc" "CC"; do
-   if $i -c $tmp_file.C 2>/dev/null; then
-     CXX="$i";
-     break;
diff --git a/app-text/html2text/html2text-1.3.2.ebuild b/app-text/html2text/html2text-1.3.2.ebuild
index 5532a697c311..3abce06c4739 100644
--- a/app-text/html2text/html2text-1.3.2.ebuild
+++ b/app-text/html2text/html2text-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/html2text/html2text-1.3.2.ebuild,v 1.14 2005/09/10 06:00:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/html2text/html2text-1.3.2.ebuild,v 1.15 2005/10/16 08:56:07 grobian Exp $
 
 inherit eutils toolchain-funcs
 
@@ -23,7 +23,7 @@ src_unpack() {
 	then
 		epatch 1.3.2_to_1.3.2a.diff
 	fi
-	epatch ${FILESDIR}/${P}-darwin.patch
+	epatch ${FILESDIR}/${P}-compiler.patch
 }
 
 src_compile() {