gentoo resync : 18.11.2019

4 files changed, 100 insertions, 0 deletions

diff --git a/media-libs/libclxclient/Manifest b/media-libs/libclxclient/Manifest
index 7fa14a0766ec..52dec804d931 100644
--- a/media-libs/libclxclient/Manifest
+++ b/media-libs/libclxclient/Manifest
@@ -1,4 +1,8 @@
 AUX libclxclient-3.9.0-Makefile.patch 1738 BLAKE2B f80642596892693bb4c46a404173aff3c1663ef227f06ace9247d44a9e5c1dde60afcda8c97073fd1106b3d929b5a1a61832cbb101a7d64a3518d3cadc0efc66 SHA512 51f938f60ce442a92c47509e8c2f0fca6614863f2482afe7f7dd558d27dfb9162cb86f4b151dd0c03f25eac65353bf796aac93374b030c70c5ac8957a456f7a2
+AUX libclxclient-3.9.2-Makefile.patch 1130 BLAKE2B a4d811b7bb964f2339d99838f3caa9088e4469bc8cd0ec18de1a4d0d87e53b1c62c797b239a3b1172a673c7d2f87c05f829fc72e4cb32c7d69a02bf31ddb64e6 SHA512 fe2d6bc14d5746786314792ddaaadac5f4d6e977cdf4e34ec58288e867c854082c93120e06002da17daf0c9709eb2074aa53603b2c99b8ad8bd9a1e9efe1eefd
+AUX libclxclient-3.9.2-enumip-include-fix.patch 310 BLAKE2B e0218f39b551978be1cf9318f21e53146c8e75826afd7e5f0cefcf43c434e3b64f3fb373386efd13b085b9b02bb631b5826b7441f9b73256097147dbb23c7b63 SHA512 3ff284c85635ea04b45f4640ab5a89a4d13b7933dc66bdb0310d5a4e1283b32d2d9078a9bf74f70f31636fb085d6ff8123d743d1750012cdf7549d8b1ad065e0
 DIST clxclient-3.9.0.tar.bz2 30272 BLAKE2B 51d7dbbf6e474b849461aaedb859bc92da0cb56f368e631016cfcb7dae1e5b3dca7630f35bc2d608fe8851cb5e60be599933834bbe358e092f2b08ad97cdc659 SHA512 4bbd621ceeebf3dfc36f0a3d02c63ba1c0e818e691e5c9681e737710824f53a58c682fb2475a7a2bba4f2dfd520166b782977320ceb73de39448cf512e26c842
+DIST clxclient-3.9.2.tar.bz2 29991 BLAKE2B ffd56894e0bcf09e2b6e4c882830e3c3a3a88f3778fe6a2c8b2ceb9336f8ce9cf28193da8e8c86987475e95e3ea2c07319bd82e88ad820b39167cfba9eefd7c3 SHA512 38c2782e58df24c2dfcb936fc9cfe4d44016055fb1aa52ef8e789bf8ec327f45f2f7a91f18012e4b0c6f253f6f10329d6d1e9fc341017ace3f2b6fa050592049
 EBUILD libclxclient-3.9.0.ebuild 920 BLAKE2B d102a195e6d77d427f9f3a7234c7bc5e71c3134f4c3d65f583dca65ab51410494f049635c40c82cff63b69ab3a2d8b7baf9367d2c88d0ea0491b1ec0394c4e38 SHA512 2a74cc4ad9d10d61b0b7ce90f372ae7d0eb72f2c45b34279654e0a77406bde530cab66917127578d5c0e7deca9a1151733c0ece650656b0fb7b4cc6f29375ee5
