Fix building with gcc-4.1 and include order when debugging is enabled, bug #131282.

Package-Manager: portage-2.1_pre10-r3

8 files changed, 98 insertions, 17 deletions

diff --git a/net-nntp/nzbget/ChangeLog b/net-nntp/nzbget/ChangeLog
index cc8133c1cd8d..960fce54642c 100644
--- a/net-nntp/nzbget/ChangeLog
+++ b/net-nntp/nzbget/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nntp/nzbget
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/ChangeLog,v 1.7 2005/09/13 13:34:42 swegener Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/ChangeLog,v 1.8 2006/05/07 10:33:32 swegener Exp $
+
+  07 May 2006; Sven Wegener <swegener@gentoo.org> +files/0.2.3-gcc41.patch,
+  +files/0.2.3-include-order.patch, nzbget-0.2.2.ebuild,
+  nzbget-0.2.3.ebuild:
+  Fix building with gcc-4.1 and include order when debugging is enabled, bug
+  #131282.
 
 *nzbget-0.2.3 (13 Sep 2005)
 
diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index 56be5bb6a3d4..caea33b5df25 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -1,16 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f2160c00931ea21b4d81ab937c34c233 ChangeLog 1851
-MD5 88d9ae003fdf33ff5833ef271200b209 files/digest-nzbget-0.2.2 64
-MD5 e86eaf9a520f4a6f90dc6532179407fd files/digest-nzbget-0.2.3 64
+AUX 0.2.3-gcc41.patch 519 RMD160 ee24b921e0b783aaa9b916001c63f78a597eb102 SHA1 cb97c2d7936c006ce3f3ef902b60c5aa1be8f566 SHA256 e7b2ed5ee644a7fa1360cfa26647ba47b9b5f9d0e094f937a5d6d3d8d4bf503a size 519
+MD5 2a81234210e25c5bea7b2d907016261b files/0.2.3-gcc41.patch 519
+RMD160 ee24b921e0b783aaa9b916001c63f78a597eb102 files/0.2.3-gcc41.patch 519
+SHA256 e7b2ed5ee644a7fa1360cfa26647ba47b9b5f9d0e094f937a5d6d3d8d4bf503a files/0.2.3-gcc41.patch 519
+AUX 0.2.3-include-order.patch 384 RMD160 58cd01be6a4eb3ba1560667e095cea326155cde9 SHA1 ac68ea145d5fb9f52c6ead2f0f757111f8b03953 SHA256 84a0b77c2cee094c4b91273f9220b4908881a8138caf2764994aca37c9d3743d size 384
+MD5 5a7b9404157b320bc96024b5b56a7bfd files/0.2.3-include-order.patch 384
+RMD160 58cd01be6a4eb3ba1560667e095cea326155cde9 files/0.2.3-include-order.patch 384
+SHA256 84a0b77c2cee094c4b91273f9220b4908881a8138caf2764994aca37c9d3743d files/0.2.3-include-order.patch 384
+DIST nzbget-0.2.2.tar.gz 191998 RMD160 56cbf77ecf8fa54ad12c930f48d750adf5830106 SHA256 4d9773c82eb6b9029e7e40c58fe41c4f89a1ea41b2dfa9f8a7aba8c631365639 size 191998
+DIST nzbget-0.2.3.tar.gz 202660 RMD160 3d519bc0f8aff5e03b52edb16509954e020285b6 SHA256 9bedeb890f7ef49d466f95d76ffea1d4d22788d6dc760c96c6433bff3ff1f6b6 size 202660
+EBUILD nzbget-0.2.2.ebuild 911 RMD160 7361e96aebecfca74035545956d8bb8195963e07 SHA1 0ad84f6fbd8b98e4794a54d166b9f8c2969cee04 SHA256 810afeb1f435bb739edb3377ce62586cf32c5cb0c88ec30091b4203ad5860f94 size 911
+MD5 ae1c5d52e6591f6638c60a34d2c76379 nzbget-0.2.2.ebuild 911
+RMD160 7361e96aebecfca74035545956d8bb8195963e07 nzbget-0.2.2.ebuild 911
+SHA256 810afeb1f435bb739edb3377ce62586cf32c5cb0c88ec30091b4203ad5860f94 nzbget-0.2.2.ebuild 911
+EBUILD nzbget-0.2.3.ebuild 902 RMD160 c4d3a973a60e9260aa3e18416ec7b15c73753d7c SHA1 8eaeb1ec73bed98237f703db4172744c48ab0db2 SHA256 2a1f80a6e7e5f64d6264301c08ef6c9c41ec9ac476ea456cb082550678b406d8 size 902
+MD5 31e402c712e3d0197ca58d6029debb56 nzbget-0.2.3.ebuild 902
+RMD160 c4d3a973a60e9260aa3e18416ec7b15c73753d7c nzbget-0.2.3.ebuild 902
+SHA256 2a1f80a6e7e5f64d6264301c08ef6c9c41ec9ac476ea456cb082550678b406d8 nzbget-0.2.3.ebuild 902
+MISC ChangeLog 2096 RMD160 f5c2b23b06a58038ad9480eb257d53f24f7f8607 SHA1 1a9c3d24c4291ca9d5140c042bf53cb67a4dd299 SHA256 710e97aca4f15a0e2d25145c2e428d29b36b32ad5904dd75fb3c76bd6c3c8d84 size 2096
+MD5 fd8aa9d28637ad17a053e03499cfab28 ChangeLog 2096
+RMD160 f5c2b23b06a58038ad9480eb257d53f24f7f8607 ChangeLog 2096
+SHA256 710e97aca4f15a0e2d25145c2e428d29b36b32ad5904dd75fb3c76bd6c3c8d84 ChangeLog 2096
+MISC metadata.xml 357 RMD160 d743b08f78b3e5f572f66c1350328f7f19c601a0 SHA1 4a952400969d38f6455a1ed8888e368ea050330d SHA256 d0e611fbf6114a41796e7f267999724aa079de9e28c0959564987c3ef1995671 size 357
 MD5 14594f19e320cd8f1735a5e2e9a00f88 metadata.xml 357
