Added gcc4-compatibility patch.

Package-Manager: portage-2.1.1_pre2-r6

4 files changed, 41 insertions, 15 deletions

diff --git a/media-plugins/vdr-calc/ChangeLog b/media-plugins/vdr-calc/ChangeLog
index 142e013a0cd0..bcbd04ef80cd 100644
--- a/media-plugins/vdr-calc/ChangeLog
+++ b/media-plugins/vdr-calc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-calc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-calc/ChangeLog,v 1.2 2006/04/17 16:50:08 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-calc/ChangeLog,v 1.3 2006/07/08 19:08:20 zzam Exp $
+
+  08 Jul 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-calc-0.0.1_rc5-gcc4.diff, vdr-calc-0.0.1_rc5.ebuild:
+  Added gcc4-compatibility patch.
 
   17 Apr 2006; Matthias Schwarzott <zzam@gentoo.org>
   vdr-calc-0.0.1_rc5.ebuild:
diff --git a/media-plugins/vdr-calc/Manifest b/media-plugins/vdr-calc/Manifest
index b0753287054d..75b4e77b160e 100644
--- a/media-plugins/vdr-calc/Manifest
+++ b/media-plugins/vdr-calc/Manifest
@@ -1,22 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f1f0a003788e3fcff86730355ee894b7 ChangeLog 488
-RMD160 69143befa2e06faaf9e2860f113e09747dad201e ChangeLog 488
-SHA256 fadccf9f4d90604e7f86e51022da8a530cb7d25743c44306cb7a927efd57fa8d ChangeLog 488
-MD5 ffc664f43cd7dcd048c2e3dc20f27635 files/digest-vdr-calc-0.0.1_rc5 253
-RMD160 79c3ee385e6a672e6fedf5c5cc3e9570af33b8b1 files/digest-vdr-calc-0.0.1_rc5 253
-SHA256 e851bb4230e78442529dc87e066a860508df6781266ef01f944aaf08e912130d files/digest-vdr-calc-0.0.1_rc5 253
+AUX vdr-calc-0.0.1_rc5-gcc4.diff 632 RMD160 1d1f6436c3397fe871245dbd31fe7c7c82b39c21 SHA1 f45373065ff98892af0efdde2c8247a7cbb8ad09 SHA256 ecbef75121d6cdaf17fda66cdef2dcd9c1cdb6ab650d6cbcc752a09bd40e457c
+MD5 0eacab2b4fc259456b937678732bb7bb files/vdr-calc-0.0.1_rc5-gcc4.diff 632
+RMD160 1d1f6436c3397fe871245dbd31fe7c7c82b39c21 files/vdr-calc-0.0.1_rc5-gcc4.diff 632
+SHA256 ecbef75121d6cdaf17fda66cdef2dcd9c1cdb6ab650d6cbcc752a09bd40e457c files/vdr-calc-0.0.1_rc5-gcc4.diff 632
+DIST vdr-calc-0[1].0.1-rc5.tgz 12460 RMD160 8795749e4f9d230de2d4ff38a25b4e783fd5262f SHA1 107cdee50726638f2d9c549970b95ed43532c0ab SHA256 10aca3e25261e26e01ff0cd559410022edf536368db241ebc10d9bda2c2311cc
+EBUILD vdr-calc-0.0.1_rc5.ebuild 599 RMD160 31ccfd40c66c5059258bddbf8a050a798fada8bc SHA1 f8a37c5fa34a249030ec0664842a6a095519d7c4 SHA256 1921071aa15d8b034a6e164861f5d45d95c7aae5e548b0c86948a737b63bd8cc
+MD5 492c16bfebdda00a415be1402612b473 vdr-calc-0.0.1_rc5.ebuild 599
+RMD160 31ccfd40c66c5059258bddbf8a050a798fada8bc vdr-calc-0.0.1_rc5.ebuild 599
+SHA256 1921071aa15d8b034a6e164861f5d45d95c7aae5e548b0c86948a737b63bd8cc vdr-calc-0.0.1_rc5.ebuild 599
+MISC ChangeLog 642 RMD160 0df4845505d91f14dfc4263cb97b873d5ab9367f SHA1 37b46e6bcf5ea3e463efbce8b4d9b781407c89de SHA256 ea7b32d4234bd0f745cd36cb67b33ea33c5f457b9e41777eba3ca2ccabb2b227
+MD5 8875827445e0d96c443664db1b9eb5e1 ChangeLog 642
+RMD160 0df4845505d91f14dfc4263cb97b873d5ab9367f ChangeLog 642
+SHA256 ea7b32d4234bd0f745cd36cb67b33ea33c5f457b9e41777eba3ca2ccabb2b227 ChangeLog 642
+MISC metadata.xml 300 RMD160 c85719cef743cf573efe73f8f84564292085c91c SHA1 4c00933e1ed60039fae091034d83e28d0890e87c SHA256 29feafd8b7177b65f8bd92553ac96779d9a91e3b7b4eeecfb0924eb7b6979587
 MD5 7c30ab7528b676a1a0c2737821599b29 metadata.xml 300
 RMD160 c85719cef743cf573efe73f8f84564292085c91c metadata.xml 300
 SHA256 29feafd8b7177b65f8bd92553ac96779d9a91e3b7b4eeecfb0924eb7b6979587 metadata.xml 300
