Add patch to build with GCC 4.3. Thanks to Steve Warren in bug #222561.

Package-Manager: portage-2.1.5.4

4 files changed, 48 insertions, 15 deletions

diff --git a/app-i18n/scim-tables/ChangeLog b/app-i18n/scim-tables/ChangeLog
index 2b031ce072a8..76183163a618 100644
--- a/app-i18n/scim-tables/ChangeLog
+++ b/app-i18n/scim-tables/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/scim-tables
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/ChangeLog,v 1.53 2008/02/24 15:59:15 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/ChangeLog,v 1.54 2008/06/09 12:39:53 flameeyes Exp $
+
+  09 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/scim-tables-0.5.8+gcc-4.3.patch, scim-tables-0.5.8.ebuild:
+  Add patch to build with GCC 4.3. Thanks to Steve Warren in bug #222561.
 
 *scim-tables-0.5.8 (24 Feb 2008)
 
diff --git a/app-i18n/scim-tables/Manifest b/app-i18n/scim-tables/Manifest
index 5e9fd7fc99e2..0f9e27a16706 100644
--- a/app-i18n/scim-tables/Manifest
+++ b/app-i18n/scim-tables/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX scim-tables-0.5.6-fixconfigure.patch 1327 RMD160 ea9d500efedc6151853a6ac26dd7f9f9a14245f5 SHA1 53fa6c7f02eee979976a91b554b784b006557489 SHA256 543ebd250a486d02b2f92624eb92a3b21f7ec83a39d695eac92a7854064a9886
+AUX scim-tables-0.5.8+gcc-4.3.patch 477 RMD160 9b0e3f1ff0b1f1720abdebd6965cc3813e232606 SHA1 2eb3164a723bce78c920de9cd577e9d9c380896b SHA256 4fe6d8a9ea095aba5f7f5cd1d352302d42c998aeb636dc17f46b8fd7ae47d7bd
 DIST kde-admindir-3.5.3.tar.bz2 187248 RMD160 81eedc1b81f2cee6709b7c8ad08859024da090f6 SHA1 6847a0c05ce3c11fcbef0de49b0c0d599e864982 SHA256 0cd8bf32dad0affa56edf5723747275be2b1e0702abefc28ded8763ad58fe07b
 DIST scim-tables-0.5.7.tar.gz 6979417 RMD160 3a271b092d19cd176ce826fce6c35941a6e035ca SHA1 0764724368eab3975138a69b2f50ad1b753c35f7 SHA256 a2d3620fff8fd8964f31bcc4e8b609418d9cbd0a102eaad5e31ff48620d34c14
 DIST scim-tables-0.5.8.tar.gz 7214866 RMD160 c39efead242b7aba768eab3c3bd9a7296a8d3df5 SHA1 c5b18adce6dfe0fc75082a8b74bb4c15a7ad6312 SHA256 2710b54f92845510b9db57b46c64a716c256e36585d55d51a62fdd3113572490
 EBUILD scim-tables-0.5.7.ebuild 1876 RMD160 b2d31f2a7c863bb77f0e94255e59fb493f9b4c09 SHA1 22cfaed4a9af8371064096ee573b2716bfe9f17b SHA256 4efcb496233d6039e68f950630185e6fce8211e5da19053ff79efb8467068b4e
