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

Package-Manager: portage-2.1_pre10-r3

9 files changed, 120 insertions, 21 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"
 }
 
diff --git a/net-nntp/pan/Manifest b/net-nntp/pan/Manifest
index 38801b3efbc6..414fa7e45791 100644
--- a/net-nntp/pan/Manifest
+++ b/net-nntp/pan/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pan-0.14.2-update-desktop-file.patch 1028 RMD160 12a05a7a1050b9d10d0ece9a117ecec930e4f6c2 SHA1 c2f41ecbccf27f440d61414b535b8112b13aff7b SHA256 ee4b8d882baf52c19ac5b2897fbaa05dfd6efd6b066fc65eea7b4d53d7d99606 size 1028
 MD5 daf054bb0ce6c974d349b379460e882b files/pan-0.14.2-update-desktop-file.patch 1028
 RMD160 12a05a7a1050b9d10d0ece9a117ecec930e4f6c2 files/pan-0.14.2-update-desktop-file.patch 1028
@@ -13,6 +16,7 @@ SHA256 618055bc7d43ad728f9db00087c91db7acd165a47b134efcedd9ec2f685bcde3 files/pa
 DIST pan-0.14.2.91.tar.bz2 1919099 RMD160 372012f9f23ef1654125977ff4dee193021fb733 SHA256 1658c22fbe29ac0b88d2ae8e487247bad40618809719819297ecf0b7ae69a9ab size 1919099
 DIST pan-0.14.2.tar.bz2 1834784 RMD160 0dff24b1d83b6fabfb9cc38a7dea5f9e99513009 SHA256 d864907d3179cde5bdd7afa02c8a2bd00f1d23ce6053f704f64e7814c7f6aba4 size 1834784
 DIST pan-0.92.tar.bz2 1220042 RMD160 16708f9d72bf2f0c7022aa903d339db946e61cfd SHA256 6cd1df3733d6ef8c2b95431c33fae56653585554f8d69e07d34f73d53cc01e37 size 1220042
+DIST pan-0.94.tar.bz2 1344428 RMD160 9f3123a449da15607426e1e18a8fd9409630ed8a SHA256 45e3b0982ddeca5a5484fcd0f5f4091e1d5d9b7c57fd91fd0e0f981a3835d249 size 1344428
 EBUILD pan-0.14.2-r1.ebuild 1464 RMD160 2ebf773763b8ecdf5990983c37ad4b3632109b46 SHA1 2374d4c3998814c6e816890d74c60cc96c550662 SHA256 b58be4ddc80e685bfa5a74c1154c606b46a6cca03a0b514c682762ab8d4fb14f size 1464
 MD5 c187e5454875f125aae15c7d484cf599 pan-0.14.2-r1.ebuild 1464
 RMD160 2ebf773763b8ecdf5990983c37ad4b3632109b46 pan-0.14.2-r1.ebuild 1464
@@ -33,10 +37,14 @@ EBUILD pan-0.92.ebuild 967 RMD160 8511e97e8cb757f4a5ee8b55c35a5ca76033f967 SHA1
 MD5 7b76d5d5723a684b2707e083c2817d85 pan-0.92.ebuild 967
 RMD160 8511e97e8cb757f4a5ee8b55c35a5ca76033f967 pan-0.92.ebuild 967
 SHA256 24bf89074801014d32fb6e0981a0e3398bc2876880782d6ba3ddaa4f904fc734 pan-0.92.ebuild 967
-MISC ChangeLog 8071 RMD160 c1930507acd2b860f5f88d7b9ab4e0f716b99303 SHA1 d78f840f7f9cc885c37b94bcd1f3103c2cb4620a SHA256 c1bc48a33538d3c39439f939795a700be435c6349d473da7940016328dc20750 size 8071
-MD5 efbe9a431a71297340efb808b4501142 ChangeLog 8071
-RMD160 c1930507acd2b860f5f88d7b9ab4e0f716b99303 ChangeLog 8071
-SHA256 c1bc48a33538d3c39439f939795a700be435c6349d473da7940016328dc20750 ChangeLog 8071
+EBUILD pan-0.94.ebuild 967 RMD160 c22ffa6616ead3ded7160d08eb99e9fa6cf0ef5e SHA1 b40f9c267a4be6cd82221dcd89fc176263f31a1b SHA256 b91d343e20ad2e0353ad1bd819e4512b1e1e548f8d3342a5f94acd79dfe88793 size 967
+MD5 d12a1b86d5362a34f81cbc53473b264b pan-0.94.ebuild 967
+RMD160 c22ffa6616ead3ded7160d08eb99e9fa6cf0ef5e pan-0.94.ebuild 967
+SHA256 b91d343e20ad2e0353ad1bd819e4512b1e1e548f8d3342a5f94acd79dfe88793 pan-0.94.ebuild 967
+MISC ChangeLog 8195 RMD160 349a54b9e20ec7fa689a6342260575c6fa9e62d6 SHA1 fbca2ebc4da00ad3a9770f044f1a84096d1eeee9 SHA256 efa81e4b05c4f8abee568b8d2495eae609da72c7ecb270656600854c9c231884 size 8195
+MD5 1b4f7dd9ae1a842d12dbd758864752dd ChangeLog 8195
+RMD160 349a54b9e20ec7fa689a6342260575c6fa9e62d6 ChangeLog 8195
+SHA256 efa81e4b05c4f8abee568b8d2495eae609da72c7ecb270656600854c9c231884 ChangeLog 8195
 MISC metadata.xml 180 RMD160 797b69d3fd6f36d441bda500c1310c91837720a4 SHA1 e2e177f18436d4250aadeadfd6ec27639861290e SHA256 1bb112215f4f710d26b79a43b61ec93003963663cfdec7b3b7173cfdbf85f52c size 180
 MD5 b379ecb012e58dcb29c4feee0f5219f2 metadata.xml 180
 RMD160 797b69d3fd6f36d441bda500c1310c91837720a4 metadata.xml 180
@@ -56,3 +64,13 @@ SHA256 fe8c623cf540b747754d6a036dcc2676907148e285b791833c73a891c3a52677 files/di
 MD5 9e4950fd873e7d828421def5d8ad6ff0 files/digest-pan-0.92 232
 RMD160 f16526c8369a121d3bf9dce7693ac32507642621 files/digest-pan-0.92 232
 SHA256 e3aa749b0bbe5ddb343590299e574b7c59011599a5e4ae8303113a5024ba8ecb files/digest-pan-0.92 232
+MD5 8b10acd5d66f35bc6211c5590eb1e0a5 files/digest-pan-0.94 232
+RMD160 1fa17fc5a0fe8f81affcc80a8a3ac9fd019c473d files/digest-pan-0.94 232
+SHA256 766c372eb8ac10edfc455775c34955f3bbdf268996edbd32515284ba9a6916e2 files/digest-pan-0.94 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEXc3wI1lqEGTUzyQRAmQdAJ45IZ9WoM9T8zUV3ex3EzKvhGN87wCffcm1
+sutv7ft9qGnP8P94zV1HpeI=
+=Vm0v
+-----END PGP SIGNATURE-----