4 files changed, 2 insertions, 131 deletions
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index a3f930322c87..7daefa9f35ef 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -1,7 +1,4 @@
-AUX farstream-0.2.8-make43.patch 1959 BLAKE2B d7c18eaf156a6cca991014dc512898cf93f1b67b10c78f28bf6cebf772d4a8974daba1305f06d7087f43fd766218d49724dca471835fcfe5dff06a105f40bb53 SHA512 c577c5f9fb384f93ce7e36cff117d3c2dea92dc7b15064dfed19d18fc5d8658044df19e2f0cc112cd347e35c6038501e0b05a1f97c95b0f43f776aabd8fba01b
 AUX farstream-0.2.9-make43.patch 1423 BLAKE2B d17a589cd2c91eab66cfb86c3050e0c9fa6cdf7a92ffb9e483f7cce2cbb9106ddc3755f56e70a33446b59aee68fb5e8bf9a4b6cde3d480f0ed411b42bb273ec3 SHA512 55c95b76e897b64b350f1740cf65311bf3ce1e2ed24515c713dbe8f0a4f1e4d4232e630e5c8abd8fce580f4ff7265f77bdefaf78ac3eb135342b2a70305bd104
-DIST farstream-0.2.8.tar.gz 1315548 BLAKE2B 3f90e6150fd13d02369837b019ad3b935165130b8396133697d0819861f5a5ed79c6eab3efdc3bcc5a6887807285bece21f188bc756ec3cd64a57f5682f5b348 SHA512 7ec5c57f8778f4107cb628dbf411e38b726152cf78920127dff4423239ff7e4980b6b4f938abba2aa21ab984b1e3053e7e648611322a0ce94df0af576df99a7e
 DIST farstream-0.2.9.tar.gz 1334833 BLAKE2B 3c23f9534cb8578acd82bb0f7308891e0448cbf5a5b986f27d14e4d727a1e52f4268532c44dcc84e2a1db19504840ddac128c9bd0a731f06e2972d233d8781b9 SHA512 8840725d2f1de59bebc8c49cf68a6712822a4e7b6ba9078713f80e3c35a39135565a1a885edab43a562f895e11b8f5d8d666d57d9b3814dabb661f46498515bd
-EBUILD farstream-0.2.8-r2.ebuild 1885 BLAKE2B 2da12350f5bd058d35ab5f06f9b5b52ec79cd51a65deb3f1f2fe71c8d5705101c4602344b4b279d06d09af9bf21c700034a63d0245ce8597edb0b2b72076361b SHA512 6256c320d320b4a47b622d6daa04c8c9adba0df5452d6d8facedb529708a1b804ab876b20471e535d1a777f22559a30f152b2fdd13f20eba647cd60a3dce5d89
-EBUILD farstream-0.2.9.ebuild 1910 BLAKE2B 58752747ef7c7549b4925e9eb8850059f8bb6fc838a996448c4e5460ab3f4e31a0e9685f2a4e76eadb6bfdc195dfe85307d842d0324c1a31483919ba8faf1d00 SHA512 dbbbb7dd2fe1254a7c4dbe5c95debc0ea41a803a658fcade307bdfec3f6e8546ab392b710fad24203496b1d2e2adaa81dd1a96dca58f18ff825dd467ab2255f0
+EBUILD farstream-0.2.9.ebuild 1904 BLAKE2B ab910554bdb54fce15c29ba5b9e54b0d10d982c40e3538bd07eb1812e64c1a64942606ffd29155894a059f8862deef7ae6198fcf94b00d17cb24ae21c5055af3 SHA512 d34582a20ddb599fd2f7852aebc3b79b67b39d8d7a75cb429bc99fd76e5c7c4fd4de466214f1fc1966ae8e9894beaa26a8f046ffdbbe8d1d7d55a18ba8aa10cc
 MISC metadata.xml 324 BLAKE2B 5d42923f0341e578e9a43d0a7c22a9f3c4110252bc5acd869d4a92a7e9ed08e7262d9ebc559cad8c3f7de63ff411daa6ff25178b37be3493eb464a7d48a88a2d SHA512 c97ce61625bf6ae20953c5164123c8494be83d4870787b247f460103c9965e9ad8d599ded1a67f7fcf91e4f0156674fdd4fa6d4177577f766d60a65eda7af93c
