add patch from upstream CVS to fix c++ comments in header file (bug #193404)

Package-Manager: portage-2.1.3.9

4 files changed, 38 insertions, 20 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 0a3194f73dd5..67a348b643a1 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.135 2007/07/23 20:02:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.136 2007/10/21 00:34:02 mr_bones_ Exp $
+
+  21 Oct 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/libsdl-1.2.12-c90-comments.patch, libsdl-1.2.12.ebuild:
+  add patch from upstream CVS to fix c++ comments in header file (bug #193404)
 
 *libsdl-1.2.12 (23 Jul 2007)
 
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 6dd82dcbb773..c69ad91a831a 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libsdl-1.2.11-audioConv.patch 428 RMD160 0d4092a4c573f95560b9cc10bfdca546d5140755 SHA1 468bd74d05646cae87d18d36f0a0c2a384ad54c2 SHA256 c7a9d541334c5d2638b3283fa8a4c9ab91b3c547148a3fb559aaaa48f1074a9f
 MD5 b4a5108fe1f2fab8203422d8d057e334 files/libsdl-1.2.11-audioConv.patch 428
 RMD160 0d4092a4c573f95560b9cc10bfdca546d5140755 files/libsdl-1.2.11-audioConv.patch 428
@@ -37,6 +34,10 @@ AUX libsdl-1.2.11-yasm-checks.patch 3226 RMD160 17dc39bb8e73c2fe62ce8e2d602dc2d6
 MD5 1017c51fb31a030a6782ad0cbe314807 files/libsdl-1.2.11-yasm-checks.patch 3226
 RMD160 17dc39bb8e73c2fe62ce8e2d602dc2d654caece1 files/libsdl-1.2.11-yasm-checks.patch 3226
 SHA256 6b7ec4108f06c75a256edfdaa2542c95724c2e6ca45022eec465e432bcecdf91 files/libsdl-1.2.11-yasm-checks.patch 3226
+AUX libsdl-1.2.12-c90-comments.patch 600 RMD160 8d4f0d3327b81b49ae0d41bdf82c82fce2e2d3c6 SHA1 695ad2ebdf21dbd43d7ade4401942f4c12040790 SHA256 0efbe7aee129838981acddd5dae8c675b779f8889961c6deda5136148deb051b
+MD5 79b342f8e9ad6031584d284377709ff8 files/libsdl-1.2.12-c90-comments.patch 600
+RMD160 8d4f0d3327b81b49ae0d41bdf82c82fce2e2d3c6 files/libsdl-1.2.12-c90-comments.patch 600
+SHA256 0efbe7aee129838981acddd5dae8c675b779f8889961c6deda5136148deb051b files/libsdl-1.2.12-c90-comments.patch 600
 DIST SDL-1.2.11.tar.gz 2796407 RMD160 91dc8877224415a4ba59e1de57c31861e550d644 SHA1 2259134d714e35ab1469d513674a3cd02510d198 SHA256 6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730
 DIST SDL-1.2.12.tar.gz 2829456 RMD160 3871023c63ea056eba43ce4f55ee8d3a73ff3022 SHA1 2c37ff1683368369c0f555d4a742f0544153610d SHA256 df77eb883efdcc61220eaf7ade38324629c273c278ce8d700a5530369e9b6df9
 EBUILD libsdl-1.2.11-r1.ebuild 4898 RMD160 cb224659e8f898ac175ad25a1067302390e79a80 SHA1 60c4b8959a8949ada07fe3d32d53bca7f0592e82 SHA256 3d26f99868ce209cb6d95dd18e3eae2aa4c29b4d99174d64068c37e1c0af8546
@@ -51,14 +52,14 @@ EBUILD libsdl-1.2.11.ebuild 4777 RMD160 5e694b0b93b016010281dc116bc7786c691cdebf
 MD5 f6e57388c8444f0c7d4a7800445a11bf libsdl-1.2.11.ebuild 4777
 RMD160 5e694b0b93b016010281dc116bc7786c691cdebf libsdl-1.2.11.ebuild 4777
 SHA256 f85c78f0e05989ac61a5129ad01cb2562046b83d00b38b00316983b40cfb119b libsdl-1.2.11.ebuild 4777
-EBUILD libsdl-1.2.12.ebuild 4290 RMD160 a421f3547a80368a40d0e9af00b884df8439fe03 SHA1 041cdfdc46f9ae8d4b933d8f91c1bc5b0cf9d4d6 SHA256 2aad14cecc8c047c1b8ff0043eb80c672b273a4ced3ac90a2cd24a38cccfd6cc
-MD5 ed1cade28a0b80cbf1a4ea9ef9ca8bf0 libsdl-1.2.12.ebuild 4290
-RMD160 a421f3547a80368a40d0e9af00b884df8439fe03 libsdl-1.2.12.ebuild 4290
-SHA256 2aad14cecc8c047c1b8ff0043eb80c672b273a4ced3ac90a2cd24a38cccfd6cc libsdl-1.2.12.ebuild 4290
-MISC ChangeLog 21106 RMD160 86b2091652f1a78d5c6a8e8b2d0efb17f894b917 SHA1 58a0de91586dc816fd63d9b6a376a02fda8c0aea SHA256 9a6d41a4b7b6eae1a88c52e4a86a407f8354879bd9a7fdc57cd5f9aa666973f9
-MD5 6de4cbe6aee6ca31647d45333b7e52c4 ChangeLog 21106
-RMD160 86b2091652f1a78d5c6a8e8b2d0efb17f894b917 ChangeLog 21106
-SHA256 9a6d41a4b7b6eae1a88c52e4a86a407f8354879bd9a7fdc57cd5f9aa666973f9 ChangeLog 21106
+EBUILD libsdl-1.2.12.ebuild 4347 RMD160 6144f5d06ac48c6d280df028039a559b2061d1b5 SHA1 02ca310169dfdd4178b980394385df2c71db425b SHA256 ffde415c7d547ef432f789603c2e0976c0b5e96c355b1415f9f387ac76f26f6f
+MD5 d57c0eeef775a571f2ea8db73004c922 libsdl-1.2.12.ebuild 4347
+RMD160 6144f5d06ac48c6d280df028039a559b2061d1b5 libsdl-1.2.12.ebuild 4347
+SHA256 ffde415c7d547ef432f789603c2e0976c0b5e96c355b1415f9f387ac76f26f6f libsdl-1.2.12.ebuild 4347
+MISC ChangeLog 21309 RMD160 796069241bf419c67c8f965ec0db95b4d05dbdb6 SHA1 eb47167ebe71059988b9815ffe4496716cc64432 SHA256 f2602b3c822c959d1ab847ba8c7714fd61c6e9b5499b54ac95c5a881ea090d33
+MD5 f7ddd4f04fec152a0c918fc5c782a83c ChangeLog 21309
+RMD160 796069241bf419c67c8f965ec0db95b4d05dbdb6 ChangeLog 21309
+SHA256 f2602b3c822c959d1ab847ba8c7714fd61c6e9b5499b54ac95c5a881ea090d33 ChangeLog 21309
 MISC metadata.xml 974 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f SHA1 8f8471103d29e564169640539c3a2a6a7de5b8c7 SHA256 e575130f8fd4925956581f5d4230469e915b1a8d63269cc0aa3510f3a4743b9b
 MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f metadata.xml 974
@@ -75,10 +76,3 @@ SHA256 be7333b21a407831ab4861ba67e56d36c9759b78f3b42400981abf3e34f5fda8 files/di
 MD5 9394ecdf1ee90adec62e82149bac7d4f files/digest-libsdl-1.2.12 235
 RMD160 b1c36c257d9a76c0081ca2647814080427da31db files/digest-libsdl-1.2.12 235
 SHA256 522164950cd8161dc27730b6ec68a898ad152cd38c19effa8e0dd71208887dec files/digest-libsdl-1.2.12 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
-
-iD8DBQFGpQmOp/wUKkr7RBoRAkmHAJ47OTyOPIHWrBjhBI1KFdASujGJXACfdf4n
-z//o7kWO5cxEKbuH0q2nR4w=
-=SMix
------END PGP SIGNATURE-----
diff --git a/media-libs/libsdl/files/libsdl-1.2.12-c90-comments.patch b/media-libs/libsdl/files/libsdl-1.2.12-c90-comments.patch
new file mode 100644
index 000000000000..cd484c1ffdf3
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-1.2.12-c90-comments.patch
@@ -0,0 +1,19 @@
+http://bugs.gentoo.org/193404
+
+Revision 3386
+Motified Sun Aug 5 03:21:18 2007 UTC by icculus
+Removed some C++ style comments from the public headers.
+
+--- branches/SDL-1.2/include/begin_code.h	2007/08/03 04:13:03	3385
++++ branches/SDL-1.2/include/begin_code.h	2007/08/05 03:21:18	3386
+@@ -90,8 +90,8 @@
+ #elif !defined(__WINS__)
+ #undef DECLSPEC
+ #define DECLSPEC __declspec(dllexport)
+-#endif //EKA2
+-#endif //__SYMBIAN32__
++#endif /* !EKA2 */
++#endif /* __SYMBIAN32__ */
+ 
+ /* Force structure packing at 4 byte alignment.
+    This is necessary if the header is included in code which has structure
diff --git a/media-libs/libsdl/libsdl-1.2.12.ebuild b/media-libs/libsdl/libsdl-1.2.12.ebuild
index a02dd145c783..7e91b7bff4de 100644
--- a/media-libs/libsdl/libsdl-1.2.12.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.12.ebuild,v 1.1 2007/07/23 20:02:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.12.ebuild,v 1.2 2007/10/21 00:34:02 mr_bones_ Exp $
 
 inherit flag-o-matic toolchain-funcs eutils libtool
 
@@ -74,6 +74,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-1.2.11-libcaca-new-api.patch #40224
 	epatch "${FILESDIR}"/${PN}-1.2.11-sdl-config.patch
 	epatch "${FILESDIR}"/${PN}-1.2.11-xinerama-head-0.patch #145917
+	epatch "${FILESDIR}"/${P}-c90-comments.patch #193404
 
 	./autogen.sh || die "autogen failed"
 	elibtoolize