dev-libs/libical-1.0-r3: revbump/merge

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

3 files changed, 46 insertions, 5 deletions

diff --git a/dev-libs/libical/ChangeLog b/dev-libs/libical/ChangeLog
index 5e155f5..f5dac62 100644
--- a/dev-libs/libical/ChangeLog
+++ b/dev-libs/libical/ChangeLog
@@ -1,6 +1,45 @@
 # ChangeLog for dev-libs/libical
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libical/ChangeLog,v 1.74 2014/04/14 15:17:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libical/ChangeLog,v 1.86 2014/05/19 12:55:58 johu Exp $
+
+  19 May 2014; Johannes Huber <johu@gentoo.org> -libical-0.48.ebuild:
+  Remove old.
+
+  17 May 2014; Agostino Sarubbo <ago@gentoo.org> libical-0.48-r2.ebuild:
+  Stable for alpha, wrt bug #509684
+
+  14 May 2014; Agostino Sarubbo <ago@gentoo.org> libical-0.48-r2.ebuild:
+  Stable for sparc, wrt bug #509684
+
+  13 May 2014; Agostino Sarubbo <ago@gentoo.org> libical-0.48-r2.ebuild:
+  Stable for ia64, wrt bug #509684
+
+  07 May 2014; Mikle Kolyada <zlogene@gentoo.org> libical-0.48-r2.ebuild:
+  arm stable wrt bug #509684
+
+  07 May 2014; Patrick Lauer <patrick@gentoo.org> libical-1.0-r2.ebuild:
+  Restrict makeopts as parallel src_compile reliably fails
+
+  06 May 2014; Mikle Kolyada <zlogene@gentoo.org> libical-0.48-r2.ebuild:
+  ppc64 stable wrt bug #509684
+
+  06 May 2014; Mikle Kolyada <zlogene@gentoo.org> libical-0.48-r2.ebuild:
+  ppc stable wrt bug #509684
+
+  06 May 2014; Mikle Kolyada <zlogene@gentoo.org> libical-0.48-r2.ebuild:
+  x86 stable wrt bug #509684
+
+  06 May 2014; Mikle Kolyada <zlogene@gentoo.org> libical-0.48-r2.ebuild:
+  amd64 stable wrt bug #509684
+
+  06 May 2014; Jeroen Roovers <jer@gentoo.org> libical-0.48-r2.ebuild:
+  Stable for HPPA (bug #509684).
+
+*libical-1.0-r2 (06 May 2014)
+
+  06 May 2014; Manuel Rüger <mrueg@gentoo.org> +libical-1.0-r2.ebuild,
+  -libical-1.0-r1.ebuild:
+  Remove static libraries when needed. Fixes bug #508726.
 
 *libical-1.0-r1 (14 Apr 2014)
 *libical-0.48-r2 (14 Apr 2014)
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 0dbeade..47969ae 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,6 +1,6 @@
 DIST libical-0.48.tar.gz 1173620 SHA256 2ae78b0757f0dd13431acf42a9a8d038339fd4767fd5134e650bf60ee0b4dff0 SHA512 d48b4b5ba78504ec81989b0ca00cac4130ece7e6363af5a0220871b6ad36835c5787a2f17fc871ef51f5950b977be0b87a2e43684ccc7396b0511424e9289d4b WHIRLPOOL f0ecea10bd5dcf18c92da771d65c051caa11d87990cfdaf708e05ddd6408965337f02e329eca73c5ed41ea384547c4f03a1498d459b1b790b9e8b4c20df79eae
 DIST libical-1.0.tar.gz 1199483 SHA256 7c39b3448e4927a2de2775d853f52b3aaeb42400970a3db0b01a78987e6ec0b7 SHA512 4764b08c9a57e867884aae4eb9b9dce53df7abebbbde7190caf4d62bdb223eed57945ac8233029b1d253afc173437363264ce8f75ccbfb2af0bb64dafdd3cec4 WHIRLPOOL 4883c639d3cd6931088efc5880858ce6789f829cec902ad82225a7d06726ca89b65325846d1e19e7afc1ea582cbe0affefd1f92986709b3bc765e6c6f9236e70
 EBUILD libical-0.48-r3.ebuild 1751 SHA256 2d2ff4199a5aad3cc2fb835f24b3d72d675e96da5422890a8bcf068d270c63a5 SHA512 d8e458157dcb197f499ba04da071dfc1cc8f5e62427669498125d2aad33576de7b01e75267e3a6ddba64163c4cc03825063ccb3b0dedd4ac19d3342f8b96b5c7 WHIRLPOOL e94d5e44c2ecc25f11899d816e0ce3d34835b06d43a197184d286b4d2451774c98d48886696143d7a493277f76cfd569dd02f8bdd8400ed8f20ce4fc07a80fd3
-EBUILD libical-1.0-r2.ebuild 1147 SHA256 9b48f99e5de00e4ab152375a59af1e8b0773fad9c62bd62a940855ed36e1340c SHA512 889f0fcfb3fb568177c31236c59b7060f6ea2c8a3a935f1b409898b11af67493995e30e2aa47a9137c3a19dcf970a35406c1b935e32e6cd5aa134545b53b8470 WHIRLPOOL 81add1b02e1ef08f72bba1dd65ac75210489021c9b5101df1625056ef51b5c71f119655358b35b1416f873cc2fd036f21af7c851a9eb5837ed124b15476bfe0f
-MISC ChangeLog 8853 SHA256 8b3e15d2c3f9d72109d5f83922f238f9fc61adfd57014c56c2cd3e806bd79db4 SHA512 d72d46dd280985e22576e83b50b1ee1c678ed003aa47c60cb9c6d8bc081f02bca8ed79dbb164b47e471cd110f523a88624a8b7b4f62f51dd0063052082a41ced WHIRLPOOL 2cd8b86bff249c09442ac723fa0f00d0ec81120da39a0739d6e9bdcec16f0277f780224d625a6a8ebe7c7d607bd21eaa1febaab36aaf405421b37bea50608344
+EBUILD libical-1.0-r3.ebuild 1194 SHA256 3de5096506e8e14f7e4b4342bd720e31494799816f417e1dd0f8282893bea872 SHA512 79aeff8fc81f694f43202e182122b79c2b9590e72981f1794038e44be31bee732811a8e9b8435d26d49af0f2a5799fc04e820801132fd240c0714c481b8134f7 WHIRLPOOL 38195892207b4d90852743ab1a5a82cc837beb66f62d3dd1a2aaad09c222c952c7eeae598ab28ffa727d2b082aa8e2e3afe3d794b14cf62a880933b0a1019db6
+MISC ChangeLog 10217 SHA256 3377715605907a7607c3f3a5a0a024ac6b109fa3b015bf8f8e19cb891edc1e8c SHA512 50f623a70a5f06d30c6313344655727e3a9b2ebd34edfb3b7933307fc7502d5e47900a2c55aebd8b7ca6f4fa4f116c6bb21c1517ccc595fea43a076da41f7669 WHIRLPOOL b985ca348e005d70369e1bf81b90508e18cd42022a45f9e85fd36d42235ab94f1575dfc4708f93f87505686cf7a79aaf809de504f77b6337a919b85e50bc1669
 MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb
diff --git a/dev-libs/libical/libical-1.0-r2.ebuild b/dev-libs/libical/libical-1.0-r3.ebuild
index 352cd56..0734d72 100644
--- a/dev-libs/libical/libical-1.0-r2.ebuild
+++ b/dev-libs/libical/libical-1.0-r3.ebuild
@@ -19,8 +19,7 @@ DEPEND="${RDEPEND}
 	dev-lang/perl"
 
 src_configure() {
-	local mycmakeargs=" $( cmake-utils_use static-libs STATIC_LIBRARY ) \
-		$( cmake-utils_use introspection GOBJECT_INTROSPECTION )"
+	local mycmakeargs=" $( cmake-utils_use introspection GOBJECT_INTROSPECTION )"
 	cmake-multilib_src_configure
 }
 
@@ -37,6 +36,9 @@ MULTILIB_WRAPPED_HEADERS=(
 src_install() {
 	cmake-multilib_src_install
 
+	# Remove static libs, cmake-flag is a trap.
+	use static-libs || find "${ED}" -name '*.a' -delete
+
 	if use examples; then
 		rm examples/Makefile* examples/CMakeLists.txt
 		insinto /usr/share/doc/${PF}/examples