Use a remote patch to work around CVS header changes.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 18 insertions, 337 deletions

diff --git a/net-analyzer/nepenthes/ChangeLog b/net-analyzer/nepenthes/ChangeLog
index 5ce3ba0ac5c8..21057a1da6bd 100644
--- a/net-analyzer/nepenthes/ChangeLog
+++ b/net-analyzer/nepenthes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nepenthes
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/ChangeLog,v 1.25 2014/10/25 11:50:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/ChangeLog,v 1.26 2014/10/25 12:09:09 jer Exp $
+
+  25 Oct 2014; Jeroen Roovers <jer@gentoo.org> nepenthes-0.2.2-r1.ebuild,
+  -files/nepenthes-0.2.2-gcc44.patch:
+  Use a remote patch to work around CVS header changes.
 
 *nepenthes-0.2.2-r1 (25 Oct 2014)
 
diff --git a/net-analyzer/nepenthes/Manifest b/net-analyzer/nepenthes/Manifest
index 75809e0784ca..029648e4baf4 100644
--- a/net-analyzer/nepenthes/Manifest
+++ b/net-analyzer/nepenthes/Manifest
@@ -5,21 +5,20 @@ AUX nepenthes-0.2.2-Werror.patch 19264 SHA256 559bd76e888874a26b8d8a7b928f07d885
 AUX nepenthes-0.2.2-cachedir.patch 519 SHA256 9e45d60ca66266478f701a44e4d0d78d732d8e7d669f4a0d43aa58fee5c1924e SHA512 fee4271066454fc532d314b3f4047520558bea5f196741e3808df58090158e7303ca9396e5fbce77a18307385fe5eac1087e26f889d69825dd597730c9234d45 WHIRLPOOL 59d2e7a883b64ec1effa4d7c8b1bda0a48477db4336e9626777c1beb1388a87f1ec9a162a45cc7e659eee581a461f1fa603d10d79dc6eb03c6f3d58ce106513b
 AUX nepenthes-0.2.2-curl_types_h.patch 2012 SHA256 48bc49b91e5858e57aeb88201a8f78474a756375afef9a56041d22a1816b048f SHA512 e2796af7e7399bb38eb2d1bd8e249d891069901da5bede54345f92d9de71c04e311cb88e92a1797d653266b27e1c3e2fd2380504c074854646bcd08638eb7eda WHIRLPOOL 80c9601b7fa707fac9bce85d2b48382c8b18a828c33db9a7795d32c5b1855d2779f883485122214b4173d024c26282c5bd7b1d50ed03cbaae2d424f670cad63f
 AUX nepenthes-0.2.2-gcc4.patch 535 SHA256 c3e65bad479b5df25ec7817512bcb4a5214e8edf45719d6b89e5ab6edff00f99 SHA512 8b1b972f41718cdd07d34a460568cf6b5979e997e77b435206410e6bda69bb6529d7d8d19ae0f3734f663ddba686eb735ef2773876216bd630531fbcc6d6185a WHIRLPOOL fa130ca9ce0c2c804092d9c1b991f6ae25233a7f9835fdf40f40bae18dff05f494351e5e328348b958f1f240faa51420f9da377fd4f35ea96d18e95afc2b113e
