Merge updates from master

6 files changed, 1 insertions, 92 deletions

diff --git a/net-misc/asterisk-spandsp_codec_g726/Manifest b/net-misc/asterisk-spandsp_codec_g726/Manifest
deleted file mode 100644
index db2c78256e7d..000000000000
--- a/net-misc/asterisk-spandsp_codec_g726/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST spandsp-0.0.2pre26_codec_g726.c.bz2 2867 SHA256 a5bfc64e2e45b8dc8799cdade8a8cdc82b103dd55a233e5725df8eb42d42264d SHA512 c44539ae3490b92bb400bd3c4a3be6832683f9e854013570cc58c34d58a4dbc9b64dd3e9635554dbbaec4f69c961d041489bfb9b79489a74190b79933c0b1b62 WHIRLPOOL 629b6fab87bd2c9cd58245587e379e208059a343ddb13619ab8fec9b8fda74bb20b15404cb8acd4d48d5f2565478e8e2894319bc3cf11ce30b1b0e1ba83b4324
diff --git a/net-misc/asterisk-spandsp_codec_g726/asterisk-spandsp_codec_g726-0.0.2_pre26.ebuild b/net-misc/asterisk-spandsp_codec_g726/asterisk-spandsp_codec_g726-0.0.2_pre26.ebuild
deleted file mode 100644
index a9a33ae8d939..000000000000
--- a/net-misc/asterisk-spandsp_codec_g726/asterisk-spandsp_codec_g726-0.0.2_pre26.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs
-
-LIB_CODEC_G726="codec_g726-32"
-SRC_CODEC_G726="spandsp-${PV/_}_codec_g726.c"
-
-DESCRIPTION="SpanDSP ITU G.726-32kbps codec for Asterisk"
-HOMEPAGE="http://soft-switch.org/downloads/spandsp/spandsp-0.0.2pre26/"
-SRC_URI="mirror://gentoo/${SRC_CODEC_G726}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=">=media-libs/spandsp-0.0.2_pre26
-	>=net-misc/asterisk-1.2.0"
-
-S="${WORKDIR}"
-
-do_compile() {
-	echo "${@}" && "${@}"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-spanddsp.patch"
-	# patch include declarations
-	sed -e 's:^\(#include.*\)"\(asterisk/.*\)":\1<\2>:g' \
-		-e 's:^\(#include.*\)"\(asterisk\.h\)":\1<asterisk/\2>:g' \
-		"${SRC_CODEC_G726}" > "${LIB_CODEC_G726}.c" \
-	|| die "unpack failed"
-}
-
-src_compile() {
-	do_compile $(tc-getCC) -D_GNU_SOURCE -fPIC ${CFLAGS} ${LDFLAGS} -lspandsp -lm \
-		-shared -o ${LIB_CODEC_G726}.so ${LIB_CODEC_G726}.c || die "compile failed"
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/asterisk/modules
-	doexe ${LIB_CODEC_G726}.so || die
-}
-
-pkg_postinst() {
-	echo
-	elog "To enable the SpanDSP G.726-32 codec, you have to"
-	elog "disable the G.726 codec shipped with Asterisk in"
-	elog "your /etc/asterisk/modules.conf:"
-	echo
-	elog "  noload => codec_g726.so"
-	echo
-	elog "Now you can use the SpanDSP codec instead:"
-	echo
-	elog "  load => ${LIB_CODEC_G726}.so"
-	echo
-}
diff --git a/net-misc/asterisk-spandsp_codec_g726/files/asterisk-spandsp_codec_g726-0.0.2_pre26-spanddsp.patch b/net-misc/asterisk-spandsp_codec_g726/files/asterisk-spandsp_codec_g726-0.0.2_pre26-spanddsp.patch
deleted file mode 100644
index b0c825427a1f..000000000000
--- a/net-misc/asterisk-spandsp_codec_g726/files/asterisk-spandsp_codec_g726-0.0.2_pre26-spanddsp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=252378
-
---- spandsp-0.0.2pre26_codec_g726.c	2008-12-24 13:46:26.000000000 +0100
-+++ spandsp-0.0.2pre26_codec_g726.c	2008-12-24 13:53:20.000000000 +0100
-@@ -25,8 +25,10 @@
- #include <string.h>
- #include <unistd.h>
- 
-+#define SPANDSP_EXPOSE_INTERNAL_STRUCTURES /* we need g726_state_s definition */
- #include <spandsp.h>
- 
-+#define _PLC_H_ /* asterisk/plc.h conflicts with spandsp/plc.h */
- #include "asterisk.h"
- 
- ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.1 $")
diff --git a/net-misc/asterisk-spandsp_codec_g726/metadata.xml b/net-misc/asterisk-spandsp_codec_g726/metadata.xml
deleted file mode 100644
index 0e2180602d8c..000000000000
--- a/net-misc/asterisk-spandsp_codec_g726/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person"><email>chainsaw@gentoo.org</email></maintainer>
-	<longdescription lang="en">
-		SpanDSP ITU G.726-32kbps codec for Asterisk. It's a replacement
-		for Asterisk's own G.726 codec, which isn't fully compliant to
-		ITU specs.
-	</longdescription>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index dba835b2ab14..39bfc9ad4f09 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -229,12 +229,6 @@ dev-haskell/hpc
 # Masked for removal in 30 days. Bug #582382.
 net-libs/hubbub
 
-# Michael Palimaka <kensington@gentoo.org> (05 May 2016)
-# Doesn't compile against latest media-libs/spandsp.
-# Not needed anymore for Asterisk 1.6.
-# Masked for removal in 30 days. Bug #575778.
-net-misc/asterisk-spandsp_codec_g726
-
 # Maciej Mrozowski <reavertm@gentoo.org> (3 May 2016)
 # Mask until >=net-libs/qxmpp-0.8.3 is provided with qt5 support.
 =net-im/kadu-3.0
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index c6388ccf1fef..4b44a9cdfaac 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -92,6 +92,7 @@ net-news/rssguard -qt4
 net-p2p/bitcoin-qt -qt4
 >=net-p2p/qbittorrent-3.2.0 -qt4
 net-p2p/transmission -qt4
+>=net-print/hplip-3.16.5 -qt4
 >=net-wireless/wpa_supplicant-2.5 -qt4
 >=sci-geosciences/merkaartor-0.18.2 -qt4
 >=sci-geosciences/qlandkartegt-1.8.0 -qt4