summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2009-05-14 07:39:36 +0000
committerNirbheek Chauhan <nirbheek@gentoo.org>2009-05-14 07:39:36 +0000
commit8f823db7d8ab11115b23adc31ec2dc83b6120833 (patch)
treefa52030bbbdc7836d9fbc1de78413d7430758945
parentVersion bump (diff)
downloadhistorical-8f823db7d8ab11115b23adc31ec2dc83b6120833.tar.gz
historical-8f823db7d8ab11115b23adc31ec2dc83b6120833.tar.bz2
historical-8f823db7d8ab11115b23adc31ec2dc83b6120833.zip
Fix intltoolize broken file, see upstream #577133
Package-Manager: portage-2.2_rc33/cvs/Linux i686
-rw-r--r--gnome-base/gnome-keyring/ChangeLog8
-rw-r--r--gnome-base/gnome-keyring/Manifest14
-rw-r--r--gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild (renamed from gnome-base/gnome-keyring/gnome-keyring-2.26.1.ebuild)5
3 files changed, 13 insertions, 14 deletions
diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index 7fcd5bfc597a..bff5e19c4491 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for gnome-base/gnome-keyring
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.146 2009/05/10 20:27:21 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.147 2009/05/14 07:39:36 nirbheek Exp $
+
+*gnome-keyring-2.26.1-r1 (14 May 2009)
+
+ 14 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+ -gnome-keyring-2.26.1.ebuild, +gnome-keyring-2.26.1-r1.ebuild:
+ Fix intltoolize broken file, see upstream #577133
*gnome-keyring-2.26.1 (10 May 2009)
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 6c98ab29f0f2..ef6cd8321e37 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX gnome-keyring-2.22.3-pkg-libtasn1.patch 1079 RMD160 8ddeb815ef69fd3a32b256fc144883c5ab9ca6f8 SHA1 84d93848fac4141aea4ddd5f221b5a3431a6774f SHA256 14332fdb39ab870bab747e148d2098f339758af5105504b9fc83c0582394303c
AUX gnome-keyring-2.22.3-warnings.patch 780 RMD160 3f3e04754189b67720f2f1e7eebb5e24b9612cd2 SHA1 95077ed5efcc493e35b64b943548c569eef1cfff SHA256 03206a46f86675ed1d2773740a23b02eaa1221c8dbbd3caea0a30a42c82a7d82
DIST gnome-keyring-2.22.3.tar.bz2 894308 RMD160 551f4a4d734e0196522be9276ae7e76110a96556 SHA1 0f52095590a684920cc683d1985ac66263702114 SHA256 1e14eed00d386763352896e540929760264885e1296ac11cfb8ca1c08dcea7f6
@@ -8,13 +5,6 @@ DIST gnome-keyring-2.24.1.tar.bz2 1125993 RMD160 17c6701ef7b35902780b6c72b79a3f0
DIST gnome-keyring-2.26.1.tar.bz2 2738687 RMD160 0975197ae8e58a8d98a2ff11c062ec6c9cf74a79 SHA1 3ff24987392b3f51109709b2c020af3557155ef8 SHA256 47a79a7963652c19d9f566289fdb49ca286bfb1bef32b7e1032eb36c49bf7926
EBUILD gnome-keyring-2.22.3-r1.ebuild 1432 RMD160 35e519fe4972b504b00159e599782bf81dbdb6f6 SHA1 d7f5032be41b5ac8e7a2080dc63cab5d6b5d0ef8 SHA256 469730467d0c8bd3aa9ec84de37a248836274b71198e45d2c987364348bd533a
EBUILD gnome-keyring-2.24.1.ebuild 1470 RMD160 631eb138f3f1e46b4e5e23c4711061d020c530f4 SHA1 adc78bfc15dfc76829e49a7a4ae543c95a2c65aa SHA256 bcdc993a032b069f0221621f2bb95c032b63b7cb248bd33cab5d439b19daba3c
-EBUILD gnome-keyring-2.26.1.ebuild 1553 RMD160 84a362f84cf62935ec1ab9cd7374effbcbbf1902 SHA1 96be8cf09a7f147c1798e42318d1fd27a278a93e SHA256 72280989668db851c24e7f4e347c299179cd3fee22a6da307dbc332b93e8fc17
-MISC ChangeLog 18644 RMD160 20204daeffa76c89c14faffd2c019ea05fb1ea64 SHA1 8d21b4a4769cd611e01b16a3a566e66aea08175a SHA256 8599d6b3cd32dd1196b3d4df5c07ed65d0ba498b109a88dbdbbcdcf96a683973
+EBUILD gnome-keyring-2.26.1-r1.ebuild 1699 RMD160 553e1d13bb23391203025e6b8c51b65833f55e9a SHA1 53aa68b78a1236f83812e022cc2f66eff6454335 SHA256 f94a95848298bf1c2b481f453a9eb1273c0f091eb522332aa2d0e0348b675715
+MISC ChangeLog 18861 RMD160 4f5450c54fcbe546eec638529a1a6c14982236d1 SHA1 55549dad85cae615c0f5b2daecd23252986848f4 SHA256 29e81012666360f79fceef3f4379de84af8ce835b48a622f243e29ea440f14b4
MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoHOLAACgkQ1fmVwcYIWAb8ZACgizNpxN6r0X/l6TGQAaeyNUl5
-IOQAn3qhVEyWth6e5nKJ++NJBNcafHgt
-=fdgM
------END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.26.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild
index 74b1a475bc61..2bf6691ff018 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.26.1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.26.1.ebuild,v 1.1 2009/05/10 20:27:21 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild,v 1.1 2009/05/14 07:39:36 nirbheek Exp $
EAPI="2"
@@ -51,6 +51,9 @@ src_prepare() {
# Remove silly CFLAGS
sed 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
-i configure.in configure || die "sed failed"
+
+ # Fix intltoolize broken file, see upstream #577133
+ sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
}
src_test() {