Version bump. Remove old.

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

6 files changed, 43 insertions, 257 deletions

diff --git a/app-text/htmlrecode/ChangeLog b/app-text/htmlrecode/ChangeLog
index c0748cdf4f28..d4654a686d7d 100644
--- a/app-text/htmlrecode/ChangeLog
+++ b/app-text/htmlrecode/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/htmlrecode
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmlrecode/ChangeLog,v 1.9 2010/11/19 02:09:40 sping Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmlrecode/ChangeLog,v 1.10 2012/04/18 19:12:31 floppym Exp $
+
+*htmlrecode-1.3.1 (18 Apr 2012)
+
+  18 Apr 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/htmlrecode-1.3.1-ar.patch, +htmlrecode-1.3.1.ebuild,
+  -files/htmlrecode-1.3.0-misc-fixes.patch, -htmlrecode-1.2.0.ebuild,
+  -htmlrecode-1.3.0-r1.ebuild, -htmlrecode-1.3.0.ebuild:
+  Version bump. Remove old.
 
 *htmlrecode-1.3.0-r1 (19 Nov 2010)
 
diff --git a/app-text/htmlrecode/files/htmlrecode-1.3.0-misc-fixes.patch b/app-text/htmlrecode/files/htmlrecode-1.3.0-misc-fixes.patch
deleted file mode 100644
index 4c32c8ae5e10..000000000000
--- a/app-text/htmlrecode/files/htmlrecode-1.3.0-misc-fixes.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-Reason: Adds missing headers (gcc-4.3 compatibility), 
-	use size_t and long where needed (amd64 fixes), and fixes some warnings.
-Upstream: Sent.
---- htmlrecode-1.3.0.orig/argh/argh.cc
-+++ htmlrecode-1.3.0/argh/argh.cc
-@@ -1,6 +1,7 @@
- #include <map>
- #include <cstdio>
- #include <cstring>
-+#include <cstdlib>
- 
- using std::strchr;
- using std::sprintf;
-@@ -153,7 +154,7 @@
-     else if(longo.substr(0, 5) == "with-")   { nega=false; longo.erase(0, 5); }
-     
- NegaDone:
--    unsigned p = longo.find('=');
-+    size_t p = longo.find('=');
-     if(p == longo.npos)p = longo.find(':');
-     string option;
-     if(p != longo.npos) {option=longo.substr(p+1);longo.erase(p);}
-@@ -192,7 +193,7 @@
-     argh_descsmap::const_iterator k;
-     
-     vector<pair<string,string> > hdrs;
--    unsigned widest=0;
-+    size_t widest=0;
- 
-     for(j=aliases->begin(); j!=aliases->end(); ++j)
-         if(argtypes->find(j->second) == argtypes->end())
-@@ -244,7 +245,7 @@
-         hdrs.push_back(pair<string,string> (s, k->second.first));
-     }
-     
--    for(unsigned a=0; a<hdrs.size(); ++a)
-+    for(size_t a=0; a<hdrs.size(); ++a)
-         PrintOpt(widest, hdrs[a].first, hdrs[a].second);
- }
- 
-@@ -380,9 +381,9 @@
-     printf("    %-*s  ", space, opt.c_str());
-     
-     bool needeol = true;
--    for(unsigned a=0; a < desc.size(); )
-+    for(size_t a=0; a < desc.size(); )
-     {
--        unsigned b = desc.find('\n', a);
-+        size_t b = desc.find('\n', a);
-         if(!needeol){printf("%*s", space+6, "");needeol=true;}
-         if(b == desc.npos) { printf("%s", desc.c_str()+a); break; }
-         printf("%s", desc.substr(a, b-a).c_str());
---- htmlrecode-1.3.0.orig/htmlrecode.cc
-+++ htmlrecode-1.3.0/htmlrecode.cc
-@@ -8,6 +8,7 @@
- #include <list>        // list
- #include <cerrno>      // errno
- #include <cstdlib>     // perror
-+#include <cstring>     // memmove
- 
- #include "htmlrecode.hh"
- 
-@@ -41,7 +42,7 @@
- }
- static bool IsEqual(const wstring &s1, const char *s2)
- {
--    for(unsigned a=0; a<s1.size(); ++a, ++s2)
-+    for(size_t a=0; a<s1.size(); ++a, ++s2)
-     {
-         if(!*s2)return false;
-         if(s1[a] >= 0x100)return false;
-@@ -147,8 +148,8 @@
- bool Page::Dumper::isok(ucs4 p) const
- {
-     char OutBuf[256], *outptr = OutBuf, *tmp = (char *)&p;
--    unsigned outsize = sizeof OutBuf;
--    unsigned insize = sizeof(p);
-+    size_t outsize = sizeof OutBuf;
-+    size_t insize = sizeof(p);
-     size_t retval = iconv(tester, &tmp, &insize, &outptr, &outsize);
-     if(retval == (size_t)-1)return false;
-     return true;
-@@ -524,10 +525,10 @@
-     while(left > 0)
-     {
-         char OutBuf[4096], *outptr = OutBuf;
--        unsigned outsize = sizeof OutBuf;
-+        size_t outsize = sizeof OutBuf;
-     #if DEBUG
-         fprintf(stderr, "P1:Converting %u bytes to %u bytes space\n", left, outsize);
--        unsigned bytesread = left, converted = outsize;
-+        size_t bytesread = left, converted = outsize;
-     #endif
-         size_t retval = iconv(converter, &input, &left, &outptr, &outsize);
-     #if DEBUG
-@@ -761,7 +762,7 @@
-             wstring &s = tag.GetParamValue("CONTENT");
-                
-             wstring tmp; tmp += "charset=";
--            unsigned a = s.find(tmp);
-+            size_t a = s.find(tmp);
-             if(a == s.npos) { continue; }
-             a += 8;
-             
-@@ -852,7 +853,7 @@
-     
-     for(;;)
-     {
--        int code = fread(bufptr+bytes, 1, sizeof InBuf - bytes, fp);
-+        size_t code = fread(bufptr+bytes, 1, sizeof InBuf - bytes, fp);
-         if(code <= 0)
-         {
-             if(!bytes)break;
-@@ -868,9 +869,9 @@
-         bool gotilseq = false;
-     #if DEBUG
-         fprintf(stderr, "P2:Converting %u bytes to %u bytes space\n", bytes, outsize);
--        unsigned bytesread = bytes;
-+        size_t bytesread = bytes;
-     #endif
--        unsigned converted = outsize;
-+        size_t converted = outsize;
-         size_t retval = iconv(converter, &bufptr, &bytes, &outptr, &outsize);
-         converted -= outsize;
-     #if DEBUG
-@@ -971,7 +972,7 @@
-             wstring s = tag.GetParamValue("CONTENT");
- 
-             wstring tmp; tmp += "charset=";
--            unsigned a = s.find(tmp);
-+            size_t a = s.find(tmp);
-             if(a == s.npos) { continue; }
-             
-             wstring way = s.substr(a+8);
-@@ -1002,7 +1003,7 @@
-         {
-             fprintf(stderr, "Error: The document is schizophrenic and claims to be encoded in various ways:");
-             set<wstring>::const_iterator i;
--            unsigned c=newcharset.size();
-+            size_t c=newcharset.size();
-             for(i=newcharset.begin(); i!=newcharset.end(); ++i)
-             {
-                 string s = Stringify(*i);
-@@ -1523,7 +1524,7 @@
-     Argh.StartParse(argc, argv);
-     for(;;)
-     {
--        int c = Argh.GetParam();
-+        long c = Argh.GetParam();
-         if(c == -1)break;
-         switch(c)
-         {
diff --git a/app-text/htmlrecode/files/htmlrecode-1.3.1-ar.patch b/app-text/htmlrecode/files/htmlrecode-1.3.1-ar.patch
new file mode 100644
index 000000000000..57e080c8a378
--- /dev/null
+++ b/app-text/htmlrecode/files/htmlrecode-1.3.1-ar.patch
@@ -0,0 +1,11 @@
+--- a/argh/Makefile
++++ b/argh/Makefile
+@@ -21,7 +21,7 @@
+ 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -fpic -o $@ -c $<
+ 
+ libargh.a: argh.o
+-	ar -rc $@ $^
++	$(AR) -rc $@ $^
+ 
+ include depfun.mak
+ 
diff --git a/app-text/htmlrecode/htmlrecode-1.2.0.ebuild b/app-text/htmlrecode/htmlrecode-1.2.0.ebuild
deleted file mode 100644
index 564f8683c328..000000000000
--- a/app-text/htmlrecode/htmlrecode-1.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmlrecode/htmlrecode-1.2.0.ebuild,v 1.6 2009/09/23 16:35:46 patrick Exp $
-
-DESCRIPTION="Recodes HTML file using a new character set"
-HOMEPAGE="http://bisqwit.iki.fi/source/htmlrecode.html"
-SRC_URI="http://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
-
-KEYWORDS="~x86 ~ppc"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-apps/sed-4"
-RDEPEND=""
-
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	sed -i \
-		-e "s:^\\(ARGHLINK.*-L.*\\):#\\1:" \
-		-e "s:^#\\(ARGHLINK=.*a\\)$:\\1:" \
-		Makefile
-
-	touch .depend argh/.depend
-}
-
-src_compile() {
-	emake -C argh libargh.a || die
-	emake htmlrecode || die
-}
-
-src_install() {
-	dobin htmlrecode
-	dodoc README.html
-}
diff --git a/app-text/htmlrecode/htmlrecode-1.3.0-r1.ebuild b/app-text/htmlrecode/htmlrecode-1.3.0-r1.ebuild
deleted file mode 100644
index e69d0d5d846d..000000000000
--- a/app-text/htmlrecode/htmlrecode-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmlrecode/htmlrecode-1.3.0-r1.ebuild,v 1.1 2010/11/19 02:09:40 sping Exp $
-
-inherit eutils
-
-DESCRIPTION="Recodes HTML file using a new character set"
-HOMEPAGE="http://bisqwit.iki.fi/source/htmlrecode.html"
-SRC_URI="http://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=sys-apps/sed-4"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-misc-fixes.patch
-
-	sed -i \
-		-e "s:^\\(ARGHLINK.*-L.*\\):#\\1:" \
-		-e "s:^#\\(ARGHLINK=.*a\\)$:\\1:" \
-		Makefile
-
-	touch .depend argh/.depend
-
-	for i in {,argh/}Makefile.sets ; do
-		einfo "Patching compile flags in \${S}/$i ..."
-		echo "CXXFLAGS=${CXXFLAGS}" >> "${i}"
-		echo "LDFLAGS=${LDFLAGS}" >> "${i}"
-	done
-}
-
-src_compile() {
-	emake -C argh libargh.a || die
-	emake htmlrecode || die
-}
-
-src_install() {
-	dobin htmlrecode || die
-	dodoc README.html
-}
diff --git a/app-text/htmlrecode/htmlrecode-1.3.0.ebuild b/app-text/htmlrecode/htmlrecode-1.3.1.ebuild
index 18aed7bf9bc6..6c67068f1a3f 100644
--- a/app-text/htmlrecode/htmlrecode-1.3.0.ebuild
+++ b/app-text/htmlrecode/htmlrecode-1.3.1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmlrecode/htmlrecode-1.3.0.ebuild,v 1.2 2009/09/23 16:35:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmlrecode/htmlrecode-1.3.1.ebuild,v 1.1 2012/04/18 19:12:31 floppym Exp $
 
-inherit eutils
+EAPI=4
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Recodes HTML file using a new character set"
 HOMEPAGE="http://bisqwit.iki.fi/source/htmlrecode.html"
@@ -16,26 +18,28 @@ IUSE=""
 DEPEND=">=sys-apps/sed-4"
 RDEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-misc-fixes.patch
-
-	sed -i \
-		-e "s:^\\(ARGHLINK.*-L.*\\):#\\1:" \
-		-e "s:^#\\(ARGHLINK=.*a\\)$:\\1:" \
-		Makefile
-
+src_prepare() {
+	epatch "${FILESDIR}/${P}-ar.patch"
 	touch .depend argh/.depend
 }
 
+src_configure() {
+	:
+}
+
 src_compile() {
-	emake -C argh libargh.a || die
-	emake htmlrecode || die
+	local makeopts=(
+		AR="$(tc-getAR)"
+		CPPDEBUG=
+		CXX="$(tc-getCXX)"
+		CXXFLAGS="${CXXFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+	)
+	emake "${makeopts[@]}" -C argh libargh.a
+	emake "${makeopts[@]}" htmlrecode
 }
 
 src_install() {
-	dobin htmlrecode || die
-	dodoc README.html
+	dobin htmlrecode
+	dohtml README.html
 }