gentoo resync : 06.01.2018

6 files changed, 78 insertions, 21 deletions

diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index ee44e6efd46f..a0129ce48302 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -3,12 +3,13 @@ AUX libical-2.0.0-libical.pc-fix-libdir-location.patch 917 BLAKE2B 6fcc8482d11e0
 AUX libical-2.0.0-libical.pc-icu-move-to-requires.patch 1443 BLAKE2B ebdabe7edd03b1b416c42335a292723715b74ef62044e5ee52887cbcbc0425e94bbd51e9167dc479b31be7120926814afd7dd6eda6b65a6b498e47a3036f3d1d SHA512 e21cd8dbb5df05f9e90289d1869521e0258bfe89fc72cd78fa89f41177a7100950b3cc0c08498f7f9e19a9ed53813f706334aae67536f1b2f581e579cda45021
 AUX libical-2.0.0-libical.pc-icu-remove-full-paths.patch 1358 BLAKE2B 5f29ec8e534b9d249c4feae41c8c35cb876435e74c998308d1e368874e2fd49ceddc7007f92daff7d2f2802e47981d702f0d75d4606ff58e1350c442cf023882 SHA512 24f9f49de882abb8e49c8a74899dc4bd9438c828e111e158826bbf396928d55b91adbbbda727310f249d8226ed23fdcc8f538b0ef55ba4c99f963ab475649409
 AUX libical-2.0.0-libical.pc-set-full-version.patch 629 BLAKE2B e7d17235c6993c1ad4ae446d36020849db14c534d517c0f6e48ac96af7e51a9e3285eb1d9cb9886101c38f88b65aafd985cf35099e140ee537468fa585e60bbb SHA512 a30127d93d1366d65e464c6d4ad08a42b9de142eac6e14a905cad3e0e094e6deafa689e8deaaa3bc8746adfc9667f8a6657088a2a1e0643035a5a3c2fbde173f
+AUX libical-2.0.0-tests.patch 1176 BLAKE2B 4e96464d103095452ef7be6ebaf5331a9bc51cc3e1f2aa3afd74326ce5809bc577e36299f0293f34348d6b65c404d995399bcf28e2809968c91253409f60bbbe SHA512 c818aed46b64c7ecd72356506ccc36508521040886d9049b2ac0c20f2943f26b5f3ef10d3850b164132a08545f1ea86852db3b4b9ac17f3e4b2f56398a7ed1fe
 AUX libical-3.0.1-pkgconfig-libdir.patch 1228 BLAKE2B 34bae335d1889d0090d02b72a61ea5fc90940210cccb2d09e3ef6a01464579f2fb6bf83b6e9dbcd35950227f0f1c830bbc0b77d1fe3eaa42fd649edfef4f3181 SHA512 556e3deadef8bbb210dbd3bf918aa9cbe0f8a1cfbbf8ecbeeff36a74f134cdebabad96f6ad05f6a1e2afcde669bb145bbea6ab83efa6f7b90b4637f7f761fa49
 DIST libical-1.0.1.tar.gz 720618 BLAKE2B 7506db93346c1104dbc6572d69e6de1f38730e906ec863badb38f4b7f635a175110f5eb1d9784e5baf74bc509bbf7875e5769ca3e47660012845cbbe6d92309e SHA512 efce88c73352fc34e9f7eda2234bdb593e917b33d1373cc6e6a21a72db1b14f2ed72976d6084dddcd8f07b08a15d5f04370bc825695d2fd40cc7b8488a7a977f
 DIST libical-2.0.0.tar.gz 699099 BLAKE2B 81c1a12faf4436d1edee4ab3f080137135c2ec7ae05efeee70696b89f2122b8f8ff92f78b6ec5e017d31841adb796d467204c299335743a6a8c15eca667b8182 SHA512 0b80f9aa40e0a485371b5949152c10d7fffb6e0dfe8c2aabc3c6e4e97ba0cdd465ae7093343245be60173bc7b24e80e919c0c0e199ff0bb2b14ed94af7087c4f
 DIST libical-3.0.1.tar.gz 865208 BLAKE2B c03fb922bbd8b86f30ab61c83ba81281ba42aee1f6655cc1b7b03af14afc77ca8b341a666f65d5ef8db771ec9e6242a987074ea98bdea1b4134885e9a529d808 SHA512 764e4f1bdb5f5b8c3e121057f475c7eca7acf5c514ac2c2527ae0ad93cd30a1c809a9e2107be2957247223f1f2936842999579c96ca19cd58b84571a29638091
 EBUILD libical-1.0.1.ebuild 1276 BLAKE2B 4190c6409f897dfe7755b1e81a11b1e3ca10fbf60cc62a9117f7ec23d0186f64235d0b8f831ff7c0de26490582eb4399050443ecece277e23fdbccb8948412eb SHA512 712364e9a0276b05cd98e6ca57fa974f653540da3e884a5ae3ce9d9d08e75910860396daf839a9dd086afbdf2cfbc8ef3bf16c5d0640828750cbd616ce5f8117