-AUX nepenthes-0.2.2-gcc44.patch 8279 SHA256 c683b1a45ee1cfd077cf5c66f8f97d5426f58d7f4ee42b4868e0507c10973d9a SHA512 e44fde3a77f71adf346d6f87734e35b808d4b2fec131ff83977b8e8a9329ea3de50e4e446b78e7e665895da2a6e91847e13298102e4d97eb27a787cb336aa3bc WHIRLPOOL 71299ebd24d673079ee70923632de77fa7c749a15c25c2e9dbf466df1a8948748e34c807b59f3710e378baf920167e5434a80657a3e71fb123c5de7a13881456
 AUX nepenthes-0.2.2-libdir.patch 555 SHA256 4f5f64246b941f4f7562fe4fcfef10f4fc3199da755a3c7b30b5ea33bbc817ce SHA512 501262dadf471351243b18567751cee9797de2cbbe25c5779d4a9dbb13bc7da39c6b6335804172412b162ad04722500c6b8d594fa18dfd54efc41e2f285db608 WHIRLPOOL 5f3f584d9d4eb5035254579a87845804f17f1ac6984a1f6234aef81aeb33d4dbb759cb0332e4c44695874f9ad79594080e10e05fb522a72c7adb9c7fb8fed78d
 AUX nepenthes-0.2.2-sysconfdir.patch 2507 SHA256 9be15e4b1280e124aab4a67c58de66a022fee311575138a3236584ed19edec52 SHA512 1f8129a59bd657280384aa2ae56dfb46eab3e153a554ed0430ccd033d7ef188640ce822ae52d4ef3fe0fe1640244ce055f3539d4d31780ac00df2158ab2ba686 WHIRLPOOL 8d968dea385f97ff9baf7ae9ce1f74072651afe6f03b958ca35db683d9f7d9221d665e0d7dd0074edc2e64623330ca4f54e8fbb9f8531e5697637a30ca847cd0
 AUX nepenthes.confd 123 SHA256 cbad703767de5e5832789dd15c32ee79fc63b188c195f86e481edac1d9fb5ddb SHA512 de60e843240735e980937a89fbcb5fd88505a3332fcb67558e89ef92a708b6c7a645819859ca3561bf35e98c11aca9992b7f6bb089c1656c603379681661a89f WHIRLPOOL 6e1e4a50fd17822ad5c35ff18762f5da6e5afd64d0fd04d1be4db2fd2de4e78007ebaf44e9915118d0f341b922f9821578e0207cd625ce52a7d10f844ad2f4d8
 AUX nepenthes.initd 538 SHA256 8f0c79f9b261f59aa203d5cae3d73856ab1173fcc7f58c98b01fe9c2c864f744 SHA512 422f8e4c523bfa8842d19c3ab9fed12f46d25ae684871955b005ab347302702a6d3c69deb34aedd6949ccca7a1326abebaa48bc773d5d0c2aa62178f28ee170b WHIRLPOOL 733ef21c1d62e0c6e651b056d1035fef8b3db12d3dc6eedbbd400ccc9d7ca3883a923182536badba4d2dcfa8837a78e1eefd255820ae4f7388c5b7185b33a8bb
 DIST nepenthes-0.2.2-gcc44.patch.bz2 1786 SHA256 2e8ecf67df2f90273a8b29a3dae0e7f9afef7ddd279a5e7981362dc1d4c12e83 SHA512 d77ea31971bcbff261e28242a59f1e2351136aae6c3e809dc827045ce8e4cfe5b67b9c12a1e3b3a04868bdbcdbd37e5bc7aaeee334838a8f485500914b3b0c6e WHIRLPOOL 33d149aae88bccc5c8d595641462654d5bc915e4c6d853ee507a28719275ac8dd2bdc885ae3181eefed229d747fdeab78bdc4eb39d77007179b7c9f494178901
 DIST nepenthes-0.2.2.tar.bz2 580491 SHA256 70d4ec64a3651eba18e2aa623326c27d888d588f75525fe87577a5eb28ae6a12 SHA512 b22d139a22aef2648a3d9e87e425f1d02404e30126eb7265ef2d584e1b5db62cc8cb92027212394576bedf53b3692ded7a2b6b3544c03f0828faf94c9553b70d WHIRLPOOL 769f4c4a561465c7baf82afd12d7f862ad4faea82c436bf81aeb947d215a4e36ccbc73aedef396945647972234a0ab949d2f02b0874bc3c570a88a5181ca40a9