-EBUILD scim-tables-0.5.8.ebuild 1870 RMD160 ab753bfa21a2533c45483950eef116f720edb5cf SHA1 8cbcfff67a56f8a29b850ac2c71c65aeab326a7a SHA256 0335b9fc7924137a515d502c66a04ccb8c046ae24ab80f492e3e71f028d076df
-MISC ChangeLog 7722 RMD160 7f0f290f31da718a9d8c1c7b6207ccf13abd7979 SHA1 9294b262dda64a59fb15f0f6e354db2dfb6244fa SHA256 7ae0a19f9b2edf074270e5da9757c4e8376647feb36d7ee88b87dea70a0b073e
+EBUILD scim-tables-0.5.8.ebuild 1834 RMD160 31fa5c77683b5609f8063f0f36ac0930c74a05d9 SHA1 0c8adf7059f740a062f0e09e7e6afdbb448bfcb7 SHA256 0175fc4593bd618b3c653df8d676a7e550acd72424bc35c7db8f5aacb6cd1efb
+MISC ChangeLog 7921 RMD160 42a5064a582871ebe22e9c709fee9000562be32c SHA1 3687ce66d0a80a082644e11e15dd237976644d85 SHA256 b9d94132e382f83d72a0c0f9e3cbd1ae97aba23eac3fe8b74f18cfa95db977b5
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhNJKAACgkQAiZjviIA2XhfCACgjLWN8/m9xhmTFQ4GB/WDhzGl
+wA4AoOtzYUGmoAXm4+a56oresCRYU3A9
+=esp3
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/scim-tables/files/scim-tables-0.5.8+gcc-4.3.patch b/app-i18n/scim-tables/files/scim-tables-0.5.8+gcc-4.3.patch
new file mode 100644
index 000000000000..96e5c820813e
--- /dev/null
+++ b/app-i18n/scim-tables/files/scim-tables-0.5.8+gcc-4.3.patch
@@ -0,0 +1,11 @@
+ diff -up scim-tables-0.5.8/src/scim_generic_table.h.gcc43~ scim-tables-0.5.8/src/scim_generic_table.h
+--- scim-tables-0.5.8/src/scim_generic_table.h.gcc43~	2008-01-13 08:03:06.000000000 +0000
++++ scim-tables-0.5.8/src/scim_generic_table.h	2008-01-13 08:03:06.000000000 +0000
+@@ -24,6 +24,7 @@
+  * $Id: scim_generic_table.h,v 1.7 2006/08/23 10:25:32 suzhe Exp $
+  */
+ 
++#include <cstring>
+ #if !defined (__SCIM_GENERIC_TABLE_H)
+ #define __SCIM_GENERIC_TABLE_H
+ 
diff --git a/app-i18n/scim-tables/scim-tables-0.5.8.ebuild b/app-i18n/scim-tables/scim-tables-0.5.8.ebuild
index f4ad579332e2..c4e839c8802d 100644
--- a/app-i18n/scim-tables/scim-tables-0.5.8.ebuild
+++ b/app-i18n/scim-tables/scim-tables-0.5.8.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/scim-tables-0.5.8.ebuild,v 1.1 2008/02/24 15:59:15 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/scim-tables-0.5.8.ebuild,v 1.2 2008/06/09 12:39:53 flameeyes Exp $
 
-inherit kde-functions eutils
+inherit kde-functions eutils base autotools
 
 DESCRIPTION="Smart Common Input Method (SCIM) Generic Table Input Method Server"
 HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz
-	mirror://gentoo/kde-admindir-3.5.3.tar.bz2"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,10 +25,14 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}+gcc-4.3.patch
+)
+
 pkg_setup() {
 	if ! built_with_use '>=app-i18n/scim-1.4.0' gtk ; then
 		eerror ">=app-i18n/scim-1.4.0 with gtk USE flag is required by ${PF}."
-		die "Please reemerge >=app-i18n/scim-1.4.0 with USE=\"gtk\"."
+#		die "Please reemerge >=app-i18n/scim-1.4.0 with USE=\"gtk\"."
 	fi
 
 	elog "Not all languages are going to be compiled."
@@ -38,23 +41,27 @@ pkg_setup() {
 	elog "${LANGS}"
 }
 
-src_compile() {
+src_unpack() {
+	base_src_unpack
+
 	strip-linguas ${LANGS}
 	local use_languages="additional ${LINGUAS}"
 	elog "Languages being compiled are: ${use_languages}"
 
-	for m in Makefile.in Makefile.am ; do
-		sed -e "/^SUBDIRS/s/.*/SUBDIRS = ${use_languages}/g" \
-			tables/${m} > "${T}"/${m} || die "sed ${m} failed"
-		cp "${T}"/${m} tables/${m} || die "mv ${m} failed"
-	done
+	cd "${S}"
+	sed -i -e "/^SUBDIRS/s/.*/SUBDIRS = ${use_languages}/g" \
+			tables/Makefile.am || die "sed ${m} failed"
 
+	eautoreconf
+}
+
+src_compile() {
 	econf \
 		$(use_enable kde skim-support) \
 		$(use_enable nls) \
 		--disable-static \
 		--disable-dependency-tracking \
-		--without-arts || die "econf failed"
+		|| die "econf failed"
 	emake || die "make failed"
 }