-EBUILD libical-2.0.0-r2.ebuild 1410 BLAKE2B 62396cfaf56e8d2c83768a807be5df756d7f0dc8a794d7e184140647014416916d580c76a2ffd20c05345fe733ce226775855a565c02fb896befbc26c9f88942 SHA512 6f4eab47e67718a9852ea95dca84e33b4c4dfaaadc0045cc3a3c0119c25766f21d93e62259f9f717e47fa94b5b72d9ae62a032285f07890957a6939a1d9caa85
-EBUILD libical-2.0.0-r3.ebuild 1607 BLAKE2B 5837219c94bab6acc3099bd4063c4877265ab7d4b9a88f507110f2aab3bba808cf1af7a0149a6f473c566116e27812404eeaa6a9264ff528dabb9f8e5099118e SHA512 dcb14367aa777a3031f284e35502c79be2da970bf68667d15c6b56c23f8a50bcf5dd4093c4ad3829a5f78da4c34e8e74b6f89b1b407a2b466b46d429850bbca9
-EBUILD libical-3.0.1.ebuild 1884 BLAKE2B 6d93808f40ff35d5e3f3baaaed6ed05a51926ecf77a8086337a94878836f3c349e8e44da33294d0d8375430f790fd8f87f6128efa8333aeca790ab96e9ff1101 SHA512 90866d79b84c606c0514f919bcb4523427256d2732d97bceb42d857ad439a32941aab3bbb602b60989ff9472d7b2120b6eb1abed2a9376259e18864ddd349958
-MISC metadata.xml 347 BLAKE2B f4f3eac1a1781d9922b06a2730eeba02dc35f380fbfe24e5b1ac4dd5d4da1e4286a185d82111a3c7b8b6c4e7d6ebd484c5df7649aa7b9dbf6185f288231e0d0f SHA512 b68df5186e55a781fe29b8a64261286c38f054e0c597b7cb265a4f9583d8978c2c6209add980e74064151ea5c5b5c6749ecfbeefaee58327ccfc4b03ace1aecc
+EBUILD libical-2.0.0-r2.ebuild 1520 BLAKE2B 9ad414a45f931658615a4844fa2ff3aba21b94ba335c5fd9635c8cb4fed0c92a9ffdceadaac653e0ebe2ac92f589122dfdeafb1044a5733c17b6a795b37b8ded SHA512 2c4c9120e6ef37e9f5e71452cfb73c24354afc53b8abc8f5d43fc0f7357a91ff6041efa46fcf1e6ce6586fde3c80ce92b0c5518bf1116e95726197ffa8dee09a
+EBUILD libical-2.0.0-r3.ebuild 1716 BLAKE2B 8e769d8440e6f00260bf0a5118ad1d21014541570b63b236cfcec038aaf185b42f3a758f1f93062a925fa8485bbb519bc5700767a5d71bf6cbfe85d5280503a7 SHA512 af97e27b3e8530018ff7e9fed1f03a96f03e823d52c935527649ca776e7b6884a34953a2519d00ba129dc30508ea99655ff5b4d5848deaa77878ca3328d1a8d5
+EBUILD libical-3.0.1.ebuild 1988 BLAKE2B 3138c3a6640cb94572fe9d18fab0249e46c086ae3e8ede7fed91d3d157ff99ef9095641d864dab397e749ec08d8a10b5574cc51a74cf2817838495634a895bba SHA512 ccc842bf0e764eaf001777daf54c0328d305aba2ce199f5ac46845dbc046f55f52b3a5eaf230fafefb35e1292011887f94210f8e639daa218891dc2a61ffe7f5
+MISC metadata.xml 333 BLAKE2B 48ec5d867610d142260cd1d0154f2762acd3c695935a37ae5e344a828a84ea6907be5cf69b3b19a6886b20ac3df73a8d7cd5c800afdbce0320b2fcfe4e0b62d2 SHA512 ad7a78aff5c325aa5a289cb96a98c55d52c60bb78b6dff207d393157d1dc7e408032453be4da87e9a7e8c6a2ca1f12226e416be2f5d04e4dd908642461eb3b8c
diff --git a/dev-libs/libical/files/libical-2.0.0-tests.patch b/dev-libs/libical/files/libical-2.0.0-tests.patch
new file mode 100644
index 000000000000..a274382b3152
--- /dev/null
+++ b/dev-libs/libical/files/libical-2.0.0-tests.patch
@@ -0,0 +1,38 @@
+From b1081cccb90fbe4cd859d3280a0470c30dce5cac Mon Sep 17 00:00:00 2001
+From: Allen Winter <allen.winter@kdab.com>
+Date: Thu, 24 Mar 2016 16:28:02 -0400
+Subject: [PATCH] recur.c, testvcal.c - use TEST_DATADIR to point to the test
+ data thereby fixing in-source building ISSUE#228
+ https://bugs.gentoo.org/show_bug.cgi?id=532296
+
+---
+ src/test/recur.c    | 2 +-
+ src/test/testvcal.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/test/recur.c b/src/test/recur.c
+index d427137a..873ec48a 100644
+--- a/src/test/recur.c
++++ b/src/test/recur.c
+@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
+ #endif
+ 
+     if (argc <= 1) {
+-        file = "../../test-data/recur.txt";
++        file = TEST_DATADIR "/recur.txt";
+     } else if (argc == 2) {
+         file = argv[1];
+     } else {
+diff --git a/src/test/testvcal.c b/src/test/testvcal.c
+index feee8147..024bbe99 100644
+--- a/src/test/testvcal.c
++++ b/src/test/testvcal.c
+@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
+     char *file;
+ 
+     if (argc != 2) {
+-        file = "../../test-data/user-cal.vcf";
++        file = TEST_DATADIR "/user-cal.vcf";
+     } else {
+         file = argv[1];
+     }
diff --git a/dev-libs/libical/libical-2.0.0-r2.ebuild b/dev-libs/libical/libical-2.0.0-r2.ebuild
index 32dc6201e26a..c0e34d96a4ea 100644
--- a/dev-libs/libical/libical-2.0.0-r2.ebuild
+++ b/dev-libs/libical/libical-2.0.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,10 @@ DOCS=(
 	doc/{AddingOrModifyingComponents,UsingLibical}.txt
 )
 
-PATCHES=( "${FILESDIR}/fix-libdir-location.patch" )
+PATCHES=(
+	"${FILESDIR}/fix-libdir-location.patch"
+	"${FILESDIR}/${P}-tests.patch" #bug 532296
+)
 
 src_configure() {
 	# See above, introspection is disabled for v2.0.0 at least.
@@ -38,6 +41,11 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_test() {
+	local myctestargs=( -j1 )
+	cmake-utils_src_test
+}
+
 src_install() {
 	cmake-utils_src_install
 
diff --git a/dev-libs/libical/libical-2.0.0-r3.ebuild b/dev-libs/libical/libical-2.0.0-r3.ebuild
index d3d88590688d..18915f35433a 100644
--- a/dev-libs/libical/libical-2.0.0-r3.ebuild
+++ b/dev-libs/libical/libical-2.0.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-libical.pc-icu-remove-full-paths.patch"
 	"${FILESDIR}/${P}-libical.pc-icu-move-to-requires.patch"
 	"${FILESDIR}/${P}-libical.pc-fix-libdir-location.patch"
+	"${FILESDIR}/${P}-tests.patch" #bug 532296
 )
 
 src_configure() {
@@ -44,6 +45,11 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_test() {
+	local myctestargs=( -j1 )
+	cmake-utils_src_test
+}
+
 src_install() {
 	cmake-utils_src_install
 
diff --git a/dev-libs/libical/libical-3.0.1.ebuild b/dev-libs/libical/libical-3.0.1.ebuild
index d34fc5db5a0d..4ad4a28d615e 100644
--- a/dev-libs/libical/libical-3.0.1.ebuild
+++ b/dev-libs/libical/libical-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,16 +13,17 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( MPL-1.0 LGPL-2.1 )"
 SLOT="0/3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="berkdb doc examples glib introspection static-libs test"
-
+IUSE="berkdb doc examples static-libs test"
+
+# TODO: disabled until useful
+# 	glib? (
+# 		dev-libs/glib:2
+# 		dev-libs/libxml2:2
+# 	)
+# 	introspection? ( dev-libs/gobject-introspection:= )
 COMMON_DEPEND="
 	dev-libs/icu:=
 	berkdb? ( sys-libs/db:= )
-	glib? (
-		dev-libs/glib:2
-		dev-libs/libxml2:2
-	)
-	introspection? ( dev-libs/gobject-introspection:= )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-lang/perl
@@ -53,11 +54,14 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DICAL_GLIB=OFF
+		-DGOBJECT_INTROSPECTION=OFF
 		$(cmake-utils_use_find_package berkdb BDB)
-		-DICAL_GLIB=$(usex glib)
-		-DGOBJECT_INTROSPECTION=$(usex introspection)
 		-DSHARED_ONLY=$(usex !static-libs)
 	)
+# 	TODO: disabled until useful
+# 		-DICAL_GLIB=$(usex glib)
+# 		-DGOBJECT_INTROSPECTION=$(usex introspection)
 	cmake-utils_src_configure
 }
 
diff --git a/dev-libs/libical/metadata.xml b/dev-libs/libical/metadata.xml
index 3bd1d0151050..002b34042a96 100644
--- a/dev-libs/libical/metadata.xml
+++ b/dev-libs/libical/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>asturm@gentoo.org</email>
+		<name>Andreas Sturmlechner</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">libical/libical</remote-id>
 	</upstream>
-	<use>
-		<flag name="glib">Enable <pkg>dev-libs/glib</pkg> GObject interface support</flag>
-	</use>
 </pkgmetadata>