gentoo resync : 24.12.2018

3 files changed, 47 insertions, 2 deletions

diff --git a/app-emulation/libcacard/Manifest b/app-emulation/libcacard/Manifest
index f6be927ac822..b96eeb75bb0c 100644
--- a/app-emulation/libcacard/Manifest
+++ b/app-emulation/libcacard/Manifest
@@ -1,8 +1,9 @@
 AUX libcacard-0.1.2-underlinking.patch 15058 BLAKE2B d24bbbb319cd837c16965e7e5e46ff9816cdfa4d4b1d56dd1ef30152fb86a6e3cb0ea8fd6f980dce6eef71ffd2dee19671ea85546867ea13a9739a3877eb4603 SHA512 dca450e974fd05f0125c447d565d3e4855e5a1d034676a2f2f5871fe137cbcb84414d0760b416c1abae6feb8f4fd0a521e98adeb1db4c797ff7e922afd3bc980
+AUX libcacard-2.6.0-simpletlv-test-fix.patch 1195 BLAKE2B 77b22b09e9c1ea080adc7763bb0d0c5d91a6f3b74c39e7446aba65adaeb94c47884a195f9a88021f4ebbb7f9a3c8f3ea23c31e2f9c40878465fa6df6a3fbfacf SHA512 9251b661884cccd627a874cc9cad9385f19208680cbce4a99e50fd8b1a94740fded075ec3c4fecef923dd50785cffeeae377cf88e6e9f6d3601e9cf5c0794adc
 DIST libcacard-0.1.2.tar.bz2 276430 BLAKE2B 315d7b0c8dcd3d6b40db4c1586cf149e6681af4e0188bed22cb526d1de79bda4a7b1c5ece894c679c2e7b727b6d05628ba9f8fbc3900503f78f13a029514e15d SHA512 a3622b29fe3a059e069ad6f7da428278a915cec362a6aae3c7cad0d47dfadba67308631435993c0f41cabe92a05874b339518dc503b71b8d86db4976bb6987f6
 DIST libcacard-2.5.1.tar.xz 325692 BLAKE2B f6ce08f08f359789886a63d4554e3492e8cb570e5b476dc8185332a951fe03e7b5577856c4c60523ad673577a3a160490aaf943f401796973b0d205ca740f949 SHA512 88e66745f649f52c3fcc7745834d628e76abc21cef1b300e8750e6c0641f65d0e11224da30fa13dea20d6ebe5d36d7a8680d029e15149fddaea43558216ccc21
 DIST libcacard-2.6.0.tar.xz 364828 BLAKE2B 3a07243abb91dab05d89bf073fabb4a0ef7e820765066a8d87e72086b88cc726de77d1fdc5118e05ed47077d76ae0a57ff591a2e4e8623c3484c6cbf00cd025e SHA512 d6dfe6fe6cd2711bf8f71edc134a7caf459fc2a9c4f664ab2f1c28cc9ee8efe7a2d5a15c4dc735956638176e07e22416cad5e8e926aa7cab3fa95ded853f5982
 EBUILD libcacard-0.1.2.ebuild 741 BLAKE2B c4ad46e5168a718992a4e99e248e7c06565873ea4695843790fbe15e007a05ee45cb592d8cf710a6c7c5657560def536a3cb56aace5b4406f174b230330c5856 SHA512 591fae7bd4b09d2176c4369b717ad90c75dc00e7f077228676b096b54dba71253cdd74ff2b1ee3baf9be7a790ca7fc8f85c2d9e210912dac88fc82345ecfc760
 EBUILD libcacard-2.5.1.ebuild 670 BLAKE2B 0c83dde859da1b5fa65f0798942184ccdcd318cc55efc99846839f1c57762e42193e25b7d6269c2e77485e50b0d242fd30fa098874539e68614225183cb2e73e SHA512 47040ae3f979d378bc6977a4e3820603b5f9f43c42ea73fbd087825c43bccc0a5bf971b0ce16eb718d2b1d24fcdf0d5dff5c5f54092e38ec320054ede2d63785
