Fix kbeam-0.61-r1.ebuild, gcc43 compatibility bug #226363. Thanks Chi-Thanh Christopher Nguyen for providing the patch.

Package-Manager: portage-2.1.5.4

4 files changed, 28 insertions, 11 deletions

diff --git a/kde-misc/kbeam/ChangeLog b/kde-misc/kbeam/ChangeLog
index 68a1caf61423..d8be30adce71 100644
--- a/kde-misc/kbeam/ChangeLog
+++ b/kde-misc/kbeam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/kbeam
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kbeam/ChangeLog,v 1.6 2006/09/28 17:45:13 deathwing00 Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kbeam/ChangeLog,v 1.7 2008/06/14 13:21:19 tgurr Exp $
+
+  14 Jun 2008; Timo Gurr <tgurr@gentoo.org> +files/kbeam-0.61-gcc43.patch,
+  kbeam-0.61-r1.ebuild:
+  Fix kbeam-0.61-r1.ebuild, gcc43 compatibility bug #226363. Thanks
+  Chi-Thanh Christopher Nguyen for providing the patch.
 
   28 Sep 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
   kbeam-0.61-r1.ebuild:
diff --git a/kde-misc/kbeam/Manifest b/kde-misc/kbeam/Manifest
index b6c24560569d..eeaa7d92a598 100644
--- a/kde-misc/kbeam/Manifest
+++ b/kde-misc/kbeam/Manifest
@@ -1,5 +1,6 @@
 AUX kbeam-0.61-aclocal_openobex.patch 2289 RMD160 77914a54a4e8303f0d38b315d260d914a3b52f69 SHA1 1bc1e5e07c9ef584808914afef87606e3ba0bd5c SHA256 8dd3297409b35fd3c119d4198e17bb7d10f3d9f2be86202a466c64ae1afa6c29
+AUX kbeam-0.61-gcc43.patch 467 RMD160 102de88c11e27d2c56c7896fe55c7ebe8cd9660d SHA1 12080f1c96496b85491e89015d85ec10996eb073 SHA256 245919d9dbc1b6814a848aca816d583b8e08fc45ab38ff740bb90b77dc743570
 DIST kbeam-0.61.tar.gz 650233 RMD160 efcef875730d65ba4c508887f6726189c01eb4bd SHA1 122be33b708f7c342ee652bad7b8c8515ef6a77a SHA256 bbceda87d230083d1662237f1b825a94c9a2a76c4a4fb99e22e6995e642e7ce2
-EBUILD kbeam-0.61-r1.ebuild 835 RMD160 4b3118479646d4fc9fc13e3bac08f117edf6e629 SHA1 9bfc79bcd34c237eee88714c06340a648868d979 SHA256 d68f05345b935f53ba2322cd8c607cf31458b1ff0c7584156fe750c051fe3192
-MISC ChangeLog 1593 RMD160 2257bebcdb742cc5ab2fe25d986b7980d369101b SHA1 42d90db5dc34a05b31bc738f9feb48389496331f SHA256 7b052d6085a6fd8795da593dad7a44c7ea16baa919b5c36c0675384c084bcbc2
+EBUILD kbeam-0.61-r1.ebuild 855 RMD160 dd9a18b72dec7c7e5bc364db4b3f5fea78925c95 SHA1 f37300b52e700467d973f772122bfe3bfe43bce7 SHA256 1fc961e53be70b8c8de1920ea811bacbe7a577929c07531962ee938fa43ad253
+MISC ChangeLog 1811 RMD160 24c33e8da08f31a96f2e893c394adbe331fc97af SHA1 2154d2d0e5afdc9938f759555e05dc3496c40188 SHA256 e0f5e62d3a5fccf945c2576bdbc0a0856b02d6f7c09d65691ebaa42d8803e5c8
 MISC metadata.xml 216 RMD160 aa6c1a4369edef4d9495c99e67cf34013614e386 SHA1 956610151e180325ae42bee51dbcefaa8c961fd6 SHA256 b9d5eb8bea543fbf88fac15c8c8112ff9853c7f41678c65c68cde0dc227b10a2
diff --git a/kde-misc/kbeam/files/kbeam-0.61-gcc43.patch b/kde-misc/kbeam/files/kbeam-0.61-gcc43.patch
new file mode 100644
index 000000000000..a55bbf42587b
--- /dev/null
+++ b/kde-misc/kbeam/files/kbeam-0.61-gcc43.patch
@@ -0,0 +1,11 @@
+diff -Naur kbeam-0.61/src/main.cpp kbeam-0.61.new/src/main.cpp
+--- kbeam-0.61/src/main.cpp	2004-09-01 23:16:04.000000000 +0200
++++ kbeam-0.61.new/src/main.cpp	2008-06-14 14:56:38.350783134 +0200
+@@ -18,6 +18,7 @@
+  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+  ***************************************************************************/
+ 
++#include <stdlib.h>
+ #include <kaboutdata.h>
+ #include <klocale.h>
+ #include <kcmdlineargs.h>
diff --git a/kde-misc/kbeam/kbeam-0.61-r1.ebuild b/kde-misc/kbeam/kbeam-0.61-r1.ebuild
index 15e88ce0ca10..499a7d991e0b 100644
--- a/kde-misc/kbeam/kbeam-0.61-r1.ebuild
+++ b/kde-misc/kbeam/kbeam-0.61-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kbeam/kbeam-0.61-r1.ebuild,v 1.3 2006/09/28 17:45:13 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kbeam/kbeam-0.61-r1.ebuild,v 1.4 2008/06/14 13:21:19 tgurr Exp $
 
 inherit kde autotools
 
-KLV="14683"
 DESCRIPTION="A KDE application that lets you send and receive files to devices, using your Infrared port."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.kde-apps.org/content/show.php?content=${KLV}"
+HOMEPAGE="http://www.kde-apps.org/content/show.php?content=14683"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
@@ -18,13 +17,14 @@ DEPEND=">=dev-libs/openobex-1.1"
 
 RDEPEND="${DEPEND}"
 
-PATCHES="${FILESDIR}/${P}-aclocal_openobex.patch"
-
-need-kde 3.2
+need-kde 3.5
 
 src_unpack() {
 	kde_src_unpack
 
+	epatch "${FILESDIR}/${P}-aclocal_openobex.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+
 	#need it for using the AM_PATH_OPENOBEX definition installed in system
 	eaclocal && eautoconf || die "eaclocal or eautoconf has failed"
 }