Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

8 files changed, 68 insertions, 149 deletions

diff --git a/dev-util/httpup/ChangeLog b/dev-util/httpup/ChangeLog
index 7bd8aa750370..23834aa77552 100644
--- a/dev-util/httpup/ChangeLog
+++ b/dev-util/httpup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/httpup
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/httpup/ChangeLog,v 1.8 2010/04/07 11:38:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/httpup/ChangeLog,v 1.9 2010/05/21 20:41:47 ssuominen Exp $
+
+*httpup-0.4.0k (21 May 2010)
+
+  21 May 2010; Samuli Suominen <ssuominen@gentoo.org> +httpup-0.4.0k.ebuild,
+  +files/httpup-0.4.0k-Makefile.patch:
+  Version bump.
 
   07 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   files/httpup-0.3.2-gcc43.patch:
diff --git a/dev-util/httpup/Manifest b/dev-util/httpup/Manifest
index 5a3484eed9ab..5354fd8c39c2 100644
--- a/dev-util/httpup/Manifest
+++ b/dev-util/httpup/Manifest
@@ -1,17 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX httpup-0.3.2-darwin.patch 268 RMD160 9820328c0ecd1a93c7da8271e12bc2d246962b11 SHA1 20a480471781df2a14b03f32ca0b5d515f73dd09 SHA256 6f6d2834e9cd058c886a779c651afda27193109c4367050bcd3b5a27cb21d9d5
-AUX httpup-0.3.2-gcc43.patch 1657 RMD160 a7ab2bc9cfdf49501d4d62b36f4ecc29c401617e SHA1 0d5f412070a0398b3946d5c42965e097d61757fd SHA256 d8273a7414c465c2e343a5342f76eee20175f75d4d41f61b27bfcaa66bcf4f23
-AUX httpup-0.3.2-gcc44.patch 1163 RMD160 642fe844c931d73ddcd820a4690d0afb6c2296fd SHA1 cbda7490d63ccc73d8817d07706aa059c5d4796a SHA256 f178859c34523109aea37b0d23993a80595b6d7e8dfcbc42738311421a21bf9b
-DIST httpup-0.3.2.tar.gz 19491 RMD160 4ba6208e5a872b4666b896431d0b179fd8a5f1da SHA1 385323e2aaf9a956b5158bdc3c02329b07989f3f SHA256 c57766bd414a08f6528b78b2677bb4f3c978b4187db775af5a437d0a6af557dc
-EBUILD httpup-0.3.2.ebuild 989 RMD160 fc2261a9fd40eef5a92945e5856c0aadb9102b9f SHA1 7d3656324fb8c89f3eba215d69c7f0bdc8cf3ebc SHA256 c4e1131ac2b0c14955fc5f9666a7465f9861400512e946f7582f8081eb494f16
-MISC ChangeLog 1228 RMD160 af85a609607caeece1e4b6191153110f5e068a91 SHA1 1efcd8318f828aa3f040f0a0f3dee7a87cafaad8 SHA256 bd3938e6055deb185e8291aeefb8d8ffd8a3c491778e7c37a38965f8afbdf26f
+AUX httpup-0.4.0k-Makefile.patch 596 RMD160 4f799e276ae871444661b217db10568edd370153 SHA1 9ba8457e5e29fc0ec1bb9de68ebbed10c7738534 SHA256 0f86b20ac1167a08cd8f38c5fcc6f0efea8762d37ddf0f0b6628837dfe45c449
+DIST httpup-0.4.0k.tar.gz 27167 RMD160 8a1bd9aebaf482e08322139fb7d97f825ba6cc72 SHA1 6d2fb3844583f9fefdf7820342f28934392b783a SHA256 780043fa99e9c1b09b115f4e0a71fc4aeb7278a59fbfcd65c9d34385ee52f3d6
+EBUILD httpup-0.4.0k.ebuild 819 RMD160 c37d367235bac171e6192b2b7acc364843374ac7 SHA1 3056f6c9a8fe945be02a4c045a505911de7bd06a SHA256 dc5a5e0065e66a17468350798bc6d35a32cc2a26a5d0dd7d5492134268b4fe19
+MISC ChangeLog 1391 RMD160 d9f9f732ba065f0e0d20131f98de0edba3235b1d SHA1 944b8aecebc01ae1f780be1898e4fe75f7eac461 SHA256 98bc41b39b0bf7dce6085a9aad9676e54f0351f7348d045783dbb11ff9fe3f8a
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAku8bsQACgkQAiZjviIA2XiGcgCdGmJeGpyTzs3Pa7RqjB7rtBcI
-TRAAoJp+AbMma0kv4Fbfz/ocAjAnjsmR
-=+XJK
------END PGP SIGNATURE-----
diff --git a/dev-util/httpup/files/httpup-0.3.2-darwin.patch b/dev-util/httpup/files/httpup-0.3.2-darwin.patch
deleted file mode 100644
index 30a76c5fa8c3..000000000000
--- a/dev-util/httpup/files/httpup-0.3.2-darwin.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-* Darwin and BSD need libgen.h for basename, on linux this header is
-  also available
-
---- httpup.cpp
-+++ httpup.cpp
-@@ -15,6 +15,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <dirent.h>
-+#include <libgen.h>
- 
- #include "fileutils.h"
- #include "httpup.h"
diff --git a/dev-util/httpup/files/httpup-0.3.2-gcc43.patch b/dev-util/httpup/files/httpup-0.3.2-gcc43.patch
deleted file mode 100644
index 5df79cb0c425..000000000000
--- a/dev-util/httpup/files/httpup-0.3.2-gcc43.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -NrU5 httpup-0.3.2.orig/configparser.cpp httpup-0.3.2/configparser.cpp
---- httpup-0.3.2.orig/configparser.cpp	2008-06-20 15:59:35.000000000 +0200
-+++ httpup-0.3.2/configparser.cpp	2008-06-20 16:00:07.000000000 +0200
-@@ -8,10 +8,11 @@
- //  the Free Software Foundation; either version 2 of the License, or     
- //  (at your option) any later version.                                   
- ////////////////////////////////////////////////////////////////////////
- 
- #include <iostream>
-+#include <cstring>
- #include "configparser.h"
- 
- using namespace std;
- 
- int ConfigParser::parseConfig(const std::string& fileName,
-diff -NrU5 httpup-0.3.2.orig/httpup.cpp httpup-0.3.2/httpup.cpp
---- httpup-0.3.2.orig/httpup.cpp	2008-06-20 15:59:35.000000000 +0200
-+++ httpup-0.3.2/httpup.cpp	2008-06-20 15:59:43.000000000 +0200
-@@ -13,11 +13,13 @@
- 
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
- #include <dirent.h>
- #include <libgen.h>
-+#include <cstring>
-+#include <cstdlib>
- 
- #include "fileutils.h"
- #include "httpup.h"
- #include "configparser.h"
- 
-diff -NrU5 httpup-0.3.2.orig/main.cpp httpup-0.3.2/main.cpp
---- httpup-0.3.2.orig/main.cpp	2008-06-20 15:59:35.000000000 +0200
-+++ httpup-0.3.2/main.cpp	2008-06-20 15:59:43.000000000 +0200
-@@ -8,11 +8,14 @@
- //  the Free Software Foundation; either version 2 of the License, or
- //  (at your option) any later version.
- ////////////////////////////////////////////////////////////////////////
- 
- #include <iostream>
--#include <string>
-+#include <cstring>
-+#include <cstdlib>
-+#include <algorithm>
-+
- using namespace std;
- 
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <dirent.h>
diff --git a/dev-util/httpup/files/httpup-0.3.2-gcc44.patch b/dev-util/httpup/files/httpup-0.3.2-gcc44.patch
deleted file mode 100644
index 83f100c76589..000000000000
--- a/dev-util/httpup/files/httpup-0.3.2-gcc44.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -NrU5 httpup-0.3.2.original/configparser.cpp httpup-0.3.2/configparser.cpp
---- httpup-0.3.2.original/configparser.cpp	2009-08-25 20:01:59.000000000 -0600
-+++ httpup-0.3.2/configparser.cpp	2009-08-25 20:02:20.000000000 -0600
-@@ -9,10 +9,11 @@
- //  (at your option) any later version.                                   
- ////////////////////////////////////////////////////////////////////////
- 
- #include <iostream>
- #include <cstring>
-+#include <cstdio>
- #include "configparser.h"
- 
- using namespace std;
- 
- int ConfigParser::parseConfig(const std::string& fileName,
-diff -NrU5 httpup-0.3.2.original/fileutils.cpp httpup-0.3.2/fileutils.cpp
---- httpup-0.3.2.original/fileutils.cpp	2009-08-25 20:01:59.000000000 -0600
-+++ httpup-0.3.2/fileutils.cpp	2009-08-25 20:02:29.000000000 -0600
-@@ -8,10 +8,11 @@
- //  the Free Software Foundation; either version 2 of the License, or     
- //  (at your option) any later version.                                   
- ////////////////////////////////////////////////////////////////////////
- 
- #include <sys/types.h>
-+#include <cstdio>
- #include <sys/stat.h>
- #include <unistd.h>
- #include <dirent.h>
- 
- #include "md5.h"
diff --git a/dev-util/httpup/files/httpup-0.4.0k-Makefile.patch b/dev-util/httpup/files/httpup-0.4.0k-Makefile.patch
new file mode 100644
index 000000000000..ee4ed9dec288
--- /dev/null
+++ b/dev-util/httpup/files/httpup-0.4.0k-Makefile.patch
@@ -0,0 +1,26 @@
+--- Makefile.orig	2010-05-21 23:31:01.000000000 +0300
++++ Makefile	2010-05-21 23:32:04.000000000 +0300
+@@ -8,10 +8,10 @@
+ mandir=		$(prefix)/man
+ 
+ 
+-CXX=		g++
+-CXXFLAGS=	-O2 -pipe -DMF_VERSION=\"${version}\"
+-CXXFLAGS+=	-g -Wall -Werror
+-LDFLAGS= 	-lcurl
++CXX?=		g++
++CXXFLAGS+=	-DMF_VERSION=\"${version}\"
++CXXFLAGS+=	-Wall
++LIBS= 		-lcurl
+ 
+ INSTALL=	/usr/bin/install
+ STRIP=		/usr/bin/strip
+@@ -36,7 +36,7 @@
+ 
+ 
+ $(name): $(OBJS)
+-	$(CXX) $(LDFLAGS) $(OBJS) -o $(name)
++	$(CXX) $(LDFLAGS) $(OBJS) -o $(name) $(LIBS)
+ 
+ distclean: clean
+ 	-rm -f Makefile config.log config.h *~ *.core core.*
diff --git a/dev-util/httpup/httpup-0.3.2.ebuild b/dev-util/httpup/httpup-0.3.2.ebuild
deleted file mode 100644
index bf064bcadd9d..000000000000
--- a/dev-util/httpup/httpup-0.3.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/httpup/httpup-0.3.2.ebuild,v 1.5 2010/02/21 01:29:43 abcd Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="synchronisation tool for http file repositories"
-HOMEPAGE="http://clc.berlios.de/projects/httpup/"
-SRC_URI="http://jw.tks6.net/files/crux/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="net-misc/curl"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-darwin.patch
-	sed -i \
-		-e 's:g++:$(CXX) $(CFLAGS) $(LDFLAGS):' \
-		Makefile
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX)" || die "make failed"
-}
-
-src_install() {
-	dobin httpup httpup-repgen httpup-repgen2 || die "dobin"
-	doman *.8
-	dodoc AUTHORS README TODO ChangeLog httpup.conf.example
-}
diff --git a/dev-util/httpup/httpup-0.4.0k.ebuild b/dev-util/httpup/httpup-0.4.0k.ebuild
new file mode 100644
index 000000000000..85414a31de7d
--- /dev/null
+++ b/dev-util/httpup/httpup-0.4.0k.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/httpup/httpup-0.4.0k.ebuild,v 1.1 2010/05/21 20:41:47 ssuominen Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="synchronisation tool for http file repositories"
+HOMEPAGE="http://jw.tks6.net/files/crux/httpup_manual.html"
+SRC_URI="http://jw.tks6.net/files/crux/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="net-misc/curl"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+}
+
+src_compile() {
+	tc-export CC CXX
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" mandir="/usr/share/man" prefix="/usr" install || die
+	dodoc AUTHORS ChangeLog httpup.conf.example README TODO
+}