1 |
commit: 12436d4d974dc5f6de69cfb533c52fb0f426af0e |
2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 28 17:28:41 2016 +0000 |
4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 28 18:06:40 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12436d4d |
7 |
|
8 |
dev-libs/libical: new version v2.0.0 with fix for bug 560572. |
9 |
|
10 |
Gentoo-Bug: 560572 |
11 |
|
12 |
Package-Manager: portage-2.2.28 |
13 |
|
14 |
dev-libs/libical/Manifest | 1 + |
15 |
dev-libs/libical/files/fix-libdir-location.patch | 26 +++++++++++++ |
16 |
dev-libs/libical/libical-2.0.0.ebuild | 47 ++++++++++++++++++++++++ |
17 |
3 files changed, 74 insertions(+) |
18 |
|
19 |
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest |
20 |
index 8eb60fe..bba6baf 100644 |
21 |
--- a/dev-libs/libical/Manifest |
22 |
+++ b/dev-libs/libical/Manifest |
23 |
@@ -1 +1,2 @@ |
24 |
DIST libical-1.0.1.tar.gz 720618 SHA256 7d5f613454ec6c7d1bcfb441c919215be53292aa15cd1cb14249d1413d6c610c SHA512 efce88c73352fc34e9f7eda2234bdb593e917b33d1373cc6e6a21a72db1b14f2ed72976d6084dddcd8f07b08a15d5f04370bc825695d2fd40cc7b8488a7a977f WHIRLPOOL b9b4aa3fe0287a5394a8b23a1c3c810059554f6cce396b98f383df9950f984e0d18961086ecbdeb1c099ca6c63f68ceb2be08a9471817e0554ecc6e7fce06347 |
25 |
+DIST libical-2.0.0.tar.gz 699099 SHA256 20f4a98475052e1200d2691ba50b27969e4bedc6e50bffd5e2fa81f4ac90de9a SHA512 0b80f9aa40e0a485371b5949152c10d7fffb6e0dfe8c2aabc3c6e4e97ba0cdd465ae7093343245be60173bc7b24e80e919c0c0e199ff0bb2b14ed94af7087c4f WHIRLPOOL 64006dba88b8e3b691620b0f349ad06112c23903be977675a61a49dc2af3e90e9869993100261b0eb401964e7115133fcbf6048c68cf39607d3273eec8f6a158 |
26 |
|
27 |
diff --git a/dev-libs/libical/files/fix-libdir-location.patch b/dev-libs/libical/files/fix-libdir-location.patch |
28 |
new file mode 100644 |
29 |
index 0000000..53eb204 |
30 |
--- /dev/null |
31 |
+++ b/dev-libs/libical/files/fix-libdir-location.patch |
32 |
@@ -0,0 +1,26 @@ |
33 |
+This is a patch for Gentoo bug 560572, provided by Georgi Georgiev. |
34 |
+ |
35 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
36 |
+index 773cf0c..e282ce4 100644 |
37 |
+--- a/CMakeLists.txt |
38 |
++++ b/CMakeLists.txt |
39 |
+@@ -336,7 +336,7 @@ endif() |
40 |
+ set(VERSION "${PROJECT_VERSION}") |
41 |
+ set(prefix "${CMAKE_INSTALL_PREFIX}") |
42 |
+ set(exec_prefix "\${prefix}") |
43 |
+-set(libdir "\${exec_prefix}/lib") |
44 |
++set(libdir "${LIB_INSTALL_DIR}") |
45 |
+ set(includedir "\${prefix}/include") |
46 |
+ set(PTHREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}") |
47 |
+ |
48 |
+diff --git a/libical.pc.in b/libical.pc.in |
49 |
+index 7774dce..bf88476 100644 |
50 |
+--- a/libical.pc.in |
51 |
++++ b/libical.pc.in |
52 |
+@@ -8,5 +8,5 @@ iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@ |
53 |
+ Name: libical |
54 |
+ Description: An implementation of basic iCAL protocols |
55 |
+ Version: @VERSION@ |
56 |
+-Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculib} |
57 |
++Libs: -lical -licalss -licalvcal ${threadslib} ${iculib} |
58 |
+ Cflags: -I${includedir} |
59 |
|
60 |
diff --git a/dev-libs/libical/libical-2.0.0.ebuild b/dev-libs/libical/libical-2.0.0.ebuild |
61 |
new file mode 100644 |
62 |
index 0000000..08ac582 |
63 |
--- /dev/null |
64 |
+++ b/dev-libs/libical/libical-2.0.0.ebuild |
65 |
@@ -0,0 +1,47 @@ |
66 |
+# Copyright 1999-2016 Gentoo Foundation |
67 |
+# Distributed under the terms of the GNU General Public License v2 |
68 |
+# $Id$ |
69 |
+ |
70 |
+EAPI=6 |
71 |
+inherit cmake-utils |
72 |
+ |
73 |
+DESCRIPTION="An implementation of basic iCAL protocols" |
74 |
+HOMEPAGE="https://github.com/libical/libical" |
75 |
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
76 |
+ |
77 |
+LICENSE="|| ( MPL-1.0 LGPL-2.1 )" |
78 |
+SLOT="0/1" |
79 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" |
80 |
+IUSE="doc examples static-libs" |
81 |
+ |
82 |
+# The GOBJECT_INTROSPECTION build is broken, and upstream has given up |
83 |
+# on it at the moment (it's disabled in Travis). It will probably come |
84 |
+# back in v2.0.1 or later. |
85 |
+#RDEPEND="introspection? ( dev-libs/gobject-introspection )" |
86 |
+DEPEND="${RDEPEND} |
87 |
+ dev-lang/perl" |
88 |
+ |
89 |
+DOCS=( |
90 |
+ AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO |
91 |
+ doc/{AddingOrModifyingComponents,UsingLibical}.txt |
92 |
+) |
93 |
+ |
94 |
+PATCHES=( "${FILESDIR}/fix-libdir-location.patch" ) |
95 |
+ |
96 |
+src_configure() { |
97 |
+ # See above, introspection is disabled for v2.0.0 at least. |
98 |
+ #local mycmakeargs=( |
99 |
+ # -DGOBJECT_INTROSPECTION=$(usex introspection true false) |
100 |
+ #) |
101 |
+ use static-libs || mycmakeargs+=( -DSHARED_ONLY=ON ) |
102 |
+ cmake-utils_src_configure |
103 |
+} |
104 |
+ |
105 |
+src_install() { |
106 |
+ cmake-utils_src_install |
107 |
+ |
108 |
+ if use examples; then |
109 |
+ rm examples/CMakeLists.txt || die |
110 |
+ dodoc -r examples |
111 |
+ fi |
112 |
+} |