[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/arch/powerpc/, net-libs/ortp/

[Michał Górny]

commit:     a344004a46c4f73c6942660108e1430bbb3d221a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  4 19:45:27 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb  4 19:48:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a344004a

net-libs/ortp: Clean up old

 net-libs/ortp/Manifest                 |  1 -
 net-libs/ortp/metadata.xml             |  1 -
 net-libs/ortp/ortp-0.22.0.ebuild       | 82 ----------------------------------
 net-libs/ortp/ortp-0.23.0.ebuild       | 75 -------------------------------
 profiles/arch/powerpc/package.use.mask |  4 --
 profiles/base/package.use.mask         | 10 -----
 6 files changed, 173 deletions(-)

diff --git a/net-libs/ortp/Manifest b/net-libs/ortp/Manifest
index ae06cb5..cdc0add 100644
--- a/net-libs/ortp/Manifest
+++ b/net-libs/ortp/Manifest
@@ -1,3 +1,2 @@
 DIST ortp-0.20.0.tar.gz 515505 SHA256 f2a8263f8242756e2ce092c710ac068cd4b21051fc70c1937b275193a2bfb3d3 SHA512 a4d666be6b6825eeb28204001d5d1263c80ef3c07931586e753d3efa8c72d76e993335c4eeaa558209b5d10d5e991ba0c88e2f5c9a35aff46b36d6e76f92b706 WHIRLPOOL cc1a9473580748a76d26bde42f074bd9bbb1bd066a7b514b0016dd75d2d5b57ff29eba18e10139457acc406593bb566fdc8c256a4241a77718d965419ecd8b50
-DIST ortp-0.22.0.tar.gz 538024 SHA256 6e37e29b3c3559bac1f2ae0c977f6ceb4d4ce8dc713b691dea8bae57bda92d0b SHA512 0453f19fd3388c3dcd12f118dbfc1a460fae77e4f9e82b1b71f4014e3bbba4d480f811d07bc781dced1fb2685901eaea364c8276c0d083f5e8d6b7074f7c4fba WHIRLPOOL 00f31d4de912dcf29778e68f5c88001eb845653303048d5c29a3c1488b1fae42399292df91596cabe1a223a4171a409af452cee97a3f075230918b068212e99c
 DIST ortp-0.23.0.tar.gz 540135 SHA256 91a5ada15f62ce5f08beceef4d0adb65469211e2f208bd96e493a8df9f84fcdb SHA512 70560168f1b138ad825e4e836e7ee218bd24b92a2d76666ba2794a4b31cadbdd8fdd40fee78d612187cde6a827005cbd836cdfc13a70947374356fb84a853ea4 WHIRLPOOL cb9dc4c925ed92816d58dc66bab9f179d6a99abe64a218710cd92763422cb8b5f81ce4bdc5ad935798e792d7a5f3ab74e9b8cbdfc9bbde7781ce92d7b90ef507

diff --git a/net-libs/ortp/metadata.xml b/net-libs/ortp/metadata.xml
index d347b54..6e703ab 100644
--- a/net-libs/ortp/metadata.xml
+++ b/net-libs/ortp/metadata.xml
@@ -5,6 +5,5 @@
 	<use>
 		<flag name="ntp-timestamp">Turn on NTP timestamping on received packet</flag>
 		<flag name="srtp">Add support for Secure RTP</flag>
-		<flag name="zrtp">Add support for ZRTP key negotiation</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-libs/ortp/ortp-0.22.0.ebuild b/net-libs/ortp/ortp-0.22.0.ebuild
deleted file mode 100644
index 855362c..00000000
--- a/net-libs/ortp/ortp-0.22.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Open Real-time Transport Protocol (RTP, RFC3550) stack"
-HOMEPAGE="http://www.linphone.org/"
-SRC_URI="mirror://nongnu/linphone/${PN}/sources/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/9"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc examples ipv6 minimal ntp-timestamp ssl" # srtp zrtp"
-
-# Note:
-# This package supposedly requires libzrtpcpp-2.0.0
-# but it is incompatible with its API...
-#
-# This package supposedly requires libsrtp
-# but it is incompatible with its API...
-
-RDEPEND="ssl? ( dev-libs/openssl )"
-#	srtp? ( net-libs/libsrtp )
-#	zrtp? ( >=net-libs/libzrtpcpp-2.0.0 )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-#REQUIRED_USE="zrtp? ( srtp )"
-
-src_prepare() {
-	# ${P} is added after ${docdir}
-	if use doc; then
-		sed -i -e 's/$(docdir)\/$(PACKAGE)-$(VERSION)/$(docdir)/' Makefile.in \
-			|| die "patching Makefile.in failed"
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		# memcheck is for HP-UX only
-		--disable-memcheck
-		# mode64bit adds +DA2.0W +DS2.0 CFLAGS wich are needed for HP-UX
-		--disable-mode64bit
-		# strict adds -Werror, don't want it
-		--disable-strict
-		# they seriously failed to understand AC_ARG_ENABLE...
-		--disable-tests_enabled
-		--enable-fast-install
-		--enable-libtool-lock
-
-		$(use_enable debug)
-		$(use_enable ipv6)
-		$(use_enable minimal perf)
-		$(use_enable ntp-timestamp)
-		$(use_enable ssl ssl-hmac)
-#		$(use_enable zrtp)
-		--disable-zrtp
-
-#		"--with-srtp=$(usex srtp "${EPREFIX}"/usr none)"
-		--with-srtp=none
-		$(use doc || echo ac_cv_path_DOXYGEN=false)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \
-		install
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	prune_libtool_files
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins src/tests/*.c
-	fi
-}

diff --git a/net-libs/ortp/ortp-0.23.0.ebuild b/net-libs/ortp/ortp-0.23.0.ebuild
deleted file mode 100644
index 18a80ad..00000000
--- a/net-libs/ortp/ortp-0.23.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Open Real-time Transport Protocol (RTP, RFC3550) stack"
-HOMEPAGE="http://www.linphone.org/"
-SRC_URI="mirror://nongnu/linphone/${PN}/sources/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/9"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc examples ipv6 minimal ntp-timestamp ssl srtp zrtp"
-
-RDEPEND="ssl? ( dev-libs/openssl:0= )
-	srtp? ( net-libs/libsrtp:0= )
-	zrtp? ( >=net-libs/libzrtpcpp-4.0.0:0= )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-REQUIRED_USE="zrtp? ( srtp )"
-
-src_prepare() {
-	# ${P} is added after ${docdir}
-	if use doc; then
-		sed -i -e 's/$(docdir)\/$(PACKAGE)-$(VERSION)/$(docdir)/' Makefile.in \
-			|| die "patching Makefile.in failed"
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		# memcheck is for HP-UX only
-		--disable-memcheck
-		# mode64bit adds +DA2.0W +DS2.0 CFLAGS wich are needed for HP-UX
-		--disable-mode64bit
-		# strict adds -Werror, do not want it
-		--disable-strict
-		# they seriously failed to understand AC_ARG_ENABLE...
-		--disable-tests_enabled
-		--enable-fast-install
-		--enable-libtool-lock
-		# this is fine as long as we do not link to polarssl
-		--enable-broken-srtp
-
-		$(use_enable debug)
-		$(use_enable ipv6)
-		$(use_enable minimal perf)
-		$(use_enable ntp-timestamp)
-		$(use_enable ssl ssl-hmac)
-		$(use_enable zrtp)
-
-		--with-srtp=$(usex srtp "${EPREFIX}"/usr none)
-		$(use doc || echo ac_cv_path_DOXYGEN=false)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \
-		install
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	prune_libtool_files
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins src/tests/*.c
-	fi
-}

diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index f2d0042..4d0c4b1 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -53,10 +53,6 @@ dev-cpp/eigen test
 # Needs arch love for elementary. #575322
 media-libs/elementary javascript
 
-# Patrick Lauer (20 Feb 2015)
-# Missing keywords on deps
-net-libs/ortp zrtp
-
 # Pacho Ramos <pacho@g.o> (15 Nov 2015)
 # Missing keywords
 media-sound/rhythmbox upnp-av

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 1fbedb2..858fcf5 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -138,10 +138,6 @@ media-plugins/grilo-plugins chromaprint
 # x11-libs/libsvg-cairo is being removed, bug #537918
 dev-ml/cairo-ocaml svg
 
-# Pacho Ramos <pacho@g.o> (21 Aug 2016)
-# net-libs/libzrtpcpp will be removed, bug #528514
-net-libs/ortp zrtp
-
 # Lars Wendler <polynomial-c@g.o> (19 Aug 2016)
 # gnutls is broken for years
 >=net-libs/gsoap-2.8.0 gnutls
@@ -394,12 +390,6 @@ dev-libs/DirectFB swfdec
 # Masked since skype isn't stable
 net-im/bitlbee skype
 
-# Michał Górny <mgorny@g.o> (15 Sep 2014)
-# Unsuccessful version bump of net-libs/libzrtpcpp, seems to cause
-# undefined references few layers deeper. Need further investigation,
-# if anybody cares.
-net-libs/ortp zrtp
-
 # Rick Farina <zerochaos@g.o> (26 Aug 2014)
 # mirisdr does not seem to like making releases
 <net-wireless/gr-osmosdr-9999 mirisdr