-MD5 3bbbb761681cfd123a998b646b2af197 nzbget-0.2.2.ebuild 816
-MD5 91cde3351dd19aea6c0302e4a0de8857 nzbget-0.2.3.ebuild 817
+RMD160 d743b08f78b3e5f572f66c1350328f7f19c601a0 metadata.xml 357
+SHA256 d0e611fbf6114a41796e7f267999724aa079de9e28c0959564987c3ef1995671 metadata.xml 357
+MD5 a2f9f5857e372121680e2152017e60bd files/digest-nzbget-0.2.2 238
+RMD160 7a9a32181891a1f14b1a5582cec4f708008c2feb files/digest-nzbget-0.2.2 238
+SHA256 6eb1334c66df0dad0ee40c0245939d5cd558946aa5a5832fd68ad45e0dd0c1ff files/digest-nzbget-0.2.2 238
+MD5 793c617efd4db4676f0391d81d43fd91 files/digest-nzbget-0.2.3 238
+RMD160 6bca43fea3a7fb7c27de5d26d2bcfc76b2f30158 files/digest-nzbget-0.2.3 238
+SHA256 6a1eee2c19bd569dcddf7f962f54492a28d257b826e755324ab8091f13f357c3 files/digest-nzbget-0.2.3 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFDJtWJI1lqEGTUzyQRAuV1AKDVAUHN4oFvroRQ9qfkFeqN+NC8vACeOH7H
-7a3eLTDKXWdZJTUR+Ohj5A0=
-=OJN7
+iD8DBQFEXc0EI1lqEGTUzyQRAg9dAKCNykVWzj54iKviOWgWmFheRPcqywCgpGKy
+katwHdMWUdgziCxBA7HZd9g=
+=t/b+
 -----END PGP SIGNATURE-----