-EBUILD nepenthes-0.2.2-r1.ebuild 1716 SHA256 80bd501bb2765748935772df52343242215bfbbd273a85b85c84f316ebd6b26f SHA512 8305f9f3bd2499cdf8bad9e7ba2ea8fe313e0670a28aefc78c7815f056352443331bb6be2095fe9cde326a78cdb5cdf0b07883b2b0c3353de48d7b82b6afe6c9 WHIRLPOOL ee50f311f593e3ea76373cf82b6cfead8d90738d6075ca6ae4efed80879a49b2313266b68e6c14ac38173b74b52ba6e249bdbd3e1a9217133b52e6054108c9f8
+EBUILD nepenthes-0.2.2-r1.ebuild 1839 SHA256 04d09d1735bd2c3a6728b92ef025d2106e1ed741863f42ad4fbe58fddfeab78c SHA512 ddd1a3be9094b4f63120dc20e15bda16d1028324854e0cca498c3e305c3724b2cab0b401328dd0c4602631dd35ae87b85b1b2d22b2b55a30060c59ccf45756f1 WHIRLPOOL 347a3ac68ebe5ecc62303eb3171a8d36a49499fb3b6ed9b3622ca7ff7252d01d7c1c8f9cc7d57dd1b208140535ea24cfc19a79934df42cd7567a3b163fda948d
 EBUILD nepenthes-0.2.2.ebuild 2326 SHA256 360ac7328148121d387f232ca7fc44975ee40b68b49eb47218f9f3271f34ced9 SHA512 3fbf2b38dc86ebfd4fe83d3d53e8a5bbc9e9c240a5a1977059c9a1e68ba0a11d861e554df00fe692882e6188ed5a2b7bc6edb1306278fd94e01f5cc5604acfbb WHIRLPOOL 85e6896dfcc36402756f57d1df29d8197a50e6e1ad004fcc24fb300cbfecb7e456710ce54a02628734bbb6eaa8690aca3574f82f74fd79b060f1753b794bd960
-MISC ChangeLog 4671 SHA256 abdb6fc95ae831e91efa05668a5006e67b1241964cea1450e2521e750105753c SHA512 916c74dedf916b50c4830ab78f3ad491104d7cbf1d52ee93e1e5d93502157f84e70745f1ad321e90f4764f0ec40fdecde16807c3e718655a54832a7aadb62464 WHIRLPOOL 16d7e03aa1a7802623bb1e0a37cd593bd7d3648769ba8321908e287b8e80210e9b75b14db0de1ba3807d61f9f5e4b24a3bc7eac8bbe697eaddbbb5fb0871cc49
+MISC ChangeLog 4840 SHA256 919f08032535d68550402479999a2d7a2a11ddd9ffc7a2ee2acc931ca9f091db SHA512 d3a074784f63451ddc867cfe08f26177f9c841794894dbc2faca0e5bc87a66e43bf3593ffb0ffd3ee039d142ca523bb40a1cf1dbc63e0f52ea52afa4695d0bd0 WHIRLPOOL fb92b0e543cd0907e4faef4945880489a0101b9e8c0ffda7be1461f21ac28d614ff4b17770f0c535376306aa72600ad4851c14c1308579401a67294489f5b80f
 MISC metadata.xml 309 SHA256 17f07d21fe72fc1d0d3deb2f0e5e9782e8a65088e6b31b6432440a5782a5b7ad SHA512 a2dc91c0a211be7d9c05ed95b970eb9e8b7c2d378a13c8e2d0c1be8b3a6158ce247fb36d4cf75242d6da04aac581af315a3f9d4e2e87fad7c7f55e167805e86b WHIRLPOOL f8dd5f92c34d933369cd3525e46d0888699c5692675b5be84ecc7f7079e14d5f728e5abbd2b7b9685110a7ca214e92710947ec086146d10daaedd882870b6047
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRLjoAACgkQVWmRsqeSphN7AwCfZlLzUksoUo7Q7s4sVM6tcNLa
-5ScAnR68SBEbj1ny+Fa0yEnp5T1jeudL
-=nWFe
+iEYEAREIAAYFAlRLkuYACgkQVWmRsqeSphO6LgCfWbr+zrDJSKv9gREasEFWHIRI
+UwcAnjvnHr9Td95D1yNBlq6DYYVVkomF
+=R2xv
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc44.patch b/net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc44.patch
deleted file mode 100644
index 5607248c55d6..000000000000
--- a/net-analyzer/nepenthes/files/nepenthes-0.2.2-gcc44.patch
+++ /dev/null
@@ -1,326 +0,0 @@
---- a/modules/download-creceive/CReceiveDialogue.cpp
-+++ b/modules/download-creceive/CReceiveDialogue.cpp
-@@ -51,10 +51,12 @@
- #include "DownloadUrl.cpp"
- #include "DownloadBuffer.cpp"
- 
- #include "SubmitManager.hpp"
- 
-+#include <cstdio>
-+
- #ifdef STDTAGS 
- #undef STDTAGS 
- #endif
- #define STDTAGS l_dl | l_dia | l_hlr
- 
---- a/modules/download-http/HTTPDialogue.cpp
-+++ b/modules/download-http/HTTPDialogue.cpp
-@@ -27,10 +27,11 @@
- 
-  /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
- 
- #include "HTTPDialogue.hpp"
- 
-+#include <cstdio>
- 
- #include "Message.hpp"
- #include "Nepenthes.hpp"
- #include "LogManager.hpp"
- 
---- a/modules/shellcode-generic/sch_generic_connect_trans.cpp
-+++ b/modules/shellcode-generic/sch_generic_connect_trans.cpp
-@@ -29,10 +29,11 @@
- 

