Cleanup due voip herd removal: http://article.gmane.org/gmane.linux.gentoo.devel/88434

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

39 files changed, 146 insertions, 563 deletions

diff --git a/net-libs/ccrtp/ChangeLog b/net-libs/ccrtp/ChangeLog
index ceac9383c736..9629a86084bf 100644
--- a/net-libs/ccrtp/ChangeLog
+++ b/net-libs/ccrtp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/ccrtp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ChangeLog,v 1.30 2013/08/10 12:55:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ChangeLog,v 1.31 2013/10/27 09:35:38 pacho Exp $
+
+  27 Oct 2013; Pacho Ramos <pacho@gentoo.org> -ccrtp-1.6.0.ebuild,
+  -ccrtp-1.7.0.ebuild, -ccrtp-2.0.3.ebuild, metadata.xml:
+  Cleanup due voip herd removal:
+  http://article.gmane.org/gmane.linux.gentoo.devel/88434
 
   10 Aug 2013; Agostino Sarubbo <ago@gentoo.org> ccrtp-2.0.5.ebuild:
   Stable for ppc, wrt bug #470546
diff --git a/net-libs/ccrtp/Manifest b/net-libs/ccrtp/Manifest
index b12e311cf467..efb6d2ad4652 100644
--- a/net-libs/ccrtp/Manifest
+++ b/net-libs/ccrtp/Manifest
@@ -1,32 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX ccrtp-1.7.0-cstddef.patch 400 SHA256 653867fed05f205ebe66e18399ab25e0ede9d3c18d8ae8ea62ea49f6def2d09d SHA512 a57dcd1ff846c1d939a437948e7bbfb486b7c8665ef852e2dc6639f23ff60fc660b877b4e7d44ab6653d3c92e174743e1380ab1863924fd5ec43a994e55db96a WHIRLPOOL 2274e82a201adc5ef7cd62ee288d23282c5beb3b36a7acb112f0ed7d7b6037ff148e45756468078f78e96a55b6f87defbd6007dd184754771c7e53b27b74b1f6
 AUX ccrtp-stdlib.patch 251 SHA256 5637a27719b50480c7e7c1de1de3d4705ef69c6e2bec4b56e9aea860046a402a SHA512 28b19eb77d5cb5c49481039e87d9a11139eed9a428683ce95ba5f4abbea09c0e5b0e2fa7d889f3577d45e881b375e90339daf887a32beef9d6a43fb3d5ab5fa4 WHIRLPOOL b0832c343a2e2d5dae0297f1323a6a8881da3da237468c7edf1ffd286df6e4d4356219f32fc7f20b53d2330ef6a2f6eb0cbb0cf437404b82d0c4228cc45bd714
-DIST ccrtp-1.6.0.tar.gz 624644 SHA256 509801156cc54a4af8d1a75fba18698ac4117bdd564ac3f61a4e0f07035a370b
-DIST ccrtp-1.7.0.tar.gz 628883 SHA256 923cd26ffc43903ef33704e46fd57f659c3ad01554927fe323635a73082d56ae SHA512 07c3aab9b9374f3c01c1236a8c9137919fd98d32b0ab238e7530fc9c98def3b345d03705b08fa9e13ae080d521a8434ff58eb6934ae089b77a7c31207c0bae99 WHIRLPOOL 967a3135ad209fc93f36bd6066576ca293b5000d2737444d85a6045556dee444843c650e346b7a2bc773bf34883d2053b0d4bf221ea26ad8bb8acc7282181851
-DIST ccrtp-2.0.3.tar.gz 722142 SHA256 01d84705f704769da021295ab39c1084de6236c2114e82bcf4767f012cfe9fdc SHA512 105bd47020af0408a92f917d0d838eb3c70a522b303a58862a90422b1ab50c9ea3bcd06665cd2f74b498563312a2c3d610c0b769688c235af7344a3429df0d47 WHIRLPOOL 66aba88cc409e458658505d915efb3f904630551e6bf01551d5687a451a42211def8f4787fa2c04754ac07d483d28eabd915099526a30f002c4e7992af9ddc3d
 DIST ccrtp-2.0.5.tar.gz 735488 SHA256 7cfad1e992986cef8245ff09b70faec1dffcab99a53a8753bce5c4ea06048911 SHA512 27a6b9c434b8141bc3545e42b603e5c850598e4e6a29f8500798648a76a20a5a8d5889595423d0181bc8d7e394c48fb4ce6494d804f3ed18a51ab1fda08e85f5 WHIRLPOOL b10dc4b0be6fcd86a7e79066af5f870151e91b3f23230a8b0b36e44c4a597d62ca98c257cbc855d19ea198d6eca4743450b041d82e3851a03b8f2a8f25c201b9
-EBUILD ccrtp-1.6.0.ebuild 1128 SHA256 788192cceac847405a6de9576617edf41c8a1cd43a3e3d38fc3e90b64278713e SHA512 8788055b69174f60584d477d69519c6e617675c646dcefb2336fedd90549714bb09579ccc6b97f97d600933e7c16480a3d3f69cb51fcc73f93b02b0bb4a105f9 WHIRLPOOL 25a30936c6b59d2c073794bd93ddf4e4638128627f2525a1d9d10dbb5a15ca7da241067601f2e970bd3d5f97ed3a5b06410959ff02d82320b33242c3d999c811
-EBUILD ccrtp-1.7.0.ebuild 1227 SHA256 0f87dae1d4aa1e5648f6404dbf5e9db942acd3c5bb820c9d409ca8f225b6c9b1 SHA512 400ec4233c4c81c1ad3ed80e434b8cc60873edd04ee71442defff12fbf74632b9ccf0ed646c7c37b26992d69d27c284fa55866d995dd5291f023b17a32c5a724 WHIRLPOOL aee85922a638d9b83d4b4e6ae9bac46f03d28c94596dcd54afbae8967f0a66f9f3d79ba60e3f3fbfe9980865563f9decf93174ebe1e8367cfa64104cffe3b5ba
-EBUILD ccrtp-2.0.3.ebuild 1204 SHA256 42164537957e512da2f9131ce4949aea6406d61d650bf844bc8bc118ec2e8bcd SHA512 622326c11e3086ccec5aad1132f2cf843e14baf054084d13efd86a0b604d3be7270ae16afb60500c47d190cc4db1798b1262deaf2aec516b9cd7541fe4b6f781 WHIRLPOOL ceee5cb8dc0f6be620156c6bf79f1d17d04285ad612b1d5bff011b4bf6c3c5d4b7232bd24bb41c0e19c55337f7acdb3234e5a9f6ea84aeb1e8455386340884a7
 EBUILD ccrtp-2.0.5.ebuild 1204 SHA256 98e58cb69f92d91bf7930827c437932a69a728a0acef15765ffa82236ff3a6b9 SHA512 47217df5bc206d509490d65f91d2c9ed5000a728ea7327bf009fabda4a6f8a159e9c33dc30bb6da8d26441501fb8d74582f545dcab4d99b5eb1876a8e3b970e2 WHIRLPOOL 83f7500bc80fc6e0c9c2411828cd2072d3f582ee9857ef3dc75885efda2f603183fdb7bee6be2e5c5ccfcb06fbe73fab8b2743b9d2fc5c5ea58bd48249df84c8
-MISC ChangeLog 4316 SHA256 63466ea54e1738fa51aeccceefa12605bbbb80ec938a5fdbbe38ddf0a9b517bb SHA512 ea7995b4a5889d6641ca58a475b5cd7d47496d9616291f110b59eeeea7fd5eea5312c0d9fe54d2b7a84e64c3fa8d23a9de5450372eb44bef80cf85bc9eb6d6d5 WHIRLPOOL 05a1d69fcfe9f5d981c81e167f81626a85daf6f36b407b013ac6292d58f195ded3d3712c5c56294cd718cfc39f57113cafa98240d626a871b40c8375a3a7ad37
-MISC metadata.xml 157 SHA256 6759dc127ff53f85505b9b455ba325e65015b694b1ec50eb99ddfc8903b967bf SHA512 0de06f1d4e9ed5e244b5cb71e583902103384d9addd6991ef750f5932fc11b7c101e5de477c1a8be6661bb6b822518e4526c64f287ac1480e3b558ac816829f7 WHIRLPOOL 76f77c019f198e57f02228dfff99311370040dd582c30a2ccf3a8072a54adac434066d3a08257c635d70daab81d642943cee43386186e7e086ba9632fa6d80b9
+MISC ChangeLog 4535 SHA256 62c2a7ce1f22fa1e8db41372be9c6fad341cbbc664e7e8965a6a27d72260e269 SHA512 cf0f7bf05ca80d7f403e0481cc1ff4e2790b80245f31bcd7369f94627d77b7fd9aa1e51fe9b00b4af93e40d67eabcbdf3383eb0779904d73b7f42ba0bd4f3556 WHIRLPOOL 761bdf056f831ba54a741dda6f4326a8e6b800b395e5803844cd74d6ccfb4d140f470b1785871ba1b8180341edf1efec9502439c3c6fe039f91bb46cef3fab95
+MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSBjeJAAoJELp701BxlEWfEGcP/RZFs2o9KwPnicTDfub9QOXE
-NAxQSQwm6WhRjUNjuzcP6LErlKMCybOrMOyKCL9XwcJmqx6657j/tIGxbdNgyBhF
-+KetZ7ABylfnWMFkU/p/ltSqDRY2HvZFMnjFCarfNXWw6KdTJbovESwrZJxaWSdu
-EGUdQ7pxtpQaNqFhmXeS6IcKU30iFdmCgZqP2Cr8WUiAFxUuwyiVP9N2KpHttdcd
-AxH8v6VYdxSTVn7LZSAhIb6MTXV8h2eJTpZ3BItPeAkMg0L1inGRpVi8Evjco3dP
-NFLl+uVwj0rJzZEatHVztXqFaAPpH0AkXycXeDkut5uhACmIXmRSTjCPg0SSvzM7
-z+vtXesLNsvsLOVlZ43OXtGrgXr/OJKBEW61ihLBh+9OkxKhw1Jl2Q9Bue/CafxU
-7xoWB9huY6Tj801+hFcImuU11GoxX4b8p+NCmeU14s7ItVMLvPc0TYoCdQ2OH0me
-dAkzHbVLajMXo2eg4WW5ybleOO/wmR3itj1AnK72e1aRRD0aHvC9QMPDCnBinsmG
-ptywwcefm7WlUjj5DAS7CF8v683bzIAg3J5uRVChB57uqBzrBGc8/pUTxuNp2EAf
-6s0JRldrYtEYAijKLvHkeCVaoiAY+tymgmuzs+205v9819D/jU0Q14g6RO43Ncqi
-8yGw+7Lvni1Gn0FCWsyS
-=gjzk
+iEYEAREIAAYFAlJs3msACgkQCaWpQKGI+9TJVgCfUPyzgom0HNCWFBEiLsx3ps89
+QHsAni19NjUuLfnJLDuXWBGPDF/5jbMv
+=orIh
 -----END PGP SIGNATURE-----
