4 files changed, 2 insertions, 110 deletions
diff --git a/media-libs/zita-alsa-pcmi/Manifest b/media-libs/zita-alsa-pcmi/Manifest
index bed5c35d31c2..b1764469a911 100644
--- a/media-libs/zita-alsa-pcmi/Manifest
+++ b/media-libs/zita-alsa-pcmi/Manifest
@@ -1,7 +1,4 @@
-AUX makefile.patch 2530 BLAKE2B 8c8821fd585e856e4264a77dda509c3fd608d69fe7ac92d1cbd6816341f34c3fcafc38e54d11d31328205aedf9d67b3b87e045378c7d12b1fc4ee9b81a422b92 SHA512 b17ef2a498889ebbc3c26c2e515f9cb596d35445e5499ec0f8fa2cb3ecf437a991cc9e29379a47d1de66584ba311f34d862d79a5455a5160765ce47264a6fa39
 AUX zita-alsa-pcmi-0.3.2-Makefile.patch 787 BLAKE2B d2658d2d051c10a37909c54aa03f45ef7e51c574036a2e116c12071d73ba78751c7f48e40749e1dcc8d30e2317a4603d5020e1b447e1694b20733a2d6ccf7c5f SHA512 52e55cb02f9cf60a71b601665263c3943e58dca1691959b52c223e2ac995ed3de43261786d70a63c267e6aa7ef9b42fbf0f8e92603a57515f56295c5d31b29e0
-DIST zita-alsa-pcmi-0.2.0.tar.bz2 21278 BLAKE2B 60fb731ec37a13472c79a21bbe56ddf83bed9067f7a0665c56f4a8accbe3dc41070b0a0111a2717837904bb30b40865f70bfddb9c5018848059eeb375e11d2ff SHA512 6b521dc8bef96a6ee73bc2accd3c7d0641e9a4f3d955868cd3fe04ae46f15a1b1ffaa45d56518f54f4fdf9f68f629e3036dca294936015205c20f01d55338e96
 DIST zita-alsa-pcmi-0.3.2.tar.bz2 21480 BLAKE2B dfd37f3cee647b7100ff1cb9f696ba7968bec4e6f11165955de67f38f48838f17c2efc0936780ce30ca0e2d7438b78ddd8a27960f6c54e7a8a5e87b1f9b50044 SHA512 9d6040d0ec636ebcf02a033cdc017105bbed8e0ddb99584890d8e027402a85791e0983a1a9cd677dc6f1da0ced530afb5e65a8e863329a5e785ef09e0b7124f0