- #include <sys/types.h>
- #include <sys/socket.h>

- #include <netinet/in.h>

- #include <arpa/inet.h>
-+#include <cstdio>
- 
- #include "LogManager.hpp"
- #include "Message.hpp"
- #include "sch_generic_connect_trans.hpp"
- #include "Socket.hpp"
---- a/modules/shellcode-generic/sch_generic_createprocess.cpp
-+++ b/modules/shellcode-generic/sch_generic_createprocess.cpp
-@@ -36,11 +36,11 @@
-  *
-  */
- 
- /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
- 
--
-+#include <cstdio>
- 
- #include "sch_generic_createprocess.hpp"
- 
- #include "Nepenthes.hpp"
- #include "Message.hpp"
---- a/modules/shellcode-generic/sch_generic_link_bind_trans.cpp
-+++ b/modules/shellcode-generic/sch_generic_link_bind_trans.cpp
-@@ -25,10 +25,12 @@
-  *
-  *******************************************************************************/
- 
-  /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
- 
-+#include <cstdio>
-+
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- 
---- a/modules/shellcode-generic/sch_generic_link_trans.cpp
-+++ b/modules/shellcode-generic/sch_generic_link_trans.cpp
-@@ -25,10 +25,11 @@
-  *
-  *******************************************************************************/
- 
-  /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
- 

-+#include <cstdio>
- 
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
---- a/modules/shellcode-generic/sch_generic_stuttgart.cpp
-+++ b/modules/shellcode-generic/sch_generic_stuttgart.cpp
-@@ -24,11 +24,13 @@
-  *             contact nepenthesdev@users.sourceforge.net  
-  *
-  *******************************************************************************/
- 
-  /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
-- 
-+
-+#include <cstdio>
-+
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- 
---- a/modules/shellcode-generic/sch_generic_url.cpp
-+++ b/modules/shellcode-generic/sch_generic_url.cpp
-@@ -36,11 +36,11 @@
-  * wikipedia states bsd code can be relicensed on to gpl, but we got no information what has to be done
-  * 
-  *
-  */
- 
--
-+#include <cstdio>
-  
- #include "sch_generic_url.hpp"
- #include "LogManager.hpp"
- #include "Message.hpp"
- #include "DownloadManager.hpp"
---- a/modules/shellcode-generic/sch_generic_wuerzburg.cpp
-+++ b/modules/shellcode-generic/sch_generic_wuerzburg.cpp
-@@ -25,10 +25,12 @@
-  *
-  *******************************************************************************/
- 
-  /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
- 

