diff options
| -rw-r--r-- | app-text/html2text/ChangeLog | 8 | ||||
| -rw-r--r-- | app-text/html2text/Manifest | 25 | ||||
| -rw-r--r-- | app-text/html2text/files/digest-html2text-1.3.1 | 5 | ||||
| -rw-r--r-- | app-text/html2text/files/digest-html2text-1.3.2 | 2 | ||||
| -rw-r--r-- | app-text/html2text/files/html2text-gcc3.3.patch | 735 | ||||
| -rw-r--r-- | app-text/html2text/html2text-1.3.1.ebuild | 9 |
6 files changed, 37 insertions, 747 deletions
diff --git a/app-text/html2text/ChangeLog b/app-text/html2text/ChangeLog index 059c92c266ac..58d500421268 100644 --- a/app-text/html2text/ChangeLog +++ b/app-text/html2text/ChangeLog @@ -1,6 +1,10 @@ # 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.24 2005/10/16 08:56:07 grobian Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/html2text/ChangeLog,v 1.25 2006/02/21 18:16:34 nattfodd Exp $ + + 21 Feb 2006; Alexandre Buisse <nattfodd@gentoo.org> + -files/html2text-gcc3.3.patch, html2text-1.3.1.ebuild: + Moved html2text-gcc3.patch to mirror as it was >20k (bug #123634). 16 Oct 2005; Fabian Groffen <grobian@gentoo.org> +files/html2text-1.3.2-compiler.patch, diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest index 8a8c1c3df0f7..25c5aabf1171 100644 --- a/app-text/html2text/Manifest +++ b/app-text/html2text/Manifest @@ -1,8 +1,21 @@ -MD5 77f75c244e62206cd73947e45efda5c9 html2text-1.3.2.ebuild 966 -MD5 d119d3855705397458841d4e537f653d html2text-1.3.1.ebuild 918 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 +RMD160 fc6fad7a23758e22e60dff4147450dcbf7924dc6 ChangeLog 3056 +SHA256 8bdfc40c6ae5a874a7bdab42ca53327df34b9f183e774ffb23e430b66f9f69ed ChangeLog 3056 +MD5 f30486bdfd2a5573c8a5a6462830260c files/digest-html2text-1.3.1 491 +RMD160 e36a821b97f6ae1f4f8046e26de20607a62e013f files/digest-html2text-1.3.1 491 +SHA256 194d1ed39dcc4bd1c554204fe3e7abf6e0c47f5fe98b2f02c146edb5f47c6e35 files/digest-html2text-1.3.1 491 +MD5 196f88cea3a2b651273ad36320b3b421 files/digest-html2text-1.3.2 247 +RMD160 9ba82b24fe3251821408a1d63b5ab508894bab2d files/digest-html2text-1.3.2 247 +SHA256 a9f6118e761b033bd12f1c07f260eaf02f783ab118f893cd77f01a6df5a67f45 files/digest-html2text-1.3.2 247 MD5 e2a2e79186f7c17498fe5f503be8a7e9 files/html2text-1.3.2-compiler.patch 344 -MD5 a6cfcb22a1966dd02fbebcaeb77d191c files/html2text-gcc3.3.patch 26518 +RMD160 6e3737179d4ca689a3c4753dcb640ad3105243a5 files/html2text-1.3.2-compiler.patch 344 +SHA256 ca28a645dd6da7e5ebe7b9ee194b5e874487638852b3d270cfe8901f9bb4bf6f files/html2text-1.3.2-compiler.patch 344 +MD5 ac552d716083cedf28c63c7e3b750715 html2text-1.3.1.ebuild 954 +RMD160 b0e9b5e764f5ddb3143f108dd4233eed3a49ed86 html2text-1.3.1.ebuild 954 +SHA256 26219b4fc2c0c7c339b6868ac09a038e1a9bf2abf6880faf054d5585c5e886b9 html2text-1.3.1.ebuild 954 +MD5 77f75c244e62206cd73947e45efda5c9 html2text-1.3.2.ebuild 966 +RMD160 dd9b3407ad4e89d2c785b3ea84ece0129ee4332f html2text-1.3.2.ebuild 966 +SHA256 ff6e18001f49ab356519441c91676695ae81d700eacf41d771bf240baf463814 html2text-1.3.2.ebuild 966 +MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164 +RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164 +SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164 diff --git a/app-text/html2text/files/digest-html2text-1.3.1 b/app-text/html2text/files/digest-html2text-1.3.1 index b83f47ba3559..35aa4fab7e1e 100644 --- a/app-text/html2text/files/digest-html2text-1.3.1 +++ b/app-text/html2text/files/digest-html2text-1.3.1 @@ -1 +1,6 @@ MD5 faa3eaeb062540e72d251d6c3fa6cc71 html2text-1.3.1.tar.gz 119859 +RMD160 1bde426ef6a2a8c174b423ac74267d85e3098952 html2text-1.3.1.tar.gz 119859 +SHA256 a38d24fd517e3b6e808729a2519f60329eacec4ebededbac288d0763c066db55 html2text-1.3.1.tar.gz 119859 +MD5 a6cfcb22a1966dd02fbebcaeb77d191c html2text-gcc3.3.patch 26518 +RMD160 d0f33ead96a2d172e45811c33af5729697f974bc html2text-gcc3.3.patch 26518 +SHA256 13879e28182dd789858746d083bc56710528fc07e1c7327fd420bfc7be6f0c29 html2text-gcc3.3.patch 26518 diff --git a/app-text/html2text/files/digest-html2text-1.3.2 b/app-text/html2text/files/digest-html2text-1.3.2 index 473e8d407f2f..ea3cbde2e1a8 100644 --- a/app-text/html2text/files/digest-html2text-1.3.2 +++ b/app-text/html2text/files/digest-html2text-1.3.2 @@ -1 +1,3 @@ MD5 14b091c7c5cb5c3bc2ce19298a0c0e27 html2text-1.3.2.tar.gz 131336 +RMD160 10a5c4cf324302d6571abd28a8f0eebf26708750 html2text-1.3.2.tar.gz 131336 +SHA256 15e458961ee168771d4e9fa4fd50e9b128ab40e7b530db5ce210178fa17dac44 html2text-1.3.2.tar.gz 131336 diff --git a/app-text/html2text/files/html2text-gcc3.3.patch b/app-text/html2text/files/html2text-gcc3.3.patch deleted file mode 100644 index feb0ecc2acb5..000000000000 --- a/app-text/html2text/files/html2text-gcc3.3.patch +++ /dev/null @@ -1,735 +0,0 @@ -diff -bB -r -u html2text-1.3.1/Area.C html2text-1.3.1-Patch_C/Area.C ---- html2text-1.3.1/Area.C Tue Nov 2 18:57:49 1999 -+++ html2text-1.3.1-Patch_C/Area.C Wed Jul 2 21:58:32 2003 -@@ -1,40 +1,32 @@ - --/* ------------------------------------------------------------------------- */ -+ /***************************************************************************/ - - /* -- * Copyright (c) 1999 -- * GMRS Software GmbH, Innsbrucker Ring 159, 81669 Munich, Germany. -- * http://www.gmrs.de -+ * Portions Copyright (c) 1999 GMRS Software GmbH -+ * Carl-von-Linde-Str. 38, D-85716 Unterschleissheim, http://www.gmrs.de - * All rights reserved. -- * Author: Arno Unkrig (arno.unkrig@gmrs.de) - * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes software developed by GMRS Software GmbH. -- * 4. The name of GMRS Software GmbH may not be used to endorse or promote -- * products derived from this software without specific prior written -- * permission. -+ * Author: Arno Unkrig <arno@unkrig.de> -+ */ -+ -+/* This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. - * -- * THIS SOFTWARE IS PROVIDED BY GMRS SOFTWARE GMBH ``AS IS'' AND ANY -- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GMRS SOFTWARE GMBH BE LIABLE -- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -- * THE POSSIBILITY OF SUCH DAMAGE. -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License in the file COPYING for more details. - */ - --/* ------------------------------------------------------------------------- */ -+ /***************************************************************************/ -+ -+/* -+ * Changes to version 1.2.2 were made by Martin Bayer <mbayer@zedat.fu-berlin.de> -+ * Dates and reasons of modifications: -+ * Wed Jul 2 21:56:45 CEST 2003: ported to g++ 3.3 -+ */ -+ -+ /***************************************************************************/ - -@@ -42,6 +34,6 @@ - #include <stdlib.h> - #include <string.h> --#include <iostream.h> -+#include <iostream> - - #include "Area.h" - #include "string.h" -@@ -477,7 +468,7 @@ - } - } - } -- os << endl; -+ os << std::endl; - } - - return os; -diff -bB -r -u html2text-1.3.1/Area.h html2text-1.3.1-Patch_C/Area.h ---- html2text-1.3.1/Area.h Thu Oct 4 22:18:09 2001 -+++ html2text-1.3.1-Patch_C/Area.h Wed Jul 2 22:00:00 2003 -@@ -7,13 +7,6 @@ - * All rights reserved. - * - * Author: Arno Unkrig <arno@unkrig.de> -- * -- * All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * "This product includes software developed by GMRS Software GmbH." -- * The name of GMRS Software GmbH may not be used to endorse or promote -- * products derived from this software without specific prior written -- * permission. - */ - - /* This program is free software; you can redistribute it and/or modify -@@ -33,6 +26,7 @@ - * Changes to version 1.2.2 were made by Martin Bayer <mbayer@zedat.fu-berlin.de> - * Dates and reasons of modifications: - * Thu Oct 4 21:21:10 CEST 2001: ported to g++ 3.0 -+ * Wed Jul 2 21:59:41 CEST 2003: ported to g++ 3.3 - */ - - /***************************************************************************/ -@@ -46,7 +40,7 @@ - - #include <sys/types.h> - #include <string> --#include <istream.h> -+#include <istream> - - #ifdef BOOL_DEFINITION - BOOL_DEFINITION -diff -bB -r -u html2text-1.3.1/CREDITS html2text-1.3.1-Patch_C/CREDITS ---- html2text-1.3.1/CREDITS Mon Sep 2 11:51:10 2002 -+++ html2text-1.3.1-Patch_C/CREDITS Wed Jul 2 22:13:37 2003 -@@ -1,4 +1,4 @@ --## CREDITS - Thanks to... Mon Sep 2 11:50:47 CEST 2002 -+## CREDITS - Thanks to... Wed Jul 2 22:12:38 CEST 2003 - ## =========================================================================== - # - # Since september 2000, these people have contributed to the development of -@@ -13,6 +13,9 @@ - - Arno Unkrig <arno@unkrig.de> - + almost all bugfixes in 1.3.1. Thanks! -+ -+Nicolas Boullis <nboullis@debian.org> -+ + ported to g++-3.3 (this change is not backward-compatible) - - - ## --------------------------------------------------------------------------- -diff -bB -r -u html2text-1.3.1/HTMLControl.C html2text-1.3.1-Patch_C/HTMLControl.C ---- html2text-1.3.1/HTMLControl.C Sun Apr 7 16:30:27 2002 -+++ html2text-1.3.1-Patch_C/HTMLControl.C Wed Jul 2 22:00:43 2003 -@@ -27,12 +27,13 @@ - * Dates and reasons of modifications: - * Fre Jun 8 17:20:38 CEST 2001: fixed coredump - * Sun Apr 7 11:31:10 CEST 2002: fixed parser errors -+ * Wed Jul 2 22:00:21 CEST 2003: ported to g++ 3.3 - */ - - /***************************************************************************/ - - --#include <iostream.h> -+#include <iostream> - #include <stdlib.h> - #include <string.h> - #include <ctype.h> -@@ -423,15 +424,15 @@ - if (c != '>') return SCAN_ERROR; - - if (debug_scanner) { -- cerr << "Scanned tag \"<" << (is_end_tag ? "/" : "") << tag_name; -+ std::cerr << "Scanned tag \"<" << (is_end_tag ? "/" : "") << tag_name; - if (!is_end_tag && tag_attributes.get()) { - const list<TagAttribute> &ta(*tag_attributes); - list<TagAttribute>::const_iterator j; - for (j = ta.begin(); j != ta.end(); ++j) { -- cerr << " " << (*j).first << "=\"" << (*j).second << "\""; -+ std::cerr << " " << (*j).first << "=\"" << (*j).second << "\""; - } - } -- cerr << ">\"" << endl; -+ std::cerr << ">\"" << std::endl; - } - - /* -@@ -445,7 +446,7 @@ - ); - if (tag == NULL) { /* EXTENSION: Swallow unknown tags. */ - if (debug_scanner) { -- cerr << "Tag unknown -- swallowed." << endl; -+ std::cerr << "Tag unknown -- swallowed." << std::endl; - } - continue; - } -@@ -456,7 +457,7 @@ - if (is_end_tag) { - if (!tag->end_tag_code) { - if (debug_scanner) { -- cerr << "Non-container end tag scanned." << endl; -+ std::cerr << "Non-container end tag scanned." << std::endl; - } - continue; - } -@@ -506,7 +507,7 @@ - */ - if (s->empty()) { delete s; continue; } - -- if (debug_scanner) cerr << "Scanned PCDATA \"" << *s << "\"" << endl; -+ if (debug_scanner) std::cerr << "Scanned PCDATA \"" << *s << "\"" << std::endl; - - return PCDATA; - } -diff -bB -r -u html2text-1.3.1/HTMLControl.h html2text-1.3.1-Patch_C/HTMLControl.h ---- html2text-1.3.1/HTMLControl.h Thu Oct 4 22:06:54 2001 -+++ html2text-1.3.1-Patch_C/HTMLControl.h Wed Jul 2 22:01:29 2003 -@@ -7,13 +7,6 @@ - * All rights reserved. - * - * Author: Arno Unkrig <arno@unkrig.de> -- * -- * All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * "This product includes software developed by GMRS Software GmbH." -- * The name of GMRS Software GmbH may not be used to endorse or promote -- * products derived from this software without specific prior written -- * permission. - */ - - /* This program is free software; you can redistribute it and/or modify -@@ -33,6 +26,7 @@ - * Changes to version 1.2.2 were made by Martin Bayer <mbayer@zedat.fu-berlin.de> - * Dates and reasons of modifications: - * Thu Oct 4 21:25:07 CEST 2001: ported to g++ 3.0 -+ * Wed Jul 2 22:01:12 CEST 2003: ported to g++ 3.3 - */ - - /***************************************************************************/ -@@ -45,7 +39,7 @@ - - #include "HTMLParser.h" - #include "urlistream.h" --#include <istream.h> -+#include <istream> - - using std::istream; - -diff -bB -r -u html2text-1.3.1/Makefile.in html2text-1.3.1-Patch_C/Makefile.in ---- html2text-1.3.1/Makefile.in Mon Sep 2 12:06:49 2002 -+++ html2text-1.3.1-Patch_C/Makefile.in Wed Jul 2 22:09:32 2003 -@@ -23,7 +23,7 @@ - # - # ----------------------------------------------------------------------------- - --VERSION=1.3.1 -+VERSION=1.3.1-Patch_C - - BISONXX = bison++ - YFLAGS = -diff -bB -r -u html2text-1.3.1/Properties.C html2text-1.3.1-Patch_C/Properties.C ---- html2text-1.3.1/Properties.C Fri Jun 8 17:51:09 2001 -+++ html2text-1.3.1-Patch_C/Properties.C Wed Jul 2 22:03:09 2003 -@@ -7,52 +7,33 @@ - * All rights reserved. - * - * Author: Arno Unkrig <arno@unkrig.de> -+ */ -+ -+/* This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. - * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes software developed by GMRS Software GmbH. -- * 4. The name of GMRS Software GmbH may not be used to endorse or promote -- * products derived from this software without specific prior written -- * permission. -- * -- * THIS SOFTWARE IS PROVIDED BY GMRS SOFTWARE GMBH ``AS IS'' AND ANY -- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GMRS SOFTWARE GMBH BE LIABLE -- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -- * THE POSSIBILITY OF SUCH DAMAGE. -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License in the file COPYING for more details. - */ - - /***************************************************************************/ - - /* - * Changes to version 1.2.2 were made by Martin Bayer <mbayer@zedat.fu-berlin.de> -- * Date and reason of last modification: Fre Jun 8 17:24:35 CEST 2001 - new method -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the file -- * COPYING for more details. -+ * Dates and reasons of modifications: -+ * Fre Jun 8 17:24:35 CEST 2001: new method -+ * Wed Jul 2 22:02:51 CEST 2003: ported to g++ 3.3 - */ - - /***************************************************************************/ - - - #include <ctype.h> --#include <iostream.h> -+#include <iostream> - - #include "Properties.h" - -diff -bB -r -u html2text-1.3.1/Properties.h html2text-1.3.1-Patch_C/Properties.h ---- html2text-1.3.1/Properties.h Thu Oct 4 22:39:10 2001 -+++ html2text-1.3.1-Patch_C/Properties.h Wed Jul 2 22:03:45 2003 -@@ -7,13 +7,6 @@ - * All rights reserved. - * - * Author: Arno Unkrig <arno@unkrig.de> -- * -- * All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * "This product includes software developed by GMRS Software GmbH." -- * The name of GMRS Software GmbH may not be used to endorse or promote -- * products derived from this software without specific prior written -- * permission. - */ - - /* This program is free software; you can redistribute it and/or modify -@@ -34,6 +27,7 @@ - * Dates and reasons of modifications: - * Fre Jun 8 17:29:50 CEST 2001 - * Thu Oct 4 22:38:59 CEST 2001: ported to g++ 3.0 -+ * Wed Jul 2 22:03:29 CEST 2003: ported to g++ 3.3 - */ - - /***************************************************************************/ -@@ -51,7 +45,7 @@ - - #include <string> - #include <map> --#include <istream.h> -+#include <istream> - - using std::string; - using std::map; -diff -bB -r -u html2text-1.3.1/format.C html2text-1.3.1-Patch_C/format.C ---- html2text-1.3.1/format.C Mon Jul 29 13:12:13 2002 -+++ html2text-1.3.1-Patch_C/format.C Wed Jul 2 22:04:27 2003 -@@ -29,12 +29,13 @@ - * Fre Jun 8 17:37:12 CEST 2001: new image handling - * Thu Oct 4 21:34:26 CEST 2001: ported to g++ 3.0 - * Mon Jul 29 13:09:26 CEST 2002: fixed runtime increment -+ * Wed Jul 2 22:04:08 CEST 2003: ported to g++ 3.3 - */ - - /***************************************************************************/ - - --#include <strstream.h> -+#include <sstream> - - #include <stdlib.h> - #include <ctype.h> -@@ -374,10 +375,10 @@ - case CUSTOM3: bullet = custom3_bullet; break; - case ARABIC_NUMBERS: - { -- ostrstream oss; -- oss << number << '.' << std::ends; -+ std::ostringstream oss; -+ oss << number << '.'; // << std::ends; - bullet = oss.str(); -- oss.rdbuf()->freeze(0); -+ // oss.rdbuf()->freeze(0); - } - break; - case LOWER_ALPHA: -diff -bB -r -u html2text-1.3.1/format.h html2text-1.3.1-Patch_C/format.h ---- html2text-1.3.1/format.h Thu Oct 4 22:04:15 2001 -+++ html2text-1.3.1-Patch_C/format.h Wed Jul 2 22:06:16 2003 -@@ -7,13 +7,6 @@ - * All rights reserved. - * - * Author: Arno Unkrig <arno@unkrig.de> -- * -- * All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * "This product includes software developed by GMRS Software GmbH." -- * The name of GMRS Software GmbH may not be used to endorse or promote -- * products derived from this software without specific prior written -- * permission. - */ - - /* This program is free software; you can redistribute it and/or modify -@@ -34,6 +27,7 @@ - * Dates and reasons of modifications: - * Fre Jun 8 17:49:39 CEST 2001: new method - * Thu Oct 4 21:36:51 CEST 2001: ported to g++ 3.0 -+ * Wed Jul 2 22:05:32 CEST 2003: ported to g++ 3.3 - */ - - /***************************************************************************/ -@@ -46,7 +40,7 @@ - - #include <string> - #include <vector> --#include <istream.h> -+#include <istream> - - using std::string; - using std::vector; -diff -bB -r -u html2text-1.3.1/html.C html2text-1.3.1-Patch_C/html.C ---- html2text-1.3.1/html.C Fri Jun 8 17:43:53 2001 -+++ html2text-1.3.1-Patch_C/html.C Wed Jul 2 22:07:34 2003 -@@ -7,45 +7,26 @@ - * All rights reserved. - * - * Author: Arno Unkrig <arno@unkrig.de> -+ */ -+ -+/* This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. - * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * 3. All advertising materials mentioning features or use of this software -- * must display the following acknowledgement: -- * This product includes software developed by GMRS Software GmbH. -- * 4. The name of GMRS Software GmbH may not be used to endorse or promote -- * products derived from this software without specific prior written -- * permission. -- * -- * THIS SOFTWARE IS PROVIDED BY GMRS SOFTWARE GMBH ``AS IS'' AND ANY -- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GMRS SOFTWARE GMBH BE LIABLE -- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -- * THE POSSIBILITY OF SUCH DAMAGE. -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License in the file COPYING for more details. - */ - - /***************************************************************************/ - - /* - * Changes to version 1.2.2 were made by Martin Bayer <mbayer@zedat.fu-berlin.de> -- * Date and reason of last modification: Fre Jun 8 17:43:02 CEST 2001 - new method -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the file -- * COPYING for more details. -+ * Dates and reasons of modifications: -+ * Fre Jun 8 17:43:02 CEST 2001: new method -+ * Wed Jul 2 22:07:12 CEST 2003: ported to g++ 3.3 - */ - - /***************************************************************************/ -@@ -53,7 +34,7 @@ - - #include <stdlib.h> - #include <stdarg.h> --#include <iostream.h> -+#include <iostream> - - #include "html.h" - #include "HTMLParser.h" -@@ -145,13 +126,13 @@ - os << "</TITLE>" << separator; - } - if (isindex_attributes.get()) { -- os << "<ISINDEX"<< isindex_attributes << ">" << endl; -+ os << "<ISINDEX"<< isindex_attributes << ">" << std::endl; - } -- if (base_attributes.get()) os << "<BASE" << base_attributes << ">" << endl; -+ if (base_attributes.get()) os << "<BASE" << base_attributes << ">" << std::endl; - foreach(scripts, os, separator); - foreach(styles, os, separator); -- if (meta_attributes.get()) os << "<META" << meta_attributes << ">" << endl; -- if (link_attributes.get()) os << "<LINK" << link_attributes << ">" << endl; -+ if (meta_attributes.get()) os << "<META" << meta_attributes << ">" << std::endl; -+ if (link_attributes.get()) os << "<LINK" << link_attributes << ">" << std::endl; - os << "</HEAD>" << separator; - } - -@@ -306,7 +287,7 @@ - { - os << "<OPTION" << attributes << ">" << separator; - if (pcdata.get()) pcdata->unparse(os, separator); -- os << "</OPTION>" << endl; -+ os << "</OPTION>" << std::endl; - } - - void -@@ -314,7 +295,7 @@ - { - os << "<SELECT" << attributes << ">" << separator; - if (content.get()) foreach(*content, os, separator); -- os << "</SELECT>" << endl; -+ os << "</SELECT>" << std::endl; - } - - void -@@ -322,7 +303,7 @@ - { - os << "<TEXTAREA" << attributes << ">" << separator; - if (pcdata.get()) pcdata->unparse(os, separator); -- os << "</TEXTAREA>" << endl; -+ os << "</TEXTAREA>" << std::endl; - } - - /* ------------------------------------------------------------------------- */ -diff -bB -r -u html2text-1.3.1/html2text.C html2text-1.3.1-Patch_C/html2text.C ---- html2text-1.3.1/html2text.C Mon Jul 22 13:49:53 2002 -+++ html2text-1.3.1-Patch_C/html2text.C Wed Jul 2 22:09:04 2003 -@@ -28,12 +28,13 @@ - * Fre Jun 8 19:00:26 CEST 2001: new image handling - * Thu Oct 4 21:42:24 CEST 2001: ported to g++ 3.0, bugfix for '-' as synonym for STDIN - * Mon Jul 22 13:48:26 CEST 2002: Made finaly reading from STDIN work. -+ * Wed Jul 2 22:08:45 CEST 2003: ported to g++ 3.3 - */ - - /***************************************************************************/ - - --#include <iostream.h> -+#include <iostream> - #include <string.h> - #include <stdlib.h> - -@@ -87,7 +88,7 @@ - */ - if (mode != SYNTAX_CHECK && !strcmp(p, "parse error")) return; - -- cerr -+ std::cerr - << "File \"" - << file_name - << "\", line " -@@ -96,7 +97,7 @@ - << current_column - << ": " - << p -- << endl; -+ << std::endl; - } - - /*virtual*/ void -@@ -109,14 +110,14 @@ - break; - - case UNPARSE: -- document.unparse(os, endl); -+ document.unparse(os, std::endl); - break; - - case SYNTAX_CHECK: - break; - - default: -- cerr << "??? Invalid mode " << mode << " ??? " << endl; -+ std::cerr << "??? Invalid mode " << mode << " ??? " << std::endl; - exit(1); - break; - } -@@ -151,23 +152,23 @@ - main(int argc, char **argv) - { - if (argc == 2 && !strcmp(argv[1], "-help")) { -- cout -- << "This is html2text, version " stringify(VERSION) << endl -- << endl -+ std::cout -+ << "This is html2text, version " stringify(VERSION) << std::endl -+ << std::endl - << usage; - exit(0); - } - - if (argc == 2 && !strcmp(argv[1], "-version")) { -- cout -- << "This is html2text, version " stringify(VERSION) << endl -- << endl -- << "The latest version can be found at http://userpage.fu-berlin.de/~mbayer/tools/" << endl -- << endl -- << "This program is distributed in the hope that it will be useful, but WITHOUT" << endl -- << "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS" << endl -- << "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details." << endl -- << endl; -+ std::cout -+ << "This is html2text, version " stringify(VERSION) << std::endl -+ << std::endl -+ << "The latest version can be found at http://userpage.fu-berlin.de/~mbayer/tools/" << std::endl -+ << std::endl -+ << "This program is distributed in the hope that it will be useful, but WITHOUT" << std::endl -+ << "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS" << std::endl -+ << "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details." << std::endl -+ << std::endl; - exit(0); - } - -@@ -195,20 +196,20 @@ - if (!strcmp(arg, "-o" )) { output_file_name = argv[++i]; } else - if (!strcmp(arg, "-nobs" )) { use_backspaces = false; } else - { -- cerr -+ std::cerr - << "Unrecognized command line option \"" - << arg - << "\", try \"-help\"." -- << endl; -+ << std::endl; - exit(1); - } - } - if (i > argc) { -- cerr -+ std::cerr - << "Error: Required parameter after \"" - << argv[argc - 1] - << "\" missing." -- << endl; -+ << std::endl; - exit(1); - } - -@@ -299,16 +300,16 @@ - Formatting::setProperty(p->key, p->value); - } - } else { -- cerr -+ std::cerr - << "Unknown style \"" - << style - << "\" specified -- try \"-help\"." -- << endl; -+ << std::endl; - ::exit(1); - } - - { -- ifstream ifs(rcfile.c_str()); -+ std::ifstream ifs(rcfile.c_str()); - if (!ifs.rdbuf()->is_open()) ifs.open("/etc/html2textrc"); - if (ifs.rdbuf()->is_open()) { - Formatting::loadProperties(ifs); -@@ -321,18 +322,18 @@ - Area::use_backspaces = use_backspaces; - - ostream *osp; -- ofstream ofs; -+ std::ofstream ofs; - - if (!strcmp(output_file_name, "-")) { -- osp = &cout; -+ osp = &std::cout; - } else { -- ofs.open(output_file_name, ios::out); -+ ofs.open(output_file_name, std::ios::out); - if (!ofs) { -- cerr -+ std::cerr - << "Could not open output file \"" - << output_file_name - << "\"." -- << endl; -+ << std::endl; - exit(1); - } - osp = &ofs; -@@ -342,7 +343,7 @@ - const char *input_url = input_urls[i]; - - if (number_of_input_urls != 1) { -- *osp << "###### " << input_url << " ######" << endl; -+ *osp << "###### " << input_url << " ######" << std::endl; - } - - istream *isp; -@@ -350,12 +351,12 @@ - - uis.open(input_url); - if (!uis.is_open()) { -- cerr -+ std::cerr - << "Opening input URL \"" - << input_url - << "\": " - << uis.open_error() -- << endl; -+ << std::endl; - exit(1); - } - -diff -bB -r -u html2text-1.3.1/urlistream.h html2text-1.3.1-Patch_C/urlistream.h ---- html2text-1.3.1/urlistream.h Sun Apr 7 12:01:21 2002 -+++ html2text-1.3.1-Patch_C/urlistream.h Wed Jul 2 22:08:32 2003 -@@ -27,6 +27,7 @@ - * Dates and reasons of modifications: - * Thu Oct 4 21:50:51 CEST 2001: ported to g++ 3.0 - * Sun Apr 7 12:00:50 CEST 2002: Handle URLs with missing node -+ * Wed Jul 2 22:08:05 CEST 2003: ported to g++ 3.3 - */ - - /***************************************************************************/ -@@ -37,7 +38,7 @@ - - /* ------------------------------------------------------------------------- */ - --#include <fstream.h> -+#include <fstream> - #include <string> - #include <unistd.h> - diff --git a/app-text/html2text/html2text-1.3.1.ebuild b/app-text/html2text/html2text-1.3.1.ebuild index 22c486b856d3..4b2c67e3256d 100644 --- a/app-text/html2text/html2text-1.3.1.ebuild +++ b/app-text/html2text/html2text-1.3.1.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/html2text/html2text-1.3.1.ebuild,v 1.12 2005/01/01 16:19:37 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/html2text/html2text-1.3.1.ebuild,v 1.13 2006/02/21 18:16:34 nattfodd Exp $ inherit eutils DESCRIPTION="A HTML to text converter" HOMEPAGE="http://userpage.fu-berlin.de/~mbayer/tools/html2text.html" -SRC_URI="http://userpage.fu-berlin.de/~mbayer/tools/historic/${P}.tar.gz" +SRC_URI="http://userpage.fu-berlin.de/~mbayer/tools/historic/${P}.tar.gz + mirror://gentoo/${PN}-gcc3.3.patch" LICENSE="GPL-2" SLOT="0" @@ -20,7 +21,7 @@ src_unpack() { # apply a patch for g++ 3.3, provided by the html2text # people (see homepage) <obz@gentoo.org> if has_version ">=sys-devel/gcc-3.3*"; then - epatch ${FILESDIR}/${PN}-gcc3.3.patch + epatch ${DISTDIR}/${PN}-gcc3.3.patch fi } |