+EBUILD libclxclient-3.9.2.ebuild 1094 BLAKE2B 17df92a2b211a4aeaecf1606e882ce1e7e589bad823e44cee021ac3dafa003005035866eb029eeaed7946d04e5ff0ff4a64eba1223bc9d87b6e27b73103f6488 SHA512 6332a2a7fe66d7daa5cefe9b7d0cd24db499dbf8697398577ef8de0cd34b9654536bc2baa607d459b2682d30a787f139f0fd1950bbaaab281be91abdeacc598d
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libclxclient/files/libclxclient-3.9.2-Makefile.patch b/media-libs/libclxclient/files/libclxclient-3.9.2-Makefile.patch
new file mode 100644
index 000000000000..e79dce5764e8
--- /dev/null
+++ b/media-libs/libclxclient/files/libclxclient-3.9.2-Makefile.patch
@@ -0,0 +1,35 @@
+diff --git a/source/Makefile b/source/Makefile
+index 177115f..c8fa0f5 100644
+--- a/source/Makefile
++++ b/source/Makefile
+@@ -24,16 +24,16 @@ SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86
+ PREFIX ?= /usr/local
+ INCDIR ?= $(PREFIX)/include
+ LIBDIR ?= $(PREFIX)/lib$(SUFFIX)
++PKGCONFIG = pkg-config
+ 
+ MAJVERS = 3
+ MINVERS = 9.2
+ VERSION = $(MAJVERS).$(MINVERS)
+ 
+ 
+-CPPFLAGS += $(shell pkgconf --cflags freetype2) 
++CPPFLAGS += $(shell ${PKGCONFIG} --cflags freetype2) 
+ CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $(PCONFCFL)
+-CXXFLAGS += -Wall -O2 -fPIC 
+-CXXFLAGS += -march=native
++CXXFLAGS += -Wall -fPIC 
+ LDLIBS +=
+ 
+ 
+@@ -55,8 +55,8 @@ install:	$(CLXCLIENT_MIN)
+ 	install -d $(DESTDIR)$(LIBDIR)
+ 	install -m 644 $(CLXCLIENT_H) $(DESTDIR)$(INCDIR)
+ 	install -m 755 $(CLXCLIENT_MIN) $(DESTDIR)$(LIBDIR)
+-	ldconfig
+-	ln -sf $(CLXCLIENT_MIN) $(DESTDIR)$(LIBDIR)/$(CLXCLIENT_SO)
++	ln -sf $(CLXCLIENT_MIN) $(DESTDIR)$(LIBDIR)/$(CLXCLIENT_MAJ)
++	ln -sf $(CLXCLIENT_MAJ) $(DESTDIR)$(LIBDIR)/$(CLXCLIENT_SO)
+ 
+ uninstall:
+ 	rm -rf $(DESTDIR)$(INCDIR)/$(CLXCLIENT_H)
diff --git a/media-libs/libclxclient/files/libclxclient-3.9.2-enumip-include-fix.patch b/media-libs/libclxclient/files/libclxclient-3.9.2-enumip-include-fix.patch
new file mode 100644
index 000000000000..710baac0db53
--- /dev/null
+++ b/media-libs/libclxclient/files/libclxclient-3.9.2-enumip-include-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/source/enumip.cc b/source/enumip.cc
+index 0873da8..1cdac0d 100644
+--- a/source/enumip.cc
++++ b/source/enumip.cc
+@@ -19,7 +19,7 @@
+ // ---------------------------------------------------------------------------------
+ 
+ 
+-#include <clxclient.h>
++#include "clxclient.h"
+ #include <X11/keysym.h>
+ 
+ 
diff --git a/media-libs/libclxclient/libclxclient-3.9.2.ebuild b/media-libs/libclxclient/libclxclient-3.9.2.ebuild
new file mode 100644
index 000000000000..718a4139a14e
--- /dev/null
+++ b/media-libs/libclxclient/libclxclient-3.9.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${PV}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+CDEPEND="
+	media-libs/freetype:2
+	media-libs/libclthreads
+	x11-libs/libX11
+	x11-libs/libXft
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+S="${WORKDIR}/clxclient-${PV}"
+
+DOCS=( AUTHORS )
+
+PATCHES=(
+	"${FILESDIR}/${P}-Makefile.patch"
+	"${FILESDIR}/${P}-enumip-include-fix.patch"
+)
+
+src_compile() {
+	tc-export CXX
+	local prefix="${EPREFIX}/usr"
+	cd "${S}/source"
+	emake INCDIR="${prefix}/include" LIBDIR="${prefix}/$(get_libdir)" PKGCONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	default
+
+	local prefix="${ED}/usr"
+	cd "${S}/source"
+	emake INCDIR="${prefix}/include" LIBDIR="${prefix}/$(get_libdir)" PKGCONFIG="$(tc-getPKG_CONFIG)" install
+}