Fix building with newer toolchains by using Debian patches #251529 by Diego E. Flameeyes Pettenò.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

4 files changed, 28 insertions, 47 deletions

diff --git a/net-nntp/nget/ChangeLog b/net-nntp/nget/ChangeLog
index 9b6d456c9530..8000ddbbfa3a 100644
--- a/net-nntp/nget/ChangeLog
+++ b/net-nntp/nget/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nntp/nget
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/nget/ChangeLog,v 1.12 2008/05/04 01:34:25 dragonheart Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nget/ChangeLog,v 1.13 2009/02/15 22:38:29 vapier Exp $
+
+  15 Feb 2009; Mike Frysinger <vapier@gentoo.org>
+  -files/nget-0.27.1-gcc-4.3.patch, +files/nget-0.27.1-headers.patch,
+  nget-0.27.1.ebuild:
+  Fix building with newer toolchains by using Debian patches #251529 by
+  Diego E. Flameeyes Pettenò.
 
   04 May 2008; Daniel Black <dragonheart@gentoo.org>
   +files/nget-0.27.1-gcc-4.3.patch, nget-0.27.1.ebuild:
diff --git a/net-nntp/nget/files/nget-0.27.1-gcc-4.3.patch b/net-nntp/nget/files/nget-0.27.1-gcc-4.3.patch
deleted file mode 100644
index d990c6a139c5..000000000000
--- a/net-nntp/nget/files/nget-0.27.1-gcc-4.3.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- auto_map.h	2004/06/17 20:59:44	1.8
-+++ auto_map.h	2008/03/03 06:41:59	1.9
-@@ -23,10 +23,10 @@
- #include <assert.h>
- #include <map>
- 
--template <class K, class T, template <class BK, class BT> class Base>
--class auto_map_base : public Base<K, restricted_ptr<T> > {
-+template <class K, class T,  class Base>
-+class auto_map_base : public Base {
- 	protected:
--		typedef Base<K, restricted_ptr<T> > super;
-+		typedef Base super;
- 	public:
- 		typedef typename super::iterator iterator;
- 
-@@ -55,9 +55,9 @@
- 
- 
- template <class K, class T>
--class auto_map : public auto_map_base<K, T, std::map> {
-+class auto_map : public auto_map_base<K, T, std::map<K, restricted_ptr<T> > > {
- 	public:
--		typedef typename auto_map_base<K, T, std::map>::super super;
-+		typedef typename auto_map_base<K, T, std::map<K, restricted_ptr<T> > >::super super;
- 		typedef typename super::iterator iterator;
- 		typedef typename super::value_type value_type;
- 		/*super::value_type value_type(const K &k, T*p) {
-@@ -74,9 +74,9 @@
- };
- 
- template <class K, class T>
--class auto_multimap : public auto_map_base<K, T, std::multimap> {
-+class auto_multimap : public auto_map_base<K, T, std::multimap<K, restricted_ptr<T> > > {
- 	public:
--		typedef typename auto_map_base<K, T, std::multimap>::super super;
-+		typedef typename auto_map_base<K, T, std::multimap<K, restricted_ptr<T> > >::super super;
- 		typedef typename super::iterator iterator;
- 		typedef typename super::value_type value_type;
- 		iterator insert_value(const K &k, T* p) { //we can't really use the normal insert funcs, but we don't want to just name it insert since it would be easy to confuse with all the normal map insert funcs
diff --git a/net-nntp/nget/files/nget-0.27.1-headers.patch b/net-nntp/nget/files/nget-0.27.1-headers.patch
new file mode 100644
index 000000000000..616ab6ece8d0
--- /dev/null
+++ b/net-nntp/nget/files/nget-0.27.1-headers.patch
@@ -0,0 +1,10 @@
+--- server.cc
++++ server.cc
+@@ -16,6 +16,7 @@
+     along with this program; if not, write to the Free Software
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
++#include <limits.h>
+ #include "server.h"
+ #include "strreps.h"
+ #include "nget.h"
diff --git a/net-nntp/nget/nget-0.27.1.ebuild b/net-nntp/nget/nget-0.27.1.ebuild
index 479ce7d4fe8a..2615e9d0aa55 100644
--- a/net-nntp/nget/nget-0.27.1.ebuild
+++ b/net-nntp/nget/nget-0.27.1.ebuild
@@ -1,12 +1,15 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/nget/nget-0.27.1.ebuild,v 1.10 2008/05/04 01:34:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nget/nget-0.27.1.ebuild,v 1.11 2009/02/15 22:38:29 vapier Exp $
 
 inherit flag-o-matic eutils
 
+DEB_VER="10"
+DEB_PATCH="${PN}_${PV}-${DEB_VER}.diff"
 DESCRIPTION="Network utility to retrieve files from an NNTP news server"
 HOMEPAGE="http://nget.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://debian/pool/main/n/nget/${DEB_PATCH}.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,9 +23,11 @@ RDEPEND="dev-libs/popt
 DEPEND="dev-libs/uulib"
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
+	epatch "${WORKDIR}"/${DEB_PATCH}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
+	epatch debian/patches/*.patch "${FILESDIR}"/${P}-headers.patch
+	sed -i '/^install_bin/s:-s::' Makefile.in
 }
 
 src_compile() {