diff --git a/net-nntp/nzbget/files/0.2.3-gcc41.patch b/net-nntp/nzbget/files/0.2.3-gcc41.patch
new file mode 100644
index 000000000000..ce2caebc9eab
--- /dev/null
+++ b/net-nntp/nzbget/files/0.2.3-gcc41.patch
@@ -0,0 +1,12 @@
+diff -ur nzbget-0.2.3-orig/ArticleDownloader.cpp nzbget-0.2.3/ArticleDownloader.cpp
+--- nzbget-0.2.3-orig/ArticleDownloader.cpp	2006-05-02 01:18:35.127138980 +0000
++++ nzbget-0.2.3/ArticleDownloader.cpp	2006-05-02 01:18:50.731853304 +0000
+@@ -184,7 +184,7 @@
+ 						line = pConnection->ReadLine();
+ 
+ 						// Have we encountered a timeout?
+-						if( (int)line == EOF )
++						if( (long)line == EOF )
+ 						{
+ 							perror( "pConnection->ReadLine() encountered error" );
+ 							m_pJob->SetStatus(JOBSTATUS_FAILED);
diff --git a/net-nntp/nzbget/files/0.2.3-include-order.patch b/net-nntp/nzbget/files/0.2.3-include-order.patch
new file mode 100644
index 000000000000..9ec88afe682b
--- /dev/null
+++ b/net-nntp/nzbget/files/0.2.3-include-order.patch
@@ -0,0 +1,15 @@
+diff -Nur nzbget-0.2.3.orig/global.cpp nzbget-0.2.3/global.cpp
+--- nzbget-0.2.3.orig/global.cpp	2005-09-02 07:00:41.000000000 +0000
++++ nzbget-0.2.3/global.cpp	2006-05-07 10:21:34.604571751 +0000
+@@ -23,10 +23,10 @@
+  */
+ 
+ 
++#include "config.h"
+ #include "Frontend.h"
+ #include "Options.h"
+ #include "global.h"
+-#include "config.h"
+ #include "GlobalControl.h"
+ 
+ #include <stdarg.h>
diff --git a/net-nntp/nzbget/files/digest-nzbget-0.2.2 b/net-nntp/nzbget/files/digest-nzbget-0.2.2
index f90cd80a2434..2007e83420d1 100644
--- a/net-nntp/nzbget/files/digest-nzbget-0.2.2
+++ b/net-nntp/nzbget/files/digest-nzbget-0.2.2
@@ -1 +1,3 @@
 MD5 377baa033ea8be97422034fd6b3179d6 nzbget-0.2.2.tar.gz 191998
+RMD160 56cbf77ecf8fa54ad12c930f48d750adf5830106 nzbget-0.2.2.tar.gz 191998
+SHA256 4d9773c82eb6b9029e7e40c58fe41c4f89a1ea41b2dfa9f8a7aba8c631365639 nzbget-0.2.2.tar.gz 191998
diff --git a/net-nntp/nzbget/files/digest-nzbget-0.2.3 b/net-nntp/nzbget/files/digest-nzbget-0.2.3
index bbe24d4a2516..164832939023 100644
--- a/net-nntp/nzbget/files/digest-nzbget-0.2.3
+++ b/net-nntp/nzbget/files/digest-nzbget-0.2.3
@@ -1 +1,3 @@
 MD5 25554537c7641bd36f573a5f7c89b449 nzbget-0.2.3.tar.gz 202660
+RMD160 3d519bc0f8aff5e03b52edb16509954e020285b6 nzbget-0.2.3.tar.gz 202660
+SHA256 9bedeb890f7ef49d466f95d76ffea1d4d22788d6dc760c96c6433bff3ff1f6b6 nzbget-0.2.3.tar.gz 202660
diff --git a/net-nntp/nzbget/nzbget-0.2.2.ebuild b/net-nntp/nzbget/nzbget-0.2.2.ebuild
index 2accf1edb5db..5f3714cfd34d 100644
--- a/net-nntp/nzbget/nzbget-0.2.2.ebuild
+++ b/net-nntp/nzbget/nzbget-0.2.2.ebuild
@@ -1,6 +1,8 @@
-# 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/net-nntp/nzbget/nzbget-0.2.2.ebuild,v 1.2 2005/09/13 13:34:42 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/nzbget-0.2.2.ebuild,v 1.3 2006/05/07 10:33:32 swegener Exp $
+
+inherit eutils autotools
 
 DESCRIPTION="A command-line based binary newsgrabber supporting .nzb files"
 HOMEPAGE="http://nzbget.sourceforge.net/"
@@ -12,9 +14,16 @@ IUSE="debug"
 
 DEPEND="dev-libs/libxml2"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/0.2.3-include-order.patch
+	epatch "${FILESDIR}"/0.2.3-gcc41.patch
+}
+
 src_compile() {
 	econf $(use_enable debug) || die "econf failed"
-	# Bad configure script is forcing CFLAGS, so we pass our own
 	emake CFLAGS="-I. -DHAVE_CONFIG_H -D_GNU_SOURCE ${CFLAGS}" || die "emake failed"
 }
 
diff --git a/net-nntp/nzbget/nzbget-0.2.3.ebuild b/net-nntp/nzbget/nzbget-0.2.3.ebuild
index 9fef6286367f..0731941d2418 100644
--- a/net-nntp/nzbget/nzbget-0.2.3.ebuild
+++ b/net-nntp/nzbget/nzbget-0.2.3.ebuild
@@ -1,6 +1,8 @@
-# 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/net-nntp/nzbget/nzbget-0.2.3.ebuild,v 1.1 2005/09/13 13:34:42 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/nzbget-0.2.3.ebuild,v 1.2 2006/05/07 10:33:32 swegener Exp $
+
+inherit eutils
 
 DESCRIPTION="A command-line based binary newsgrabber supporting .nzb files"
 HOMEPAGE="http://nzbget.sourceforge.net/"
@@ -12,9 +14,16 @@ IUSE="debug"
 
 DEPEND="dev-libs/libxml2"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/0.2.3-include-order.patch
+	epatch "${FILESDIR}"/0.2.3-gcc41.patch
+}
+
 src_compile() {
 	econf $(use_enable debug) || die "econf failed"
-	# Bad configure script is forcing CFLAGS, so we pass our own
 	emake CFLAGS="-I. -DHAVE_CONFIG_H -D_GNU_SOURCE ${CFLAGS}" || die "emake failed"
 }