Marking and adding a patch for ~ppc-macos

Package-Manager: portage-2.0.51.22-r2

4 files changed, 28 insertions, 16 deletions

diff --git a/app-text/html2text/ChangeLog b/app-text/html2text/ChangeLog
index 8084d85304f1..d32d5ada6daa 100644
--- a/app-text/html2text/ChangeLog
+++ b/app-text/html2text/ChangeLog
@@ -1,6 +1,14 @@
 # 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.20 2005/06/15 23:48:34 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/html2text/ChangeLog,v 1.21 2005/08/31 11:37:32 grobian Exp $
+
+  31 Aug 2005; Fabian Groffen <grobian@gentoo.org>
+  +files/html2text-1.3.2-darwin.patch, html2text-1.3.2.ebuild:
+  Made patch "1.3.2_to_1.3.2a.diff" be applied on gcc 3.3 and up (especially
+  4.0.0 on ppc-macos)
+  Added a patch that allows compilation on ppc-macos, thanks to Thomas Kjosmoen
+  <gentoo at kjosmoen (dot) com>
+  Marking ~ppc-macos
 
   15 Jun 2005; <dang@gentoo.org> html2text-1.3.2.ebuild:
   Stable on amd64
diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index f712953dd6e7..573e9eb449e8 100644
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e64ca853025a5a59664880695013fd6f html2text-1.3.2.ebuild 879
+MD5 98652ad9bace66faf94f50afb1df4f67 html2text-1.3.2.ebuild 965
 MD5 d119d3855705397458841d4e537f653d html2text-1.3.1.ebuild 918
-MD5 72e3d640c1dbced6748b22594d21ca70 ChangeLog 2302
+MD5 d4700798ecd84adc087e5b4d89c4a38c ChangeLog 2653
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 MD5 821cb2c304f248bddc5badca9704b671 files/digest-html2text-1.3.1 67
 MD5 d6d204607fbd0d3e41bcd6983ad09e46 files/digest-html2text-1.3.2 67
+MD5 a0eaffe187b007804fabed11983f42ab files/html2text-1.3.2-darwin.patch 282
 MD5 a6cfcb22a1966dd02fbebcaeb77d191c files/html2text-gcc3.3.patch 26518
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCsL5momPajV0RnrERAj9xAJ9SR7EDGrmfgIoc3cnyvshcoSOk3gCfQdpW
-qa6sZIu43+n8bTmLOYSLeQE=
-=iaV5
------END PGP SIGNATURE-----
diff --git a/app-text/html2text/files/html2text-1.3.2-darwin.patch b/app-text/html2text/files/html2text-1.3.2-darwin.patch
new file mode 100644
index 000000000000..fb7e3e0cc2bc
--- /dev/null
+++ b/app-text/html2text/files/html2text-1.3.2-darwin.patch
@@ -0,0 +1,11 @@
+--- 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 875f672bf772..76a7d55a5bb0 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.12 2005/06/15 23:48:34 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/html2text/html2text-1.3.2.ebuild,v 1.13 2005/08/31 11:37:32 grobian Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="http://userpage.fu-berlin.de/~mbayer/tools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc ~ppc-macos ppc64 sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc"
@@ -18,10 +18,12 @@ DEPEND="virtual/libc"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	if [ `gcc-major-version` -ge 3 -a `gcc-minor-version` -ge 3 ]
+	if [ `gcc-major-version` -ge 4 -o \
+		`gcc-major-version` -ge 3 -a `gcc-minor-version` -ge 3 ];
 	then
 		epatch 1.3.2_to_1.3.2a.diff
 	fi
+	epatch ${FILESDIR}/${P}-darwin.patch
 }
 
 src_compile() {