-EBUILD zita-alsa-pcmi-0.2.0.ebuild 990 BLAKE2B 228fec4deef42701c346fd4b0cad5fccb5fb0e6c2ee11ab8d90654dc26a49424135ac57f334766a397bbbe805158c3c73062db6a28f9419ebaba92c1f2386532 SHA512 adff03ab865cbcf696e0f0d2cc545ede173b2aaa146aebc7a79eeacdb234a5ddaf4aabbda28dc73db1323ab8aeff05d2361aa34fbb3f80df88faae4bf50218de
-EBUILD zita-alsa-pcmi-0.3.2.ebuild 884 BLAKE2B 9cb753d9da62c62279fa37cab2785cc0765b572c9ce09e5f4233f924c422210d411daee03d772783895fcb9493f01ba19ee327b816fc1448ca467cb83adde29f SHA512 a18e27eed2355296d4e2d1373e78eb34db00a029f74069102ecb266811bc0d4fd42a84de02de4a40a201e5e4d1ff71c3b616127346c95b195b6bdf5006bcb2d0
+EBUILD zita-alsa-pcmi-0.3.2.ebuild 882 BLAKE2B 1dabedf1df2e0f5e13a13c26bf396c0f05d4239b13561cb411b1277ce407d6384d50bbda99a13d519983d8e721c79d030955edb26b06b330d4d39a9ba9618f4c SHA512 6a65e7c7fe4fc3641168cbf5b77b0d3951aa35c0d8b3d86fa479305f383e4fab5096ff61e2c26d0aa550ed61db21b4e1c8a39d9e2334d3639860e8e56276c252
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/zita-alsa-pcmi/files/makefile.patch b/media-libs/zita-alsa-pcmi/files/makefile.patch
deleted file mode 100644
index d5e86d6c68f5..000000000000
--- a/media-libs/zita-alsa-pcmi/files/makefile.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Index: zita-alsa-pcmi-0.2.0/libs/Makefile
-===================================================================
---- zita-alsa-pcmi-0.2.0.orig/libs/Makefile
-+++ zita-alsa-pcmi-0.2.0/libs/Makefile
-@@ -31,7 +31,7 @@ VERSION = $(MAJVERS).$(MINVERS)
- 
- 
- CPPFLAGS += -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
--CXXFLAGS += -O2 -Wall -I. -fPIC
-+CXXFLAGS += -Wall -I. -fPIC
- LDLFAGS +=
- LDLIBS +=
- 
-@@ -45,14 +45,14 @@ ZITA-ALSA-PCMI_H = zita-alsa-pcmi.h
- 
- 
- $(ZITA-ALSA-PCMI_MIN): $(ZITA-ALSA-PCMI_O)
--	g++ -shared $(LDFLAGS) -Wl,-soname,$(ZITA-ALSA-PCMI_MAJ) -o $(ZITA-ALSA-PCMI_MIN) $(ZITA-ALSA-PCMI_O) $(ZITA-ALSA-PCMI_DEP)
-+	$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-ALSA-PCMI_MAJ) -o $(ZITA-ALSA-PCMI_MIN) $(ZITA-ALSA-PCMI_O) $(ZITA-ALSA-PCMI_DEP)
- 
- 
- install:	$(ZITA-ALSA-PCMI_MIN)
- 	install -Dm 644 $(ZITA-ALSA-PCMI_H)   $(DESTDIR)$(PREFIX)/include/$(ZITA-ALSA-PCMI_H)
- 	install -Dm 644 $(ZITA-ALSA-PCMI_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-ALSA-PCMI_MIN)
- 	ln -sf $(ZITA-ALSA-PCMI_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-ALSA-PCMI_SO)
--	ldconfig
-+	ln -sf $(ZITA-ALSA-PCMI_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-ALSA-PCMI_MAJ)
- 
- uninstall:
- 	rm -rf $(DESTDIR)$(PREFIX)/include/zita-alsa-pcmi.h
-Index: zita-alsa-pcmi-0.2.0/apps/Makefile
-===================================================================
---- zita-alsa-pcmi-0.2.0.orig/apps/Makefile
-+++ zita-alsa-pcmi-0.2.0/apps/Makefile
-@@ -23,9 +23,9 @@ PREFIX = /usr/local
- SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
- LIBDIR = lib$(SUFFIX)
- VERSION = "0.1.0"
--LDFLAGS += -L$(PREFIX)/$(LIBDIR)
--CPPFLAGS += -DVERSION=\"$(VERSION)\"
--CXXFLAGS += -O2 -Wall -MMD -MP
-+LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L../libs/
-+CPPFLAGS += -DVERSION=\"$(VERSION)\" -I../libs/
-+CXXFLAGS += -Wall -MMD -MP
- 
- 
- all:	alsa_loopback alsa_delay
-@@ -34,7 +34,7 @@ all:	alsa_loopback alsa_delay
- ALSA_LOOPBACK_O =	alsa_loopback.o pxthread.o
- alsa_loopback:	LDLIBS += -lzita-alsa-pcmi -lasound -lpthread -lrt
- alsa_loopback:	$(ALSA_LOOPBACK_O)
--	g++ $(LDFLAGS) -o $@ $(ALSA_LOOPBACK_O) $(LDLIBS)
-+	$(CXX) $(LDFLAGS) -o $@ $(ALSA_LOOPBACK_O) $(LDLIBS)
- $(ALSA_LOOPBACK_O):
- -include $(_ALSA_LOOPBACK_O:%.o=%.d)
- 
-@@ -42,7 +42,7 @@ $(ALSA_LOOPBACK_O):
- ALSA_DELAY_O =	alsa_delay.o mtdm.o pxthread.o
- alsa_delay:	LDLIBS += -lzita-alsa-pcmi -lasound -lpthread -lrt
- alsa_delay:	$(ALSA_DELAY_O)
--	g++ $(LDFLAGS) -o $@ $(ALSA_DELAY_O) $(LDLIBS)
-+	$(CXX) $(LDFLAGS) -o $@ $(ALSA_DELAY_O) $(LDLIBS)
- $(ALSA_DELAY_O):
- -include $(ALSA_DELAY_O:%.o=%.d)
- 
diff --git a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.2.0.ebuild b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.2.0.ebuild
deleted file mode 100644
index bc254d1853fb..000000000000
--- a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="Provides easy access to ALSA PCM devices"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-DEPEND="media-libs/alsa-lib"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/makefile.patch"
-}
-
-src_compile() {
-	tc-export CC CXX
-	cd "${S}/libs"
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)"
-	ln -s libzita-alsa-pcmi.so.0.2.0 libzita-alsa-pcmi.so
-	cd "${S}/apps"
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)"
-}
-
-src_install() {
-	cd "${S}/libs"
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)" DESTDIR="${D}" install
-	cd "${S}/apps"
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)" DESTDIR="${D}" install
-	cd "${S}"
-	dodoc AUTHORS README
-}
diff --git a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.3.2.ebuild b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.3.2.ebuild
index 033dc4432202..ba25be31b16d 100644
--- a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.3.2.ebuild
+++ b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 CDEPEND="media-libs/alsa-lib"