Remove masked for removal package
authorPacho Ramos <pacho@gentoo.org>
Tue, 3 Feb 2015 14:59:02 +0000 (14:59 +0000)
committerPacho Ramos <pacho@gentoo.org>
Tue, 3 Feb 2015 14:59:02 +0000 (14:59 +0000)
14 files changed:
net-libs/libdmapsharing/files/libdmapsharing-2.1.13-build-order.patch [deleted file]
net-libs/libdmapsharing/files/libdmapsharing-2.1.13-glib-2.31.patch [deleted file]
net-libs/libdmapsharing/files/libdmapsharing-2.1.13-slotability-fix.patch [deleted file]
net-libs/libdmapsharing/libdmapsharing-2.9.23.ebuild [deleted file]
net-libs/pjsip/ChangeLog [deleted file]
net-libs/pjsip/Manifest [deleted file]
net-libs/pjsip/files/pjsip-2.1-codecid.patch [deleted file]
net-libs/pjsip/files/pjsip-2.1-multilib.patch [deleted file]
net-libs/pjsip/files/pjsip-2.1-new-ffmpeg-workaround.patch [deleted file]
net-libs/pjsip/metadata.xml [deleted file]
net-libs/pjsip/pjsip-1.14.ebuild [deleted file]
net-libs/pjsip/pjsip-2.1-r1.ebuild [deleted file]
net-libs/pjsip/pjsip-2.1-r2.ebuild [deleted file]
net-libs/pjsip/pjsip-2.1.ebuild [deleted file]

