gentoo resync : 14.07.2018

5 files changed, 78 insertions, 0 deletions

diff --git a/dev-libs/chmlib/Manifest b/dev-libs/chmlib/Manifest
new file mode 100644
index 000000000000..791007603204
--- /dev/null
+++ b/dev-libs/chmlib/Manifest
@@ -0,0 +1,5 @@
+AUX chmlib-0.39-stdtypes.patch 624 BLAKE2B 29de38c9de0faf7b924c0220a6ef77d338755fa57b87a120db99866b85cf7b8b4bdcacb2d5ba301eeecc6ed167384aceedf059f232a933ee920ff3ad8b9e1388 SHA512 123c28fb581c59f7aba886a0ef9ccdc31586411ad23a716759738075fa9006b2bb170f371c2e272dd21816fed3e426ab4259f16fd2ea9220c4eb005a9edf8194
+AUX chmlib-0.40-headers.patch 361 BLAKE2B 182336c3e3ac3c30226c4860315ecae2d6fec900a84e49b4f7daaa84ecf7ef1e249d46fb059978afa43ed00bffef6eb915ac19b1f78eff98714d9e633f642b5d SHA512 985cdee377e53f7df8d3d53aa305069fa138388397494094498415ec1b026bcb5e2e218ac91ed8977c930840a73f371124b0f7bdadbc1b79a65384b333a4b8d0
+DIST chmlib-0.40.tar.bz2 252036 BLAKE2B 69216120f7efcc7bfaa30faa46d9f2e2490923a6b42a766fe39838bda2b3b033ea39cb0c05eeab85a66b5a69f9297a6a412c375a2d790a463c7f6338610432fc SHA512 3a3e151cf455b19e9e7c163a1d1e5ac52e8196f0b98f77932c72af58f3517824b9244667a18279ae754ccea784f6d6ab0c47465e74e3768ce98bb7dca0ca16e3
+EBUILD chmlib-0.40-r1.ebuild 669 BLAKE2B 8804aa8b64200cfeb05054774cf51c9131a4a09cdf34a19efd90de35cde20cbee1b5609f7073a48285a4d30d3d379f6a742a89efebda938fb606f505c4ab5951 SHA512 5c372f8308f04e2d697778e6132d66156409e9eb1da8ad505cb97365d4c27dde453f35fde7a479fde1a204362eff6816e1f3f5aa60497cedf122113a9eee14bc
+MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/dev-libs/chmlib/chmlib-0.40-r1.ebuild b/dev-libs/chmlib/chmlib-0.40-r1.ebuild
new file mode 100644
index 000000000000..f1e56dc52863
--- /dev/null
+++ b/dev-libs/chmlib/chmlib-0.40-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit out-of-source
+
+DESCRIPTION="Library for MS CHM (compressed html) file format"
+HOMEPAGE="http://www.jedrea.com/chmlib/"
+SRC_URI="http://www.jedrea.com/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86"
+IUSE="+examples static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.39-stdtypes.patch
+	"${FILESDIR}"/${P}-headers.patch
+)
+
+my_src_configure() {
+	econf \
+		$(use_enable examples) \
+		$(use_enable static-libs static)
+}
+
+my_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/chmlib/files/chmlib-0.39-stdtypes.patch b/dev-libs/chmlib/files/chmlib-0.39-stdtypes.patch
new file mode 100644
index 000000000000..c0b809b2d9db
--- /dev/null
+++ b/dev-libs/chmlib/files/chmlib-0.39-stdtypes.patch
@@ -0,0 +1,20 @@
+--- a/src/chm_lib.c
++++ b/src/chm_lib.c
+@@ -149,6 +149,17 @@ typedef unsigned __int32        UInt32;
+ typedef __int64                 Int64;
+ typedef unsigned __int64        UInt64;
+ 
++/* Linux: use C standard types */
++#elif defined(__linux__)
++#include <stdint.h>
++typedef unsigned char           UChar;
++typedef int16_t                 Int16;
++typedef uint16_t                UInt16;
++typedef int32_t                 Int32;
++typedef uint32_t                UInt32;
++typedef int64_t                 Int64;
++typedef uint64_t                UInt64;
++
+ /* I386, 32-bit, non-Windows */
+ /* Sparc        */
+ /* MIPS         */
diff --git a/dev-libs/chmlib/files/chmlib-0.40-headers.patch b/dev-libs/chmlib/files/chmlib-0.40-headers.patch
new file mode 100644
index 000000000000..5daa458be8a5
--- /dev/null
+++ b/dev-libs/chmlib/files/chmlib-0.40-headers.patch
@@ -0,0 +1,18 @@
+--- a/src/chm_http.c
++++ b/src/chm_http.c
+@@ -34,6 +34,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+ #if __sun || __sgi
+   #include <strings.h>
+ #endif
+@@ -42,6 +43,7 @@
+ #include <sys/socket.h>
+ #include <sys/types.h>
+ #include <netinet/in.h>
++#include <arpa/inet.h>
+ 
+ /* threading includes */
+ #include <pthread.h>
diff --git a/dev-libs/chmlib/metadata.xml b/dev-libs/chmlib/metadata.xml
new file mode 100644
index 000000000000..097975e3adc2
--- /dev/null
+++ b/dev-libs/chmlib/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>