media-libs/libclthreads: renamed to dev-libs/libclthreads

Bug: https://bugs.gentoo.org/437186
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

8 files changed, 6 insertions, 158 deletions

diff --git a/media-libs/libclthreads/Manifest b/media-libs/libclthreads/Manifest
deleted file mode 100644
index 029191ce5cb2..000000000000
--- a/media-libs/libclthreads/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST clthreads-2.4.0.tar.bz2 14796 BLAKE2B 7c79608b8ebe29a8170a355069aa39496f785146a272edfe048e7dc61100302b56789ab5faa0aaad227cbe8b44eb660132f1ba22d34d304e417301d8582d5431 SHA512 c307d9611e0530469b36367f05721e6676d7bb186be97d38b851e66d9f670663ceceedf065823b27ac5864725d52cc2f462fd8d96f1398a202e30d82910ec58b
-DIST clthreads-2.4.2.tar.bz2 14357 BLAKE2B c73696e816431d70737d0481237efbb7a05d274f9fb0728b2bf2ba748a4a0540672af92ab8d35b6ab331c91841185aeb3705f5a75e3446a0c2c3631a8b331421 SHA512 a91de7a287c2cb9b2ce17e4c158db79bbaeccb278510d11e6c05fcbe9295c26b4d0231fa97800b265decd1d0886b7425f7b5d4cbcb18758be540356408e72131
diff --git a/media-libs/libclthreads/files/libclthreads-2.4.0-Makefile.patch b/media-libs/libclthreads/files/libclthreads-2.4.0-Makefile.patch
deleted file mode 100644
index c20ba176d765..000000000000
--- a/media-libs/libclthreads/files/libclthreads-2.4.0-Makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: Makefile
-===================================================================
---- Makefile.orig
-+++ Makefile
-@@ -28,7 +28,7 @@ VERSION = $(MAJVERS).$(MINVERS)
- DISTDIR = clthreads-$(VERSION)
- 
- 
--CPPFLAGS += -Wall -I. -fpic -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 
-+CPPFLAGS += -Wall -I. -fpic -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
- LDLFAGS += 
- LDLIBS +=
- 
-@@ -36,22 +36,20 @@ LDLIBS +=
- CLTHREADS_SO = libclthreads.so
- CLTHREADS_MAJ = $(CLTHREADS_SO).$(MAJVERS)
- CLTHREADS_MIN = $(CLTHREADS_MAJ).$(MINVERS)
--CLTHREADS_DEP = -lpthread
-+CLTHREADS_DEP = -lpthread -lrt
- CLTHREADS_O = p_thread.o a_thread.o itc_mesg.o itc_ip1q.o itc_ctrl.o textmsg.o
- CLTHREADS_H = clthreads.h
- 
- 
- $(CLTHREADS_MIN): $(CLTHREADS_O)
--	g++ -shared $(LDFLAGS) -Wl,-soname,$(CLTHREADS_MAJ) -o $(CLTHREADS_MIN) $(CLTHREADS_O) $(CLTHREADS_DEP)
-+	$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLTHREADS_MAJ) -o $(CLTHREADS_MIN) $(CLTHREADS_O) $(CLTHREADS_DEP)
- 
- 
- install:	$(CLTHREADS_MIN)
--	/usr/bin/install -d $(PREFIX)/$(LIBDIR)
--	/usr/bin/install -m 644 $(CLTHREADS_H) $(PREFIX)/include
--	/usr/bin/install -m 755 $(CLTHREADS_MIN) $(PREFIX)/$(LIBDIR)
--	/sbin/ldconfig -n $(PREFIX)/$(LIBDIR)
--	ln -sf $(CLTHREADS_MIN) $(PREFIX)/$(LIBDIR)/$(CLTHREADS_SO)
--
-+	/usr/bin/install -D $(CLTHREADS_H) $(DESTDIR)usr/include/$(CLTHREADS_H)
-+	/usr/bin/install -D $(CLTHREADS_MIN) $(DESTDIR)$(CLTHREADS_LIBDIR)/$(CLTHREADS_MIN)
-+	ln -sf $(CLTHREADS_MIN) $(DESTDIR)$(CLTHREADS_LIBDIR)/$(CLTHREADS_MAJ)
-+	ln -sf $(CLTHREADS_MAJ) $(DESTDIR)$(CLTHREADS_LIBDIR)/$(CLTHREADS_SO)
- 
- clean:
- 	/bin/rm -f *~ *.o *.a *.d *.so.*
diff --git a/media-libs/libclthreads/files/libclthreads-2.4.2-Makefile.patch b/media-libs/libclthreads/files/libclthreads-2.4.2-Makefile.patch
deleted file mode 100644
index fa386fff7914..000000000000
--- a/media-libs/libclthreads/files/libclthreads-2.4.2-Makefile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/source/Makefile b/source/Makefile
-index f841f3f..206e607 100644
---- a/source/Makefile
-+++ b/source/Makefile
-@@ -32,8 +32,7 @@ VERSION = $(MAJVERS).$(MINVERS)
- 
- 
- CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -I.  
--CXXFLAGS += -Wall -O2 -fPIC
--CXXFLAGS += -march=native
-+CXXFLAGS += -Wall -fPIC
- LDLFAGS += 
- LDLIBS +=
- 
-@@ -51,12 +50,12 @@ $(CLTHREADS_MIN): $(CLTHREADS_O)
- 
- 
- install:	$(CLTHREADS_MIN)
--	install -d $(DESTDIR)$(PREFIX)/$(INCDIR)
--	install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
--	install -m 644 $(CLTHREADS_H) $(DESTDIR)$(INCDIR)
--	install -m 755 $(CLTHREADS_MIN) $(DESTDIR)$(LIBDIR)
--	ldconfig
--	ln -sf $(CLTHREADS_MIN) $(DESTDIR)$(LIBDIR)/$(CLTHREADS_SO)
-+	install -d $(DESTDIR)${PREFIX}/$(INCDIR)
-+	install -d $(DESTDIR)${PREFIX}/$(LIBDIR)
-+	install -m 644 $(CLTHREADS_H) $(DESTDIR)${PREFIX}/$(INCDIR)
-+	install -m 755 $(CLTHREADS_MIN) $(DESTDIR)${PREFIX}/$(LIBDIR)
-+	ln -sf $(CLTHREADS_MIN) $(DESTDIR)${PREFIX}/$(LIBDIR)/$(CLTHREADS_SO)
-+	ln -sf $(CLTHREADS_MIN) $(DESTDIR)${PREFIX}/$(LIBDIR)/$(CLTHREADS_MAJ)
- 
- uninstall:
- 	rm -rf $(DESTDIR)$(INCDIR)/$(CLTHREADS_H)
diff --git a/media-libs/libclthreads/libclthreads-2.4.0-r1.ebuild b/media-libs/libclthreads/libclthreads-2.4.0-r1.ebuild
deleted file mode 100644
index 22339f553e9c..000000000000
--- a/media-libs/libclthreads/libclthreads-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-MY_P="${P/lib/}"
-
-S="${WORKDIR}/${MY_P}"
-
-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/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.4.0-Makefile.patch"
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake
-}
-
-src_install() {
-	emake CLTHREADS_LIBDIR="/usr/$(get_libdir)" DESTDIR="${ED}" install
-	dodoc AUTHORS
-}
diff --git a/media-libs/libclthreads/libclthreads-2.4.2.ebuild b/media-libs/libclthreads/libclthreads-2.4.2.ebuild
deleted file mode 100644
index 767abb9cc530..000000000000
--- a/media-libs/libclthreads/libclthreads-2.4.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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/clthreads-${PV}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-S="${WORKDIR}/clthreads-${PV}"
-
-DOCS=( AUTHORS )
-
-PATCHES=(
-	"${FILESDIR}/${P}-Makefile.patch"
-)
-
-src_compile() {
-	cd "${S}"/source || die "Failed to cd to sources"
-	tc-export CXX
-	emake
-}
-
-src_install() {
-	default
-
-	cd "${S}"/source || die "Failed to cd to sources"
-	emake PREFIX="${EPREFIX}/usr" INCDIR="include" LIBDIR="$(get_libdir)" DESTDIR="${ED}" install
-}
diff --git a/media-libs/libclthreads/metadata.xml b/media-libs/libclthreads/metadata.xml
deleted file mode 100644
index c870d0eef0ab..000000000000
--- a/media-libs/libclthreads/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-libs/libclxclient/libclxclient-3.9.0.ebuild b/media-libs/libclxclient/libclxclient-3.9.0.ebuild
index c3e30e23f4c8..6e99eca015a2 100644
--- a/media-libs/libclxclient/libclxclient-3.9.0.ebuild
+++ b/media-libs/libclxclient/libclxclient-3.9.0.ebuild
@@ -18,10 +18,12 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
-RDEPEND="x11-libs/libX11
-	x11-libs/libXft
+RDEPEND="
+	>=dev-libs/libclthreads-2.4.0
 	media-libs/freetype:2
-	>=media-libs/libclthreads-2.4.0"
+	x11-libs/libX11
+	x11-libs/libXft
+"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/media-libs/libclxclient/libclxclient-3.9.2.ebuild b/media-libs/libclxclient/libclxclient-3.9.2.ebuild
index 130c632aa402..18d81677bb4a 100644
--- a/media-libs/libclxclient/libclxclient-3.9.2.ebuild
+++ b/media-libs/libclxclient/libclxclient-3.9.2.ebuild
@@ -15,8 +15,8 @@ KEYWORDS="amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 CDEPEND="
+	dev-libs/libclthreads
 	media-libs/freetype:2
-	media-libs/libclthreads
 	x11-libs/libX11
 	x11-libs/libXft
 "