Remove stdbool patch for bug #297854

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 10 insertions, 34 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index a774979c2317..c35eb7c689c3 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.169 2009/12/19 19:44:31 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.170 2009/12/29 18:13:05 cedk Exp $
+
+*openvpn-2.1.0-r1 (29 Dec 2009)
+
+  29 Dec 2009; Cédric Krier <cedk@gentoo.org> -openvpn-2.1.0.ebuild,
+  +openvpn-2.1.0-r1.ebuild, -files/openvpn-2.1.0-stdbool.patch:
+  Remove stdbool patch for bug #297854
 
 *openvpn-2.1.0 (19 Dec 2009)
 
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 3c3b88db5976..08fb386c11d1 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -3,7 +3,6 @@ AUX openvpn-2.0.7-pam.patch 1236 RMD160 3f9035a7005b206e1447dfd75edcb65cb5531b2d
 AUX openvpn-2.0.7-persistent.patch 1857 RMD160 b3232feb19810ac405cd7af6bb692ed03f9c44c2 SHA1 5ac9d0ff58f56ef771d44bb1dc13322815339e72 SHA256 51de714f2191ac3ea59a7f7c5a0aa1c0bf15ee5d79ace10f2276d415cd0f59e0
 AUX openvpn-2.0.9-pam.patch 1190 RMD160 e914b19aeeb9d9d108394aa61bacd019a3223d4a SHA1 774c1d7fd322249a3ba9d42995640d94093a33b2 SHA256 c485acbb8dae4c9440ebd76a92e2de733faa6320ee6fb2d2408111c802a74b7e
 AUX openvpn-2.0.9-persistent.patch 1851 RMD160 18571bd041024001339fce6dc2472567047c5508 SHA1 a982646053e94f99f514080c2188215a7edcab2a SHA256 60a825023db6b1e1082bc3de4c2efb47e6cf6c5bb73c78de03c29ab8fe79c7ac
-AUX openvpn-2.1.0-stdbool.patch 548 RMD160 057deb0ca697ea437bde8f9ff08d27233e9af5ca SHA1 d762d85a69a40aadcc3e999db7debd5cdc7fc70e SHA256 fc4347f2f4e2dfc2a0ec400031f5329428e78e7dc6205b70070067e8c3b67237
 AUX openvpn-2.1.conf 892 RMD160 687a747ed2f801b051438d02da8fcd44c6954484 SHA1 e65db7d972483c9391ef92d2931d9db7b69e4329 SHA256 330149a83684ddabe413d134d4c8efad4c88b18c2ab67165014deff5f7fffad2
 AUX openvpn-2.1.init 4198 RMD160 02564fa325a33aee08c643869f56c9947c27e5fc SHA1 57b9cf1b1dc62b7b1c9940acdd43e890ed5c79a2 SHA256 0c3e385e534992f6329c15b4be97a343b2e69a21d778e2d193297f40a33a13e0
 AUX openvpn-2.1_rc13-peercred.patch 251 RMD160 26123eedc9b685fb01de93c1141588f8008562f5 SHA1 8132510ebbd891ec55ef36d0cb8a86cb64a0145f SHA256 e7c2025ec49d3a5c2d95d80ee3c26ed9ccd0587d1664860b3a1eceb2bb7c778f
@@ -27,10 +26,10 @@ DIST openvpn-2.1_rc22-ipv6-0.4.10.patch.gz 21090 RMD160 34c4c2ebeef129230643ab40
 EBUILD openvpn-2.0.6.ebuild 3992 RMD160 a29b45480578f9ff80a8ab202c57813f6052c350 SHA1 e973ea504b42a90d4de99756a0349d6cee80dea3 SHA256 7fac8d4cecd9595317533ee2d2b79e2c93d350b83cffc63c07168c093ed11e28
 EBUILD openvpn-2.0.7-r2.ebuild 4170 RMD160 ef75f17baaf6ac5932e7f9c5fabce4721a6c82c0 SHA1 cd9a3c4eb180689f9f4196d697a3ce06eae29a86 SHA256 38e1d07c767e64b9c46d3798e75deb73ff7fd583e173a2518230174d4ce1b3a5
 EBUILD openvpn-2.0.9.ebuild 4266 RMD160 21afbb0a8dc307ccfc989f10bb934895f2a9b0c6 SHA1 42aa8365eb6903dc164d1ff4661067ddecef9bf4 SHA256 1281eab97a97d8212659ce494ddb66e8c992ad59a7a2d3adca81a6f033b9e6f2