-+#include <cstdio>
-+
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- 
---- a/modules/shellcode-generic/sch_generic_xor.cpp
-+++ b/modules/shellcode-generic/sch_generic_xor.cpp
-@@ -40,10 +40,12 @@
- 
- 
- 
- #include "sch_generic_xor.hpp"
- 
-+#include <cstdio>
-+
- #include "Nepenthes.hpp"
- #include "Message.hpp"
- #include "Message.cpp"
- #include "LogManager.hpp"
- #include "Utilities.hpp"
---- a/modules/shellcode-signatures/sch_namespace_bindfiletransfer.cpp
-+++ b/modules/shellcode-signatures/sch_namespace_bindfiletransfer.cpp
-@@ -25,10 +25,12 @@
-  *
-  *******************************************************************************/
- 
- /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
- 
-+#include <cstdio>
-+
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- 
---- a/modules/shellcode-signatures/sch_namespace_connectbackfiletransfer.cpp
-+++ b/modules/shellcode-signatures/sch_namespace_connectbackfiletransfer.cpp
-@@ -25,10 +25,12 @@
-  *
-  *******************************************************************************/
- 
- /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
- 
-+#include <cstdio>
-+
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- 
---- a/modules/shellemu-winnt/VFS.cpp
-+++ b/modules/shellemu-winnt/VFS.cpp
-@@ -20,10 +20,11 @@
-  *
-  *******************************************************************************/
- 
- 
- #include <ctype.h>
-+#include <cstdio>
- 
- #include "VFS.hpp"
- #include "VFSNode.hpp"
- #include "VFSDir.hpp"
- #include "VFSFile.hpp"
---- a/modules/shellemu-winnt/VFSCommand.hpp
-+++ b/modules/shellemu-winnt/VFSCommand.hpp
-@@ -28,10 +28,11 @@
-  /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
- 
- #ifndef HAVE_VFSCOMMANDECHO
- #define HAVE_VFSCOMMANDECHO
- 
-+#include <stdint.h>
- #include <list>
- #include <string>
- #include <vector>
- 
- #include "VFSNode.hpp"
---- a/modules/shellemu-winnt/VFSCommandRCP.cpp
-+++ b/modules/shellemu-winnt/VFSCommandRCP.cpp
-@@ -24,11 +24,13 @@
-  *             contact nepenthesdev@users.sourceforge.net  
-  *
-  *******************************************************************************/
- 
- /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
-- 
-+
-+#include <cstdio>
-+
- #include "VFSCommandRCP.hpp"
- #include "VFSNode.hpp"
- #include "VFSDir.hpp"
- #include "VFSFile.hpp"
- #include "Nepenthes.hpp"
---- a/modules/submit-file/submit-file.cpp
-+++ b/modules/submit-file/submit-file.cpp
-@@ -28,10 +28,11 @@
-  /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <cstdio>
- 
- #include "submit-file.hpp"
- #include "Download.hpp"
- #include "DownloadBuffer.hpp"
- #include "Utilities.hpp"
---- a/modules/submit-postgres/PGDownloadContext.cpp
-+++ b/modules/submit-postgres/PGDownloadContext.cpp
-@@ -25,10 +25,11 @@
-  *
-  *******************************************************************************/
- 
- /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
- 
-+#include <cstdio> 
- 
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
---- a/nepenthes-core/src/DownloadManager.cpp
-+++ b/nepenthes-core/src/DownloadManager.cpp
-@@ -40,10 +40,12 @@
- #include "Config.hpp"
- 
- #include "SubmitEvent.hpp"
- #include "EventManager.hpp"
- 
-+#include <cstdio>
-+
- using namespace std;
- using namespace nepenthes;
- 
- #ifdef STDTAGS 
- #undef STDTAGS 
---- a/nepenthes-core/src/ModuleManager.cpp
-+++ b/nepenthes-core/src/ModuleManager.cpp
-@@ -33,10 +33,12 @@
- #include "Module.hpp"
- #include "Config.hpp"
- #include "Nepenthes.hpp"
- #include "LogManager.hpp"
- 
-+#include <cstdio>
-+
- using namespace nepenthes;
- using namespace std;
- 
- #ifdef STDTAGS 
- #undef STDTAGS 
---- a/nepenthes-core/src/ShellcodeManager.cpp
-+++ b/nepenthes-core/src/ShellcodeManager.cpp
-@@ -33,10 +33,12 @@
- #include "LogManager.hpp"
- #include "Message.hpp"
- #include "SocketEvent.hpp"
- #include "EventManager.hpp"
- 
-+#include <cstdio>
-+
- using namespace nepenthes;
- 
- #ifdef STDTAGS 
- #undef STDTAGS 
- #endif
---- a/nepenthes-core/src/Socket.cpp
-+++ b/nepenthes-core/src/Socket.cpp
-@@ -27,10 +27,11 @@
- 
- /* $Id: nepenthes-0.2.2-gcc44.patch,v 1.3 2014/10/25 11:50:22 jer Exp $ */
- 
- #include <string>
- #include <sstream>
-+#include <cstdio>
- 
- #include <time.h>
- 
- #include <sys/types.h>
- #include <sys/socket.h>
---- a/nepenthes-core/src/Utilities.cpp
-+++ b/nepenthes-core/src/Utilities.cpp
-@@ -36,10 +36,12 @@
- #include <string.h>
- #include <sys/types.h>
- #include <inttypes.h>
- #include <ctype.h>
- 
-+#include <cstdio>
-+
- #include "Utilities.hpp"
- #include "LogManager.hpp"
- #include "Config.hpp"
- 
- using namespace nepenthes;
diff --git a/net-analyzer/nepenthes/nepenthes-0.2.2-r1.ebuild b/net-analyzer/nepenthes/nepenthes-0.2.2-r1.ebuild
index 5d57dce45507..86cf922f9407 100644
--- a/net-analyzer/nepenthes/nepenthes-0.2.2-r1.ebuild
+++ b/net-analyzer/nepenthes/nepenthes-0.2.2-r1.ebuild
@@ -1,13 +1,17 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/nepenthes-0.2.2-r1.ebuild,v 1.1 2014/10/25 11:50:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/nepenthes-0.2.2-r1.ebuild,v 1.2 2014/10/25 12:09:09 jer Exp $
 
 EAPI=5
 inherit autotools eutils user
 
 DESCRIPTION="Nepenthes is a low interaction honeypot that captures worms by emulating known vulnerabilities"
 HOMEPAGE="http://nepenthes.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.bz2
+	https://dev.gentoo.org/~jer/${P}-gcc44.patch.bz2
+"
+# The gcc44 patch includes CVS headers so we do not put it in the tree
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -32,9 +36,9 @@ src_prepare() {
 		"${FILESDIR}"/${P}-cachedir.patch \
 		"${FILESDIR}"/${P}-curl_types_h.patch \
 		"${FILESDIR}"/${P}-gcc4.patch \
-		"${FILESDIR}"/${P}-gcc44.patch \
 		"${FILESDIR}"/${P}-libdir.patch \
-		"${FILESDIR}"/${P}-sysconfdir.patch
+		"${FILESDIR}"/${P}-sysconfdir.patch \
+		"${WORKDIR}"/${P}-gcc44.patch
 
 	eautoreconf
 }