-MD5 a42099059148865e05f97d86bf921a60 vdr-calc-0.0.1_rc5.ebuild 561
-RMD160 0a07920668df378b1e87820cae242d3b356074de vdr-calc-0.0.1_rc5.ebuild 561
-SHA256 26e19e3d1cbf59020f7071eec7b351cd2e6851c9ec5b461cc391daa18467112a vdr-calc-0.0.1_rc5.ebuild 561
+MD5 ffc664f43cd7dcd048c2e3dc20f27635 files/digest-vdr-calc-0.0.1_rc5 253
+RMD160 79c3ee385e6a672e6fedf5c5cc3e9570af33b8b1 files/digest-vdr-calc-0.0.1_rc5 253
+SHA256 e851bb4230e78442529dc87e066a860508df6781266ef01f944aaf08e912130d files/digest-vdr-calc-0.0.1_rc5 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEQ8eLZfSl1Kp5KmoRAmkmAKCcv/kj8rVDmGCAgLddl2bplZATcwCg2x2K
-XYYRs/2KzU00qRRRTQ/jZBI=
-=HgrY
+iD8DBQFEsAKrZfSl1Kp5KmoRAq+KAJ9Uj0sP9AdILRcuEwVfVC9L3eoSowCfTRxI
+Z569swG+Cj86bMRFLX6gIQ4=
+=vW83
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-calc/files/vdr-calc-0.0.1_rc5-gcc4.diff b/media-plugins/vdr-calc/files/vdr-calc-0.0.1_rc5-gcc4.diff
new file mode 100644
index 000000000000..0c5aaafd34ee
--- /dev/null
+++ b/media-plugins/vdr-calc/files/vdr-calc-0.0.1_rc5-gcc4.diff
@@ -0,0 +1,12 @@
+diff -ru calc-0.0.1-rc5-orig/calc.c calc-0.0.1-rc5/calc.c
+--- calc-0.0.1-rc5-orig/calc.c	2006-07-08 20:57:47.571929926 +0200
++++ calc-0.0.1-rc5/calc.c	2006-07-08 20:58:03.045402607 +0200
+@@ -72,7 +72,7 @@
+   void AddDigit(eKeys key);
+   void CalculateResult(char* inOperand1, char* inOperand2, char *outOperand, char cOperator);
+   operType operatorSymbol;
+-  void cCalcMain::CalculateResultTrig(char* inOperand1, char *outOperand, char cOperator, gradType calculateGradType);
++  void CalculateResultTrig(char* inOperand1, char *outOperand, char cOperator, gradType calculateGradType);
+ public:
+   cCalcMain(void);
+   ~cCalcMain();
diff --git a/media-plugins/vdr-calc/vdr-calc-0.0.1_rc5.ebuild b/media-plugins/vdr-calc/vdr-calc-0.0.1_rc5.ebuild
index d486e5aa8f03..07e2287351f5 100644
--- a/media-plugins/vdr-calc/vdr-calc-0.0.1_rc5.ebuild
+++ b/media-plugins/vdr-calc/vdr-calc-0.0.1_rc5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-calc/vdr-calc-0.0.1_rc5.ebuild,v 1.2 2006/04/17 16:50:08 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-calc/vdr-calc-0.0.1_rc5.ebuild,v 1.3 2006/07/08 19:08:20 zzam Exp $
 
 IUSE=""
 inherit vdr-plugin
@@ -15,3 +15,5 @@ LICENSE="GPL-2"
 
 DEPEND=">=media-video/vdr-1.3.7"
 
+PATCHES="${FILESDIR}/${P}-gcc4.diff"
+