gentoo resync : 13.10.2019

4 files changed, 3 insertions, 73 deletions

diff --git a/net-libs/iax/Manifest b/net-libs/iax/Manifest
index 20f6ba6b5570..4a97c8c64bef 100644
--- a/net-libs/iax/Manifest
+++ b/net-libs/iax/Manifest
@@ -2,7 +2,5 @@ AUX 0.2.2-debug.patch 684 BLAKE2B 6a3ef9e2fab7723bf4397f734753ae8d3abdc091b5df5f
 AUX 0.2.2-memset.patch 482 BLAKE2B 534d38f9553dcfed0da0eae77e517f4faf5a18546f357364fa5e3cbbfc512cc2f708bdb7dac05cfc1ecb4944512dbed0f4e8f99702807713b466b10ffd8f6812 SHA512 70f98b10b5899326d5480ea72e785038320b22ec3c7ff42015a716de425313c42b79184063ef7fbdf29c1164d0ecf316d2621685065a84fe7f305c7aab2d0a87
 AUX 0.2.2-sandbox.patch 753 BLAKE2B 1bf2433fd6258dbd778bc073b33e07bbae9aa70e33ae9663fa41f573564ed2b74092daaf11df5ac61d9ea491b5a718f8126e7b1017d68a61ab696518d9e25e2e SHA512 b6d726272c62ffdd2c6f8bdc484990ef8ab6a0b9bf4909c896d6d7e41f2df027b6eb37f0c077b39fa05f849e6d5c40a341af2239dc312285e6ef3d3084a1c5bf
 DIST iax-0.2.2.tar.gz 139379 BLAKE2B 6fd4ac85774851605162ad9845c1e847aae7c2e0504f06a302d223ec51d1963cbb1e309b98d5a41ef70e4bf3de88be60a65ad7e8c08e23d73096b43efa7a2a0c SHA512 f86fc56c9f31665e849e8528d2852e06abd803e8d02fa6098d68eefecccc263ded97d1870e9ee157ec1610fefc92b8f14f2d858fbce115c5da83a6dec1eea210
-EBUILD iax-0.2.2-r1.ebuild 980 BLAKE2B 1a896fca35bcd94a49b959a4f95ad332843cf31a1a8a1612f39994930f2fbb3e1511cf6f32feeb3d181dac763ea785d15d5fe6b6f9407212d9431af6cc883205 SHA512 375af86ad23e4f4a8ddfc10327ab1f3900cf0df7c0a424d3757f6c43c5d83ea99d9c004c01415574588a762713df6c4f05ef6747e1c997d29122bf8e75c4dc53
-EBUILD iax-0.2.2-r3.ebuild 624 BLAKE2B 25d0274741747217e681a43f688573a11a674aae680122f0c004503bcf99c2f7e0f7e9b3e62f9cc2c6ea16dffc4147e1da3f58200a5a9cdff6a8621793261db4 SHA512 baaac8ee3cbad35ddf3a076e3932cfab5b966faa8e238626f4d6d6802807afad96dbb45dda04a76e20e5509f656e668bed0cad9c2e472bb74216f6eee59ad364
-EBUILD iax-0.2.2.ebuild 551 BLAKE2B dd44db1dd9cd2ead40b112a96c25ac263b0f7ea9cf717a5ee10e21b9989b57d6b8e340a594bc99b84bdd20854464de73d776df862bf264e1d6277dd027ca548a SHA512 1759c583af89dbb2f5d42704b17f312c2455c6039e19e847f47df794a83ac648e0817101e992baa9e9a7a2fda1d42b90f7ec89c01e44a53f3bdfdbed7c052132
+EBUILD iax-0.2.2-r3.ebuild 619 BLAKE2B 40f95cabf62b3c058f115c7f0ab6ca8e1d4f26a3659b53bd1135ce3f13dd265693b9a7dfac4b6f16fba5a37f385914803ae9b0f715c2e0614fe9c2a6ecf16dfd SHA512 57af3aceea4e035e9a5375d0d3ebf3396ef0baf96d294485bcf9cbf51a73a01e655b1fb78cb7454e8535eb4c293d18a3a35f5e5313608fea59081d8d5b728cfa
 MISC metadata.xml 294 BLAKE2B c338dd8584a092a04570848494079ea52fdfe31db40ca185256ef99832c827a856c43b7b0f46abe4ef23c00ecd2e9e38cc258285c1043773494f4007e69b914b SHA512 d2a7e75b1cd19f4218697e94518b8b6a225437924352c200fb3ba180197ace527752e1b12f490c3a265e8f9952976ad1078743985d83b19239447d658230a42a
diff --git a/net-libs/iax/iax-0.2.2-r1.ebuild b/net-libs/iax/iax-0.2.2-r1.ebuild
deleted file mode 100644
index 46813b978f01..000000000000
--- a/net-libs/iax/iax-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="IAX (Inter Asterisk eXchange) Library"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/libiax/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="debug snomhack"
-
-src_prepare() {
-	default
-	if ! use debug; then
-		sed -i -e "s:-DDEBUG_SUPPORT -DDEBUG_DEFAULT ::" src/Makefile.in \
-			|| die "sed failed"
-	fi
-
-	# use users CFLAGS and LDFLAGS
-	sed -i -e "s:CFLAGS =:CFLAGS+=:" src/Makefile.in || die "sed failed"
-	sed -i -e "s:\(libiax_la_LDFLAGS = \):\1@LDFLAGS@:" src/Makefile.in \
-		|| die "sed failed"
-
-	# fix sandbox violations
-	sed -i -e "s:\(\$(includedir)/iax\):\$(DESTDIR)\1:" src/Makefile.in \
-		|| die "sed failed"
-	sed -ie -e "/\/sbin\/ldconfig/d" src/Makefile.in || die "sed failed"
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug extreme-debug) \
-		$(use_enable snomhack)
-}
diff --git a/net-libs/iax/iax-0.2.2-r3.ebuild b/net-libs/iax/iax-0.2.2-r3.ebuild
index 42757477e346..c8255c09a37f 100644
--- a/net-libs/iax/iax-0.2.2-r3.ebuild
+++ b/net-libs/iax/iax-0.2.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/libiax/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE="debug snomhack"
 
 PATCHES=(
diff --git a/net-libs/iax/iax-0.2.2.ebuild b/net-libs/iax/iax-0.2.2.ebuild
deleted file mode 100644
index d29014d2cb7a..000000000000
--- a/net-libs/iax/iax-0.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-IUSE=""
-
-DESCRIPTION="IAX (Inter Asterisk eXchange) Library"
-HOMEPAGE="https://www.digium.com/"
-LICENSE="LGPL-2"
-DEPEND=""
-RDEPEND=""
-SLOT="0"
-SRC_URI="https://www.digium.com/pub/libiax/${P}.tar.gz"
-
-D_PREFIX=/usr
-
-KEYWORDS="ppc x86"
-
-src_compile() {
-	./configure --prefix=${D_PREFIX} --enable-autoupdate
-
-	export UCFLAGS="${CFLAGS}"
-
-	emake || die
-}
-
-src_install () {
-	make prefix="${D}"/${D_PREFIX} install
-	dodoc NEWS AUTHORS README
-}