-EBUILD openvpn-2.1.0.ebuild 5551 RMD160 c56ea0ca750a455179a8ef6302fbe777886cc083 SHA1 256a16edb669da985ca5c77e56c0d7f772510ab3 SHA256 128ac169d1a8f72d110ffdf941f65693ae47ed1ac909fa581725fe214c14dc54
+EBUILD openvpn-2.1.0-r1.ebuild 5506 RMD160 b2584d40cba9cb7768ff6d580c0ed7ac7e8e78ae SHA1 e3fa81c574093d2eb9f92db0a8858e4157429485 SHA256 d2278985714ccfe22218c7a8944ce66c32bb479f3a89603be5e860ee6bb98b11
 EBUILD openvpn-2.1_rc15.ebuild 4679 RMD160 f814096d99990986e910c1ecc933df636a586a71 SHA1 8ffbab4ca728b933029f7bf9876e862477401b06 SHA256 66012cc09038cc22dc33962cbe6cea5051e1106141f21b9dad202da51ab2e7db
 EBUILD openvpn-2.1_rc19.ebuild 4685 RMD160 738549b27fc91bab472cdc83589c02cbb718e2a2 SHA1 74da0799d955e8f78f375e044ac32c6a6c41e7bb SHA256 278bf6d40ecc63a0f5a077b4dd1ec726efdfe5919718565a3e2d25646fbca5d5
 EBUILD openvpn-2.1_rc20.ebuild 5430 RMD160 1496406547e3eb871aa9540f535714ebad931fe6 SHA1 3a13d8c306387201411ba5dffdb5355c9373981b SHA256 8b529b7937b50832463dcd50ff642ee4d929f36ebdf655945da8e46768d3c367
 EBUILD openvpn-2.1_rc21.ebuild 5488 RMD160 b59322eafea45860b18cbdabae00727265e192fa SHA1 ead7f1079204379ff77830f178f6efa8dee61df1 SHA256 16e27575161bbd7fc0c5f3347b9876481237ecaa0998ad9e7d3f757da0cc9a93
-MISC ChangeLog 25873 RMD160 dc08f1d9c04b9ccaed5af9a88b501921c10ffc8d SHA1 e2bb13671d2f54fd86ad8dd2c01d8ef13de08f56 SHA256 8f64224cffeedb700bf87f9006077eb5f63a66f153ca09dbe6db190549a031a8
+MISC ChangeLog 26080 RMD160 a1e003de04455cf592c1d1db5cd947d8ad1544c3 SHA1 6798cabab344b7d6778e19195586e5e1329c4a88 SHA256 63c62b1ad629924dc68e9f91d896151d553bbc1d46560e28ae361391cb0d196f
 MISC metadata.xml 733 RMD160 c6fec2d3dfa62bf6800c0f47760a21e4cb2f0f6a SHA1 22f9b0d1527a69ecba158110f24aa23503ffd2e0 SHA256 8292ee60e6cb2eab0b1e3a7ca9b21cb935b1fbaf858113fa5e7bf4b32026633e
diff --git a/net-misc/openvpn/files/openvpn-2.1.0-stdbool.patch b/net-misc/openvpn/files/openvpn-2.1.0-stdbool.patch
deleted file mode 100644
index ab91159953f9..000000000000
--- a/net-misc/openvpn/files/openvpn-2.1.0-stdbool.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ru openvpn-2.1.0~/basic.h openvpn-2.1.0/basic.h
---- openvpn-2.1.0~/basic.h	2009-12-19 20:31:43.000000000 +0100
-+++ openvpn-2.1.0/basic.h	2009-12-19 20:31:56.000000000 +0100
-@@ -22,22 +22,11 @@
-  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
-+#include <stdbool.h>
-+
- #ifndef BASIC_H
- #define BASIC_H
- 
--/* bool definitions */
--#ifndef bool
--#define bool int
--#endif
--
--#ifndef true
--#define true 1
--#endif
--
--#ifndef false
--#define false 0
--#endif
--
- #define BOOL_CAST(x) ((x) ? (true) : (false))
- 
- /* size of an array */
diff --git a/net-misc/openvpn/openvpn-2.1.0.ebuild b/net-misc/openvpn/openvpn-2.1.0-r1.ebuild
index 77ad27ced51b..6dd1b896b155 100644
--- a/net-misc/openvpn/openvpn-2.1.0.ebuild
+++ b/net-misc/openvpn/openvpn-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1.0.ebuild,v 1.1 2009/12/19 19:44:31 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1.0-r1.ebuild,v 1.1 2009/12/29 18:13:05 cedk Exp $
 
 inherit eutils multilib toolchain-funcs autotools
 
@@ -46,7 +46,6 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${PN}-2.1_rc13-peercred.patch"
 	epatch "${FILESDIR}/${PN}-2.1_rc20-pkcs11.patch"
-	epatch "${FILESDIR}/${PN}-2.1.0-stdbool.patch"
 	use ipv6 && epatch "${WORKDIR}/${PN}-2.1_rc22-ipv6-${IPV6_VERSION}.patch"
 	use eurephia && epatch "${DISTDIR}/${P}_eurephia.patch"
 	sed -i \