-EBUILD libcacard-2.6.0.ebuild 753 BLAKE2B 8a1272adc7ae91259ebbf85e95bad031acba95552492ae9d8bdf004254b8c6318cb9f394e33ed7640d5f5c1d13014abc29b90eed46d55664009346d25e632a64 SHA512 8079617a7b8e080bc548379a0fdaaf695cf0a506e77d426f6288ff27c338ff69b286cf903ccb14a700db7d0af7f8e9b194450a2493e7f23ec20bd9408ea443f6
+EBUILD libcacard-2.6.0.ebuild 992 BLAKE2B 3ab01ad92cd2aa396dfd00734a35f7e9443b8e0ea39d5706eb7ba1327386af67c58942a665b72e682291dc0376741a0485e3553c328a30f0687f05653f89c85b SHA512 a190c722bc2042adea4cdc6dd55bef234954d2a1895bfcf2fad9d545dd95c46132ffbbd1934d03d0c1c6c2ff02a6c79b042cb29bc51742e7d5a9c83e99770532
 MISC metadata.xml 401 BLAKE2B 585a9670acb4d98be5545e72793dd1998e8b1a01b9636899924a4a56cf1593e334bc562c615664c14897c78f975efb9844ff2935fce6ce2a443fbf318c371027 SHA512 32692892c082887a0fd59fe2ddcf68da7d46d6e79bac6d02e2420d80252f92d0a0868ebc100e94f92fdbc8a71155731c31c6fed1eebaa80d296b69aa1f25cede
diff --git a/app-emulation/libcacard/files/libcacard-2.6.0-simpletlv-test-fix.patch b/app-emulation/libcacard/files/libcacard-2.6.0-simpletlv-test-fix.patch
new file mode 100644
index 000000000000..40e2a9d21e26
--- /dev/null
+++ b/app-emulation/libcacard/files/libcacard-2.6.0-simpletlv-test-fix.patch
@@ -0,0 +1,31 @@
+diff --git a/tests/simpletlv.c b/tests/simpletlv.c
+index cd0cd69c4dfb504a52e3f7314e4a01657377eb68..9ddc5b999f73d56f35f85810479760b301330282 100644
+--- a/tests/simpletlv.c
++++ b/tests/simpletlv.c
+@@ -48,7 +48,7 @@ static void test_length_simple(void)
+ 
+ static void test_length_nested(void)
+ {
+-    size_t length = 0;
++    int length = 0;
+     unsigned char simple_value[] = "\x12\x14";
+     static struct simpletlv_member simple[1] = {
+       {0x25, 2, {/*.value = simple_value*/}, SIMPLETLV_TYPE_LEAF}
+@@ -102,7 +102,7 @@ static void test_length_skipped(void)
+ static void test_encode_simple(void)
+ {
+     unsigned char *result = NULL;
+-    size_t result_len = 0;
++    int result_len = 0;
+     unsigned char simple_value[] = "\x10\x11";
+     unsigned char simple_encoded[] = "\x25\x02\x10\x11";
+     unsigned char long_value[256] = "Long data value";
+@@ -168,7 +168,7 @@ static void test_encode_simple(void)
+ static void test_encode_nested(void)
+ {
+     unsigned char *result = NULL;
+-    size_t result_len = 0;
++    int result_len = 0;
+     unsigned char simple_value[] = "\x12\x14";
+     unsigned char encoded[] = "\x72\x04\x25\x02\x12\x14";
+     static struct simpletlv_member simple[1] = {
diff --git a/app-emulation/libcacard/libcacard-2.6.0.ebuild b/app-emulation/libcacard/libcacard-2.6.0.ebuild
index 22750df56b3f..f79632a12098 100644
--- a/app-emulation/libcacard/libcacard-2.6.0.ebuild
+++ b/app-emulation/libcacard/libcacard-2.6.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.spice-space.org/download/libcacard/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+passthrough static-libs"
 
 RDEPEND=">=dev-libs/nss-3.13
@@ -18,6 +18,19 @@ RDEPEND=">=dev-libs/nss-3.13
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${P}-simpletlv-test-fix.patch"
+	)
+
+src_prepare() {
+	default
+
+	# remove test requiring SoftHSMv2 which is not in the tree atm
+	sed -i \
+		-e 's|tests/hwtests$(EXEEXT) \($(am__EXEEXT_1)\)|\1|' \
+		Makefile.in || die
+}
+
 src_configure() {
 	econf \
 		$(use_enable passthrough pcsc) \