diff --git a/net-libs/farstream/farstream-0.2.8-r2.ebuild b/net-libs/farstream/farstream-0.2.8-r2.ebuild
deleted file mode 100644
index 3ef67aeb0e53..000000000000
--- a/net-libs/farstream/farstream-0.2.8-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Audio/video conferencing framework specifically designed for instant messengers"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/Farstream"
-SRC_URI="https://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+introspection test upnp"
-SLOT="0.2/5" # .so version
-
-# Tests need shmsink from gst-plugins-bad, which isn't packaged
-# FIXME: do an out-of-tree build for tests if USE=-msn
-RESTRICT="test"
-
-COMMONDEPEND="
-	>=media-libs/gstreamer-1.4:1.0
-	>=media-libs/gst-plugins-base-1.4:1.0
-	>=dev-libs/glib-2.32:2
-	>=net-libs/libnice-0.1.8
-	introspection? ( >=dev-libs/gobject-introspection-0.10.11:= )
-	upnp? ( >=net-libs/gupnp-igd-0.2:= )
-"
-RDEPEND="${COMMONDEPEND}
-	>=media-libs/gst-plugins-bad-1.4:1.0
-	>=media-libs/gst-plugins-good-1.4:1.0
-	media-plugins/gst-plugins-srtp:1.0
-	media-plugins/gst-plugins-libnice:1.0
-"
-DEPEND="${COMMONDEPEND}
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.18
-	virtual/pkgconfig
-	test? (
-		media-libs/gst-plugins-base:1.0[vorbis]
-		media-libs/gst-plugins-good:1.0 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.8-make43.patch # remove when bumping and switching to Meson
-)
-
-src_configure() {
-	plugins="fsrawconference,fsrtpconference,fsmsnconference,fsrtpxdata,fsfunnel,fsrtcpfilter,fsvideoanyrate"
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable upnp gupnp) \
-		--with-plugins=${plugins} \
-		ac_cv_path_PYTHON=
-}
-
-src_compile() {
-	# Prevent sandbox violations, bug #539224
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	addpredict /dev
-	gnome2_src_compile
-}
diff --git a/net-libs/farstream/farstream-0.2.9.ebuild b/net-libs/farstream/farstream-0.2.9.ebuild
index 4c76af4f7c7f..eb7ddd40101c 100644
--- a/net-libs/farstream/farstream-0.2.9.ebuild
+++ b/net-libs/farstream/farstream-0.2.9.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/Farstream"
 SRC_URI="https://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+introspection test upnp valgrind"
 SLOT="0.2/5" # .so version
 
diff --git a/net-libs/farstream/files/farstream-0.2.8-make43.patch b/net-libs/farstream/files/farstream-0.2.8-make43.patch
deleted file mode 100644
index c1e1c0d42791..000000000000
--- a/net-libs/farstream/files/farstream-0.2.8-make43.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/farstream/Makefile.in
-+++ b/farstream/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -549,7 +551,7 @@
- glib_enum_define = FS
- glib_gen_prefix = _fs
- glib_gen_basename = fs
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@introspection_sources = \
- @HAVE_INTROSPECTION_TRUE@	$(libfarstream_@FS_APIVERSION@_la_SOURCES) \
- @HAVE_INTROSPECTION_TRUE@	$(nodist_libfarstreaminclude_HEADERS) \
---- a/gst/fsrtpconference/Makefile.in
-+++ b/gst/fsrtpconference/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -569,7 +571,7 @@
- glib_enum_define = FS_RTP
- glib_gen_prefix = _fs_rtp
- glib_gen_basename = fs-rtp
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: all-am
- 
- .SUFFIXES:
---- a/transmitters/rawudp/Makefile.in
-+++ b/transmitters/rawudp/Makefile.in
-@@ -17,6 +17,8 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
-@@ -496,7 +498,7 @@
- glib_enum_define = FS_RAWUDP
- glib_gen_prefix = _fs_rawudp
- glib_gen_basename = fs-rawudp
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: all-am
- 
- .SUFFIXES: