summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-06-20 06:51:30 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-06-20 06:51:30 +0000
commit886f493869c6bd1d2e4bbcd9f2c6f49aadc1e5af (patch)
treeb8c580850c9a38f4c2426fb37077a25098ce43ff /gnome-extra
parentRemove old wrt bug 421987. (diff)
downloadhistorical-886f493869c6bd1d2e4bbcd9f2c6f49aadc1e5af.tar.gz
historical-886f493869c6bd1d2e4bbcd9f2c6f49aadc1e5af.tar.bz2
historical-886f493869c6bd1d2e4bbcd9f2c6f49aadc1e5af.zip
Fix sys-devel/automake >= 1.12 compability wrt #420351
Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/evolution-data-server/ChangeLog6
-rw-r--r--gnome-extra/evolution-data-server/Manifest18
-rw-r--r--gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild9
3 files changed, 22 insertions, 11 deletions
diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 3e66543ee976..efc9be9c0b94 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-extra/evolution-data-server
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.336 2012/05/24 13:53:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.337 2012/06/20 06:51:30 ssuominen Exp $
+
+ 20 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+ evolution-data-server-3.2.3-r2.ebuild:
+ Fix sys-devel/automake >= 1.12 compability wrt #420351
24 May 2012; Samuli Suominen <ssuominen@gentoo.org>
evolution-data-server-2.32.3-r2.ebuild:
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index a3d055814fed..1c31fbff3e65 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -20,19 +20,19 @@ DIST evolution-data-server-3.4.2.tar.xz 3879040 RMD160 01be750debfb5e3daf2b92ab0
EBUILD evolution-data-server-2.32.3-r1.ebuild 4669 RMD160 6b7ae7ec4b48af2ea9c2dd755775bd784ce2059f SHA1 0908d474d443bab5c17274ac2df4ce392880897b SHA256 b617dd397ebf949c4947a2072e6b2e1236a99efe3fcc40a8831ae74be3eaabb9
EBUILD evolution-data-server-2.32.3-r2.ebuild 4927 RMD160 b8fc2d5c3aecc7440a094f82a58c185bcade7f36 SHA1 41f71e3582357797b8a2f3960581d6a8b9c8cda8 SHA256 ef197c74b73133e780d4d087266adafdead9c80f8ba507d98ed2dc59fc456188
EBUILD evolution-data-server-3.2.3-r1.ebuild 4331 RMD160 0912e2cc516d5f87874c05ed7e4378692feede05 SHA1 7ec63766dd07205b5128437f9c1ef6c662eb5afc SHA256 9ad2605c2551afd67aa387b039eb758e3f633a052eaee2dccd7fc921ea41ef03
-EBUILD evolution-data-server-3.2.3-r2.ebuild 4432 RMD160 4d7f67b7a9654107182d795a6f9138fbcd824481 SHA1 a331bf45742046909d9775fef37819eecf27348e SHA256 c6d1eeb150b706c4828427f0da97ca96f928c8904decd4c877f4bec3aae53f75
+EBUILD evolution-data-server-3.2.3-r2.ebuild 4649 RMD160 a3f2c4f991514dc1bfb37d7c1f024c2d0fd0bb2a SHA1 6aaf3081c474ac35ba32e59e48214f410ee844c6 SHA256 01a10190b9775c9ec00a77f742445e0dfeb74cfafb25ede6215bc2686792b590
EBUILD evolution-data-server-3.4.1.ebuild 3998 RMD160 8ad3f2359f966379f76967a9621dfcd2fc52695f SHA1 614c0e5becde4664b236f3a81aac2735ade41a58 SHA256 18b3b55fd6d6a7035f6ed22ef97005ab555035de12699be8bb261719942818f8
EBUILD evolution-data-server-3.4.2.ebuild 3998 RMD160 b3ab65aa7ee931fdcdf708743e133aca04a512a5 SHA1 f879628d343f5e5ebf6b0619d35ab6aa741ddb1a SHA256 61dc843fe73de3101b2c582b9a5bfb25ec1386b7fedfe38e74ddea64c903aca0
-MISC ChangeLog 66102 RMD160 07b3f8388ade80697ad470e30d0e05104fec8f93 SHA1 7bc320b9945be1a84b013652006333bb7c6e0279 SHA256 dd95f3ae57788988733e9939baa6bf977c47064bbf758beabc9cdb7040a86b65
+MISC ChangeLog 66255 RMD160 90cfc09566c725aa694e9fd574bbed459eb5cce4 SHA1 8736f459dea75ad825c2f274c661b3891fe31425 SHA256 0f9dddc1ad881158448a6ec161c9b777a06b8ccac5777e03de31b0659549bb0c
MISC metadata.xml 535 RMD160 206f4b4067eab119530224247177d5f8ca6c97e2 SHA1 21a9ce92639d7c5aed6b189eca4f40b00b97778b SHA256 f458f1517ae769596f0dab7860b2789867e773eb32ad7cc00279dc7e2e82d64c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBAgAGBQJPvj1bAAoJEEdUh39IaPFN7KkIAJxwcviIxsuavBrZkdzbrCKU
-2U4R/i/NxIVg9s5Y4DqtlyK/qbIKCRJnV9AAEPNZcPcK3pj/ysXxfWSH1qIb3GGd
-ASoX0WHMW6Z83r3j0yxhEj/t/kuQvTHDtGmn1YwNN/qHBkBMWmqhFF5mSx9/NPWP
-Lrj18RWtjXs5VvF8Tlut5KTMe/hon3k3HiAKvBUsSORagh1G4GRVdQsLrgXRPXz4
-AZIDiBmzVt++2MGNpG/vuASl2ECZVwhNSMoC60lCG2CWcZsJqqx127AKCsYHI3pQ
-3TTpuyNmHBHutQytnQjIaobWYgiYPVwx6CfFb/12y3eY8UYRY4E9U2ujebQ9YrE=
-=+2OY
+iQEcBAEBAgAGBQJP4XHfAAoJEEdUh39IaPFNQHIH/2WtRruQpSTiLWuV/kQXv4df
+eU6p8FyTXTLtL4baWw3JAEYH6JCWzvt4DSljJD1gNVpmg3paK82BJbg38JlsaS0+
+yQ/qjlqUFI54SLLcbmVjMVYAWxQY32yATDGnPJGr4uDYkbt4DfnvGn9WCK8Z3oDp
+zR3PnwfzLmVZYORIMDYCMiZe8wxctc0Hcz3uTGcOXdDuzGfFg7nFMt7AUFasGnxv
+I7vKDPiEY3vabjvf9f2ChTkFOF8pwzYYQ3MnT08nKBiZzTiKSbDgssnH22DBdcEA
+/C10QX1q46TWjTFNFXRkjTByVMY1wiRw9PSzom11w1spGZ1ZLUDtJg06VZPqjbM=
+=nrmE
-----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild
index 8a8906da2eab..721b8f241597 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-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/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild,v 1.1 2012/05/07 05:58:06 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.3-r2.ebuild,v 1.2 2012/06/20 06:51:30 ssuominen Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -91,6 +91,13 @@ src_prepare() {
# fix Google calendar event adding, bug #412829
epatch "${FILESDIR}/${P}-google-calendar.patch"
+ # Fix >=sys-devel/automake-1.12 compability wrt #420351
+ sed -i \
+ -e '/PROG_MKDIR_P/s:AM:AC:' \
+ -e 's:mkdir_p:MKDIR_P:' \
+ -e '/AM_INIT_AUTOMAKE/s:-Werror ::' \
+ m4/po.m4 po/Makefile.in.in configure.ac || die
+
eautoreconf
gnome2_src_prepare