diff --git a/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-build-order.patch b/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-build-order.patch
deleted file mode 100644 (file)
index 5cafd37..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-From e6433e978c3be048a5ff640325fd589677d14e5b Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Fri, 8 Apr 2011 11:24:08 +0200
-Subject: [PATCH 2/2] gentoo: gtk-doc needs to have the library built
-
----
- Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 3a1498e..099c054 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--SUBDIRS = docs libdmapsharing tests
-+SUBDIRS = libdmapsharing docs tests
- DIST_SUBDIRS = docs libdmapsharing m4 media tests
- 
- ### all of the standard pc files we need to generate
--- 
-1.7.4.1
-
diff --git a/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-glib-2.31.patch b/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-glib-2.31.patch
deleted file mode 100644 (file)
index 57935e3..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-From 401b054f026f437d36fba06c25be9f49bee8ab00 Mon Sep 17 00:00:00 2001
-From: "W. Michael Petullo" <mike@flyn.org>
-Date: Mon, 5 Dec 2011 11:14:42 -0600
-Subject: [PATCH] Update glib includes in dpap-share.c (thanks Adam Jackson)
-
-Signed-off-by: W. Michael Petullo <mike@flyn.org>
----
- libdmapsharing/dpap-share.c |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/libdmapsharing/dpap-share.c b/libdmapsharing/dpap-share.c
-index 5b5628d..6c21d68 100644
---- a/libdmapsharing/dpap-share.c
-+++ b/libdmapsharing/dpap-share.c
-@@ -27,8 +27,7 @@
- #include <stdlib.h>
- 
- #include <glib/gi18n.h>
--#include <glib/gslist.h>
--#include <glib/gmappedfile.h>
-+#include <glib.h>
- 
- #include <unistd.h>
- #include <sys/types.h>
--- 
-1.7.8.6
-
diff --git a/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-slotability-fix.patch b/net-libs/libdmapsharing/files/libdmapsharing-2.1.13-slotability-fix.patch
deleted file mode 100644 (file)
index 25b38f6..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-From d7cab09c8c6afe6c8da35932ba99579542764934 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 23 Mar 2011 23:31:07 +0100
-Subject: [PATCH 1/2] gentoo: fix slotability
-
----
- docs/Makefile.am           |    4 ++--
- libdmapsharing.pc.in       |    2 +-
- libdmapsharing/Makefile.am |   16 ++++++++--------
- tests/Makefile.am          |    4 ++--
- 4 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/docs/Makefile.am b/docs/Makefile.am
-index bd6f455..205aa5c 100644
---- a/docs/Makefile.am
-+++ b/docs/Makefile.am
-@@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = 1.6
- # of using the various options.
- 
- # The name of the module, e.g. 'glib'.
--DOC_MODULE=libdmapsharing
-+DOC_MODULE=libdmapsharing-@API_VERSION@
- 
- # Uncomment for versioned docs and specify the version of the module, e.g. '2'.
- #DOC_MODULE_VERSION=2
-@@ -95,7 +95,7 @@ GTKDOC_CFLAGS= \
-       $(MDNS_CFLAGS)
- 
- GTKDOC_LIBS= \
--      $(top_builddir)/libdmapsharing/libdmapsharing.la \
-+      $(top_builddir)/libdmapsharing/libdmapsharing-@API_VERSION@.la \
-       $(GLIB_LIBS) \
-       $(GTHREAD_LIBS) \
-       $(GOBJECT_LIBS) \
-diff --git a/libdmapsharing.pc.in b/libdmapsharing.pc.in
-index c95a5cf..c46f912 100644
---- a/libdmapsharing.pc.in
-+++ b/libdmapsharing.pc.in
-@@ -7,5 +7,5 @@ Name: libdmapsharing
- Description: libdmapsharing
- Version: @VERSION@
- Requires: glib-2.0 libsoup-2.4
--Libs: -L${libdir} -ldmapsharing
-+Libs: -L${libdir} -ldmapsharing-@API_VERSION@
- Cflags: -I${includedir}/libdmapsharing-@API_VERSION@
-diff --git a/libdmapsharing/Makefile.am b/libdmapsharing/Makefile.am
-index 6a589d4..293b042 100644
---- a/libdmapsharing/Makefile.am
-+++ b/libdmapsharing/Makefile.am
-@@ -1,8 +1,8 @@
--lib_LTLIBRARIES = libdmapsharing.la
-+lib_LTLIBRARIES = libdmapsharing-2.2.la
- 
- BUILT_SOURCES = dmap-marshal.c dmap-marshal.h dmap-enums.c dmap-enums.h
- 
--libdmapsharing_la_SOURCES = \
-+libdmapsharing_2_2_la_SOURCES = \
-       $(BUILT_SOURCES) \
-       daap-record.c \
-       daap-share.c \
-@@ -21,15 +21,15 @@ libdmapsharing_la_SOURCES = \
-       dpap-share.c
- 
- if USE_HOWL
--libdmapsharing_la_SOURCES += \
-+libdmapsharing_2_2_la_SOURCES += \
-       dmap-mdns-browser-howl.c
- else
- if USE_DNS_SD
--libdmapsharing_la_SOURCES += \
-+libdmapsharing_2_2_la_SOURCES += \
-       dmap-mdns-browser-dnssd.c \
-       dmap-mdns-publisher-dnssd.c
- else
--libdmapsharing_la_SOURCES += \
-+libdmapsharing_2_2_la_SOURCES += \
-       dmap-mdns-avahi.c \
-       dmap-mdns-browser-avahi.c \
-       dmap-mdns-publisher-avahi.c
-@@ -37,14 +37,14 @@ endif
- endif
- 
- if USE_GSTREAMERAPP
--libdmapsharing_la_SOURCES += \
-+libdmapsharing_2_2_la_SOURCES += \
-       g-gst-input-stream.c \
-       g-gst-mp3-input-stream.c \
-       g-gst-wav-input-stream.c \
-       gst-util.c
- endif
- 
--libdmapsharing_la_CFLAGS = \
-+libdmapsharing_2_2_la_CFLAGS = \
-       -DG_LOG_DOMAIN=\"libdmapsharing\" \
-       -I$(top_srcdir) \
-       $(GDKPIXBUF_CFLAGS) \
-@@ -52,7 +52,7 @@ libdmapsharing_la_CFLAGS = \
-       $(GSTREAMERAPP_CFLAGS) \
-       $(MDNS_CFLAGS)
- 
--libdmapsharing_la_LDFLAGS = \
-+libdmapsharing_2_2_la_LDFLAGS = \
-       -version-info @SO_VERSION@ \
-       $(GLIB_LIBS) \
-       $(GTHREAD_LIBS) \
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index acf0ee5..60e64c9 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -9,7 +9,7 @@ test_dmap_client_SOURCES = \
-       test-dmap-client.c
- 
- test_dmap_client_LDADD = \
--      $(top_builddir)/libdmapsharing/libdmapsharing.la \
-+      $(top_builddir)/libdmapsharing/libdmapsharing-2.2.la \
-       $(GLIB_LIBS) \
-       $(GTHREAD_LIBS) \
-       $(GOBJECT_LIBS) \
-@@ -29,7 +29,7 @@ test_dmap_server_SOURCES = \
-       test-dpap-record-factory.c
- 
- test_dmap_server_LDADD = \
--      $(top_builddir)/libdmapsharing/libdmapsharing.la \
-+      $(top_builddir)/libdmapsharing/libdmapsharing-2.2.la \
-       $(GLIB_LIBS) \
-       $(GTHREAD_LIBS) \
-       $(GOBJECT_LIBS) \
--- 
-1.7.4.1
-
diff --git a/net-libs/libdmapsharing/libdmapsharing-2.9.23.ebuild b/net-libs/libdmapsharing/libdmapsharing-2.9.23.ebuild
deleted file mode 100644 (file)
index 4a7031e..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libdmapsharing/libdmapsharing-2.9.23.ebuild,v 1.3 2013/12/08 19:25:01 pacho Exp $
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="A library that implements the DMAP family of protocols"
-HOMEPAGE="http://www.flyn.org/projects/libdmapsharing"
-SRC_URI="http://www.flyn.org/projects/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="3.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-# Vala/libgee/gtk+:2 is only used when maintainer-mode is enabled
-# Doesn't seem to be used for anything...
-# TODO: implement tests (requires dev-libs/check)
-RDEPEND="
-       >=dev-libs/glib-2.36.0:2
-       x11-libs/gdk-pixbuf:2
-
-       >=net-dns/avahi-0.6
-       >=net-libs/libsoup-2.32:2.4
-       media-libs/gstreamer:1.0
-       media-libs/gst-plugins-base:1.0
-
-       sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-       dev-util/gtk-doc-am
-       virtual/pkgconfig
-"
-
-src_prepare() {
-       default
-
-       # Fix documentation slotting
-       sed "s/^\(DOC_MODULE\).*/\1 = ${PN}-${SLOT}/" \
-               -i doc/Makefile.am doc/Makefile.in || die "sed failed"
-}
-
-src_configure() {
-       econf \
-               --disable-maintainer-mode \
-               --with-mdns=avahi
-}
-
-src_install() {
-       default
-       prune_libtool_files
-}
diff --git a/net-libs/pjsip/ChangeLog b/net-libs/pjsip/ChangeLog
deleted file mode 100644 (file)
index 14b5af1..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-# ChangeLog for net-libs/pjsip
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/pjsip/ChangeLog,v 1.17 2014/03/09 13:07:51 aballier Exp $
-
-  09 Mar 2014; Alexis Ballier <aballier@gentoo.org> pjsip-2.1-r2.ebuild,
-  +files/pjsip-2.1-codecid.patch:
-  fix build with ffmpeg2, bug #498454
-
-  20 Jan 2014; Sergey Popov <pinkbyte@gentoo.org> pjsip-2.1-r2.ebuild:
-  Fix install failure on non-multilib systems, bug #497744. Thanks to Luke-Jr
-  <luke-jr+gentoobugs AT utopios.org> for discovering this issue
-
-*pjsip-2.1-r2 (31 Dec 2013)
-
-  31 Dec 2013; Sergey Popov <pinkbyte@gentoo.org> +pjsip-2.1-r2.ebuild,
-  +files/pjsip-2.1-multilib.patch:
-  Revision bump: fix pkgconfig file generation, respect lib directory, wrt bug
-  #496430. Thanks to Nikoli <nikoli AT gmx.us> for discovering this issues
-
-*pjsip-2.1-r1 (17 Jun 2013)
-
-  17 Jun 2013; Sergey Popov <pinkbyte@gentoo.org> +pjsip-2.1-r1.ebuild,
-  +files/pjsip-2.1-new-ffmpeg-workaround.patch:
-  Revision bump: EAPI 5, epatch_user, fix building with new ffmpeg/libav, wrt
-  bug #469582
-
-  17 Jun 2013; Sergey Popov <pinkbyte@gentoo.org> pjsip-2.1.ebuild:
-  Fix automagic dependency on ffmpeg
-
-  16 Jun 2013; Pacho Ramos <pacho@gentoo.org> -pjsip-1.12.ebuild,
-  -pjsip-1.6.ebuild, -pjsip-1.8.10.ebuild, metadata.xml:
-  Cleanup due #200380
-
-*pjsip-2.1 (04 May 2013)
-
-  04 May 2013; <elvanor@gentoo.org> +pjsip-2.1.ebuild:
-  Version bump to 2.1.
-
-  13 Jan 2013; Agostino Sarubbo <ago@gentoo.org> pjsip-1.14.ebuild:
-  Stable for x86, wrt bug #448278
-
-  25 Dec 2012; Agostino Sarubbo <ago@gentoo.org> pjsip-1.14.ebuild:
-  Stable for amd64, wrt bug #448278
-
-*pjsip-1.14 (29 Apr 2012)
-
-  29 Apr 2012; <elvanor@gentoo.org> +pjsip-1.14.ebuild:
-  Version bump to 1.14.
-
-  02 Mar 2012;  <elvanor@gentoo.org> pjsip-1.12.ebuild:
-  Quick typo fix.
-
-  02 Mar 2012; <elvanor@gentoo.org> pjsip-1.12.ebuild, metadata.xml:
-  Added the cli USE flag, bug #401773.
-
-*pjsip-1.12 (26 Nov 2011)
-
-  26 Nov 2011; <elvanor@gentoo.org> +pjsip-1.12.ebuild:
-  1.12 version bump.
-
-*pjsip-1.8.10 (22 Feb 2011)
-
-  22 Feb 2011; <elvanor@gentoo.org> +pjsip-1.8.10.ebuild:
-  Version bump to 1.8.10.
-
-  04 Nov 2010; Christian Faulhammer <fauli@gentoo.org> pjsip-1.6.ebuild:
-  stable x86, bug 342757
-
-  28 Oct 2010; Markos Chandras <hwoarang@gentoo.org> pjsip-1.6.ebuild:
-  Keyworded for amd64. Bug 342757
-
-*pjsip-1.6 (16 Jul 2010)
-
-  16 Jul 2010; Jean-Noël Rivasseau <elvanor@gentoo.org> +pjsip-1.6.ebuild,
-  +metadata.xml:
-  Initial import from bug #188056. Cleaned up a bit the ebuild from Atman
-  Sense (atman.sense@zise.de).
-  Thanks!
diff --git a/net-libs/pjsip/Manifest b/net-libs/pjsip/Manifest
deleted file mode 100644 (file)
index da0dfed..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX pjsip-2.1-codecid.patch 1735 SHA256 a83b54c81a4d5643a52e6ec11e1fb1998f2123ae8b1ba7edfaa066a7b353c03d SHA512 67ddde4c1e97e82fe59ab886efc1d331e0ec037ae145fef0600c0273b20a2b2f171f8bf50f2fcd18909e786746378ff9f39b9c8bb5902598b77dff5c6ebb973f WHIRLPOOL 2ed99135b4d4ed5ae027e80947dfd9dc6de4b44e6c79cc084922ed3b5a3e6b97c80c5e37daef1b5e2dfb471f2f9e9061e1e8112f69729c3b50ac8f9c513f2c51
-AUX pjsip-2.1-multilib.patch 2061 SHA256 75d3a78b10c5012ad54b82625b64e71e9c3800bd4135f2c1784f6c1a789616e0 SHA512 bc347219914c562bb8e4d758f824e0289b9ec22ebc786872519ccdf2366d90680c4b10e13e191ed999f1b32664bbb98bc56196aec163b95e607b8b452b341c14 WHIRLPOOL 032b5d7b1497257889919ccb10b13913a5dc447f60e0e14eb175e02fd39aea7073998f6158ab837bfeb7c7dec32c0ec77b4c8b41b891f7e30b56f574ed1e53e8
-AUX pjsip-2.1-new-ffmpeg-workaround.patch 380 SHA256 8a288b0e80a176446fcb3a7ac3a590370d32ff2c36d814a9df7d0663b73858b8 SHA512 e431170adfd8364e0547bde13bf0ab6e0e8b289fd26d23add08bb15776f342d4b0d5a6de0d694ca5a841225825a1465073b33b130921837e8183b3f410a12222 WHIRLPOOL 3ebdd6a87599e0807d7848332d0a7e1ec8d25fbcc905a616a942423a862360e6e1d7724bfa0f774052ea7ba1dd9f4947167591a831b63f9476d322b03f624804
-DIST pjproject-1.14.tar.bz2 3861992 SHA256 d5e394c08572231e68866c86697cef9d86ecc4d9b873705fa5e5ae56817d0656 SHA512 885802f2d8ab314c4bf62678162c6bc7c830e1279c5df2888c16fc65c698e26ae7190f2736917c289d4430e5675e865c15e9dce0843542344d8084197238bb46 WHIRLPOOL 24fb5644a811f283dac1330b842166167655ae5c1715da938fe36f46008ae4c43d30d8abe13dc3a5f08aafefd1d9ffe78f40f8cf4ae319d29c7690557e01a131
-DIST pjproject-2.1.tar.bz2 4111835 SHA256 ac86d2401e1cb4a4f0207e4fd58921f869d0b5ee65a26aa438039a107ba415a5 SHA512 a31c33fb45b074bb43ecf8f579d140cf2d7fe2d508edad5643a9124e7e85dc50e1ecc860e2e52ca42e82c92121b08e7e3691b5dd99db844b21749e03afbc2f94 WHIRLPOOL 5363b206186d08e9446ca4c0cf8bbe668816944cfc06c7e0f30cdbeccfae0771813dbc02aa2151fa185a508e3a1b86a22a1e0126f13b965282ce036f31e9fd08
-EBUILD pjsip-1.14.ebuild 2753 SHA256 40ce41f4a03aab3620dc4fed86475513fab4a5f9b40f90e9ba9d214fa5024bfb SHA512 8f8318986bdfd87fd6fde8f21c514a0eb7473b6d3b07fb836afd9512396601eceee37747ee40d39a9399629c983b971a604438ed5e87d7955b2afb3801a7da09 WHIRLPOOL 64066da9433df887b2554e430e815eb2fa89172ff76c22663cbe1ee490c88dbe45bb6a284d2936c4e4b7ea4fadc165a75aaa7f8db109dec38801e773db534e72
-EBUILD pjsip-2.1-r1.ebuild 1990 SHA256 c4fe4d01ea468a59ead9c9a86ad968e501fd967147db903f1f781e52c4c8114e SHA512 7c8e473c64a62deb70f7a83ddbdeb280802dc411aa0180c2f595a3e22c2b439759a56185cd8e7114a18cb1dde91f51b02de176b9c3d6b5e621713743a2f28728 WHIRLPOOL a94a7a6b9655404150a2aae7989612cd5aeb3dc2bc6f6be6fae2d612e5cecb53c0972583ee35c6325cbcc29e7b9eb008bf1af4aca23e9fa6e0b144e19e198a40
-EBUILD pjsip-2.1-r2.ebuild 2206 SHA256 df5757f614fe1eeeb3ab25bfdaf52f9cc86776a601d3da489c3729925ad12a63 SHA512 1a5b9012f7095ee15cdc7802fc0f18713f2caee85631af9a0172e381f4d70b0caa92e70c0411c19ca92618aa8480ecf972c828bc999e01cbc1cc2b84de273375 WHIRLPOOL b9ad4fbf36a30da6765e310b66ee2e3257032437018fff43079f3e9b9528b7ca520697ff13b6824e1ba37d426aad6812a6c21d452f0431ba75e991fc94761fb8
-EBUILD pjsip-2.1.ebuild 1954 SHA256 1d01f240117de30662451812f6d9892972b1e50e23a4a1cbb53ed3ea7dbfe84f SHA512 8139fcac23beb604e0ef424dc846005b8bc22c10707ce53dda181444a70f3a7ae5899af43a9bf32153d6430cb853a64a499d8746eefe1935f4a5737179372dac WHIRLPOOL 8dc1ad929ac713619f619287aa59ca2e1d4f93490e6b29d342b91424d2358be9daafd4d1fd77fd49139f182408c13246389f180c3e8f05d31208b2b5c3c23637
-MISC ChangeLog 2613 SHA256 1262995df5127e8674731eedd5de3df347f5e5d2d71434f987dae466c85a4899 SHA512 f6934e4769a04d996774341309ab6c2416eccbaff74f796ea1f7124949ad76e4cc1631bb32f1cfef0404c5607c538898c714641aab9bd0c7c963358925b4b372 WHIRLPOOL a91c1c0eb1826e4cb2d767a2a609f2dc279169715141e0ba755b7e6161e2257db86f521f69fb21b3089736fa5828c32b53ec08598879625d9728bf029514f780
-MISC metadata.xml 902 SHA256 7d33c28a8c43039e371c9a519da699a4d7a07d701b8b4d09fb4f260b1da8e4ae SHA512 e9d07891cb7595bc13a15bacd52ac874f2e4f5fc4e983dea9c9b00c61fdc6641b1a24748baeac294e5508fe500f5840c13d6b96b6e67ac1ed1663589273d7282 WHIRLPOOL afeb81ec264b366bd5b9c0a1c88ab80a8aa4cde63ad0c42482bcb30ac4346b4c4a7d6fe217cba7efd1cd5576a4f511129dd42a529b92d596d2ae023ebf0320a1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlMcZ6gACgkQvFcC4BYPU0qZ0QCgsULWBW6btvmfQ9nZ30IL5T7N
-jykAn39pYdGF/BvamgKjSdps05qLISht
-=Gi93
------END PGP SIGNATURE-----
diff --git a/net-libs/pjsip/files/pjsip-2.1-codecid.patch b/net-libs/pjsip/files/pjsip-2.1-codecid.patch
deleted file mode 100644 (file)
index a6abdca..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: pjproject-2.1.0/pjmedia/src/pjmedia/ffmpeg_util.c
-===================================================================
---- pjproject-2.1.0.orig/pjmedia/src/pjmedia/ffmpeg_util.c
-+++ pjproject-2.1.0/pjmedia/src/pjmedia/ffmpeg_util.c
-@@ -62,7 +62,7 @@ static const struct ffmpeg_fmt_table_t
- static const struct ffmpeg_codec_table_t
- {
-     pjmedia_format_id id;
--    enum CodecID      codec_id;
-+    enum AVCodecID    codec_id;
- } ffmpeg_codec_table[] =
- {
-     {PJMEDIA_FORMAT_H261,     CODEC_ID_H261},
-@@ -165,7 +165,7 @@ pj_status_t PixelFormat_to_pjmedia_forma
- }
- 
- pj_status_t pjmedia_format_id_to_CodecID(pjmedia_format_id fmt_id,
--                                       enum CodecID *codec_id)
-+                                       enum AVCodecID *codec_id)
- {
-     unsigned i;
-     for (i=0; i<PJ_ARRAY_SIZE(ffmpeg_codec_table); ++i) {
-@@ -180,7 +180,7 @@ pj_status_t pjmedia_format_id_to_CodecID
-     return PJ_ENOTFOUND;
- }
- 
--pj_status_t CodecID_to_pjmedia_format_id(enum CodecID codec_id,
-+pj_status_t CodecID_to_pjmedia_format_id(enum AVCodecID codec_id,
-                                        pjmedia_format_id *fmt_id)
- {
-     unsigned i;
-Index: pjproject-2.1.0/pjmedia/src/pjmedia/ffmpeg_util.h
-===================================================================
---- pjproject-2.1.0.orig/pjmedia/src/pjmedia/ffmpeg_util.h
-+++ pjproject-2.1.0/pjmedia/src/pjmedia/ffmpeg_util.h
-@@ -51,9 +51,9 @@ pj_status_t PixelFormat_to_pjmedia_forma
-                                            pjmedia_format_id *fmt_id);
- 
- pj_status_t pjmedia_format_id_to_CodecID(pjmedia_format_id fmt_id,
--                                       enum CodecID *codec_id);
-+                                       enum AVCodecID *codec_id);
- 
--pj_status_t CodecID_to_pjmedia_format_id(enum CodecID codec_id,
-+pj_status_t CodecID_to_pjmedia_format_id(enum AVCodecID codec_id,
-                                        pjmedia_format_id *fmt_id);
- 
- #endif /* __PJMEDIA_FFMPEG_UTIL_H__ */
diff --git a/net-libs/pjsip/files/pjsip-2.1-multilib.patch b/net-libs/pjsip/files/pjsip-2.1-multilib.patch
deleted file mode 100644 (file)
index 101476c..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-Buildsystem fixes for proper respecting multilib-aware systems
-
-Gentoo bugreport: https://bugs.gentoo.org/show_bug.cgi?id=496430
-
---- Makefile.orig      2012-03-22 15:15:59.000000000 +0400
-+++ Makefile   2013-12-31 13:50:16.434307159 +0400
-@@ -108,14 +108,15 @@
- prefix = $(ac_prefix)
- 
- install:
--      mkdir -p $(DESTDIR)$(prefix)/lib
--      cp -f $(APP_LIB_FILES) $(DESTDIR)$(prefix)/lib/
-+      mkdir -p $(DESTDIR)$(PJ_INSTALL_LIB_DIR)
-+      cp -f $(APP_LIB_FILES) $(DESTDIR)$(PJ_INSTALL_LIB_DIR)/
-       mkdir -p $(DESTDIR)$(prefix)/include
-       for d in pjlib pjlib-util pjnath pjmedia pjsip; do \
-               cp -RLf $$d/include/* $(DESTDIR)$(prefix)/include/; \
-       done
--      mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig
--      sed -e "s!@PREFIX@!$(DESTDIR)$(prefix)!" libpjproject.pc.in | \
-+      mkdir -p $(DESTDIR)$(PJ_INSTALL_LIB_DIR)/pkgconfig
-+      sed -e "s!@PREFIX@!$(prefix)!" libpjproject.pc.in | \
-+              sed -e "s!@LIBDIR@!$(PJ_INSTALL_LIB_DIR)!" | \
-               sed -e "s/@PJ_VERSION@/$(PJ_VERSION)/" | \
-               sed -e "s!@PJ_LDLIBS@!$(PJ_LDLIBS)!" | \
--              sed -e "s!@PJ_INSTALL_CFLAGS@!$(PJ_INSTALL_CFLAGS)!" > $(DESTDIR)/$(prefix)/lib/pkgconfig/libpjproject.pc
-+              sed -e "s!@PJ_INSTALL_CFLAGS@!$(PJ_INSTALL_CFLAGS)!" > $(DESTDIR)/$(PJ_INSTALL_LIB_DIR)/pkgconfig/libpjproject.pc
---- libpjproject.pc.in.orig    2013-12-31 13:51:08.459302831 +0400
-+++ libpjproject.pc.in 2013-12-31 13:51:16.857302132 +0400
-@@ -2,7 +2,7 @@
- 
- prefix=@PREFIX@
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=@LIBDIR@
- includedir=${prefix}/include
- 
- Name: libpjproject
---- build.mak.in.orig  2013-12-31 13:52:22.492296672 +0400
-+++ build.mak.in       2013-12-31 13:52:06.722297984 +0400
-@@ -163,7 +163,7 @@
- # library from the install location (i.e. --prefix)
- export PJ_INSTALL_DIR := @prefix@
- export PJ_INSTALL_INC_DIR := $(PJ_INSTALL_DIR)/include
--export PJ_INSTALL_LIB_DIR := $(PJ_INSTALL_DIR)/lib
-+export PJ_INSTALL_LIB_DIR := @libdir@
- export PJ_INSTALL_CFLAGS := -I$(PJ_INSTALL_INC_DIR) -DPJ_AUTOCONF=1   @CFLAGS@
- export PJ_INSTALL_CXXFLAGS := $(PJ_INSTALL_CFLAGS)
- export PJ_INSTALL_LDFLAGS := -L$(PJ_INSTALL_LIB_DIR) $(APP_LDLIBS)
diff --git a/net-libs/pjsip/files/pjsip-2.1-new-ffmpeg-workaround.patch b/net-libs/pjsip/files/pjsip-2.1-new-ffmpeg-workaround.patch
deleted file mode 100644 (file)
index 530fc22..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./pjmedia/src/pjmedia/ffmpeg_util.h.orig   2013-06-17 10:49:51.333210748 +0400
-+++ ./pjmedia/src/pjmedia/ffmpeg_util.h        2013-06-17 10:50:15.069209407 +0400
-@@ -37,6 +37,10 @@
- #include <libavutil/avutil.h>
- #include <libavcodec/avcodec.h>
- 
-+#ifndef PIX_FMT_GBR24P
-+      #define PIX_FMT_GBR24P PIX_FMT_GBRP
-+#endif
-+
- void pjmedia_ffmpeg_add_ref();
- void pjmedia_ffmpeg_dec_ref();
- 
diff --git a/net-libs/pjsip/metadata.xml b/net-libs/pjsip/metadata.xml
deleted file mode 100644 (file)
index d7fe6ee..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-       <maintainer>
-               <email>maintainer-needed@gentoo.org</email>
-       </maintainer>
-       <longdescription>
-               Pjsip is a set of Open Source, comprehensive, high performance, small footprint
-               multimedia communication libraries written in C language for building
-               embedded/non-embedded VoIP applications.
-       </longdescription>
-       <use>
-               <flag name="cli">Installs pjsua, a simple command-line SIP client</flag>
-               <flag name="epoll">epoll system call support</flag>
-               <flag name="ext-sound">External sound device support</flag>
-               <flag name="g711">Builds the G711 codec</flag>
-               <flag name="g722">Builds the G722 codec</flag>
-               <flag name="g7221">Builds the G7221 codec</flag>
-               <flag name="ilbc">Builds the ilbc codec</flag>
-               <flag name="l16">Builds the L16 codec</flag>
-       </use>
-</pkgmetadata>
-
diff --git a/net-libs/pjsip/pjsip-1.14.ebuild b/net-libs/pjsip/pjsip-1.14.ebuild
deleted file mode 100644 (file)
index cd5f42b..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/pjsip/pjsip-1.14.ebuild,v 1.3 2013/01/13 11:23:36 ago Exp $
-
-EAPI="2"
-
-DESCRIPTION="Multimedia communication libraries written in C language
-for building VoIP applications."
-HOMEPAGE="http://www.pjsip.org/"
-SRC_URI="http://www.pjsip.org/release/${PV}/pjproject-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa cli doc epoll examples ext-sound g711 g722 g7221 gsm ilbc l16
-oss python speex"
-#small-filter large-filter speex-aec ssl
-
-DEPEND="alsa? ( media-libs/alsa-lib )
-       gsm? ( media-sound/gsm )
-       ilbc? ( dev-libs/ilbc-rfc3951 )
-       speex? ( media-libs/speex )"
-       #ssl? ( dev-libs/openssl )
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/pjproject-${PV}"
-
-src_prepare() {
-       # Remove target name from lib names
-       sed -i -e 's/-$(TARGET_NAME)//g' \
-               -e 's/= $(TARGET_NAME).a/= .a/g' \
-               -e 's/-$(LIB_SUFFIX)/$(LIB_SUFFIX)/g' \
-               $(find . -name '*.mak*' -o -name Makefile) || die "sed failed."
-
-       # Fix hardcoded prefix and flags
-       sed -i \
-               -e 's/poll@/poll@\nexport PREFIX := @prefix@\n/g' \
-               -e 's!prefix = /usr/local!prefix = $(PREFIX)!' \
-               -e '/PJLIB_CFLAGS/ s/(_CFLAGS)/(_CFLAGS) -fPIC/g' \
-               -e '/PJLIB_UTIL_CFLAGS/ s/(_CFLAGS)/(_CFLAGS) -fPIC/g' \
-               Makefile \
-               build.mak.in || die "sed failed."
-
-       # TODO: remove deps to shipped codecs and libs, use system ones
-       # rm -r third_party
-       # libresample: https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html
-}
-
-src_configure() {
-       # Disable through portage available codecs
-       econf --disable-gsm-codec \
-               --disable-speex-codec \
-               --disable-ilbc-codec \
-               --disable-speex-aec \
-               $(use_enable epoll) \
-               $(use_enable alsa sound) \
-               $(use_enable oss) \
-               $(use_enable ext-sound) \
-               $(use_enable g711 g711-codec) \
-               $(use_enable l16 l16-codec) \
-               $(use_enable g722 g722-codec) \
-               $(use_enable g7221 g7221-codec) || die "econf failed."
-               #$(use_enable small-filter) \
-               #$(use_enable large-filter) \
-               #$(use_enable speex-aec) \
-               #$(use_enable ssl) \ #broken? sflphone doesn't compile if enabled or disabled
-}
-
-src_compile() {
-       emake dep || die "emake dep failed."
-       emake -j1 || die "emake failed."
-}
-
-src_install() {
-       DESTDIR="${D}" emake install || die "emake install failed."
-
-       if use cli; then
-               dobin pjsip-apps/bin/pjsua
-       fi
-
-       if use python; then
-               pushd pjsip-apps/src/python
-               python setup.py install --prefix="${D}/usr/"
-               popd
-       fi
-
-       if use doc; then
-               dodoc README.txt README-RTEMS
-       fi
-
-       if use examples; then
-               insinto "/usr/share/doc/${P}/examples"
-               doins "${S}/pjsip-apps/src/samples/"*
-       fi
-
-       # Remove files that pjproject should not install
-       rm -r "${D}/usr/lib/libportaudio.a" \
-               "${D}/usr/lib/libsrtp.a"
-}
diff --git a/net-libs/pjsip/pjsip-2.1-r1.ebuild b/net-libs/pjsip/pjsip-2.1-r1.ebuild
deleted file mode 100644 (file)
index 13cbde4..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/pjsip/pjsip-2.1-r1.ebuild,v 1.1 2013/06/17 07:19:34 pinkbyte Exp $
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Multimedia communication libraries written in C language for building VoIP applications"
-HOMEPAGE="http://www.pjsip.org/"
-SRC_URI="http://www.pjsip.org/release/${PV}/pjproject-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa cli doc examples ext-sound ffmpeg g711 g722 g7221 gsm ilbc l16 oss python speex"
-#small-filter large-filter speex-aec ssl
-
-DEPEND="alsa? ( media-libs/alsa-lib )
-       ffmpeg? ( virtual/ffmpeg )
-       gsm? ( media-sound/gsm )
-       ilbc? ( dev-libs/ilbc-rfc3951 )
-       speex? ( media-libs/speex )"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/pjproject-${PV}.0"
-
-src_prepare() {
-       # bug #469582
-       epatch "${FILESDIR}/${P}-new-ffmpeg-workaround.patch"
-
-       epatch_user
-}
-
-src_configure() {
-       # Disable through portage available codecs
-       econf --disable-gsm-codec \
-               --disable-speex-codec \
-               --disable-ilbc-codec \
-               --disable-speex-aec \
-               $(use_enable alsa sound) \
-               $(use_enable oss) \
-               $(use_enable ext-sound) \
-               $(use ffmpeg || echo '--disable-ffmpeg') \
-               $(use_enable g711 g711-codec) \
-               $(use_enable l16 l16-codec) \
-               $(use_enable g722 g722-codec) \
-               $(use_enable g7221 g7221-codec)
-               #$(use_enable small-filter) \
-               #$(use_enable large-filter) \
-               #$(use_enable speex-aec) \
-               #$(use_enable ssl tls) #broken? sflphone doesn't compile if enabled or disabled
-}
-
-src_compile() {
-       emake dep
-       emake -j1
-}
-
-src_install() {
-       DESTDIR="${D}" emake install
-
-       if use cli; then
-               newbin pjsip-apps/bin/pjsua* pjsua
-       fi
-
-       if use python; then
-               pushd pjsip-apps/src/python
-               python setup.py install --prefix="${D}/usr/"
-               popd
-       fi
-
-       if use doc; then
-               dodoc README.txt README-RTEMS
-       fi
-
-       if use examples; then
-               docinto examples
-               docompress -x "/usr/share/doc/${PF}/examples"
-               dodoc pjsip-apps/src/samples/*
-       fi
-}
diff --git a/net-libs/pjsip/pjsip-2.1-r2.ebuild b/net-libs/pjsip/pjsip-2.1-r2.ebuild
deleted file mode 100644 (file)
index 8cc54ba..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/pjsip/pjsip-2.1-r2.ebuild,v 1.3 2014/03/09 13:07:51 aballier Exp $
-
-EAPI="5"
-
-inherit eutils multilib
-
-DESCRIPTION="Multimedia communication libraries written in C language for building VoIP applications"
-HOMEPAGE="http://www.pjsip.org/"
-SRC_URI="http://www.pjsip.org/release/${PV}/pjproject-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa cli doc examples ext-sound ffmpeg g711 g722 g7221 gsm ilbc l16 oss python speex"
-#small-filter large-filter speex-aec ssl
-
-DEPEND="alsa? ( media-libs/alsa-lib )
-       ffmpeg? ( >=virtual/ffmpeg-9 )
-       gsm? ( media-sound/gsm )
-       ilbc? ( dev-libs/ilbc-rfc3951 )
-       speex? ( media-libs/speex )"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/pjproject-${PV}.0"
-
-src_prepare() {
-       # bug #469582
-       epatch "${FILESDIR}/${P}-new-ffmpeg-workaround.patch"
-       # bug #496430
-       epatch "${FILESDIR}/${P}-multilib.patch"
-       # bug #498454
-       epatch "${FILESDIR}/${P}-codecid.patch"
-
-       epatch_user
-}
-
-src_configure() {
-       # Disable through portage available codecs
-       # libdir should be defined explicitly, bug #497744
-       econf \
-               --libdir="/usr/$(get_libdir)" \
-               --disable-gsm-codec \
-               --disable-speex-codec \
-               --disable-ilbc-codec \
-               --disable-speex-aec \
-               $(use_enable alsa sound) \
-               $(use_enable oss) \
-               $(use_enable ext-sound) \
-               $(use ffmpeg || echo '--disable-ffmpeg') \
-               $(use_enable g711 g711-codec) \
-               $(use_enable l16 l16-codec) \
-               $(use_enable g722 g722-codec) \
-               $(use_enable g7221 g7221-codec)
-               #$(use_enable small-filter) \
-               #$(use_enable large-filter) \
-               #$(use_enable speex-aec) \
-               #$(use_enable ssl tls) #broken? sflphone doesn't compile if enabled or disabled
-}
-
-src_compile() {
-       emake dep
-       emake -j1
-}
-
-src_install() {
-       DESTDIR="${D}" emake install
-
-       if use cli; then
-               newbin pjsip-apps/bin/pjsua* pjsua
-       fi
-
-       if use python; then
-               pushd pjsip-apps/src/python
-               python setup.py install --prefix="${D}/usr/"
-               popd
-       fi
-
-       if use doc; then
-               dodoc README.txt README-RTEMS
-       fi
-
-       if use examples; then
-               docinto examples
-               docompress -x "/usr/share/doc/${PF}/examples"
-               dodoc pjsip-apps/src/samples/*
-       fi
-}
diff --git a/net-libs/pjsip/pjsip-2.1.ebuild b/net-libs/pjsip/pjsip-2.1.ebuild
deleted file mode 100644 (file)
index 615c8d5..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/pjsip/pjsip-2.1.ebuild,v 1.2 2013/06/17 06:46:20 pinkbyte Exp $
-
-EAPI="2"
-
-DESCRIPTION="Multimedia communication libraries written in C language
-for building VoIP applications."
-HOMEPAGE="http://www.pjsip.org/"
-SRC_URI="http://www.pjsip.org/release/${PV}/pjproject-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa cli doc examples ext-sound ffmpeg g711 g722 g7221 gsm
-ilbc l16 oss python speex"
-#small-filter large-filter speex-aec ssl
-
-DEPEND="alsa? ( media-libs/alsa-lib )
-       gsm? ( media-sound/gsm )
-       ilbc? ( dev-libs/ilbc-rfc3951 )
-       speex? ( media-libs/speex )
-       ffmpeg? ( virtual/ffmpeg )"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/pjproject-${PV}.0"
-
-src_configure() {
-       # Disable through portage available codecs
-       econf --disable-gsm-codec \
-               --disable-speex-codec \
-               --disable-ilbc-codec \
-               --disable-speex-aec \
-               $(use_enable alsa sound) \
-               $(use_enable oss) \
-               $(use_enable ext-sound) \
-               $(use ffmpeg || echo '--disable-ffmpeg') \
-               $(use_enable g711 g711-codec) \
-               $(use_enable l16 l16-codec) \
-               $(use_enable g722 g722-codec) \
-               $(use_enable g7221 g7221-codec) || die "econf failed."
-               #$(use_enable small-filter) \
-               #$(use_enable large-filter) \
-               #$(use_enable speex-aec) \
-               #$(use_enable ssl tls) #broken? sflphone doesn't compile if enabled or disabled
-}
-
-src_compile() {
-       emake dep || die "emake dep failed."
-       emake -j1 || die "emake failed."
-}
-
-src_install() {
-       DESTDIR="${D}" emake install || die "emake install failed."
-
-       if use cli; then
-               newbin pjsip-apps/bin/pjsua* pjsua
-       fi
-
-       if use python; then
-               pushd pjsip-apps/src/python
-               python setup.py install --prefix="${D}/usr/"
-               popd
-       fi
-
-       if use doc; then
-               dodoc README.txt README-RTEMS
-       fi
-
-       if use examples; then
-               insinto "/usr/share/doc/${P}/examples"
-               doins "${S}/pjsip-apps/src/samples/"*
-       fi
-}