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

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

5 files changed, 42 insertions, 50 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/Manifest b/net-nntp/nget/Manifest
index 558461e87999..7191d690879b 100644
--- a/net-nntp/nget/Manifest
+++ b/net-nntp/nget/Manifest
@@ -1,5 +1,16 @@
-AUX nget-0.27.1-gcc-4.3.patch 1670 RMD160 2bf5f73176196b7d580e7bbb52e8691c7ca39331 SHA1 0ca866ac4435a245a52b80ff5e6e59b8912f5a46 SHA256 ca592c5a17b04deb8aaacd49af855fd49eebbe9b6f4252a2eb89fa2882f452a5
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX nget-0.27.1-headers.patch 261 RMD160 19f58c08d0459def15c70d652ddd3fd08499e45e SHA1 2d6a41ac7b57216f0f24f3d3bb7a7e8c8bc8fb9e SHA256 64e89bfe811fe3f3b7950bb5a6d4e8adfea04ebd3b4fcf50b4e211be7c1b151b
 DIST nget-0.27.1.tar.gz 490164 RMD160 b90e3d6e2a33e630144a090f68f9bdd818f5e1bd SHA1 80e348dcb65fcb26cbe037598e676f4770cd7ad1 SHA256 6ec0339c8e0e3e31504f5171f479f154d3c0ba2108377a0105fe4a5f5082ea69
-EBUILD nget-0.27.1.ebuild 1133 RMD160 0bd86d15075ce143e6d2038b5035238ab539dc71 SHA1 b57dd41077668c668fecb332961bf14308821487 SHA256 24ef5a3b17909c1ba9c48c3cac4b51f692d61f04d34c656aa99799b018bee666
-MISC ChangeLog 3352 RMD160 f163e2b5e6ffd531b9c1b8fe4ac10ea8b9ed2d88 SHA1 5f38ef30704861889d4044f4d7a60753692833de SHA256 b9164741253c9b4d4622801d4f65038e70d055c877536b487fa9319dc7ddaaea
+DIST nget_0.27.1-10.diff.gz 5649 RMD160 dd9697353b7d197bd02a2fd0a7cac48e25b26354 SHA1 0b8bb442a235de815447922e42ba0eab0096217f SHA256 cefaf94ca9a65aca9727256aa33a30e5b7fd575639ad0386ff9740d2ef96a483
+EBUILD nget-0.27.1.ebuild 1329 RMD160 fbefc3e7aeea1d7cc7845649e99ac1460549bae9 SHA1 c0fb8361b204fe79325f7cb1660448b25b3f1195 SHA256 eecc1242392e1e5f5c4970ed496aa67b4efef9f8f874e046991d527d944dea28
+MISC ChangeLog 3593 RMD160 ac451104f24c6230bc7af48050b588fe1b0343f1 SHA1 a25742e3bb3cca328c0c5339ae3b3e362b17411a SHA256 45591ce42fe6487ee052164efc02930c9590ea8dbd2a401141d26d056e62f8e1
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmYmWsACgkQn/5bYzqsSmHy0QCgoeUgqcdevEdf1BMRSLxs2fbb
+mS4An0o6/WQFgjgWsJ4vcrUZwtHwNbit
+=UWoD
+-----END PGP SIGNATURE-----
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() {