summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs/libical')
-rw-r--r--dev-libs/libical/ChangeLog8
-rw-r--r--dev-libs/libical/libical-1.0-r2.ebuild (renamed from dev-libs/libical/libical-1.0-r1.ebuild)8
2 files changed, 12 insertions, 4 deletions
diff --git a/dev-libs/libical/ChangeLog b/dev-libs/libical/ChangeLog
index 5e155f561ddf..9db47a72e591 100644
--- a/dev-libs/libical/ChangeLog
+++ b/dev-libs/libical/ChangeLog
@@ -1,6 +1,12 @@
# 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.75 2014/05/06 12:55:41 mrueg Exp $
+
+*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/libical-1.0-r1.ebuild b/dev-libs/libical/libical-1.0-r2.ebuild
index 8df239541b80..6e61c040a7d7 100644
--- a/dev-libs/libical/libical-1.0-r1.ebuild
+++ b/dev-libs/libical/libical-1.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libical/libical-1.0-r1.ebuild,v 1.1 2014/04/14 15:17:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libical/libical-1.0-r2.ebuild,v 1.1 2014/05/06 12:55:41 mrueg Exp $
EAPI=5
inherit cmake-utils
@@ -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-utils_src_configure
}
@@ -32,6 +31,9 @@ DOCS=(
src_install() {
cmake-utils_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