summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaohiro Aota <naota@gentoo.org>2012-05-29 22:43:49 +0000
committerNaohiro Aota <naota@gentoo.org>2012-05-29 22:43:49 +0000
commit3c03d4bd97962bf39f8bf56cba1e78f61edcd37f (patch)
tree6661d8431d0814fd3348431974909e4140628db1 /app-i18n
parentSecurity updates in the 1.8 & 10 branches for an IAX2 remote crash, bug #4181... (diff)
downloadgentoo-2-3c03d4bd97962bf39f8bf56cba1e78f61edcd37f.tar.gz
gentoo-2-3c03d4bd97962bf39f8bf56cba1e78f61edcd37f.tar.bz2
gentoo-2-3c03d4bd97962bf39f8bf56cba1e78f61edcd37f.zip
Remove intltool.m4 to update it. #417563
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'app-i18n')
-rw-r--r--app-i18n/scim/ChangeLog6
-rw-r--r--app-i18n/scim/scim-1.4.9-r1.ebuild5
-rw-r--r--app-i18n/scim/scim-1.4.9-r2.ebuild5
3 files changed, 11 insertions, 5 deletions
diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index 6a0e15f6471f..0930266c6247 100644
--- a/app-i18n/scim/ChangeLog
+++ b/app-i18n/scim/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-i18n/scim
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.148 2012/05/03 19:24:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.149 2012/05/29 22:43:49 naota Exp $
+
+ 29 May 2012; Naohiro Aota <naota@gentoo.org> scim-1.4.9-r1.ebuild,
+ scim-1.4.9-r2.ebuild:
+ Remove intltool.m4 to update it. #417563
03 May 2012; Jeff Horelick <jdhore@gentoo.org> scim-1.4.9-r1.ebuild,
scim-1.4.9-r2.ebuild, scim-1.4.11.ebuild, scim-1.4.11-r1.ebuild:
diff --git a/app-i18n/scim/scim-1.4.9-r1.ebuild b/app-i18n/scim/scim-1.4.9-r1.ebuild
index e1c74d4464f0..fceb77214e3b 100644
--- a/app-i18n/scim/scim-1.4.9-r1.ebuild
+++ b/app-i18n/scim/scim-1.4.9-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.9-r1.ebuild,v 1.14 2012/05/03 19:24:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.9-r1.ebuild,v 1.15 2012/05/29 22:43:49 naota Exp $
EAPI="2"
inherit autotools eutils flag-o-matic multilib
@@ -40,7 +40,8 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-1.4.7-syslibltdl.patch"
# bug #283317
epatch "${FILESDIR}/${PN}-fix-disappeared-status-icon.patch"
- rm "${S}"/src/ltdl.{cpp,h} || die
+ # remove m4/intltool.me to update it #417563
+ rm "${S}"/src/ltdl.{cpp,h} m4/intltool.m4 || die
eautoreconf
}
diff --git a/app-i18n/scim/scim-1.4.9-r2.ebuild b/app-i18n/scim/scim-1.4.9-r2.ebuild
index 9f7d67d23723..95ceb0d6e8f8 100644
--- a/app-i18n/scim/scim-1.4.9-r2.ebuild
+++ b/app-i18n/scim/scim-1.4.9-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.9-r2.ebuild,v 1.2 2012/05/03 19:24:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.9-r2.ebuild,v 1.3 2012/05/29 22:43:49 naota Exp $
EAPI="3"
inherit autotools eutils flag-o-matic multilib
@@ -45,7 +45,8 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-1.4.7-syslibltdl.patch"
# bug #283317
epatch "${FILESDIR}/${PN}-fix-disappeared-status-icon.patch"
- rm "${S}"/src/ltdl.{cpp,h} || die
+ # remove m4/intltool.m4 to update it #417563
+ rm "${S}"/src/ltdl.{cpp,h} m4/intltool.m4 || die
eautoreconf
}