diff --git a/net-libs/ccrtp/ccrtp-1.6.0.ebuild b/net-libs/ccrtp/ccrtp-1.6.0.ebuild
deleted file mode 100644
index c7ee43b1da5f..000000000000
--- a/net-libs/ccrtp/ccrtp-1.6.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ccrtp-1.6.0.ebuild,v 1.3 2012/05/05 02:54:23 jdhore Exp $
-
-inherit multilib eutils
-
-DESCRIPTION="GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"
-HOMEPAGE="http://www.gnu.org/software/ccrtp/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ppc ~ppc64 ~x86"
-LICENSE="GPL-2"
-IUSE="doc"
-SLOT="0"
-
-RDEPEND=">=dev-cpp/commoncpp2-1.3.0
-	dev-libs/libgcrypt"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-stdlib.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README ChangeLog AUTHORS NEWS TODO
-	use doc && dohtml -r doc/html/*
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.4.so.0 ]] ; then
-		elog "Please run: revdep-rebuild --library libccrtp1-1.4.so.0"
-	fi
-	if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.5.so.0 ]] ; then
-		elog "Please run: revdep-rebuild --library libccrtp1-1.5.so.0"
-	fi
-}
diff --git a/net-libs/ccrtp/ccrtp-1.7.0.ebuild b/net-libs/ccrtp/ccrtp-1.7.0.ebuild
deleted file mode 100644
index 6a277790b620..000000000000
--- a/net-libs/ccrtp/ccrtp-1.7.0.ebuild
+++ /dev/null
@@ -1,42 +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/ccrtp/ccrtp-1.7.0.ebuild,v 1.4 2013/02/13 10:57:26 chithanh Exp $
-
-inherit base multilib
-
-DESCRIPTION="GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"
-HOMEPAGE="http://www.gnu.org/software/ccrtp/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-LICENSE="GPL-2"
-IUSE="doc"
-SLOT="0"
-
-RDEPEND=">=dev-cpp/commoncpp2-1.3.0
-	dev-libs/libgcrypt"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cstddef.patch
-)
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README ChangeLog AUTHORS NEWS TODO
-	use doc && dohtml -r doc/html/*
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.4.so.0 ]] ; then
-		elog "Please run: revdep-rebuild --library libccrtp1-1.4.so.0"
-	fi
-	if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.5.so.0 ]] ; then
-		elog "Please run: revdep-rebuild --library libccrtp1-1.5.so.0"
-	fi
-	if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.6.so.0 ]] ; then
-		elog "Please run: revdep-rebuild --library libccrtp1-1.6.so.0"
-	fi
-}
diff --git a/net-libs/ccrtp/ccrtp-2.0.3.ebuild b/net-libs/ccrtp/ccrtp-2.0.3.ebuild
deleted file mode 100644
index 6593483f06d2..000000000000
--- a/net-libs/ccrtp/ccrtp-2.0.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ccrtp-2.0.3.ebuild,v 1.5 2012/11/22 18:30:25 ago Exp $
-
-EAPI=4
-inherit eutils multilib
-
-DESCRIPTION="GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"
-HOMEPAGE="http://www.gnu.org/software/ccrtp/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 ppc ppc64 x86"
-LICENSE="GPL-2"
-IUSE="doc"
-SLOT="0"
-
-RDEPEND=">=dev-cpp/commoncpp2-1.3.0
-	dev-libs/libgcrypt
-	>=dev-libs/ucommon-5.0.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	use doc && dohtml -r doc/html/*
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.4.so.0 ]] ; then
-		elog "Please run: revdep-rebuild --library libccrtp1-1.4.so.0"
-	fi
-	if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.5.so.0 ]] ; then
-		elog "Please run: revdep-rebuild --library libccrtp1-1.5.so.0"
-	fi
-	if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.6.so.0 ]] ; then
-		elog "Please run: revdep-rebuild --library libccrtp1-1.6.so.0"
-	fi
-}
diff --git a/net-libs/ccrtp/metadata.xml b/net-libs/ccrtp/metadata.xml
index 02207a5a38e2..4538a68724a6 100644
--- a/net-libs/ccrtp/metadata.xml
+++ b/net-libs/ccrtp/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>voip</herd>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>
diff --git a/net-libs/farstream/ChangeLog b/net-libs/farstream/ChangeLog
index d2fe61e3afe6..4d7c80fa9c9a 100644
--- a/net-libs/farstream/ChangeLog
+++ b/net-libs/farstream/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/farstream
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/farstream/ChangeLog,v 1.25 2013/04/10 20:22:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/farstream/ChangeLog,v 1.26 2013/10/27 09:36:57 pacho Exp $
+
+  27 Oct 2013; Pacho Ramos <pacho@gentoo.org> -farstream-0.1.2-r1.ebuild,
+  metadata.xml:
+  Cleanup due voip herd removal:
+  http://article.gmane.org/gmane.linux.gentoo.devel/88434
 
   10 Apr 2013; Agostino Sarubbo <ago@gentoo.org> farstream-0.2.2.ebuild:
   Stable for hppa, wrt bug #458984
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index 9878f5915950..23ad5cfd6615 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -2,26 +2,14 @@
 Hash: SHA256
 
 AUX farstream-0.1.2-introspection-tag-order.patch 4840 SHA256 f540ea6f239e291f9ffc5b806cfea9f9cd0c4f13963e900719a5ee3a3f370124 SHA512 a0fddf3dbbee8dd89ef05fe4df1c3c76fd6f4750d9b6aa8287691e51adc97b4e52e5bc84995918e526ebe44f61c099aa4b1f443d56da5978b6a8b88aa6e98bf9 WHIRLPOOL 03dc7a3a6285214b20833fd89de341e1f4235e01893eccbe8db0ce4cbf55e670309d6cfa22df8d13baff10e0c19058b7c76523f4b56c4c6d793ce85ab446ea6f
-DIST farstream-0.1.2.tar.gz 1265972 SHA256 fa5a40597b47b59d124f7fd57f66704b030d576cdc0d90e107c7a592f05e73d9 SHA512 7d9ddde5d17205752a17298fb90cf855a828b2ae58746fbdc7e47749cee5e5eac4fd56f97f58251a5d253901cdd555e9cfade6016b6d92df99daefbe850e2910 WHIRLPOOL 273d20082152ff09adf8e64481b1b7c7ba7e6a24fc09addc219880fbee7f1e6b9845ce727c032fa3c364e8d2440736fd0324015426591b7e9766f11054828294
 DIST farstream-0.2.2.tar.gz 1246020 SHA256 ffd3c536372781713956eeb28644a6e9ee6e3bab034bee65af6bbb61213cb080 SHA512 0675334c56c82d9298dadeb7d140e74bdcb4176403ece8bcb73adba8c9f119097d623c8df5ac88a75343e3ed84d7284b6304643e3c1ea022bfcde6f16d12de3a WHIRLPOOL 9c531bc40665fd1da1260697290e8884149fd98eae8fe0e679d1241b1a646cb8ace94fd2c11011a491e19b21346e0bb3a9aa31f181341159151cfbc24c63958d
-EBUILD farstream-0.1.2-r1.ebuild 2447 SHA256 8595757c70e57e9968db7a8264e08607e6c8e432f95f88a029e3e5e6d61081d3 SHA512 ec9d6ca8fafbf2f4b1b615608ab03a3fa26be49924c1ad71692e1f27e3ad411b368d0869304de65ee638f25565afdd0a0c5ddc9ad0373a37390b4a20a20aecef WHIRLPOOL 3ff197808da2ad96880263233e1fd4f98c0f1adba7bde72abdbc23c3990b5d478dd1bb78f6d5bf8c8f0fe810160f2379a1d5be20c7c3fe9639199f80a713425a
 EBUILD farstream-0.2.2.ebuild 1915 SHA256 3c8bfa2866a35e6120c7e7150fcc017529d46a9f79059cecdf2cb1baedb7e541 SHA512 c80de7849cf0fb299d749accb4075511a52f517fe4e4d64e2ebf76bd105229dd5e06b02e0152276f371dd2b75b784491a205450f595281afdfcf946f55a3448e WHIRLPOOL 7c1c1530a736f2abe6658992cc69519ea9fbfe1a66323c8e04d0e1146a4dc5a818539ce242dd6e56c42a520cc438cbaa9fe9cb613cde9309bf3093119c1eac6f
-MISC ChangeLog 3547 SHA256 5b20cbca7120814550a8ea487af0a38b0dbf975746673833c8406a31b00ed09f SHA512 bc50526e46bd7ab683fbfabb7bd519561b8091a8c34482bd0076ec7352400a63f8f263652f17aebce2b21338e8a11a32b2db0115f62177b0c28ced9cadbb71df WHIRLPOOL 8999908b677f6d4ea8929385b60dfc371f687bb6b75ce050e6f11652afdef1e582e871160818d85079c001f15ca04b9438f54fff49eef8642e0d34e78fd8e5c6
-MISC metadata.xml 296 SHA256 869eb649a74546817eefe4591d0c8e10e0b6be3817bcba1977956e16eaf006da SHA512 7cd2a0d434e916344081ad4ede235b681e50e1b983ee73e9ddc7233de328604a55d42bd491b9ee459fee17a15c5422a1a564dc861f50f83ee82f4963a62946b8 WHIRLPOOL 30283455590cd728e689f1c0207515f476f02c7b0e3481df1cc668d4ebfb801b0e736f942fd97696a089b4a1bda8078858b29c595feeb67bb9b7ebb9c9876e23
+MISC ChangeLog 3731 SHA256 08f6b6cc88b56a31f9db3b003b33c74db490d4dcfcf89825804343030123f8a1 SHA512 46ad063cd79271fd1dd0cde2d54b1743395fed21bad6b4bab2bfe834c94f7122b8db5ce458dcc69f62fae7638a6d7a5e04c78855a821a391608553912f97f81b WHIRLPOOL 1e62ff675c57154e4e692777555081919f389c765b49d61d52d63bacd4c8e404ab8250955753479c9d077baf9fef2c70e61b71d4b87443497a0a61e576441114
+MISC metadata.xml 277 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb SHA512 ca1d5e77776eb584f9e897f4abb7b4a1e2bc7942564d81c812ff94d64593c6e1e0a7996c0be8f6493cce579c815024e006bf5642b8fc57d59e3818d960b9cb0c WHIRLPOOL ea0c213f488fd7c0cf1783f9542feaed34859244150a79926029bad19b066db2ce6d2cd3e539c860e9eee50b3138bfe32c520e8c663dbe9a86999c04b28b140f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRZcn1AAoJELp701BxlEWftugP/jfi53vJmvof6hRJQ9yUL1F+
-Ms4OxA5CpzElRnTAhbCwqlllQ+mPIu9urm3gpzLqWALOYN/NiYT/73Qm4g9sN1u5
-ZbTS36yFQN6UmjswBRmjKPmOvsLBk7Xeuze9jW4gzeQNdZ8qoE8T7Rjj9/46E3zI
-Fq9UzM/K14SswzJPJoTvA9POWVsXzcE6zJP2sZinmKuIGqu1cs5NngeCog8oGQXg
-6pFpH5jKaE5PDzfHDUBmZg6bSDGDC8ap2poi1BVLRyMtFJ0n5Jiy/oGZoi2Whhk6
-3uoZQ8QYeszYxx4AxqoEA6IZ5FW7rvFFLViNBkEzo+EGHKxgIo+b8lgqqr/vgnHW
-23xAVEZr2OmGoyXQ0ha2v3cMAQ1ETf83Ut7d7HMPmy8u2iCqtyyGsP7nvne7+cWV
-2GNvpYVDevbRpxUaJ8Ix18DB7OfOdx8V4FLl6soNM7dmOKZGxPg4JJ4Web7FlrNy
-j/ESWvbfoXTJYR3YxPqFpzWHT+9L0PaMaQGYqon/aUkYy8k1AjwEh+sQAyw5QAR1
-e4Y5ZtKJWJIbNkdPcIxOoP6mT3cpWkt/4OwhhbM1KEpM9lUN0mS/H0shEn4cQmJ4
-kXLppHB0y9WD73fxWMqYBtPty60xaggxjaUi/MptWK4kIFU2YcNSbXyiFb8lBx7z
-h5CioX5wN6xOGLV300z1
-=eJAw
+iEYEAREIAAYFAlJs3rsACgkQCaWpQKGI+9Qi/ACdGnXz4eBL5f1SfoG1ZoUw7ZrD
+zqEAn3GjQythcJDfUPR/qoVedb74svYN
+=88A5
 -----END PGP SIGNATURE-----
diff --git a/net-libs/farstream/farstream-0.1.2-r1.ebuild b/net-libs/farstream/farstream-0.1.2-r1.ebuild
deleted file mode 100644
index faf3597a05bb..000000000000
--- a/net-libs/farstream/farstream-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/farstream/farstream-0.1.2-r1.ebuild,v 1.13 2012/12/08 01:23:36 tetromino Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit eutils python
-
-DESCRIPTION="Audio/video conferencing framework specifically designed for instant messengers"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/Farstream"
-SRC_URI="http://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+introspection python msn test upnp"
-
-SLOT="0.1"
-
-# Tests need shmsink from gst-plugins-bad, which isn't packaged
-RESTRICT="test"
-
-COMMONDEPEND=">=media-libs/gstreamer-0.10.33:0.10
-	>=media-libs/gst-plugins-base-0.10.33:0.10
-	>=dev-libs/glib-2.30:2
-	>=net-libs/libnice-0.1.0
-	introspection? ( >=dev-libs/gobject-introspection-0.10.11 )
-	python? (
-		>=dev-python/pygobject-2.16:2
-		>=dev-python/gst-python-0.10.10 )
-	upnp? ( net-libs/gupnp-igd )"
-
-RDEPEND="${COMMONDEPEND}
-	>=media-libs/gst-plugins-good-0.10.17:0.10
-	>=media-libs/gst-plugins-bad-0.10.17:0.10
-	|| (
-		>=media-plugins/gst-plugins-libnice-0.1.0:0.10
-		<=net-libs/libnice-0.1.3[gstreamer] )
-	msn? ( >=media-plugins/gst-plugins-mimic-0.10.17:0.10 )
-	!net-libs/farsight2"
-# This package is just a rename from farsight2
-
-DEPEND="${COMMONDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	test? (
-		media-libs/gst-plugins-good:0.10
-		media-plugins/gst-plugins-vorbis:0.10 )"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Fix building with gobject-introspection-1.33.x, bug #425096
-	epatch "${FILESDIR}/${P}-introspection-tag-order.patch"
-}
-
-src_configure() {
-	plugins="fsrawconference,fsrtpconference,fsfunnel,fsrtcpfilter,fsvideoanyrate"
-	use msn && plugins="${plugins},fsmsnconference"
-	econf --disable-static \
-		$(use_enable introspection) \
-		$(use_enable python) \
-		$(use_enable upnp gupnp) \
-		--with-plugins=${plugins}
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS README ChangeLog
-
-	# Remove .la files since static libs are no longer being installed
-	find "${D}" -name '*.la' -exec rm -f '{}' + || die
-}
-
-src_test() {
-	# FIXME: do an out-of-tree build for tests if USE=-msn
-	if ! use msn; then
-		elog "Tests disabled without msn use flag"
-		return
-	fi
-
-	emake -j1 check
-}
diff --git a/net-libs/farstream/metadata.xml b/net-libs/farstream/metadata.xml
index e3bc0d794290..44825d13c084 100644
--- a/net-libs/farstream/metadata.xml
+++ b/net-libs/farstream/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>voip</herd>
 	<herd>gnome</herd>
 	<use>
 		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
diff --git a/net-libs/iax/ChangeLog b/net-libs/iax/ChangeLog
index 59166000e3ff..385b26b20953 100644
--- a/net-libs/iax/ChangeLog
+++ b/net-libs/iax/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/iax
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/iax/ChangeLog,v 1.11 2010/11/04 17:32:53 fauli Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/iax/ChangeLog,v 1.12 2013/10/27 09:38:21 pacho Exp $
+
+  27 Oct 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+  Cleanup due voip herd removal:
+  http://article.gmane.org/gmane.linux.gentoo.devel/88434
 
   04 Nov 2010; Christian Faulhammer <fauli@gentoo.org> iax-0.2.2-r1.ebuild:
   stable x86, bug 342757
@@ -37,4 +41,3 @@
 
   27 Jul 2002; Sean Summers <ebuild@generalprotectionfault.com> iax-0.2.2.ebuild :
   Initial package
-
diff --git a/net-libs/iax/Manifest b/net-libs/iax/Manifest
index 21696dabd4d7..44e7dbeffd41 100644
--- a/net-libs/iax/Manifest
+++ b/net-libs/iax/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST iax-0.2.2.tar.gz 139379 RMD160 5ed32a581c9d8a041c393a0ce41e4244adb21496 SHA1 d19c92db44fe994119ceceec2d744df52f055669 SHA256 7c3caf939a821440407931a13838dd0dfea21fbec373d1985e2604df5d149cb8
-EBUILD iax-0.2.2-r1.ebuild 1216 RMD160 55d535edd6d9b887f30509fad634c9f037d7369d SHA1 06041e3bfa465b4ca46959873234f83effaa5be1 SHA256 afc6ed672c105cc2b80db2ac60297e4281b9d19151c3e609474a0737550721d6
-EBUILD iax-0.2.2.ebuild 651 RMD160 3f7ed50922329fc66108009a1bebd3a7e49a2328 SHA1 e66806e2bd7f8a7c46e5def141a2145b5c0787e7 SHA256 e15be9647f697aba526b8c06673358bdb00fce7f9810ea3cfe2caf0c3e16d82f
-MISC ChangeLog 1321 RMD160 5dc479416452620757a003251e469011531f137a SHA1 007017d4759e22423b627ed1f9a584b1f5205c36 SHA256 41a3024109be261088ab56f8134fa079cddf978d301df328ec59f600049a3b75
-MISC metadata.xml 239 RMD160 e0b59651eca4faea853353051d8f72e11374dff5 SHA1 2b7ed48c0fd8ecb2a921e0352ac0190440ff1cd1 SHA256 1797f837f8a289f437fc8b7f859d48b14dbc13b6fb447503f8603f2ad2b47849
+DIST iax-0.2.2.tar.gz 139379 SHA256 7c3caf939a821440407931a13838dd0dfea21fbec373d1985e2604df5d149cb8
+EBUILD iax-0.2.2-r1.ebuild 1216 SHA256 afc6ed672c105cc2b80db2ac60297e4281b9d19151c3e609474a0737550721d6 SHA512 954f5277942a4db38bfc7b0c0ff3df540d7ad4c5b808e3a907fc51bb82d8882a09338167cc8f660cdf7bd2a46ba8aba0e0ab28abb88d89f9cdba84a1d525bfe8 WHIRLPOOL d5bd044d2134d60864ab8824a816b2934206530c44322a3a04b5b62b19469a0e9925dd228efe61b0f4f6ae2d130207e07adfabb5effa3a0d4c03c8b5c754a84a
+EBUILD iax-0.2.2.ebuild 651 SHA256 e15be9647f697aba526b8c06673358bdb00fce7f9810ea3cfe2caf0c3e16d82f SHA512 9243b0362d2716b71c77d49eb4ba0faaa939cd5ec472912eb22d3df37e9cce8061f3a4ff39f9a7c2b2306e17fa230bd3cd19d96cdeecaac866b5cc4425395998 WHIRLPOOL d38ab5c6d743182ca54dbd7526f8c57df382167f17a30f201cdd8613b9581fef63494fb4b50543c1b1565e78abba3fcc790f5f5b83b5ccd10d6ef99659c099f3
+MISC ChangeLog 1472 SHA256 9570c6591deffc9335589f2665ab1f56b1a983de137cd3d4dd767d117c9ba2f6 SHA512 b897bac55d471212d218f6bcbb1d0b5d0684c7114a6e50838ee51c94f83a5ace6d7d807fdef989145aae98c17bd89129d9c1cac290c90ffac83594c043283325 WHIRLPOOL 113f0807ed31919abb1c10bb38c3ecb461e674405963aca830c9cc6cbef4190f1c5f7dc42ab12e52da00eb49543bd9ca1f5b1dc5dde86eb24a481829029b9deb
+MISC metadata.xml 280 SHA256 b514a6234c3559d36cc052bc167bb7348196b87c7a4dce5247d181ef51d43f2e SHA512 7964a7d5c8ee04f3d22c024b7f8df1b9700e6243c51b7bc361b43542b4f43d8e5ede90498f9cce4eb54dd027a1070e503b76b33e89f051584597c1ebfed05d9d WHIRLPOOL 2c968df01f99f161b6d10143da648e6c52e16354cb01597ff92004fac593c09fdff50c3de8c8c790a4e12b9becc5e0bab381d87ab3f3f0bd734c63db027e6466
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEARECAAYFAkzS7lUACgkQNQqtfCuFneOd+gCgkkTxaGNbzkqCy4wCAhHQBYTG
-IKcAoIIO5uxSQK7QePPVF0PHlan2FvUs
-=hm0o
+iEYEAREIAAYFAlJs3w4ACgkQCaWpQKGI+9RRvgCeIwScNb5cRizMU/6I1sq+Y11q
+rqgAoIZDsz91Kyf8mNEA59knFeqnGEyz
+=Y+E2
 -----END PGP SIGNATURE-----
diff --git a/net-libs/iax/metadata.xml b/net-libs/iax/metadata.xml
index 438af7a6bfd8..34479aea5739 100644
--- a/net-libs/iax/metadata.xml
+++ b/net-libs/iax/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>voip</herd>
+<maintainer><email>chainsaw@gentoo.org</email></maintainer>
 	<use>
 		<flag name='snomhack'>Use slower memset for SNOM phoneem</flag>
 	</use>
diff --git a/net-libs/libeXosip/ChangeLog b/net-libs/libeXosip/ChangeLog
index 4653e48b58e1..3d2a2e8deed2 100644
--- a/net-libs/libeXosip/ChangeLog
+++ b/net-libs/libeXosip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libeXosip
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libeXosip/ChangeLog,v 1.26 2013/03/05 16:47:49 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libeXosip/ChangeLog,v 1.27 2013/10/27 09:40:05 pacho Exp $
+
+  27 Oct 2013; Pacho Ramos <pacho@gentoo.org> -libeXosip-3.6.0.ebuild,
+  metadata.xml:
+  Cleanup due voip herd removal:
+  http://article.gmane.org/gmane.linux.gentoo.devel/88434
 
 *libeXosip-4.0.0 (05 Mar 2013)
 
diff --git a/net-libs/libeXosip/Manifest b/net-libs/libeXosip/Manifest
index 9583a5aa54c6..36644fcccc9c 100644
--- a/net-libs/libeXosip/Manifest
+++ b/net-libs/libeXosip/Manifest
@@ -1,9 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX libeXosip-3.3.0-automagic-openssl.patch 581 SHA256 adf5fbbd52959bf6816723c9dddf211743ce5ce006120961018a1b96c54b27c8 SHA512 78288385a0c8ecba573d3acacda7ec441003f48476bac5465596b978f237f3d46119eb28a0d292ad71765f413bfd08c9a3f7be02470b3d36d73b5c1dedb89235 WHIRLPOOL ef55aa83bb71cede1753da28b6cc8385fba5af6946c4e00f53ba4895eafe720e2761f8669b3523476476500a8003c9957f02aabcde8738558e01167202df03ee
 DIST libeXosip2-3.5.0.tar.gz 472081 SHA256 46010e62a6f675df13e5be759d033b6bce1bd5882eebb4acd553f9dd3b461afc SHA512 67e04cd53aedaa25f7fd9b79923e075ecc4773dff0b5fd0ce0db01ebf22c09da62c6a686bf9afd6c90e6f086ee24301736c1e0d95c8b98e062ff414ad8a20016 WHIRLPOOL 08f586e826df0313f3ff3526da391930f40ff1a4c858957d5979d2c7b2f8b9b881072ec7a856c16e2a08c53af00fa061eef6fe96032bc204cf1fb601a7ccee2a
-DIST libeXosip2-3.6.0.tar.gz 489574 SHA256 91da1a084c9ab663afe04b493342e075ad59ac54a1af011c7f2ba4543a923564 SHA512 00931fb17baa61c324b529ffc4f7fedede02aa8939ac005a861814d2fe1d12be80cd3650833a08ac50e09dbe328907610295f080d94c4843497aca0ca5ab7f63 WHIRLPOOL 4d214de721a4918a7653e411b8d4e5fe3f72f68eb8046bf9537534a990cad6ade749d59500d15ca9b8f1998593ab90c07c9bcd72b771551eed744e8570266054
 DIST libeXosip2-4.0.0.tar.gz 526339 SHA256 5267a82a9c05990bfde629eb7f73b24a8812a2ecc4614600e022257dfac8b2e5 SHA512 8e286e1e533c12bce26a164e42286c3239556860863a877438f63a694e47055f17fb98eb0f2ed91cac72f0645e8bf4dd9b922b5065357f16c0bacafc99406f51 WHIRLPOOL 35b0ad25ce415fbfde40eda93fb6e5a694136b25d4c327356db848e0ad354891729bafe81babd74e9a11de6a45f051f029acb802d9f4aaeb894f3462d05bcc75
 EBUILD libeXosip-3.5.0.ebuild 987 SHA256 39ccf13bcee8cfe8d3ebab7c4d666289a03f5f20becbb132e94397b807ec09be SHA512 6a610fb595bb0cfb4e84c4a989488889fe0d7b1fe04aa47c3899d7c4b3b50a20ac2a246d7add1339c06f5cea6b01f39b41907af8be56d3c5ff0f340dd33a521d WHIRLPOOL a683d9158a25b8a41c0fa65dd14f3ce6b271d52f707c205b166e0322bcbf848855827d9a53670ec052bd0a75979ab31d5975b873d7bd0c259c1fd930db1186a7
-EBUILD libeXosip-3.6.0.ebuild 990 SHA256 ca7c27cca0903630755e1327bfea2c89fd2cced5f8d0bc62b7595e763c810c08 SHA512 8929b1f339e23e8e180b4ecf1a05500f166bf716c496875415312d7f0c5e56c60e448ebc67bdd19841718a4eb43e9265620f5b2922d51d183684c6799699f757 WHIRLPOOL 407680a2582d411f3414f81822fb51519bcc29d5b4e0c80076ae2df7215321d20dac8201e4f4cf4bee58c0910a9c68a689e18b5f3db3027ccb9481fb6749967d
 EBUILD libeXosip-4.0.0.ebuild 988 SHA256 0c142eedc2957881a87073732604d7b99d4880ae9dfd0806c10a06ab170a5b24 SHA512 39c4a0a4236a9d4c1e436b26ee1e2ad3587be14296696e39a4340b0164421140896b9d4d0c3c732bed41da4b869698b3b8e1505fed10ecc876fa619069a7fab6 WHIRLPOOL 8998a8b84d9a38335e1167099a9b0229abf915fea67cbb98b23a221e68715e564599dea388c047db9cb167775f04bf03390a8ccdea5022cae195435b2f15a6dc
-MISC ChangeLog 3564 SHA256 f897c324ad24a1808838cb816757954e4a7061cc784056529ea8b2a3bceb95e0 SHA512 d3edc85689319603d66c9c0fd81b1e3c5e72cfd3ee416b9d9944be359d9942fe3d3f28cf3a5072ace44bd21022abda027b31a136c620dd044ae9c4e2d66ec685 WHIRLPOOL 45ee2c4af68d5678a9fc678dcee02018c8b5da92a7c0daa5221141816e6b661a74db02c5e39e5adb8ef612f2cfff783a84bd4a8a13aeaab8e01dfe76f63b640c
-MISC metadata.xml 239 SHA256 96301484ba18c97804f13dec904098c543c30b9c91d958ea3ce68113ef3da809 SHA512 db6eb3b6f46aaed616b356992fc5ba01bf36d51a03e6a4c2b691f5b99bf160cb199d79eac75ca6f9286c537eb8e983c01dc7cfd5533f210b90497db2fae2ed5d WHIRLPOOL 0cc132dd254faa8480ed1dac7a46ee6d0733831ccecfd7149c906d506093c0261b28f7a9fe63dc7cd666b1409d24f13141201e70624abbce5404f3578dbc9837
+MISC ChangeLog 3740 SHA256 f9d751dc63fa0eea43bb4e670f658d1b949a4273bd4aa92e63679dfd935dd108 SHA512 367bdceab3ecfb794161721c09db4032b7af018bd5ecad2741fad481cf8baaf51b6fa19ac1667299404e92f0d039e7c697ece07d1ed662f40184bd04a65d1d48 WHIRLPOOL b2e4b0aeca405f011f1da3efe390e9c18bb3af8178ea9a03b3fbe839baefe038f0b8e86edc107c855b6c23e518646cb58b7408403edb32b63dbdedf5e45f83d2
+MISC metadata.xml 290 SHA256 0018de91a51419f79a9739569204c202bfff2f2ab79e80412f10a72c74b75438 SHA512 4a37284ec10613417f9cb377e695b6e47932e7221633a9ec48ac78569499c5483d92b74a6d141bb0b9e33393da36f48be06f4555a2759f8f81636816a54ceaa4 WHIRLPOOL fe385d50abed1954a3f2189af083773c5b62f235b7ec8cbd002f90369d0c7a3e24384d5d66d1b335b3e881225bf5c1bbbb017cd2872eed31f094132b2801bd64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlJs33YACgkQCaWpQKGI+9ToRwCeM/oaga5I3IV0uLTjdbhQ9zeg
+yHYAnAlQlRPOmobZbsY2ikbT5mL6wq6m
+=pm7e
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libeXosip/libeXosip-3.6.0.ebuild b/net-libs/libeXosip/libeXosip-3.6.0.ebuild
deleted file mode 100644
index a2655771705d..000000000000
--- a/net-libs/libeXosip/libeXosip-3.6.0.ebuild
+++ /dev/null
@@ -1,38 +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/libeXosip/libeXosip-3.6.0.ebuild,v 1.2 2013/03/05 16:47:49 chithanh Exp $
-
-EAPI="2"
-
-inherit eutils
-
-MY_PV=${PV%.?}-${PV##*.}
-MY_PV=${PV}
-MY_P=${PN}2-${MY_PV}
-DESCRIPTION="library that hides the complexity of using the SIP protocol for multimedia session establishement"
-HOMEPAGE="http://savannah.nongnu.org/projects/exosip/"
-SRC_URI="http://download.savannah.nongnu.org/releases/exosip/${MY_P}.tar.gz"
-
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x86-macos"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="+srv ssl"
-
-DEPEND=">=net-libs/libosip-3.6.0
-	<net-libs/libosip-4
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	econf \
-		--enable-mt \
-		$(use_enable ssl openssl) \
-		$(use_enable srv srvrec)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/net-libs/libeXosip/metadata.xml b/net-libs/libeXosip/metadata.xml
index 36f06ae0fb07..f3711a31a6e3 100644
--- a/net-libs/libeXosip/metadata.xml
+++ b/net-libs/libeXosip/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>voip</herd>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <use>
   <flag name='srv'>enable support for SRV records DNS queries</flag>
 </use>
diff --git a/net-libs/libosip/ChangeLog b/net-libs/libosip/ChangeLog
index a27300bc0056..11f954b7feb6 100644
--- a/net-libs/libosip/ChangeLog
+++ b/net-libs/libosip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libosip
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libosip/ChangeLog,v 1.56 2013/08/18 13:25:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libosip/ChangeLog,v 1.57 2013/10/27 09:41:49 pacho Exp $
+
+  27 Oct 2013; Pacho Ramos <pacho@gentoo.org> -libosip-3.5.0.ebuild,
+  -libosip-3.6.0.ebuild, metadata.xml:
+  Cleanup due voip herd removal:
+  http://article.gmane.org/gmane.linux.gentoo.devel/88434
 
   18 Aug 2013; Agostino Sarubbo <ago@gentoo.org> libosip-4.0.0.ebuild:
   Stable for x86, wrt bug #470554
diff --git a/net-libs/libosip/Manifest b/net-libs/libosip/Manifest
index a1572c866bff..9d6ca9563044 100644
--- a/net-libs/libosip/Manifest
+++ b/net-libs/libosip/Manifest
@@ -1,29 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX libosip-3.3.0-out-source-build.patch 522 SHA256 07c09d740f140b8375bb793b2a94c6e08169b141ed56cd834f6ac3a215c1edbc SHA512 ca4911303c290f635befa93c465ed25cef85c182c6645c1a3700ed6c68da9f268c52fdf07473e116f1a06daa477c4c1aa8803cec3cb151b45cdc1b504f705f4e WHIRLPOOL 6d58a6ba23a584c2ea8f1661b383fe4892f2977349159382cdb7220fd02895279528ac2505d1c676ee3bcb7d4a19a039fb79b491e1b0c1fee33ec14c67052e36
-DIST libosip2-3.5.0.tar.gz 597632 SHA256 dd955daa24d9ce2de6709b8c13e7c04ebc3afa8ac094d6a15a02a075be719a91 SHA512 2e8792fa57bb5b209f5e39d499ad5b9fe9d849adc3c81fa65f688c69d6e083d3600d24afa9cd35da83d066e671344961a913943b0ee453b8b7f68d8b4e419061 WHIRLPOOL 097461ae92f387efb2cada3ebc2c37a0604d81253c79cb9c3849bc92097f29320a5c6b12e976d653562ff0ce24e6a73f9a690217911f70192898fb5b368aabc6
-DIST libosip2-3.6.0.tar.gz 598496 SHA256 c9a18b0c760506d150017cdb1fa5c1cefe12b8dcbbf9a7e784eb75af376e96cd SHA512 58109fdc643673e811ce576374194d6d33b930ecec3221f31834471f52f5f2b2b30e5e331e245e33b2aafbff1aaa411d3a7657c25f3bb0b9d6cda0ae766fd538 WHIRLPOOL 7ba0050963aa2c997ee3dd3769bbcc7910586818c7fd76037044be9843cb47481fd024b9f77f3a99b6958e42ec3f68004063d7cf8b7713fd7c60a5eab6b17ef3
 DIST libosip2-4.0.0.tar.gz 644958 SHA256 bb2d228a41750fab397480002b0865f305f83a3840b1aa84851593593491b015 SHA512 995fc67c9a7536628ebaec9f4500bafa8a2f88081531bbae5194372b51102d556de28aea7d121e20cfda82b302a8a4ceb6488dbad61676930fdc13accb12b961 WHIRLPOOL 1c5df05f5317f6daaa7623f9868ed057ea3f07d84523088038bba366bdb955424b615a5bfb96754c89e046523e5db44075529a552439dc961a490d4e2eb57198
-EBUILD libosip-3.5.0.ebuild 900 SHA256 6462770819364fd87926743b5fb861fedd16fc7431081d1c0213e151f0d5c018 SHA512 4f23bd4eea2238c465406bdf1cc9d70a68ad6332a918ffd5cc3e41258a927d805e15c4c26df39c5cea688b7560d43c5d34f314cfe47c30813379553fc094a23f WHIRLPOOL 2431d497fb1d51aa05fb9bc71fd69b1baff46ab72c54c1e00f13b017093b9522e837ff624555731821e50a030f02724ac851d70459d972d5e3defecaa3e473cd
-EBUILD libosip-3.6.0.ebuild 897 SHA256 e1f9c58af0dd371db2e5d647a7e7e34e30303657da57a3c7fe86d05c26d22cc1 SHA512 2c0acb920909c59c5ce5f78abe9de27306e89e6949702e47450b9062f09e192715600ef083cdd75b0e5b3044a47357113a80b5ad188c1d824b4d73f270780b45 WHIRLPOOL 3d9316705ece2c05758dd03ff260ccaac50d8e483da17129e06fd3b3913ab77c6f73f2227fa7a1334cd64568feb200d027a6124aefc397c6d36793bc060881f5
 EBUILD libosip-4.0.0.ebuild 910 SHA256 7cc782789b11ba59532ff2a5d3b403601b876d2150b36bb9f106b38b140aa12c SHA512 0400425c198c5978f77bcfe191f110330563a7b4c241c55c39426f3bd8851812480e836cbcfb44bf6a16a8edf3797737846a3b316de0174925fbbb554e115942 WHIRLPOOL feb9e3cdad73a22b95fb9af194bbb59625f7c44990800c2cf4760d5ecc8a12affdfebb66556072797fed147f5f2e2320fcf5cf219a1ec85ab7399b567babf179
-MISC ChangeLog 7347 SHA256 24d6b19a11262967cbdbe10f9118b588c7120a51e3e2be34e5cc965465e312c0 SHA512 6c5c5a76cb38da012a1ee04b2cdf7123ad1c68fa69f55fba8613420f78cc160459749e8ccb9549e5f63b0562444f29c6d408bc2bc4a09da46e646b18948ddb73 WHIRLPOOL bbc50bfb5e32c649ebb97a9f2f0a1bd78f95eb119f5ad48a62e483a8c3d75dec2d950cccc1a28c2bfc5bb6ae3bd65fd0df342fedd8c62ee402e191dd2defc803
-MISC metadata.xml 159 SHA256 6831e631b05a25ddae6c3e148d49b98877ee1dd318185a0c95f3cad8a89bf34d SHA512 7f16a333a56ea471ab46585ffe72378ef15805784a1a2cc98625db77be6548d2265dcd4267deabd67db9f63c21cfb86a25e6531747401cf15fd33b316e44c665 WHIRLPOOL 750d293fa390b8bbb6fc654ffc049670fa879605a4abdc5f1a87b0ed6942a9d9c95df732573c0287d192155a283067f5657cbf6162dd757a8cd7351d77ed9f2c
+MISC ChangeLog 7549 SHA256 2a07a5d130ccd536736e8d5c80cb755cd298088d9f20deaaf8f212ed46e76c86 SHA512 9bd666dff38a4d9f8d3df18c0c809f8095c691a12b0a510bbec8a608d82ef726201b865a1f1560730728eb5af1393d0e3d9ad0e84328658d1ea5cca800b62152 WHIRLPOOL aa15be77dc972dd0d98f2878d99b563c8538d4153d13eaeceb044c1e569fa2492b4206410ea8d2de43fbccaafa684b8cde77eb1d0dda25b82ed72408b8155ef8
+MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSEMtFAAoJELp701BxlEWfIAQP/18Ph43I4e73kC+PPNJiImhJ
-ANVd1lYhEbBV9ILOo2gCAZpW6BBHrB1teSFzGRl0eM7VhT21nm/JojF3VwnGFNWm
-w29U4Tw7FGGi8hr++66peBBWDoQsjgdEAsNNib4HfHeFz/bLrFfwkIWscnnbdssZ
-9OnFSCTNO9y4x0fWvqZaY3QRTU7NLxRkdhCJybApIWOoW0Xj6CBoEaOfOVQIBXWe
-8zPMq17/1UB6QCVc7xdyX2psJD1A8vEXcoQaoJL4a/Pmgco3Qgk16P7QtNJKryb5
-yjmH7SqAIR3kXo6+Olo6PXRelZnEtdoEMHcvHo8krEa0SZ8UgbLOdOQu2cIQxWqB
-5fUhJQInqZsm4QfYG+0nQYEaHBykSF25t9Q3QObIUE3HGCGglJHYQyFwV6wVexvu
-wcozIQ/6t0auK3MAQ3QodYt+Ab0QKzgoLWn/YgcUkFNl4km/nyuF6wXWZGuV8s5I
-7BBgxFs8cQjNygU1PAIXKXxCBJNcGI279MEq6MtXdnpmB653IpEfswxFGMUX/vDg
-pvtqyqn9N7OsAakfy4qXOOQuK1JDSlsn3InseyUntNzhg5A/DvQc67ZfDy0x3eO7
-+jRfpgXUKSGrTcI5zZYgxQ6foDCli/zxxKRYNGcAgfV3+ay5DsoeTEKXvh4oSXHp
-zz4CSnbn6AiitHw2qcpg
-=3GpS
+iEYEAREIAAYFAlJs398ACgkQCaWpQKGI+9RK4gCeKShkQZe6WjZ7Rix1vr1BuwXt
+lL8AnRMJM+Uf9G+YCWnKjEJGVd2+81C9
+=nyIc
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libosip/libosip-3.5.0.ebuild b/net-libs/libosip/libosip-3.5.0.ebuild
deleted file mode 100644
index 6d4a6d3adb2b..000000000000
--- a/net-libs/libosip/libosip-3.5.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libosip/libosip-3.5.0.ebuild,v 1.4 2012/01/06 15:04:14 ranger Exp $
-
-EAPI="2"
-
-inherit eutils autotools
-
-MY_PV=${PV%.?}-${PV##*.}
-MY_PV=${PV}
-MY_P=${PN}2-${MY_PV}
-DESCRIPTION="a simple way to support the Session Initiation Protocol"
-HOMEPAGE="http://www.gnu.org/software/osip/"
-SRC_URI="mirror://gnu/osip/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="amd64 ppc ~sparc x86 ~ppc-macos ~x86-macos"
-IUSE="test"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.3.0-out-source-build.patch"
-	AT_M4DIR="scripts" eautoreconf
-}
-
-src_configure() {
-	econf --enable-mt \
-		$(use_enable test)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to install"
-	dodoc AUTHORS ChangeLog FEATURES HISTORY README NEWS TODO || die
-}
diff --git a/net-libs/libosip/libosip-3.6.0.ebuild b/net-libs/libosip/libosip-3.6.0.ebuild
deleted file mode 100644
index 6f81e69362fe..000000000000
--- a/net-libs/libosip/libosip-3.6.0.ebuild
+++ /dev/null
@@ -1,36 +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/libosip/libosip-3.6.0.ebuild,v 1.4 2013/02/14 22:08:06 ago Exp $
-
-EAPI="2"
-
-inherit eutils autotools
-
-MY_PV=${PV%.?}-${PV##*.}
-MY_PV=${PV}
-MY_P=${PN}2-${MY_PV}
-DESCRIPTION="a simple way to support the Session Initiation Protocol"
-HOMEPAGE="http://www.gnu.org/software/osip/"
-SRC_URI="mirror://gnu/osip/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="amd64 ppc ~sparc x86 ~ppc-macos ~x86-macos"
-IUSE="test"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.3.0-out-source-build.patch"
-	AT_M4DIR="scripts" eautoreconf
-}
-
-src_configure() {
-	econf --enable-mt \
-		$(use_enable test)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to install"
-	dodoc AUTHORS ChangeLog FEATURES HISTORY README NEWS TODO || die
-}
diff --git a/net-libs/libosip/metadata.xml b/net-libs/libosip/metadata.xml
index 8d1e4dd4a5b8..4538a68724a6 100644
--- a/net-libs/libosip/metadata.xml
+++ b/net-libs/libosip/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>voip</herd>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>
diff --git a/net-libs/libsrtp/ChangeLog b/net-libs/libsrtp/ChangeLog
index 20701dd0289c..82c6033256e7 100644
--- a/net-libs/libsrtp/ChangeLog
+++ b/net-libs/libsrtp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libsrtp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsrtp/ChangeLog,v 1.36 2013/10/24 06:11:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsrtp/ChangeLog,v 1.37 2013/10/27 09:42:27 pacho Exp $
+
+  27 Oct 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+  Cleanup due voip herd removal:
+  http://article.gmane.org/gmane.linux.gentoo.devel/88434
 
   24 Oct 2013; Agostino Sarubbo <ago@gentoo.org>
   libsrtp-1.4.4_p20121108-r1.ebuild:
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 0a59efbcb916..4a7f1c89388e 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX libsrtp-1.4.4-invalid-index.patch 412 SHA256 afef97d3da04d4d00ebc9aef598f32dce959a64e94da48c54f4201dfc5a0667c SHA512 eda02d691be19de883d061031c0c7070e375da3581f4294a7c8fa30f498c4c7aaa306c291230171d0391e226b624277ae09b4337dd14aa2625a9cb6bb4884764 WHIRLPOOL 3b0ecc41a920550efe935a647de469a67b2fa8784be4842c323d3efbbb237f8f0a706343f14fc6795bf53b35b8153f02eafb99e5ccacbeff80fe99312708f067
 AUX libsrtp-1.4.4-shared.patch 1670 SHA256 76bbfa40334c17327331f3532f45a6b83139dc94cc4eee9e4a48db4ece63961c SHA512 c9005c00fd81cf13243897f2803d1528812bd83849aa318c5cbabfb3fd7cd3870b94cf5d6ad6eaab5b181b2e439be6cdfe9a9a38338632bbf34647a18d120a69 WHIRLPOOL cbc5a2a44069326a64dc50080cc2f897ec706f414dd55e9c1565ded0a428693144f94bd84b992da669711a92691ea9366949e9cd0c39989ec9f28d1c1cc2b5f0
@@ -11,22 +11,12 @@ EBUILD libsrtp-1.4.4-r1.ebuild 2181 SHA256 df28a118d1ef97c8a006c33c70b232f4cf19a
 EBUILD libsrtp-1.4.4-r2.ebuild 2265 SHA256 2b74ebcd58029b08b386d233e055da4fde0a76c423f23af71bb9ee7ab64c7f91 SHA512 0d6d5ee0488d830e9206c14b4d6e85c16d1339778b47730c1773c5cdec87d6a119858441ac97c6ba465856ca73dccce7a26993fb0a64e3a19612c384119a8de6 WHIRLPOOL f052c50cdc653f4fff4ab3caca003c83331539da0700fcafb98318e2038ecf5f4d0999810d8b35292f7b224a2b0a75268d8b2afe6bccc4a36215eae66b16bfdb
 EBUILD libsrtp-1.4.4_p20121108-r1.ebuild 2276 SHA256 74b4ddd57b8cf210a5b0881e56c369f434115c96ec9d790221d2df972b28bded SHA512 5a8f171814375a611bece2e9c6f797d68efaa8f9568ee389a75964b16011fa56b16da50a40a66c9d2123a0d67a51c633e9844b64587ab313102ced7e2d57fe50 WHIRLPOOL 4da40ac3a219bdbe64cc6dfd7cce497c3ef05261c25c2f2b213ab7a71b1b1fa8d3a935ac6759b194916dfd68f21cf61c084688dd060d3f2147f121c636197e27
 EBUILD libsrtp-1.4.4_p20121108.ebuild 2231 SHA256 444e2e4a535735f9b773a95b073d87e6c7d95c6a7dfe93a9aaf1c0d787e15d61 SHA512 894f750e35e9b18b8b6c44242eecd96cac94c0fef163271235f30a3725378c50452ad94f8575a7bd2866df7bebe41c4f3e6290fa697cfb098751b8f9205ab6a4 WHIRLPOOL 59332afd44d1412dc1fb8f6bd4f370a108971b2833613ee94b138592612aef32749c48bd9511ddbc157a9a068b809a3df509d0e25a4f319a4affe55bc257f3b8
-MISC ChangeLog 5033 SHA256 114d99a9c3f85254d97ab7091f03c970eb63690df48a44ae3ad827b88e6bf76a SHA512 4bbf816130ed3415b171ccc7d0f18f7de2650813db17951245f7223ffbf1f44dcefbf15232a052e4dcb995284f354cb430157af09cded0148be3d7fbc82cecb2 WHIRLPOOL 4b451529ba219b6ea5183162f7b5ba8e0d0a77e4722e56d1586bb6eac605c1ece39e8ff96d42f3d0a78ef31093a571f4e2d477dcba8ed154c41c74b641564e9d
-MISC metadata.xml 505 SHA256 a6102bc3faaaf3124b2ef0112c2d81ffe85fa142feb08ed55ed33b4619e6d73c SHA512 431075a50a23cf16f37be607c111f0d9dc5cd0c47845f9f43e3c888d4113b0b0ffd42aa93114db52278e415d0662efb1f825e8bf0da8be7b6ff27ef94b9c5686 WHIRLPOOL 1f399f7274bf1d1a7729b81111eb21e0ccd0443bd85751f1c4cc7a25fc96f51f62979659fe096f205314bf164b501c33b8c5f45344d421230210300d0daa3cb9
+MISC ChangeLog 5187 SHA256 8cef02c8a1813c178fe0137f7a3a598cb5ce24d5a59dbaa2673eb57d7e9ec583 SHA512 33c5a5e9c867f99923a93b17044748a60924454541bd5868efcd6a3ff4a6390880fee2002aa9b2908207737e1dfab231492b8726a1de725cf4db5108e1bec14b WHIRLPOOL 780873e0b8f5816b07d3904386ee522196a3c0ff7546a737f842eeb477da28e1bad96351aadced9cbcd903c2f577f42f541ce23cbbbfdc2dc4b0e412c7f83b96
+MISC metadata.xml 486 SHA256 e4398885162277b61dce30faf6ee3a012fbbd8ba4ea6d356e1fcdb4b0afb6df3 SHA512 3442bf00153cca769d1e62bc37619659985dd5a2bd90aea99d47235f7bda1d624f1f9b0304cbcf740311ce742dddc754f6e730cc172eece1332cf247b721b314 WHIRLPOOL 7cedb286c99d7c6efd4ac9b95d7d08317abd0776e3ef36fafe56d7df925ee3a95d3eec4ef4291a83af1ee12ee9a88f248211716c3b719078146bf4bc90cd31df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSaLn/AAoJELp701BxlEWfBhUQAJKXW3niKyCKjD6ZXk3TtJM8
-0kyA5S19Sd1Rn1geuHAwTfeKBerVCJM1Z0fwPUda07huzvew3Fv8ePChMcjSQQm7
-Dih/q6tV3vzN+47KGfhK5fKWZ1X6xhUBAKdvuBzT9s70siwkwX0xJm7taoCADb8h
-aqbF1FiSDK2NFXijDdjNOf9UOuIsfjb6Ze51imUJ457UTQnBUy2xf6FB5cKyllgx
-oAkSGi2zevuHLOSIUzzenMSt5CNObzCvOn/8paij7OwGiqbWKLx21RWXJJXR0NiE
-GJZm2r2pMgPJ3qGUFFzkLH55T/Ps1h8370PbvRx2Wc7MNgcIaPuEYmnEA82DhnHz
-MATmrP3h/f5B2QC6fqCKVV720YRHlnMCL0CoEO50jEF0B7DzGYINcT3jlU0IqpnM
-5TWlaG0LL7kTwlG/sjks613pwiz5PN+jq3YsuS0lt8p13fZV/jc3oMfq8KENE1pA
-o/nZliLxZ8WkE4fgCqWnBrqZ4jJjFGFvdMfy8+ASj3PcGS3Gov/WvF1RytziEfcU
-HR7B2KPf5y1kUzIPalPykeB6+dgI7uRBL7uT1ttmxCR0rGiraBJ9Jj7Ec3j17C3p
-9jwumX21o03ycMI3wHg8D19L2Xi3gB0C8wEUmgj59MOSn9C/7voTiTSqEQlC075c
-yJGrCRCC9nUTTgzpEnoW
-=mjq8
+iEYEAREIAAYFAlJs4AQACgkQCaWpQKGI+9SzygCdHh6dZ528Mtr7NQoSCCIJJl7J
+zukAniPe2mJ/1edNX7N7rfc8LH5rBN96
+=pmkb
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsrtp/metadata.xml b/net-libs/libsrtp/metadata.xml
index cea9dc7a090a..7c0719729e73 100644
--- a/net-libs/libsrtp/metadata.xml
+++ b/net-libs/libsrtp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>voip</herd>
 	<herd>chromium</herd>
 	<maintainer>
 		<email>chainsaw@gentoo.org</email>
diff --git a/net-libs/opal/ChangeLog b/net-libs/opal/ChangeLog
index bdacfacf2b40..8cfe15194048 100644
--- a/net-libs/opal/ChangeLog
+++ b/net-libs/opal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/opal
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.96 2013/06/25 16:11:52 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.97 2013/10/27 09:43:16 pacho Exp $
+
+  27 Oct 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+  Cleanup due voip herd removal:
+  http://article.gmane.org/gmane.linux.gentoo.devel/88434
 
   25 Jun 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   opal-3.10.10.ebuild, opal-3.10.9.ebuild, opal-3.6.8-r2.ebuild:
diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest
index ea40bd0f5454..999d8e91e232 100644
--- a/net-libs/opal/Manifest
+++ b/net-libs/opal/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX opal-2.1.1-notrace.diff 263 SHA256 3abf99ab2a7bde2e1a2380e22a9c5e15240439bdf7766b4715c78cacd46961c0 SHA512 279ebd4821af25ba1ef795aad66d1ae20489337ab2d78c174b4caa4dbbf02b4f8c7f6fdc5e2822e1c6441e2850d0924f108dcaf06beaf238be58b44daee91b71 WHIRLPOOL b71b6bf51eda7d9a5c24a9bcff85c41c3017e92c6be4f1fed5022ccbfac0ea0f3b66a4cc9b501810b5e342b8f8cf8110c698deca9ed71661a3f5fe40184040da
 AUX opal-3.10.9-avoid_cflags_mixup.patch 5378 SHA256 80a41d81a1caeaee31c43c7b71bac9943692eed3e6a5f7f5c4a1bf837cd391e7 SHA512 fdc6b52db3bd299d2235ebdb917921d3c9d01a03ffed65e8e4b833e66da21bde4c1497740a38a41f3d7393a6c65969a64587612a11c9590904b66c9fb86e1e7e WHIRLPOOL fc1d97a7180d50748b521cb345b58487e2183506b68d5d952f004d3f382cd77171b222187fa4bd92510026781012d601c23ec23f5df8023ad3e9ec73c5e98b0c
 AUX opal-3.10.9-disable-h323-workaround.patch 498 SHA256 b1d943f7eb33c1828bf5a086abe1256dac55ce7f9a9cd16cbe9fa72b00d7ede2 SHA512 58e8ef12c39bce3a4d386b2b6033e1e242852bbf78371c58e91bd020cfcd95b40a9831db91fa76da431a9f8c4bb40c846b420e3a462dad77658a37c2281a9d39 WHIRLPOOL 6c590b837ebdcb11491aa3b9759d6c7e5930aa07d294bcfd473327f37866df97400bf1de588da853b6c807a233c23388359ac5a1e27c05ae1d4cc361585b98ae
@@ -25,5 +28,12 @@ EBUILD opal-3.10.10.ebuild 7576 SHA256 bca735f87d649a085e360487953a38528223efcac
 EBUILD opal-3.10.9.ebuild 7499 SHA256 a848325025549d7d03120018307c932d56e49d4b4f69241dc2d6f08da01d2a87 SHA512 2ec660c2e210439aee9d07dbe963aee0352c724d791244d3deaa0209a9e01cd6a8eae01ffda543ffed6879b0fffa5dceb4822f127278f8b67e405283dca4868e WHIRLPOOL 8983c174c7864b50ee4d523d41d7bf34ef5c0ba4efbc11367f236a6b7f8171a8031df8597eb954487ff8ef1547a1557394252cdb52f85f74a6e8a77b9e5e35f6
 EBUILD opal-3.12.4.ebuild 7038 SHA256 efeeb3db5056c1df69fbccd2fa97d214d5cb257e72fa3617c9a7dcb94fdf504c SHA512 4b0951eaadf2ecb50481510eb81e3ab1188f0206ab85528ce5e449efbf66974bd6dd2b9304753d7da2e2c70572401f176d270b63b4c9ebdc7412d73fc401403a WHIRLPOOL 882d5838d030d128d6fcb39cc7754eb0120a5f8b2594929f016041c2fa4272318d241d78146b5acdf7c54564c896778a853cd9621aa21db1d53995e4cfa93165
 EBUILD opal-3.6.8-r2.ebuild 8586 SHA256 0903e0079cd06942bac4eba1facb8dd51da32e98802142596585b71e73053311 SHA512 769ae0f12d768fc2a7f9fbc20130a930000db145ae55e4968f1ecd949e92fa1717a59fb8db27106d76e7d47406eae2a518150769f2039c0fd053b3d29fffe0d3 WHIRLPOOL 45d77148cb4a01ec0cbbaa9c47f4512f527c15dc3ba5b4007fd0bdafc36ac1cc03d16dfe1c54adbfae9fc8606bd004697246573512ccb756d43f9e5fd28ab9a5
-MISC ChangeLog 14199 SHA256 1602bc9d1dce7243a6c374c5b79dfdb848a9604b3205074e6af895dd345ab7df SHA512 6cc388644bb6d95f15b958f7b75d6570b8a42fec0b6bde256f75603f397e1442e5148bb8944188b8ab931f5e326467c46d594e724589fde025ff40dabce1abd6 WHIRLPOOL 37865b217d29f16fab2221199b7abe732e6f373a5c76f812a5d5eaefb7c7c41513289725d9809dc4513c99b338a9e63f107788242537267dbdba9e8010f5b162
-MISC metadata.xml 2175 SHA256 e3d7c35d326798477da494de953c9fcf81bc61663a32571c665d0b83905bd195 SHA512 e5288f68dbac4331d9d7ccfa37539c75daa44ccaea27d421d88c9093c7d3071a0d8941bfe98aaf879b57c01d5c0ea1c62deef77df8893c55b90dfde9ee393440 WHIRLPOOL f153469f1e7a9a0c08433e716628d31be74d5a1fea61a6d20215631e375fcccb6b48ca66067457abbaea19a21593bad4d11e02a2454c417a94391247d0831651
+MISC ChangeLog 14348 SHA256 b4be16aff3da4635e9338c1b0e9ac0dfa4dbd0ea4e2e0ce894eba300139e0338 SHA512 7ca49855696860b1ad9c36f24343cca2bbd946a9049f53788ebe65e02ab522203c2e096f97f8b2f180e120f72affd34c42dc1c8a463e2a48f2587d265ca08655 WHIRLPOOL 9d2a68be2c088c1dfec07438b12a6738d40fcba8c5cfee4b96d00ad75ae5b5a3a1becee29da22f0a354983e2ca3a9316c68adda0bf2f91c2c1be66b37ecaef0c
+MISC metadata.xml 2104 SHA256 36785805d9274b5d54abceae38e229317c904ff8695475662af1fbf36f92562f SHA512 f8a4186ad5b9ba6ad310dd82a1c83082e2512a311764989898775fc540327dc9908be72be0c70f527847f60bc4b4382172a97fb89567dfd5f772d34b8246bffb WHIRLPOOL 0474338ca8b6798a246a0278a6ee84f5e017efaf1908709b6e69e5996e8726bc3eb3fbd5a96b9566cf4fa3fd13f632c55bddec3d671a43c7857ea9d24223e07d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlJs4DUACgkQCaWpQKGI+9Q+yACffyhuE+kUjhnBeL1cMUvHBwq3
+XDMAn3eT/y9mpBU4HM7nwuIQLNpXxtkg
+=vevp
+-----END PGP SIGNATURE-----
diff --git a/net-libs/opal/metadata.xml b/net-libs/opal/metadata.xml
index 9fd8c05a9916..4d2c6ccc3c17 100644
--- a/net-libs/opal/metadata.xml
+++ b/net-libs/opal/metadata.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>voip</herd>
 <maintainer>
         <email>neurogeek@gentoo.org</email>
         <name>Jesus Rivero</name>
-	<description>Assign to herd and CC me</description>
 </maintainer>
 	<use> 
 		<flag name="audio">Enable audio support</flag>
diff --git a/net-libs/osptoolkit/ChangeLog b/net-libs/osptoolkit/ChangeLog
index 254ce06b6399..b40b9f1f82a3 100644
--- a/net-libs/osptoolkit/ChangeLog
+++ b/net-libs/osptoolkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/osptoolkit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/osptoolkit/ChangeLog,v 1.19 2013/10/06 19:31:06 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/osptoolkit/ChangeLog,v 1.20 2013/10/27 09:44:45 pacho Exp $
+
+  27 Oct 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+  Cleanup due voip herd removal:
+  http://article.gmane.org/gmane.linux.gentoo.devel/88434
 
 *osptoolkit-4.1.5 (06 Oct 2013)
 
diff --git a/net-libs/osptoolkit/Manifest b/net-libs/osptoolkit/Manifest
index ef5fa4e57ea0..daa30932fbff 100644
--- a/net-libs/osptoolkit/Manifest
+++ b/net-libs/osptoolkit/Manifest
@@ -10,12 +10,12 @@ EBUILD osptoolkit-3.3.6-r1.ebuild 1899 SHA256 254b88e0da2ddb8d209a30e715d8643dc3
 EBUILD osptoolkit-3.4.2.ebuild 3119 SHA256 a649386596362ba08994207770d70e2a96e43963addf3049d7e263c205b5bbc0 SHA512 c8b3993b4bdf60f3cf1bfca4505df578924b8435ea2921aa7748e007b42dbb81a21848e2d1953475993d086a774a00005beb6a39ab6a86ec93f0e1bd1810d60f WHIRLPOOL 987fdb9cdd0ed9092f77f31705adaae890230c1f3d33944dedcaf2911f74353a4313e4be5be7cc61869993ab02116c8e757d2a73d2aa8487cd45e18dce6b3a5e
 EBUILD osptoolkit-3.5.0.ebuild 2948 SHA256 99cc11fb2144545bd10369eec58c4ffc6397a02cbeb5ddf063bb4d4c0cebecfe SHA512 21f6b9f795a1af95deb7c3f66e374c7bfd0c3bdba5e17302d442e856aec9c4729e75bd865aa361b315a4b4fbd73dd6780d51574e87f3969292f5c228ffbd89a5 WHIRLPOOL 67b1ea2ed334343f150507d5477f4776b23884c295f60dddb13ad1ed061abe7c0417c0c8cfa75eef432ade279529015662da085a7df11ee3858cda07edfb960a
 EBUILD osptoolkit-4.1.5.ebuild 2952 SHA256 49ed4398425269af0f24ef5056ad1b0f07a19a5f5c0352fd5535535f8dd308c6 SHA512 f05d7f3a78536469f63dd73fbbf57954484af52ab56e69cdc383329f836bbccdfbfe8643e566e6b7554dc64c8012e67aefc5ef31ffa0a2f8456a3a52a7b292ad WHIRLPOOL a013e157a2ce9b5cea5b95ebeceabd370632405656554aa1e40e12c5ae0e766566304bf2d2a22283b06f75415737e582060a17d486db669c42bdcc928aedcea7
-MISC ChangeLog 2830 SHA256 bddaa083e712d50715056d14fea318c525ef3a4272f11293a8cc368284fb9f79 SHA512 9221faa698901db1109e2a01b8f53654eb4bfd5152f81c479167fed24a8eb0e54be0626829bf57908d23ac4d799ddef2a546484f328c337f8c502ec119436d01 WHIRLPOOL 4b89d2d1c8f10a7708ed6acb284c5a3cf147749b42156fa0c9662a06e886ebafb0916dfd26c454b5dd62b1c82b4976549a7c3453eb0d9c551e5bce0183c85f7f
-MISC metadata.xml 257 SHA256 ad64812c2b7c47f6071002a0d7614aff3d4ba8349958093745d0a637b265d23b SHA512 bd0b963a4eb04cfeecd66ee7924e03e626cea31e783b324dd20dd2fdf6b604ae941d947eeccc624b48b09f43ad47b38c180bf11d57f51ecd8ee20f930feb0a68 WHIRLPOOL f1f041949854b8664db24ab9533be66c034c82c3259e6efb122bf9c3d3abb99447dc18b9c4303790f16a43c3ff1feb9800480787a260a665c9fb19606bb6c8cd
+MISC ChangeLog 2979 SHA256 f751799ce80e1d4b2eaf9acc6c93e98f87e2be2310d80be97fe6cc5b35fead05 SHA512 68ba8bec5b131a471aebb69a5e152951b44503bea89d394271a577b49992192f618f5726cd483416a2de18cb9a21ab57a7bba4e7e07fd676c6eb96cf4a6e5488 WHIRLPOOL 4b568d81607a7ebecf3f2620b746e812e27fdf0cfe96a8a9cbf8b02a3982474d18fb0c589ecae84389bc8619469c5351eaeb9bc4db8f7834706420b83ce38eec
+MISC metadata.xml 237 SHA256 88d9092fd208599a8b524cca9633d9330223e45c34a44e54b2de05edb4738ac7 SHA512 11773ab2b5adaa81f3c8f73413d2f257ea1d1624df689154ee2697412ff14ea8f9851b805c4a474b486abb0a066cfc929f91eb852a208b9536885d467df36af1 WHIRLPOOL 324b778d3103d615af41fd6d1d978beeeeb08f4823a3c81fd453464b4df2ed59b56a481ddd65b4eb740dc75b4dc69133e761199abe6d27333b1fce97d5b5a1be
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJRu2kACgkQp5vW4rUFj5qNTACfcKt4LARt9vm+wBneGJ+OFhiA
-8fIAoL28Liy9RA2klCeqJ8OzHsExdjDE
-=6I4w
+iEYEAREIAAYFAlJs4I4ACgkQCaWpQKGI+9Ri5gCbBu6jP24iS7kutZRKXey9QfOU
+NsgAnRpdapHBadLbMbID3o/Iwbly5J8h
+=qkWZ
 -----END PGP SIGNATURE-----
diff --git a/net-libs/osptoolkit/metadata.xml b/net-libs/osptoolkit/metadata.xml
index 66a09d837718..3ed4669f55a4 100644
--- a/net-libs/osptoolkit/metadata.xml
+++ b/net-libs/osptoolkit/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>voip</herd>
   <maintainer>
     <email>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
diff --git a/net-libs/sofia-sip/ChangeLog b/net-libs/sofia-sip/ChangeLog
index daa5c5adfad2..fdc8d5862f95 100644
--- a/net-libs/sofia-sip/ChangeLog
+++ b/net-libs/sofia-sip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/sofia-sip
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/sofia-sip/ChangeLog,v 1.26 2013/02/02 23:05:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/sofia-sip/ChangeLog,v 1.27 2013/10/27 09:46:42 pacho Exp $
+
+  27 Oct 2013; Pacho Ramos <pacho@gentoo.org> -sofia-sip-1.12.10.ebuild,
+  metadata.xml:
+  Cleanup due voip herd removal:
+  http://article.gmane.org/gmane.linux.gentoo.devel/88434
 
   02 Feb 2013; Agostino Sarubbo <ago@gentoo.org> sofia-sip-1.12.11.ebuild:
   Add ~arm, wrt bug #449220
diff --git a/net-libs/sofia-sip/Manifest b/net-libs/sofia-sip/Manifest
index 797055787958..4decbe195651 100644
--- a/net-libs/sofia-sip/Manifest
+++ b/net-libs/sofia-sip/Manifest
@@ -1,6 +1,14 @@
-DIST sofia-sip-1.12.10.tar.gz 2855890 SHA256 e6648382f24c73997f83e153cfef7f42125bf0dd3af73b98ca623e10ec321663 SHA512 3d19d7563dcd2a6e7b5361f1d04d33d2f5aa0223857fbd9556e62104be44227139affc2c033a237ec186f16f27357bedeeac3ac419e53959c69ee8d6be14ca32 WHIRLPOOL d1bc81c7f813a6d8ff199f9b31f3ab8dfac382dec4d6d02a6f11134753973fa249d9b031917a63bd4862bd5c2ce7df4e77757fd7637d649c665caf15c2cf767a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST sofia-sip-1.12.11.tar.gz 2927808 SHA256 2b01bc2e1826e00d1f7f57d29a2854b15fd5fe24695e47a14a735d195dd37c81 SHA512 48bef0223ecf5a31267773c8e2491c1990b4419be67154e350cc9e5644a98e55409d635d7828824de3e0e1658caebe5b61e44d613615beb709ecbe8180be131c WHIRLPOOL 81231856b974847a384ce8539306f3175960085381e031fb53594f86ab924e04811f76f68f4882cabdd4b5771de10da90fd35e4d4b4398db7f99c9e2d71f52fb
-EBUILD sofia-sip-1.12.10.ebuild 831 SHA256 4842f7f3824f3d3ca09e79db55a579dfa361e493e1d3c4c373139cf52fb6b9b5 SHA512 792e0a5831b8c001aaafe2daff6b838826f041522775c9f6b247d4d24bace0ee46ef551af15dba0e0597694628a6fc23f07604ab24089f184a9b34eb8a64e21c WHIRLPOOL 6332099f2a2c1403e63c41c2db2cbfc6777a796d99f89ad31771eff48e16a76ac63fd0e40e5fa5b620b932d1bc9f21cf77d0eca4a2061d397e25a06f1b7567e3
 EBUILD sofia-sip-1.12.11.ebuild 913 SHA256 7ee4c99abbfc2dbb36051c139b21ad41e6a1974f152ff29124502dd027ad30bd SHA512 34d2c1511ffc252b75e0a65f85c00bfe2a0b1affefe519bcb8376cfee18b9e2b3c995db6557a4697f28ce4c7af6a006425a5ad5e1e309ba5491284e4cfdf23b6 WHIRLPOOL 74c76491e8a4493b942ccf399857b838c59885bd56fcecb08d0122d81819e8ee1ab68dec201c9bb9da5679a75cfffc6f971ddd6242bdff5484ecd4ae21b7719e
-MISC ChangeLog 3809 SHA256 019758ad4b59b22f0e04237b214baab7f0455b20a588dc4730a5c9b518df5d5f SHA512 693627d03190bf18201297005e784a1bf499570f76230d4ff0f56e27057156598e018603b2210f4c629ed8d9a65a26b2bba628e4a5d4d4825bb4313dfdbf7482 WHIRLPOOL 50dc83e06043c470990e71b176fe90216a1f08baf473e070d9ee894402069c100460cfec7608ec1015170e859494baf708aa052a02edbf4135613f1bb0045945
-MISC metadata.xml 157 SHA256 6759dc127ff53f85505b9b455ba325e65015b694b1ec50eb99ddfc8903b967bf SHA512 0de06f1d4e9ed5e244b5cb71e583902103384d9addd6991ef750f5932fc11b7c101e5de477c1a8be6661bb6b822518e4526c64f287ac1480e3b558ac816829f7 WHIRLPOOL 76f77c019f198e57f02228dfff99311370040dd582c30a2ccf3a8072a54adac434066d3a08257c635d70daab81d642943cee43386186e7e086ba9632fa6d80b9
+MISC ChangeLog 3992 SHA256 ea00cd96c8cfee7bd047095667e7ef54d9218a51bf426e0865be89ecd164a6ef SHA512 fa18cf21576019a133754260ae84cdc904d27dcf22d6544d7cebea6906dc7374541c4869f5fee17704c64943479b1620fc034efb06d83e9559aa70d51c60b7ea WHIRLPOOL f4418727ca1c9d91d59a67fe026370892cff177c55790bd12d0d79b3a1ed2e9349cb421eae9f283352ec9bf9ba65ab33112328bc3c521644569c2f527e2215dc
+MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlJs4QMACgkQCaWpQKGI+9QY5ACghvhRgiDswUUJk/u4f8RC0/Cc
+fJcAnik9EldnuYbn0SeL4bQ2qEX+13PF
+=xHkz
+-----END PGP SIGNATURE-----
diff --git a/net-libs/sofia-sip/metadata.xml b/net-libs/sofia-sip/metadata.xml
index 02207a5a38e2..da6fd63d0085 100644
--- a/net-libs/sofia-sip/metadata.xml
+++ b/net-libs/sofia-sip/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>voip</herd>
+<herd>gnome</herd>
 </pkgmetadata>
diff --git a/net-libs/sofia-sip/sofia-sip-1.12.10.ebuild b/net-libs/sofia-sip/sofia-sip-1.12.10.ebuild
deleted file mode 100644
index 10e2ad32c40d..000000000000
--- a/net-libs/sofia-sip/sofia-sip-1.12.10.ebuild
+++ /dev/null
@@ -1,30 +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/sofia-sip/sofia-sip-1.12.10.ebuild,v 1.11 2013/01/15 22:02:18 ulm Exp $
-
-DESCRIPTION="RFC3261 compliant SIP User-Agent library"
-HOMEPAGE="http://sofia-sip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+ BSD public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="ssl"
-
-RDEPEND="dev-libs/glib
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}"
-
-# tests are broken, see bugs 304607 and 330261
-RESTRICT="test"
-
-src_compile() {
-	econf $(use_with ssl openssl) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc ChangeLog COPYRIGHTS README TODO
-}
diff --git a/net-libs/telepathy-glib/ChangeLog b/net-libs/telepathy-glib/ChangeLog
index 2623158afc96..9635747e0cf8 100644
--- a/net-libs/telepathy-glib/ChangeLog
+++ b/net-libs/telepathy-glib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/telepathy-glib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/ChangeLog,v 1.139 2013/09/05 19:01:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/ChangeLog,v 1.140 2013/10/27 09:47:38 pacho Exp $
+
+  27 Oct 2013; Pacho Ramos <pacho@gentoo.org> -telepathy-glib-0.20.3.ebuild,
+  metadata.xml:
+  Cleanup due voip herd removal:
+  http://article.gmane.org/gmane.linux.gentoo.devel/88434
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> telepathy-glib-0.20.1-r1.ebuild,
   telepathy-glib-0.20.3.ebuild, telepathy-glib-0.20.4.ebuild:
diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
index 6b2616f92fa0..5c4d598605c2 100644
--- a/net-libs/telepathy-glib/Manifest
+++ b/net-libs/telepathy-glib/Manifest
@@ -2,29 +2,15 @@
 Hash: SHA256
 
 DIST telepathy-glib-0.20.1.tar.gz 3755290 SHA256 01a0343f61fbd389fed9c819751aa75914150aa567472dcb480ced7f4ed261b6 SHA512 41407a40a6dc81cef17cbc4d5c558bd90ae6db57445acbb9fad2188b04b4ba95456232b9e1565336af271db0379b295a660af845cf6d535b3518e75577496bac WHIRLPOOL 9f875102d4553bcc2aa3f78c1901bed48f5eddf38cd1558c036c84cd8ff7eea6d7a116081fb9973b0fe9f1ebbf4fe558c627eb3e8f374ab4407e6cbadac459ee
-DIST telepathy-glib-0.20.3.tar.gz 3838030 SHA256 c4ff03d7c60cb5da3b33eaafe598c51c6cb7fdac7b275353b04591f4badc69af SHA512 117af605fa65d659b30a879827caf505875811ad3b44cad06fffe02c550f4bd72445344e7b78a0d013d429ce94653fe250df51b73da6e5a171230ac1dd5abf58 WHIRLPOOL 807a31fbe8ae708a8e3fbbb37cf412df3eca3dc0e1ad88071f5cef3a972cc899571e8d5940dd7acbfdbf0c6d3037db06ec84f3c1114da62ac284072d1c95055a
 DIST telepathy-glib-0.20.4.tar.gz 3839235 SHA256 c9a307c85d412c58bc68265c4c4128a8e3ffb283bc784143f1f086faaafcb16c SHA512 608a9cb1d95843167f208cf1b3e72a18277a432627ce4ac3d545fd4b11764e2b18adaf836abf25c242a8f457ca729a00d5aaab7ab37ef316a534dc31ec76792c WHIRLPOOL 2a5a4bb14aeedfa23b9706dcefc77d821e32aaf744c6428db86aedb1c532b4b2d0258b9585c57d932499be7f80ac768674255cd2400649318e0e66783c6431a8
 EBUILD telepathy-glib-0.20.1-r1.ebuild 1481 SHA256 2f1e9b0a57cbbf148f51c7a0045824376a425059351aa3793b33c9bd17e5cb46 SHA512 f2b1a72b4a6281dd46fd3bc828560663f9462077d9b9a46a905cd7a6a618a987e069509898b4cb24fc549bfea541d72bc7192335657b4ac413397221c804372c WHIRLPOOL 235472fd2d9bf1115c82a6bf09c2262a7b4b66c011a5769898b1a29c49064d849c9559d07caefaa092a470d89072bf449712982196ceadbd48c5a28c8eca9593
-EBUILD telepathy-glib-0.20.3.ebuild 1461 SHA256 a7a3ccdc9491330e9a04c78565f30e3ddfe2e9aeeaf7a6badfa1e82407944df5 SHA512 9390101ced13d464d5ef14571300675f42c95cb0e4423910e2fb4581570bb143de9684130126dd77a11db660d78163222991664a70cf0b3d288115d60855552e WHIRLPOOL 09ab392a7f1ddb3d4909dd69c120df52fe348bb42537afd0e691c475987d39aa2eef7a85a3d3878ae26976737580e15b66fa0cd4d339c4d17d65a6cbdf7497c2
 EBUILD telepathy-glib-0.20.4.ebuild 1461 SHA256 64a5a92c73bda8a35a92fcbce0d95ab12b426d00601a25de4a1ec71e29572186 SHA512 88e0e314dabe92ccdac62184c44a2b5621f018cd31d7230f58de012bba3e5f0c61586d5427edcabb558dc5b83faebb9d35fa9263448a2455b0834df9a120f277 WHIRLPOOL ee99efe6e24f70dd77c56aa03eef9faaa8c9f5e80bfa05e76b9cd29f5de7533d5f921d6e9dc64dc0ed928a5b799e53b0464028ec24e2c41599e2aededd2fcdce
-MISC ChangeLog 21493 SHA256 b0303c4c12f13301d408455c8ae65b26d99756f206cb9438de03a4d8d26aa287 SHA512 d98f4ae6226ec37fb700d1b3f80731be546ca136996011d6996ca95e0ddd18151158b7e6a6cc633719c13c1755dcd8c52bfe472082b3e649ac0516a36b5a956e WHIRLPOOL a25c85653dc36799de94fdbd30f844cbb8a043428d3af40b56762b94f6c4e8a95d39c0d1692e9dca90a6a469afc4ce257e8f4f1db1c93f6be096c346863b083f
-MISC metadata.xml 265 SHA256 1b965d61ea883d464b6f34f9455313caaac09e6ad6b685ce5892bdfb2321d290 SHA512 f84bd9f6fe5d2d5c54352a501000ef20a458fb29e103ff40a7b8984783c98ef161fb475156422ce05a28e218aabeafae560283add7246a700ed75167389b4a35 WHIRLPOOL a7d109033be253ec99afd69b92dc528f27c955b6270678b0d851270493cfdeb1e2df23132f952c77aba3fc29f9e05ffc75e27c80ca1d3b926ad282aecfd6e27f
+MISC ChangeLog 21677 SHA256 b469f0b0b0a8d406d802d083e382b294cb7e2cf59875b3cdbab889dd767db4d7 SHA512 ab09a3a9f67729ff72c1556b161dabe1e01972cdd92ac6dc96dad8dd8305e5599cfef6c9a28d6632476bff62886a26336acadcf4f546bfcfc6e808de3d315634 WHIRLPOOL 6c2e90064e912609f3d408d0901ce7a4f1dd835c21922e4c4b7308421300c9d546ba87935ac27d31ad49394d83ad736a19194d276475592ecdf00f5973428b8f
+MISC metadata.xml 246 SHA256 4431d4d4a1e491b0bdc3bee9e375b2734009977172e2da95c02eebc64c7fe576 SHA512 eb48110bbdbc5f1aff117d79f3cf007fcfd2672ecd446b471ff1a022aa9d7d0a369adb26e8958ebbadc551683c0d4f3a80dd0657424483e6db21266ec8e1263c WHIRLPOOL 42549ca6bfdb65cea6337ec0a7b5f020863ab7be9dccfdd3ca36f89509438463a41e0eb1ec538ea50171db173c14ae464993b9b71a2efcd93a2f64a36c6cf7ae
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKNUwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOILsQALLKDsEssDmHzRFDybWYAzt8
-lQqYhExKube6qLV6ruXxpD2xxm2wYZushW+I43qNo7rkyDYynRDSLRNC9/tQrRWL
-Ur2UhWYC7HN8szaFwiQEmWjtWqKk2+dcrAR4AajwtLgs5IbjT4WQRFwx+INZjJcb
-Ctn1C8NFblTzuTfAOG5r2Vny1EN5dl6GGeZnKX8t78+dWUE+vSY4cOG14CbonAx2
-fTBEMTCUzEg/cxFt7hNVFpurULdDl/0wMlKEFWPCJErdFNr3SLgnzAU3dsU29bSx
-GI+tlQ24eJ7Q5Am30V26sBCw/PQ5QEjdkrFRGglIqSyOH2km8VpdlGD/7fwDhp0v
-72B0Z6NAHsZ+1M15WyABke6aj8DqLfnwOVtewT+ClGrBzWIH17NFLxMzYkNpAsIW
-8NNQ6HJsDptN5CwifepNhTh5tLgjwf0CyvhzjKSB+kDP26dV1uHuyvPDfUtS/dm1
-fhWkuqJtrsvpHw5STsRdu/x9c6p1POVbXv/gK0OVugZiR6MezhzWjxO3U5HYMokt
-tl0HEd89l1PsIWI32I494cHHLeo1ZvZO5ggx2GOwzQNsF8SzTZP+46xBe3riCOPZ
-Iqw+QIHodx9r/zPUzad/hcba5PoMw6eHzAKy/A44TWNd0OPGBe3Gk+CBMZJr4PZj
-DWWb6cZP5NGfqBzsf7F7
-=ouo3
+iEYEAREIAAYFAlJs4TsACgkQCaWpQKGI+9QZnwCffKtdLX0XJfY6/pPmzkKroCkw
+7lgAniyRWgY7npZhVirSo1YH8JykC2kh
+=AeF8
 -----END PGP SIGNATURE-----
diff --git a/net-libs/telepathy-glib/metadata.xml b/net-libs/telepathy-glib/metadata.xml
index f9f287c7e5ce..455620cf3c8e 100644
--- a/net-libs/telepathy-glib/metadata.xml
+++ b/net-libs/telepathy-glib/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gnome</herd>
-	<herd>voip</herd>
 	<use>
 		<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
 	</use>
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.20.3.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.20.3.ebuild
deleted file mode 100644
index 5508081c18ec..000000000000
--- a/net-libs/telepathy-glib/telepathy-glib-0.20.3.ebuild
+++ /dev/null
@@ -1,61 +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/telepathy-glib/telepathy-glib-0.20.3.ebuild,v 1.2 2013/09/05 19:01:34 mgorny Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_{6,7} )
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome2-utils python-r1 vala virtualx
-
-DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol."
-HOMEPAGE="http://telepathy.freedesktop.org"
-SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-IUSE="debug +introspection +vala"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	vala? ( introspection )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/dbus-glib-0.90
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-	${PYTHON_DEPS}
-"
-
-src_configure() {
-	python_export_best
-
-	econf \
-		--disable-static \
-		--disable-installed-tests \
-		$(use_enable debug backtrace) \
-		$(use_enable debug debug-cache) \
-		$(use_enable introspection) \
-		$(use_enable vala vala-bindings)
-}
-
-src_test() {
-	gnome2_environment_reset
-	unset DBUS_SESSION_BUS_ADDRESS
-	# Needs dbus for tests (auto-launched)
-	Xemake -j1 check
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}