Point SRC_URI at new location. Adjust HOMEPAGE. EAPI=4. Fix bug 144497.

Package-Manager: portage-2.2.0_alpha93/cvs/Linux x86_64

5 files changed, 82 insertions, 8 deletions

diff --git a/app-text/html2text/ChangeLog b/app-text/html2text/ChangeLog
index 35cdc544883b..9a27e4f79654 100644
--- a/app-text/html2text/ChangeLog
+++ b/app-text/html2text/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/html2text
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/html2text/ChangeLog,v 1.36 2010/01/02 11:22:49 fauli Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/html2text/ChangeLog,v 1.37 2012/03/22 16:41:43 floppym Exp $
+
+*html2text-1.3.2a (22 Mar 2012)
+
+  22 Mar 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/html2text-1.3.2a-compiler.patch,
+  +files/html2text-1.3.2a-urlistream-get.patch, +html2text-1.3.2a.ebuild:
+  Point SRC_URI at new location. Adjust HOMEPAGE. EAPI=4. Fix bug 144497.
 
   02 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   html2text-1.3.2-r1.ebuild:
diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index 4cd5471d2c1e..38c6c50d6a7b 100644
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@@ -1,16 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX html2text-1.3.2-compiler.patch 344 RMD160 6e3737179d4ca689a3c4753dcb640ad3105243a5 SHA1 002dfc8c2639efd6ea1ac2e4990fb2d19fc9e566 SHA256 ca28a645dd6da7e5ebe7b9ee194b5e874487638852b3d270cfe8901f9bb4bf6f
+AUX html2text-1.3.2a-compiler.patch 247 RMD160 6c843b3e7c62bfc275a2273ef315577afd2b07fd SHA1 221b43ed7cf965709ba84ea1f10e9325e694841b SHA256 45baac91a2f393ab546f25ac2ade176a207f2c862e2cbdbb08a8b6f1a79874b1
+AUX html2text-1.3.2a-urlistream-get.patch 186 RMD160 f2699ffc391d10728667cbd7c13421cdb534c4cf SHA1 bb788ef12d7704ecc3b2b914f2616d0c261a7e21 SHA256 9373fe49bace3b435dabe451cda2505f0618bbf8a3b6e8bc841cf83dea3e09fc
 DIST html2text-1.3.2.tar.gz 131336 RMD160 10a5c4cf324302d6571abd28a8f0eebf26708750 SHA1 4ef3e6b30a2ac323693975da3ca8ce96013daa58 SHA256 15e458961ee168771d4e9fa4fd50e9b128ab40e7b530db5ce210178fa17dac44
+DIST html2text-1.3.2a.tar.gz 130088 RMD160 2771c52ea3ff6c97a13d6171839e61bb19226311 SHA1 91d46e3218d05b0783bebee96a14f0df0eb9773e SHA256 000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392
 EBUILD html2text-1.3.2-r1.ebuild 964 RMD160 80c97bbac5da7fe3082054e0a6ce06a0afab3cf2 SHA1 5a6b55c80c68aff30522fafa4ae18df0762c08ca SHA256 dfe70182665bd8677824db9b2b66c70b4695b4ab1fb91c0359cf35b3e41db8ad
 EBUILD html2text-1.3.2.ebuild 925 RMD160 0628d712787209f3a9bfd2bdb0c915b5805b4910 SHA1 12f04a76cc0fffff2d6086d712c955fbb6f7dee7 SHA256 e0744b628233df1c2336973fdafdd493e33f162be10105f2d06b6ce2c25d062f
-MISC ChangeLog 4601 RMD160 135e848c53f1a3dab69a7560bfec119c05a25fce SHA1 79310dcf39d597ab63ee3443e343db94aa9f840e SHA256 3c4c863d4f5217db7145a578801474ba072e65dcb1ecb63295f44bb2a54c3595
+EBUILD html2text-1.3.2a.ebuild 916 RMD160 b44e896b5a92db196acb948a16defa884f8a1aa6 SHA1 1a3042ab14a4c7687450b59118bc1584222db6d5 SHA256 a13588e1d5fbc55d7c4a3bbf78cca9425420f69a3f51ec82a96007e252b9308d
+MISC ChangeLog 4876 RMD160 52fa1db44d43683a91e210c943cc6730df88df60 SHA1 3543fe7ccccac3dab0552040f0b68f9b4e770b5c SHA256 dfcb31406194b5db79b6490c09c32ef83a9813077a6edcdb8f8691888e09dc64
 MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAks/LI8ACgkQNQqtfCuFneP+ugCeOu6suywXKs6pDm5mnzrh0e/d
-snsAn2TXjpBeB21DtE2a/r8fv14/L2bL
-=ER67
+iF4EAREIAAYFAk9rVk0ACgkQC77qH+pIQ6QvQAD/TxzFoptdyWD3dg8kERKr4JcO
+5F6BYT87IHOodhhLMEIBAK7Ww+O6V+IRDx3uHu/ov4w/nNb5sJ094p7EFbSalg3e
+=hiBd
 -----END PGP SIGNATURE-----
diff --git a/app-text/html2text/files/html2text-1.3.2a-compiler.patch b/app-text/html2text/files/html2text-1.3.2a-compiler.patch
new file mode 100644
index 000000000000..19a1341209d4
--- /dev/null
+++ b/app-text/html2text/files/html2text-1.3.2a-compiler.patch
@@ -0,0 +1,13 @@
+--- a/configure
++++ b/configure
+@@ -38,8 +38,8 @@
+   return 0;
+ }
+ EOF
+-CXX=unknown;
+-for i in "CC" "g++" "cc" "$CC"; do
++CXX=${CXX-unknown}
++for i in "$CXX" "CC" "g++" "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.2a-urlistream-get.patch b/app-text/html2text/files/html2text-1.3.2a-urlistream-get.patch
new file mode 100644
index 000000000000..949d8958a449
--- /dev/null
+++ b/app-text/html2text/files/html2text-1.3.2a-urlistream-get.patch
@@ -0,0 +1,11 @@
+--- a/urlistream.C
++++ b/urlistream.C
+@@ -362,7 +362,7 @@
+ int
+ urlistream::get()
+ {
+-  char ch;
++  unsigned char ch;
+   int ret = ::read(fd_, &ch, 1);
+   return (ret > 0 ? ch : -1);
+ }
diff --git a/app-text/html2text/html2text-1.3.2a.ebuild b/app-text/html2text/html2text-1.3.2a.ebuild
new file mode 100644
index 000000000000..ac8dcba605cd
--- /dev/null
+++ b/app-text/html2text/html2text-1.3.2a.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/html2text/html2text-1.3.2a.ebuild,v 1.1 2012/03/22 16:41:43 floppym Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A HTML to text converter"
+HOMEPAGE="http://www.mbayer.de/html2text/"
+SRC_URI="http://www.mbayer.de/html2text/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-compiler.patch
+	epatch "${FILESDIR}"/${P}-urlistream-get.patch
+}
+
+src_configure() {
+	tc-export CXX
+	default
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}" DEBUG="${CXXFLAGS}"
+}
+
+src_install() {
+	dobin html2text
+	doman html2text.1.gz html2textrc.5.gz
+	dodoc CHANGES CREDITS KNOWN_BUGS README TODO
+}