drop old

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

41 files changed, 97 insertions, 1928 deletions

diff --git a/net-libs/farstream/ChangeLog b/net-libs/farstream/ChangeLog
index fbf47e3ec614..50a52c702ff0 100644
--- a/net-libs/farstream/ChangeLog
+++ b/net-libs/farstream/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/farstream
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/farstream/ChangeLog,v 1.34 2014/04/12 09:44:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/farstream/ChangeLog,v 1.35 2014/04/27 08:14:02 pacho Exp $
+
+  27 Apr 2014; Pacho Ramos <pacho@gentoo.org> -farstream-0.2.2.ebuild:
+  drop old
 
   12 Apr 2014; Pacho Ramos <pacho@gentoo.org> farstream-0.1.2-r1.ebuild:
   Fix depend to proper slot (#507332 by Grant Goodyear)
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index 15e942e457d4..ee4cd5c083e0 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -3,17 +3,15 @@ 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
 DIST farstream-0.2.3.tar.gz 1253317 SHA256 bff535949252cdfc0374cb91f08b08476e7af38183295269b579500cc6c60496 SHA512 2f584a034611c22bfaa622e043884329a6d32821fd194b55d5c92669285ee43ff1a60cde3a9f825c3a895c50fd733ff6cf85beeb7efffff053eca287e7bc9528 WHIRLPOOL b93006211c35f6275d8422472f2effe3f70e8ee9b78a7a463f1b9e6caea8736d2a14cdf151151bbd663e2b101735b4521b4e637a4dd072bb65d03f24b71a73c8
 EBUILD farstream-0.1.2-r1.ebuild 2517 SHA256 bd6472bf18121c84ec70017595b4d9d637a1b76114111b47d19b053040ca9d01 SHA512 57fd32f7e0eeccb02ffb80cfd69330ef53395cbd319536e125e0af3f52041341e5bdd9e88be0f112dd71420bb907f02e0b190b933f9d6af15a0eab49f2abaafc WHIRLPOOL 28bd9dd2d2f297df7c5bef981c88abf2c377a47c55b27c1975dcaf09a4ddd387f9d9b1000d66ce05d1a1057af63bb2ca9d4bd80b79a33753912f0bfdd98fee40
-EBUILD farstream-0.2.2.ebuild 1915 SHA256 3c8bfa2866a35e6120c7e7150fcc017529d46a9f79059cecdf2cb1baedb7e541 SHA512 c80de7849cf0fb299d749accb4075511a52f517fe4e4d64e2ebf76bd105229dd5e06b02e0152276f371dd2b75b784491a205450f595281afdfcf946f55a3448e WHIRLPOOL 7c1c1530a736f2abe6658992cc69519ea9fbfe1a66323c8e04d0e1146a4dc5a818539ce242dd6e56c42a520cc438cbaa9fe9cb613cde9309bf3093119c1eac6f
 EBUILD farstream-0.2.3.ebuild 1867 SHA256 fe8b10289ef7c7fed451eb51854f465c10cb69998651150da04533feffa8ee53 SHA512 4dc8bd4dcf78491e89fdcc5f8343d16cf0b70fca0a6907cbab0fddeb9d096b509598450dc002359bf01e702c6b9eb5c32a0a52613e9a8aa6056956ad7cde5d9d WHIRLPOOL 64fb0dda34edeaa5352eeaf8628bde707875a4e5b3d9c4b1d3e8de285e4b73f823360f824836d9bebcf7ca2289b53df71bb78e244595d55120c3cd141c5e1327
-MISC ChangeLog 4692 SHA256 33ea3c755698c288bf94ae7bb591feba892ca19c0de13e7b8bf899aef6b59289 SHA512 60b683148a98946131ec2968a8074b5a8fc5481cbedb63373fac4edc44764cf80dffae8d73a9b3c7a85b950cc749182b52f2033d1c336d0fb952b63896c7eb2b WHIRLPOOL 5357972c11adb7b698ca1cf46db271c797ebd741fb3de0969bedfe4c18a9a765d99ef08b92cfcd8dde709dd16b62521e030e99eb636d6f337ab6f98a735f75ff
+MISC ChangeLog 4775 SHA256 c084e7ef55e09a8a78a0d0b0018f39823160e6b1c3cc010599de2c2ee0fb9dfd SHA512 ebb8a8ef1aad8dd49ca997695df5e7f69b4a2dd0c7daeea368805098772720dcca79389e31d4e3a676240df0aeb3e46c18250259be1dce0314dbaf7d0d207d21 WHIRLPOOL 63dbd0e1da566d7a49befbca6c9b6fd2e89c81473e6709a9d97eb19e86891e1d2510b5f6e9b638a9d2b1dcfbce99ee0ebcaa41fe1f90b5873f43d2b597913ee8
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNJCxYACgkQCaWpQKGI+9RaQwCeORMKo+56QcTzf3egQYPVqvXr
-jiMAn1VNsNQ3OClYfnbOWluzEdl/1F0/
-=U8m/
+iEYEAREIAAYFAlNcvEsACgkQCaWpQKGI+9T9TgCfSo7U5h9NJQFsJO1Zpgls7Io0
+EB0AnjaxZE4NuzDqKf6DPmBz6lBke+Bv
+=xSjD
 -----END PGP SIGNATURE-----
diff --git a/net-libs/farstream/farstream-0.2.2.ebuild b/net-libs/farstream/farstream-0.2.2.ebuild
deleted file mode 100644
index c15421cdc0f6..000000000000
--- a/net-libs/farstream/farstream-0.2.2.ebuild
+++ /dev/null
@@ -1,71 +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/farstream/farstream-0.2.2.ebuild,v 1.10 2013/04/10 20:22:10 ago Exp $
-
-EAPI="5"
-
-# no PYTHON_DEPEND, python is purely a build-time dependency
-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 msn test upnp"
-
-SLOT="0.2"
-
-# Tests need shmsink from gst-plugins-bad, which isn't packaged
-RESTRICT="test"
-
-COMMONDEPEND="media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=dev-libs/glib-2.32:2
-	>=net-libs/libnice-0.1.3-r1
-	introspection? ( >=dev-libs/gobject-introspection-0.10.11 )
-	upnp? ( >=net-libs/gupnp-igd-0.2:= )"
-
-RDEPEND="${COMMONDEPEND}
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-bad:1.0
-	media-plugins/gst-plugins-libnice:1.0
-	msn? ( media-plugins/gst-plugins-mimic:1.0 )"
-
-DEPEND="${COMMONDEPEND}
-	=dev-lang/python-2*
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	test? (
-		media-libs/gst-plugins-base:1.0[vorbis]
-		media-libs/gst-plugins-good:1.0 )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_configure() {
-	plugins="fsrawconference,fsrtpconference,fsfunnel,fsrtcpfilter,fsvideoanyrate"
-	use msn && plugins="${plugins},fsmsnconference"
-	econf --disable-static \
-		$(use_enable introspection) \
-		$(use_enable upnp gupnp) \
-		--with-plugins=${plugins}
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}
-
-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/glib-networking/ChangeLog b/net-libs/glib-networking/ChangeLog
index 53261965fd0b..83f179bfa8a1 100644
--- a/net-libs/glib-networking/ChangeLog
+++ b/net-libs/glib-networking/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/glib-networking
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.79 2014/04/21 10:30:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.80 2014/04/27 08:15:14 pacho Exp $
+
+  27 Apr 2014; Pacho Ramos <pacho@gentoo.org> -glib-networking-2.32.3.ebuild,
+  -glib-networking-2.34.2.ebuild, -glib-networking-2.36.2.ebuild:
+  drop old
 
   21 Apr 2014; Agostino Sarubbo <ago@gentoo.org> glib-networking-2.38.2.ebuild:
   Stable for arm, wrt bug #507568
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 9a77581cc0a9..4316ff1204c0 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,30 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST glib-networking-2.32.3.tar.xz 331996 SHA256 39fe23e86a57bb7a8a67c65668394ad0fbe2d43960c1f9d68311d5d13ef1e5cf SHA512 33e29a31b0c62c8413f40d2c562c3ec0580c374a16052d174ceb703ef0c9e91145953b4377547ae2184d60d24b01c1b7694b99c94221d8d0f16d5ef7ab21f72d WHIRLPOOL 3fbc3fdd0c800483d0cefe37511f8a61dc60526b5dcd68dbeea033d5c3229f8357af16a0c32389f7462ae6f97153597784fd59fcd3eeaced5fe6d9a2f9865c8d
-DIST glib-networking-2.34.2.tar.xz 346828 SHA256 00a92ec7b31f03a2fc1eeff568c0f1664e109b3add8c7042d2d420953f49dfde SHA512 e9474e340c928adc67d777108a8cd0a001584fce433bcd27d2b52bb946bd341fade3a89b41e07759ef666d48eb3ed73bab87df0e37dfbaa71606f18b31fdee1b WHIRLPOOL 9e085df94075e11abaa0d79c34267add5221ce7c94597e58edf9ad3b3cd19dd25369e69ab0f67b43f54828433c75b3de0035d87d028895fd6ca5da5b9b252032
-DIST glib-networking-2.36.2.tar.xz 352284 SHA256 2108d55b0af3eea56ce256830bcaf1519d6337e0054ef2eff80f2c0ef0eb23f9 SHA512 077c8d821ff3942b7ddad51b4045a6a9aa05b50da58f5446ee2e536dbdffa81018141feea9e793da7b031a2991c6e4ccc66e524d288ab9e85603daa895283536 WHIRLPOOL 478e721db35a9c50bc32da71cb5ac55dd6b397544b147a1bda6b987f063f0dab615b536560169e145348dbc114363a85f4d20e487024c1f3f4075f3ce7526f8e
 DIST glib-networking-2.38.2.tar.xz 362524 SHA256 e8e2fe919d3236169c9bfaec807966ec81b844fc28b11bddc9f8256cfa949fc7 SHA512 299649fbb7df0821695b812e7d4f97ccfc8d63231fb3b9f6c8c1b0ea69d03bb1de80b1e6c7ca295837b210bca57620c9cbe2150fe1a36d9238604ad5d2412e33 WHIRLPOOL fb42e5e41245cae54ae32467896fb18d07e06e3ad2cc0bbfc00ec71c9ca8991dc277bceac43175bf5355284db1be7f5d6212abad59f29d2339af9bb1558e9897
-EBUILD glib-networking-2.32.3.ebuild 1879 SHA256 06920b6148c4b300d50d62cb35e848b319723844d2a9196cbe930c0479d26014 SHA512 7ebd5817c45b94cd8ccc63e2c54339bb5456aaeea573db63c6b8a6df5184f7a524c9b2f631c421107283fde0cc2e58f3e0deb0ce4caca91e24ba19856477b8c4 WHIRLPOOL 12bf8ccbaac62c1128e0e5d5c604f26607d3c02612e7a2ce9a7a6bc0684fd38cd6155ed1f0870d3da9af237436029f3e8cd97d4b5f79e2f9c1051b9f4051ecdf
-EBUILD glib-networking-2.34.2.ebuild 1695 SHA256 7b338d5e017cf1e809a1540f34237f6790c39cf44727e594281bcfbd6d0591d2 SHA512 7a07ef7e9a404c249dce34beef986c4fb0c9cc8a7d3e63bf72419a37f8bde31f7ff9a04130b1e697203c682dbe9ee25b5e17fef50515d19cab967580aa6fd9da WHIRLPOOL 1f584afe822b9722602b10925b73b9d41e6f168707d3bf471a70943d43360efd5e2f85c6904a8ca7423d689a2d64e7c8afe80568b33f46beb528821ab9a4c76b
-EBUILD glib-networking-2.36.2.ebuild 1718 SHA256 2ff2c9930ef13c4433dc99106cd85f6d62637eb0e1b658151e8c955777ba9651 SHA512 2d9e6abb4f5a535eb70a4dee7afa215d331461444aa678d650b93884e0adbf7d3dbec965cde321de16eb29f9f013bddbe85bbc45ce02ecacbdf133f784f85f91 WHIRLPOOL faf3c8916a97a87e603ec08aebd07df2299e1a3268b27d546f1bf88616ba71d456f9245d08eb2bef1817e6cf20b3cb1ebf37e7b7b822accfae4418ada089c70e
 EBUILD glib-networking-2.38.2.ebuild 1400 SHA256 3a60ca4730d58e481458ffe0b2984b1724c332cfd6ace505342e9ff539189293 SHA512 0354851780dd5c2859392999ebbf1c793cb1ed92a49d074517ab6ee7075738e2e153e7048e6618ab56b268093ee849bc2f7d5332b7bb1eada2bdd987dc520b16 WHIRLPOOL e44c026f92058ee6565deb479b5b47bde584abd5e936414901bd86434f508e015d096d5cefa3599ae34672016c8902ffd13d5fd6d55922abb1677aba1718299c
-MISC ChangeLog 11892 SHA256 4d73754398bf2a5dbf755c12f8f4e3496aef938ce3932917f354811f03a64f3e SHA512 9af5fabddf1b4040414adcc956fe9872dabe91cd72668386ad6cf357a7fed2902210fb114851592b91f7daace4229f29438635c901567e321121e7fd8f1fa024 WHIRLPOOL 8e99524a0e49c67d1c8401638eb64ef67d58b0a2ad291131ce06169a7a57e05ef470811a20d432e8d082f09a5532108b888b92e6167a37c9e1b82968afff0d8d
+MISC ChangeLog 12050 SHA256 554451f9fe1136f4d5c7326191add414b7272a311b68400eaaad4ebbe874d0be SHA512 43c2c7cbffff9a8f20203d8a1caa1520018cfda2056d399148a9834b0fbd26129b6b97e6dde47de2a1f8d0dc7d0b9d62f7eb6b57fe95fec4834835a0f5da4d5c WHIRLPOOL 4d795374627cc5e709b8d9585d3e5e0f01e7dabf5108f131d97f1b9fad807ff409de50b2b5ffbc5ba737b0f1db0f3e2a079589179464ddae3bbb00122eff5236
 MISC metadata.xml 395 SHA256 a55b4f7f8a8d4bffa2ec51ee271f2f9360e8bafe955871a253f32c16911a395e SHA512 302a9f2dff08e1925f57d3384875f2397f70998736d8b70f0d46f7f3abe37f6aaad192ae593395333e8f5118043a47dbdd1675dcdb4a6f84500d7d58b1e9af31 WHIRLPOOL 89498cd69c69b219da5cb20c337d2be0187e9db702c8a83b0f7ffcc6a0d1ded8a753a05dc28cd304f5098aa821be8fd8aa774b38818d370c3a56cbec01d8d6a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTVPM3AAoJELp701BxlEWf2K4P/j7W4goranDU8r3UwmDE6aJw
-wiNOTDtaIymPXzvAQI5O2DAafsS0Fbic6giJg3d/80CksdOVTxntacz5wBpCjNOx
-ZY8jvRFvKkQS7TSnufQHZBDpJDZfbT8jTaKuHdzSKxgvPtM4XuE2M6ImMxfGtW82
-j+zZWXs80nS+lKRpJOlCbAnEUbkTGVEEi3/nbIftivuSoY8M75cnqgF7j+kywAe1
-sdIN8IIZ8B3ZxJjvVayztQyp2IZqjpmrvdm0vTu0i83fRBD9BM3H1hmI3QRyF9NJ
-2s3hy5C/UI0jtmvNrx/1DADjuUovIbD2hRAyXdbOrRRcx3WrZ0z3FngNQxDk681P
-UEi5OFeDtVlxCKRVwcd1O79Dilwb2qRvbg2ZqwyeQKBdHkSfor17mgj7ljOifBaJ
-EyFTQYPgZO7IgS/fK3kt14f9PGo3UNxTEO1+WatS1TV6kMjYqkr3vz4F6EbeMfFK
-4i2far7ZwxEg8rzw/Dc+0VV2jYD0oboewKGQMYiJzxOy/011oglSEtlI1TprGYTy
-TnO2bBODPnmRLr7Sx5KlJIN475Bx6V1qsZElazYFH+Cn57KzSU50eQjHaULF+Dd3
-m+VWRAVQUL3AnTd1ptPHEKs0EdQaxwF+uLYEc1Il5lFpJgOUwXJ7dKYaCiRqnwm2
-8yPZ/PhEmYeaDj8jSkHj
-=XLkq
+iEYEAREIAAYFAlNcvJQACgkQCaWpQKGI+9Q5rgCfVy7+ssz9ogbVwbCRrqRMsNLf
+AGQAn2llMZrkCbv9zeMOu9pLtSZmy82C
+=s2sY
 -----END PGP SIGNATURE-----
diff --git a/net-libs/glib-networking/glib-networking-2.32.3.ebuild b/net-libs/glib-networking/glib-networking-2.32.3.ebuild
deleted file mode 100644
index e86673a3f3ba..000000000000
--- a/net-libs/glib-networking/glib-networking-2.32.3.ebuild
+++ /dev/null
@@ -1,67 +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/glib-networking/glib-networking-2.32.3.ebuild,v 1.10 2012/10/28 16:19:59 armin76 Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 virtualx
-
-DESCRIPTION="Network-related giomodules for glib"
-HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+gnome +libproxy smartcard +ssl test"
-
-RDEPEND=">=dev-libs/glib-2.31.6:2
-	gnome? ( gnome-base/gsettings-desktop-schemas )
-	libproxy? ( >=net-libs/libproxy-0.4.6-r3 )
-	smartcard? (
-		>=app-crypt/p11-kit-0.8
-		>=net-libs/gnutls-2.12.8[pkcs11] )
-	ssl? (
-		app-misc/ca-certificates
-		>=net-libs/gnutls-2.11.0 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	sys-devel/gettext
-	test? ( sys-apps/dbus[X] )"
-# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
-
-pkg_setup() {
-	# AUTHORS, ChangeLog are empty
-	DOCS="NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-		$(use_with gnome gnome-proxy)
-		$(use_with libproxy)
-		$(use_with smartcard pkcs11)
-		$(use_with ssl gnutls)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Drop DEPRECATED flags
-	sed -e 's:-D[A-Z_]*DISABLE_DEPRECATED *\\:\\:g' \
-		-e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
-		-i Makefile.{decl,in} \
-		proxy/gnome/Makefile.in \
-		proxy/libproxy/Makefile.in \
-		proxy/tests/Makefile.in \
-		tls/gnutls/Makefile.in \
-		tls/pkcs11/Makefile.{am,in} \
-		tls/tests/Makefile.in || die
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
-		tls/pkcs11/Makefile.{am,in} || die
-}
-
-src_test() {
-	Xemake check
-}
diff --git a/net-libs/glib-networking/glib-networking-2.34.2.ebuild b/net-libs/glib-networking/glib-networking-2.34.2.ebuild
deleted file mode 100644
index 51ea8fe6d606..000000000000
--- a/net-libs/glib-networking/glib-networking-2.34.2.ebuild
+++ /dev/null
@@ -1,59 +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/glib-networking/glib-networking-2.34.2.ebuild,v 1.6 2013/11/14 06:49:17 mattst88 Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 virtualx
-
-DESCRIPTION="Network-related giomodules for glib"
-HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE="+gnome +libproxy smartcard +ssl test"
-KEYWORDS="alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-RDEPEND=">=dev-libs/glib-2.34:2
-	gnome? ( gnome-base/gsettings-desktop-schemas )
-	libproxy? ( >=net-libs/libproxy-0.4.6-r3:= )
-	smartcard? (
-		>=app-crypt/p11-kit-0.8
-		>=net-libs/gnutls-2.12.8:=[pkcs11] )
-	ssl? (
-		app-misc/ca-certificates
-		>=net-libs/gnutls-2.11.0:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( sys-apps/dbus[X] )"
-# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
-
-src_prepare() {
-	# FIXME: new failing tests
-	sed -e '/tls.connection.simultaneous-async-rehandshake/,+1 d' \
-		-e '/tls.connection.simultaneous-sync-rehandshake/,+1 d' \
-		-i tls/tests/connection.c || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# AUTHORS, ChangeLog are empty
-	DOCS="NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-		$(use_with gnome gnome-proxy)
-		$(use_with libproxy)
-		$(use_with smartcard pkcs11)
-		$(use_with ssl gnutls)"
-	gnome2_src_configure
-}
-
-src_test() {
-	Xemake check
-}
diff --git a/net-libs/glib-networking/glib-networking-2.36.2.ebuild b/net-libs/glib-networking/glib-networking-2.36.2.ebuild
deleted file mode 100644
index 8140551a25a9..000000000000
--- a/net-libs/glib-networking/glib-networking-2.36.2.ebuild
+++ /dev/null
@@ -1,60 +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/glib-networking/glib-networking-2.36.2.ebuild,v 1.4 2013/12/22 16:16:45 jer Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 virtualx
-
-DESCRIPTION="Network-related giomodules for glib"
-HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE="+gnome +libproxy smartcard +ssl test"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.35.8:2
-	gnome? ( gnome-base/gsettings-desktop-schemas )
-	libproxy? ( >=net-libs/libproxy-0.4.6-r3:= )
-	smartcard? (
-		>=app-crypt/p11-kit-0.8
-		>=net-libs/gnutls-2.12.8:=[pkcs11] )
-	ssl? (
-		app-misc/ca-certificates
-		>=net-libs/gnutls-2.11.0:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( sys-apps/dbus[X] )
-"
-# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
-
-src_prepare() {
-	# Failing tests, upstream #695062 (will be fixed in 2.38)
-	sed -e '/tls.connection.simultaneous-async-rehandshake/,+1 d' \
-		-e '/tls.connection.simultaneous-sync-rehandshake/,+1 d' \
-		-i tls/tests/connection.c || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# AUTHORS, ChangeLog are empty
-	DOCS="NEWS README"
-	gnome2_src_configure \
-		--disable-static \
-		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
-		$(use_with gnome gnome-proxy) \
-		$(use_with libproxy) \
-		$(use_with smartcard pkcs11) \
-		$(use_with ssl gnutls)
-}
-
-src_test() {
-	Xemake check
-}
diff --git a/net-libs/gnome-online-accounts/ChangeLog b/net-libs/gnome-online-accounts/ChangeLog
index 50923619cc37..8c7b85ef1c5e 100644
--- a/net-libs/gnome-online-accounts/ChangeLog
+++ b/net-libs/gnome-online-accounts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/gnome-online-accounts
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnome-online-accounts/ChangeLog,v 1.35 2014/04/12 12:52:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnome-online-accounts/ChangeLog,v 1.36 2014/04/27 08:15:51 pacho Exp $
+
+  27 Apr 2014; Pacho Ramos <pacho@gentoo.org>
+  -gnome-online-accounts-3.10.3.ebuild:
+  drop old
 
 *gnome-online-accounts-3.10.4 (12 Apr 2014)
 
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index cdbd42e6ee76..55c566d4f46b 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA256
 
 DIST gnome-online-accounts-3.10.2.tar.xz 1267216 SHA256 0b2418c1845337b6574a12d2075d319d8aaa5bbc4b0d1d123108c5da00e11b97 SHA512 1a6a63dbeff8188062454fbda6a6009f7657041ef0264cd5c89af01ab7c965d3ae66a7b336a9e3dc9051acf67c075430802cbc64946b770048c9488b4835c151 WHIRLPOOL e558a402aba11a2cc57ff31762d1d4909ae6e17605cca92c65b7a65f26ae7492f3b08c929be66f6833ff6d29a8717264cbd2992f648901ce6f02ac7f6047c6f1
-DIST gnome-online-accounts-3.10.3.tar.xz 1333772 SHA256 09a0bb2219a6fb0cad07617c916430172e98716170b4136eaf48a322d409ad4c SHA512 0a16fb934402826bfac7e1962bc5561bab017c5d9881758870f607ddba3bc9b82386a608332c5fb3b15584b1ac917746a2e18cb4f9cf5e3664be29715bfd927c WHIRLPOOL 6b62e64ed919b9b711b3fb90010ddd9661d6d5c3609d7b2d730ad82b115b09ed1817666f5b38c939187a9d17be6d7b28ff6bbb90524f001be9a72a26e5cf9a28
 DIST gnome-online-accounts-3.10.4.tar.xz 1337188 SHA256 b963d7ed28052283d486d6bbaa4e0dd131f6ee6f6b62c83e65b01b468f065c91 SHA512 0db9e8c655fd9b1180ece6f81a82b5246ee044616c9987c1baa9b6acde1125b49700df77dd720d22421ea069427988fa77dc8e8b9c8beead674518c7724fa96e WHIRLPOOL bc1f8e4b95300f11dcbd7cfff6fd09dc12a38e831086623fd8c25d96016094977dc9c618b1b3be72d7363a3980d2a5ecffdd00e32302726d5e070f23e52281f8
 EBUILD gnome-online-accounts-3.10.2.ebuild 2162 SHA256 16d819b5621db24bc8cf3cc1eb602f19a2b112af7ee7c455bc4a0b127cdc6390 SHA512 06b51b3fcc67862bc31e7688ba6c11a06a8af093947b28cb4850a63793b3970dea6c8cfc843d56e83988fb99d140c833fa082ef55c992bfd9090978615b94bca WHIRLPOOL 553719b8ab0cacf352397566ff1c832ec69ea321e594455657603aa8b916bbbf06308448ee336bcf7fd9b5989dfe14ba4180aae1e48c0e235fac0a377aac5fe1
-EBUILD gnome-online-accounts-3.10.3.ebuild 2173 SHA256 9ab7d6709007b54900c2d3c7da07bd9644f191215e593faeb9126ea1230a56db SHA512 095f84046920d8e17ce0f932f55ad8fc11f93cf1da61992b3803fef360b77f3ac9b0a8ab74097ce472ac6ac552a1fa3018e2e8f9ff142abf7039538199d1a259 WHIRLPOOL a4e6991ad77946399742e1ab1506d4cf69637ea56e1c0fc4cc8c291a9ca4902a7fa0c0821567e6951b7ac4ae73fa4d96725071b6d759206bd5d3bb5c5e8af5f9
 EBUILD gnome-online-accounts-3.10.4.ebuild 2173 SHA256 f0660f5eefd6e07bb11b19bf0d0d2f1b086a98cf5f06713382ef905ffabda58c SHA512 5113efa23bcebdea1575c3396046cb393e4af5674a120b4be00732aa63a2b63ef912468ba3c061c762f4538ecf19a3e7ed37ac3061abe59fa19517a3717f8c89 WHIRLPOOL f4d505926778cd32ea015c09475b5782721c72ee92df024289f4c25c7d25a4d79af7c700da41272ae8f37b62756a61b9f464ce86cf8a8c0ce86d4a8a03ac7981
-MISC ChangeLog 6648 SHA256 1d873cf63643ff82b1303f75607e7d7a16baeed1a86ef1a4d314b2ed353f7160 SHA512 7f36f1667c30c3fea5e054f93ce80d13af1b13cb73e0991fa6c176aa1d005fa4cb27648395e0409f7ba85ef31ad81111b86c9bb7ee9ca728248e3eb2eaf05196 WHIRLPOOL abbd2531c2f02971500d1ed638fb10311ccc77e9a99cfddf12f4b617e6b45a415cd3b6ab8a510dfaafd1043fa4ec0018d57b3d9d913c8d8cddb7844512111ece
+MISC ChangeLog 6746 SHA256 d14f71369e9b64851b74c0c272af0548a90d1741a0b7c0d0248c53f9e8311ae4 SHA512 7198abc316e3f6363c321ce491602e2c6f5969cf6f9ddc7c5a8f3db3833595b0557bbac35b9ec91952407e47f3bf3fe25d0c9a479d610d658fe5fda205c1fac5 WHIRLPOOL 2fd6a86c099c8bd9da69beaddcb86db4dbe3c68a293f726c08b386a721a7fc5ebb8c4195197cfb32c966684dc5b64d805401374c873a7ec19e9519be9ef08d24
 MISC metadata.xml 382 SHA256 6f896cf53b7405ce97aebde94a84b4139d67c3e9f347955e926c280578f14cd1 SHA512 085dd12bf7dad134870e8abfd08afff38f151596f4f56946eb3d1b367705c5b76a915dcc131a9a0c5d6f799c7feadb8082154b6c83d8471f1a0365d51e873245 WHIRLPOOL 5a9048d954fac7975358da0933a598c67cc687b5af7ba6a853f6ffc36ebcec575e23447af1d3275a63531da6702408a0ae6c69e5f8856e78c2d903acb024434e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNJNwMACgkQCaWpQKGI+9QVoQCeNrlon8dRkkOe8/J+CaFQLcxd
-3igAnAjZLajzzslMf1fM7Ez9FOerlCVc
-=d6ty
+iEYEAREIAAYFAlNcvLgACgkQCaWpQKGI+9QrnQCcDQWMFxwkn/kR7ARWURZCzqD2
+arAAmwf5LiVCr+U4BFZ3O5V9prngLerz
+=uQSV
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.10.3.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.10.3.ebuild
deleted file mode 100644
index 649beaa7c4d7..000000000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.10.3.ebuild
+++ /dev/null
@@ -1,75 +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/gnome-online-accounts/gnome-online-accounts-3.10.3.ebuild,v 1.1 2014/03/29 18:51:40 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="GNOME framework for accessing online accounts"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-
-LICENSE="LGPL-2+"
-SLOT="0/1"
-IUSE="gnome +introspection kerberos" # telepathy"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# pango used in goaeditablelabel
-# libsoup used in goaoauthprovider
-# goa kerberos provider is incompatible with app-crypt/heimdal, see
-# https://bugzilla.gnome.org/show_bug.cgi?id=692250
-# json-glib-0.16 needed for bug #485092
-RDEPEND="
-	>=dev-libs/glib-2.35:2
-	>=app-crypt/libsecret-0.5
-	>=dev-libs/json-glib-0.16
-	dev-libs/libxml2:2
-	>=net-libs/libsoup-2.42:2.4
-	net-libs/rest:0.7
-	net-libs/telepathy-glib
-	>=net-libs/webkit-gtk-2.1.90:3
-	>=x11-libs/gtk+-3.5.1:3
-	x11-libs/pango
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
-	kerberos? (
-		app-crypt/gcr:0=
-		app-crypt/mit-krb5 )
-"
-#	telepathy? ( net-libs/telepathy-glib )
-# goa-daemon can launch gnome-control-center
-PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
-
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.3
-	>=dev-util/gdbus-codegen-2.30.0
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# Due to sub-configure
-QA_CONFIGURE_OPTIONS=".*"
-
-src_configure() {
-	# TODO: Give users a way to set the G/Y!/FB/Twitter/Windows Live secrets
-	# Twitter/Y! disabled per upstream recommendation, bug #497168
-	# telepathy optional support is really badly done, bug #494456
-	gnome2_src_configure \
-		--disable-static \
-		--disable-twitter \
-		--disable-yahoo \
-		--enable-documentation \
-		--enable-exchange \
-		--enable-facebook \
-		--enable-flickr \
-		--enable-imap-smtp \
-		--enable-owncloud \
-		--enable-telepathy \
-		$(use_enable kerberos)
-		#$(use_enable telepathy)
-	# gudev & cheese from sub-configure is overriden
-	# by top level configure, and disabled so leave it like that
-}
diff --git a/net-libs/gupnp-av/ChangeLog b/net-libs/gupnp-av/ChangeLog
index 012ac3e1108a..dd272fdc8250 100644
--- a/net-libs/gupnp-av/ChangeLog
+++ b/net-libs/gupnp-av/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/gupnp-av
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-av/ChangeLog,v 1.40 2014/03/09 12:03:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-av/ChangeLog,v 1.41 2014/04/27 08:18:55 pacho Exp $
+
+  27 Apr 2014; Pacho Ramos <pacho@gentoo.org> -gupnp-av-0.12.4.ebuild:
+  drop old
 
   09 Mar 2014; Pacho Ramos <pacho@gentoo.org> gupnp-av-0.12.5.ebuild:
   x86 stable, bug 499954
diff --git a/net-libs/gupnp-av/Manifest b/net-libs/gupnp-av/Manifest
index 19d8a935e2ac..83b63ed401a6 100644
--- a/net-libs/gupnp-av/Manifest
+++ b/net-libs/gupnp-av/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gupnp-av-0.12.4.tar.xz 345996 SHA256 548a9cef8ab3007734e20a4ce284c422ae299b7e024a4824299f6ae7e3dd7a5b SHA512 f357f7d628da0170c8eeea92256e5199a85c800ec23f33c94b9d12fbc259840fc1be58710ac09bbd6d530b60769782c5d0397b6bc3f8741893a0d7a34ea584aa WHIRLPOOL b4e92b64fbdbb79bf39714e4bbf606c20e6bb200018e9c6dddfed2a3352657fb2b616a5916b604363c98f916dd130f032f1c0d33a95b4f912f2738c697fbe6d0
 DIST gupnp-av-0.12.5.tar.xz 345900 SHA256 8375034ccc4a45e90923c26135517aab57a88f5757ce65a1b23378df4c60bff6 SHA512 5c557fd06b97c6399d32a1afa8cd4b85446812dec519d1368873ebb393543dc0ba31bd21c7f04a10cb4fd22915c0e7e781a36c5ad3acf2642fd73143a7813f45 WHIRLPOOL 7f52499a1b21f39d767b52c9dabeca322770eaa40202d4ea12f034cb51c712391753cb037b26de3537204a6b5d22231b7d2267c3f73caea6b6f3f4d8b00e0302
-EBUILD gupnp-av-0.12.4.ebuild 1110 SHA256 9ac6339a9e31ac47091d911b283f751c09ba2eb9e1ef1e1802d65b99b957a4ce SHA512 3a7f18948484453e5f24da9b30320ecdd2d69c2970d9e6851b4077a9723f7195fefe11d4372345aa4fd34e177659c8aed1841572546c6321bc144b444caf05b9 WHIRLPOOL e1226842faa010a721e4050b2fed286d228ba184880f8ca1d6d930255495f7c36bfe01ad31e179483610aa530f1538acf2e41ff2b5410e000d62e606b84253e3
 EBUILD gupnp-av-0.12.5.ebuild 1110 SHA256 99f7865461101d5e7f532dc7b886bd085765bb9cf602873c639beeb4a0a80434 SHA512 a8166dbda11865e145b4a99f1b16585fee7c970b7fb6eefc88165cc74a50a3179d2390448650b646fb8c8ffcb357784f047db6312f04a46d70cf6a58b4339b02 WHIRLPOOL f94d2576e07d2eb9b6c263d81ddb7ee8ede9a40f6f5540f1a1f020977c6b434ae4699fa30b53a615fd218052c5857c4401b4bd4789dcee85f248043f092390c3
-MISC ChangeLog 5620 SHA256 4d1ac95792481df99fb687a7f997cc7d8ffb733c8eecfa389448c25c62f5eef6 SHA512 592510486d1b1fe2a0d49ccf5340373ff3f8fd807bf5a3e0ec49d158c8d8d8e7ecfdab250ce03507211ba2dc8946581435cfb419f9cdcda6784f818efbe7f87d WHIRLPOOL 9e48f7e1fcc4f47923b581e6afa3065c4133f1749d200ec2a41ed599a74284ad2785b864a84f8d2c7693816435c305f941f7c9193bf6f7293728042ebe7b64b0
+MISC ChangeLog 5703 SHA256 e2565b9690e00749cfde52d35f7c3432835e8d8c17023f7b1fdf24bedc0873ea SHA512 2c993db62afa45ee517799b0f618ffcce7efa30777bf0c17bfc904f7fe22707c447692ed0ef2b5c0c64a209248d21f01b12050a97cc8380471cc78d080d475fc WHIRLPOOL 212fd258048f779fe8ba09b3fb3135e094a2da4e731e8942d99944a3d5f137a29deaaa0e993136bb793edb0edaca2afee62846fb9e9cad497ca7d65dfa74b155
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMcWIMACgkQCaWpQKGI+9TjbgCfZouY949l6hUC0oRnShISXsMn
-gkYAn36MXlCDDHaDRX2FCFAY3RCE/SjE
-=uQX6
+iEYEAREIAAYFAlNcvXAACgkQCaWpQKGI+9QjwwCfQ3/bSA1fo/GoiNKS/pJ9s/06
+jFgAnAyXnGbgrbgBOPOmbP2QzJr0OSzY
+=a8CL
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gupnp-av/gupnp-av-0.12.4.ebuild b/net-libs/gupnp-av/gupnp-av-0.12.4.ebuild
deleted file mode 100644
index d557df079ab1..000000000000
--- a/net-libs/gupnp-av/gupnp-av-0.12.4.ebuild
+++ /dev/null
@@ -1,44 +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/gupnp-av/gupnp-av-0.12.4.ebuild,v 1.3 2013/12/08 19:23:56 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome2 vala
-
-DESCRIPTION="Utility library aiming to ease the handling UPnP A/V profiles"
-HOMEPAGE="http://gupnp.org/"
-
-LICENSE="LGPL-2"
-SLOT="0/2" # subslot: soname version
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.16:2
-	>=net-libs/gssdp-0.9.2[introspection?]
-	>=net-libs/libsoup-2.28.2:2.4[introspection?]
-	dev-libs/libxml2
-	>=net-libs/gupnp-0.19[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	!net-libs/gupnp-vala
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.10
-	virtual/pkgconfig
-	introspection? ( $(vala_depend) )
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	use introspection && vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		--disable-static
-}
diff --git a/net-libs/libdmapsharing/ChangeLog b/net-libs/libdmapsharing/ChangeLog
index f0bada5c80d8..0f068eb8524e 100644
--- a/net-libs/libdmapsharing/ChangeLog
+++ b/net-libs/libdmapsharing/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libdmapsharing
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libdmapsharing/ChangeLog,v 1.21 2014/02/10 03:33:48 moult Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libdmapsharing/ChangeLog,v 1.22 2014/04/27 08:22:59 pacho Exp $
+
+  27 Apr 2014; Pacho Ramos <pacho@gentoo.org> -libdmapsharing-2.9.15.ebuild,
+  -libdmapsharing-2.9.17.ebuild:
+  drop old
 
   10 Feb 2014; Dion Moult <moult@gentoo.org> -libdmapsharing-2.1.13.ebuild:
   Remove net-libs/libdmapsharing:2.2 - see bug #488144
diff --git a/net-libs/libdmapsharing/Manifest b/net-libs/libdmapsharing/Manifest
index ad32c776ac1f..88f6715bc4cb 100644
--- a/net-libs/libdmapsharing/Manifest
+++ b/net-libs/libdmapsharing/Manifest
@@ -1,11 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX libdmapsharing-2.1.13-build-order.patch 616 SHA256 aefbc59129acaff39204a68be61a9d85fa11199a176cdbb4a8158d14d18c6db3 SHA512 5ef0f40188c8d42983699d28e278239004c96d64f5961146b2ab814d37a3137dc06200d5b354ebb624ff7c49e06cbf2fa9764e39f3cca51a8b4abb9d7494ea19 WHIRLPOOL cc4ccda01b55326cc81e790a38b2bbdecab0cfec7f93352dcb1e572921246d6ad9675361b0c2abbe5ae0ee991bd6f04538a64ac972669f933a39b8d8935c6ed4
 AUX libdmapsharing-2.1.13-glib-2.31.patch 744 SHA256 f7d5ae0c4d7376c792c5d03d282defe427b2ecb52a5c21b9294add9915bbf414 SHA512 708f8f8439594d29d95cfe235118405caa1d02282d20ea5889d01a2cebaa445955d58d53231e8ad8f31eb501466764dbce23303abac18a7fd45ed78913b78301 WHIRLPOOL 76a08821335a933e0ba35ac4bbbc56c83f8894008fb49bf57f9ad25c0bfce13fccb55a5b83d14d804b6ea8fa6f70755c41dc81c615d16dd561739e1c5e5958b1
 AUX libdmapsharing-2.1.13-slotability-fix.patch 3698 SHA256 3c0de833f78e932c4f89567ed14ff3ea07fd784abb5e4cb0bda6d5af9bbc55b5 SHA512 2eb517f5a91aceaf23710c6cc1eb52fd3a70ec30c0543b633034b01b828c07f3fbe75b49debcc630d3ba8de43b86de38f03be5e303d470e2d67041262bf9b058 WHIRLPOOL 26959c7039f7e4c4cd738a85ac9efa8c074260e950721097136d7cfdf36c8c24c8eed52718b2bd2dfd50eb2af561753f5da3e6728eabf3d5b699a36cee029505
-DIST libdmapsharing-2.9.15.tar.gz 708500 SHA256 3f9ba35058fe7c8df06a893807a455e5328c11ebaee58019373f9310cc3930fa SHA512 95790149e3a8bf177f6b1701eb6a44339b96997ac6e957a7ce404878ebe71d2124f57367dc9e5b8a0cbe1ff5cc1dc59713eb133adc0d4624fc083a30fc2a60c5 WHIRLPOOL 748f3112b998f82d841825e47a468bc7f453c7a5ab360d5fe24a78827008affede728cfbdfc5afc136ca6161562c49c308e03ec6bad1c84f32801b3f0cf89a43
-DIST libdmapsharing-2.9.17.tar.gz 714775 SHA256 d00fce10ae6b11a992a67341ad174b2ff56bad3da24b8b5b6486f6718a49eb78 SHA512 67cfa8465053a994268b0a79f1f1d103a51a451f5277bbcb41c43f008c5cbb778a75737b61d4f51fee30f97bcb22c394da06376993dd787595d87539ad335710 WHIRLPOOL 94c1282eb6d416ab0c8118561ba7b20ae0caa80b1035645b74b28dd07cc410cb66aa9944a84db60be7f7be411f14e846c52e82b821f69cb159f3a268fe2187b2
 DIST libdmapsharing-2.9.23.tar.gz 728237 SHA256 b2410f8c3bb5fb4c92da99fcfe16bccc407840ef44914d8179cf74d4d24f9b90 SHA512 6111569f54d565c89a68733643a9160b71daf2974d8a042ac43959489b986e7e4e3bbd2b52dad920b00d5ce7d8e68f8df1de78d93254cf77e76b49b6242fa408 WHIRLPOOL c3a5cb3a2a25076b5ad07427f67a638f3d12e402084c49509acf7ccf55829539938cedeabf5fe6b3a65950080daad979d376ca7475974581a24c64c0bce68b85
-EBUILD libdmapsharing-2.9.15.ebuild 1273 SHA256 a4cf4f76331008ba05b6be01641fe0d5cc0c6473076dfeb819907dcc5b330e1c SHA512 edb33d2de2b743e1ed97d3274b76b9d85454a9c00370e02b842f5e625cb9bd1c5488c2959a12859188cb7456ffd6404304ae4ba6153c07e3226354ff6a759f57 WHIRLPOOL b2515a414813fb4d15e8eade8a7a4c150ac908a319c33a33b039647b040e85597554a3465a7d71e102887000bead6d5c5da1c9872fe8580b87a8d5991fe4db1b
-EBUILD libdmapsharing-2.9.17.ebuild 1225 SHA256 d36d344a52312fa8d9632825697afcd1c0ebc9d3bb44c5775f6d214081e3d3ba SHA512 a772f07729eb65a0caba0ec9ce563ba7ba989baa2aaa92f48ec050643510e201560e096f4c2a2cb98f919c7331e42dbf926c4fa421b69e17351eba0a7f04e371 WHIRLPOOL 7468d2804d1ce690a3d3f5aa7ac4df5f6b8ca37a5ee2862b4de2f561a43148c18a03d38fe15d9a2a8d513c30fe54af7574875130bf80436f24dbbbd518f44e08
 EBUILD libdmapsharing-2.9.23.ebuild 1236 SHA256 08791932b27613416930912e23dbba079bb4a8884fcce4fa04c50be292a097e9 SHA512 32343971ffeb8e632294cffa37a43ff8a748f67782b90f143d24c2842a0c101d1de42cd6d4767ce2b988bc3269696ae7a2bb2d1cee3b50fec1bb70a6056b5ef1 WHIRLPOOL fe823d023b6ffcfb109061ec00aa332369405e41d44a03f84b7b34dfd70e29f6d207f475abaee191d5f21e7c68319e1cb7851718f7e2b12dcff581efaaafb9fe
-MISC ChangeLog 3420 SHA256 619dd7d59d46e58d5ccec274836bf9f2b5dd2d2716fadd6cfdffa3f58c8a68ef SHA512 c54b6429f66274e7456ccc4952f81fc81ff62bf13e6a1aa27fc6f4870692a4aaa41594d232ca1e1664798dbdb1c47e46ceed7fea140ddfea127ffab303fd1dd9 WHIRLPOOL e9266a3c4d942054d91d0c9b0492571b46c4184f414ffb74a61acefee69f0a8e0e7b4979ff72f4834a6be0851a4d2f7441860d7010b277e86407d80d8dc232b3
+MISC ChangeLog 3542 SHA256 62218b601045dbe7c43269ecd8f9f1b974164239b9623b4d3eea3045ba819a5f SHA512 61f18a600a316dc1a1f9c5c6e3fd2a52416c0128ae5293030b9c059c77d2adc28b0ba36c9b6b175c876c79b94ab585e82336cabbd366f26125877e1936c23f3e WHIRLPOOL 62cbc71798f02ac70910e04a5d71738d0f761e7cec81720d0e574089dcc0ad0690abe545f8c5841e92c463ce43f5e6bd0b32f6fb5824729d5a6c045f06fdc1e2
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlNcvmQACgkQCaWpQKGI+9SZMACfaJ2vNwVuY0eaBn3BcJGYr0yA
+BjgAmgLUnS8duqi9a/fdb/nl3NTFE0PF
+=2ZGy
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libdmapsharing/libdmapsharing-2.9.15.ebuild b/net-libs/libdmapsharing/libdmapsharing-2.9.15.ebuild
deleted file mode 100644
index 5e05f1ac3753..000000000000
--- a/net-libs/libdmapsharing/libdmapsharing-2.9.15.ebuild
+++ /dev/null
@@ -1,51 +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.15.ebuild,v 1.10 2013/02/02 23:03:59 ago Exp $
-
-EAPI="4"
-
-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
-	x11-libs/gdk-pixbuf:2
-
-	>=net-dns/avahi-0.6
-	>=net-libs/libsoup-2.32:2.4
-	>=media-libs/gstreamer-0.10:0.10
-	>=media-libs/gst-plugins-base-0.10.24:0.10
-
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	# Fix documentation sloting
-	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
-	find "${ED}" -name "*.la" -delete || die "la file removal failed"
-}
diff --git a/net-libs/libdmapsharing/libdmapsharing-2.9.17.ebuild b/net-libs/libdmapsharing/libdmapsharing-2.9.17.ebuild
deleted file mode 100644
index c385b2027518..000000000000
--- a/net-libs/libdmapsharing/libdmapsharing-2.9.17.ebuild
+++ /dev/null
@@ -1,52 +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.17.ebuild,v 1.1 2013/04/22 18:24:14 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
-	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/libsocialweb/ChangeLog b/net-libs/libsocialweb/ChangeLog
index 5fa0c986da09..f5b1c3cff3c7 100644
--- a/net-libs/libsocialweb/ChangeLog
+++ b/net-libs/libsocialweb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/libsocialweb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsocialweb/ChangeLog,v 1.28 2014/03/09 12:03:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsocialweb/ChangeLog,v 1.29 2014/04/27 08:23:47 pacho Exp $
+
+  27 Apr 2014; Pacho Ramos <pacho@gentoo.org> -libsocialweb-0.25.21.ebuild:
+  drop old
 
   09 Mar 2014; Pacho Ramos <pacho@gentoo.org> libsocialweb-0.25.21-r1.ebuild:
   x86 stable, bug 499954
diff --git a/net-libs/libsocialweb/Manifest b/net-libs/libsocialweb/Manifest
index c8988d878f85..2d8eb046c3bb 100644
--- a/net-libs/libsocialweb/Manifest
+++ b/net-libs/libsocialweb/Manifest
@@ -6,13 +6,12 @@ AUX libsocialweb-0.25.20-introspection-annotations.patch 3152 SHA256 fec8d2c67c6
 AUX libsocialweb-0.25.21-gmodule.patch 1824 SHA256 2f3dd7ddcd3daf807b17f18f0ac24130b513be0e09c05b20959c111923b1e6cb SHA512 99505faa240a415f2c275671f557dbf0bb3be88854ccd7631a7c1ab82b2d097178bef39d8a633a92894a7ea849c0ccf3f96bcac58de5db26224b940de3395c21 WHIRLPOOL d8f555923da6bb5a762a045a8f43f1cfc1e31c3364582c5f40808167171465abca8c39597d4e2298b5c0ea3e4a75569e431860ae0771c7a8967632713a2b99c5
 DIST libsocialweb-0.25.21.tar.xz 472152 SHA256 f676567640cede66b6ff62f440c968943c2f3a164dd5f26155b6154ab93bf687 SHA512 8ee8885d02327c685397f5df899ce807400e94b7e5d80f7d00ad43955f765ca6c12ac077cc0a10d9fc9d601feaf8fa609a71daa6779f8b1dd1969916afe829dd WHIRLPOOL f1b7c588a89526f6bfdc79a68e4b54f78f5899715fb0eab26fea70d1fad79a236ce71b9b207bb9559276f4c87186f77fbd58d6425acb5528b130028210376792
 EBUILD libsocialweb-0.25.21-r1.ebuild 2469 SHA256 44387dcb60d581f024c1166caa65c918eec0395d86312c4f3e91f2a2e211f803 SHA512 79b7c53a59b588def81fc8026a1cac67f0ccb0477141634e9d1a0193d50d75f61d4f096902e403f9a61ea871dd1cd1e2540b0b6920258185772511594ee7fda1 WHIRLPOOL 71f0c9ca076a41ad1c370ec321087d9cb842910545ec8a407761890c768f079e1d3ff168a14fb49d69fd1bc793540e83c2378057a4dadf6bc4958def4d7d5659
-EBUILD libsocialweb-0.25.21.ebuild 2390 SHA256 2d6ad3f133b543a1a4f85c1a1cc9babd07120bcc4479b792921bdd283bf4decb SHA512 84a2fbb2e77ac422b3ef43533c9081c410b937a2d3d80551ffff79eef27b2d3fa6efe132819b74b47f9fa4903e96c25e4d06265aa2edbd274066832ccbe48245 WHIRLPOOL 2fa170bdc580edf504cbc563c1193071c5f79f67abd9dc69c332872a5769d7f967764dacf5f90e9cb24942a33383b8d6282f92e08428e92cf4d23959dd6605c7
-MISC ChangeLog 4560 SHA256 9b8db80fbd9d6c3aa58b9a3d061ecb02c94d7924fa11c62269b7c5f5e3f7e7ef SHA512 9df231b0e0e98436df19f96c5841d7f698e9d1c3c6b98759e66213b5bc833846505171341955bb30198cb457f7088d75447616ad6d5f422434bfe91515dc0277 WHIRLPOOL 577b3093b6e9d2dbe2fbb4e685f511704c2b7a09e31a7f35eb481fe873a75766e2b1c3807d1627da4d5774f323658049ef865f426e34dc0e41f25553c7aab789
+MISC ChangeLog 4648 SHA256 b3d9f030f9e043bb29ba78af6421af81bbd6e0eda9ffc058e014ca29c92aa6f4 SHA512 9fc58b401371de51f0a17fe45a542e4afb16af2658d03791375a7e1717daa54c29308d6f3f68db94801b7caa4452658bdc8c1d8083f902e8adfb36aba75cbfe5 WHIRLPOOL cf5ba169a1ec7e694ac9f48d2302f0fcb85ebf0944b06fb2319a64e69649bc4977adb8e7472d69dadee9cec9f2a80d7d38f39d70be2ac1cb56da7e3972666b48
 MISC metadata.xml 379 SHA256 6c8b7139e8abc93278d75475abaddd7b01b2fd55eb3642a91b229d03950a2e60 SHA512 289ae686f025215e0a2f18211a9ca3b9a998210fcf6550ef0d82fe0817e4ea2d2269354ad7b68d541f85381ba68f6e69b87d001550f7e67c3a8dadd65e88c543 WHIRLPOOL 25d7248b85a15b5e823fde1d2c07b82bfce9ca44f494b3221e08060238c6e4663a0ee3b6b897b952ce84d94e17eb670f6d8eb2bddae31768267a8e224150f134
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMcWIsACgkQCaWpQKGI+9TuLwCeKxNLdlHbVHKvJgCTGljAl/Ps
-niQAn2YeD+tUAC3zB9MIW+/AjoazwtvA
-=Vhl2
+iEYEAREIAAYFAlNcvpQACgkQCaWpQKGI+9RCUQCggXh8C4uTuJs0whSzevOG+vgt
+zrcAn2y27eqRSLhXwmuonvfK+35l7IAp
+=5P+j
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsocialweb/libsocialweb-0.25.21.ebuild b/net-libs/libsocialweb/libsocialweb-0.25.21.ebuild
deleted file mode 100644
index 8d275709b07c..000000000000
--- a/net-libs/libsocialweb/libsocialweb-0.25.21.ebuild
+++ /dev/null
@@ -1,85 +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/libsocialweb/libsocialweb-0.25.21.ebuild,v 1.11 2014/01/22 21:35:47 eva Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2"
-VALA_MIN_API_VERSION="0.12"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils gnome2 python vala
-
-DESCRIPTION="Social web services integration framework"
-HOMEPAGE="http://git.gnome.org/browse/libsocialweb"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="connman +gnome +introspection +networkmanager vala"
-
-# NOTE: coverage testing should not be enabled
-RDEPEND=">=dev-libs/glib-2.14:2
-	>=net-libs/rest-0.7.10
-
-	gnome-base/gconf:2
-	gnome-base/libgnome-keyring
-	dev-libs/dbus-glib
-	dev-libs/json-glib
-	net-libs/libsoup:2.4
-
-	gnome? ( >=net-libs/libsoup-gnome-2.25.1:2.4 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-	networkmanager? ( net-misc/networkmanager )
-	!networkmanager? ( connman? ( net-misc/connman ) )"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.15
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-
-# Introspection is needed for vala bindings
-REQUIRED_USE="vala? ( introspection )"
-
-pkg_setup() {
-	# TODO: enable sys-apps/keyutils support (--without-kernel-keyring)
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-gcov
-		--without-kernel-keyring
-		--enable-all-services
-		$(use_enable introspection)
-		$(use_enable vala vala-bindings)
-		$(use_with gnome)
-		--with-online=always"
-
-	# NetworkManager always overrides connman support
-	use connman && G2CONF="${G2CONF} --with-online=connman"
-	use networkmanager && G2CONF="${G2CONF} --with-online=networkmanager"
-
-	DOCS="AUTHORS README TODO"
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Sent upstream, gnome bug 677445
-	epatch "${FILESDIR}"/${PN}-0.25.20-gold.patch
-	# https://bugzilla.gnome.org/show_bug.cgi?id=686503
-	epatch "${FILESDIR}"/${PN}-0.25.21-gmodule.patch
-
-	# Fix namespacing of introspection annotations, bug #426984
-	epatch "${FILESDIR}"/${PN}-0.25.20-introspection-annotations.patch
-
-	eautoreconf
-
-	gnome2_src_prepare
-	use vala && vala_src_prepare
-
-	# Fix python shebang (FIXME: should be in utils-r1)
-	sed -e "/^#!/ s/python/${PYTHON}/" \
-		-i  "${S}/tools/glib-ginterface-gen.py" || die
-}
diff --git a/net-libs/libsoup-gnome/ChangeLog b/net-libs/libsoup-gnome/ChangeLog
index 6f5b6847bd5c..78ff504180e7 100644
--- a/net-libs/libsoup-gnome/ChangeLog
+++ b/net-libs/libsoup-gnome/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libsoup-gnome
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.105 2014/04/21 10:30:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.106 2014/04/27 08:25:17 pacho Exp $
+
+  27 Apr 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/libsoup-gnome-2.38.0-system-lib.patch,
+  -files/libsoup-gnome-2.40.2-system-lib.patch,
+  -files/libsoup-gnome-2.42.2-system-lib.patch, -libsoup-gnome-2.38.1.ebuild,
+  -libsoup-gnome-2.40.3.ebuild, -libsoup-gnome-2.42.3.1.ebuild:
+  drop old
 
   21 Apr 2014; Agostino Sarubbo <ago@gentoo.org> libsoup-gnome-2.44.2.ebuild:
   Stable for arm, wrt bug #507568
diff --git a/net-libs/libsoup-gnome/Manifest b/net-libs/libsoup-gnome/Manifest
index d74e24e4486d..3d7f38c83064 100644
--- a/net-libs/libsoup-gnome/Manifest
+++ b/net-libs/libsoup-gnome/Manifest
@@ -1,34 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libsoup-gnome-2.38.0-system-lib.patch 6632 SHA256 6693f3976025c07d5ddfb5c27ebd46df5c92491691fdab7d07d47f1058ac696e SHA512 2434a6515bff745dc615d5a80f3c8c6f555ce55f0bd1748538d4571a97f973e811693aa2b8352f47c40ff6b14374a7a2b8b42b7fb6cb3c117a88353c66105399 WHIRLPOOL a95f9c1699407cbd8c5451e511bab75e8dda8d986cf3960726c30f40c4e76d13990a6e9ceb9a49180c5d02e8973f16993ce01ba46a24cab6a1dba2b0c17f5398
-AUX libsoup-gnome-2.40.2-system-lib.patch 7054 SHA256 6ca82717df71123e0a02405f5a6ad2e5f0eb7c544b4857017d4ab942c0359e96 SHA512 7a7736b46144abf05674aa9050bde932b2b62dd1fc8895758d4d7969455c38c9a26d7ce40b58d19c7053fce2841399fd5088b71bc69012ce554ab30ee576a7a4 WHIRLPOOL 15f8fa8cce1c85f3431320c46bcdbe7127c047868fd012a3ddb1b5f0713c568f4658cd5cfd15d0a6f9892b227b1a075ef5c78b4a648ab8ed4696f63f83556a5a
-AUX libsoup-gnome-2.42.2-system-lib.patch 7088 SHA256 b4a78508fb00a4afc14f682c4d1e1555e1266a46c8360f4935d03ce1aaacc01d SHA512 1e7124aa0ff16e8c183ecfdf8f004e4806050421e43b8a8df492302f00e7e7e3c0b3b3b9343712a51f87fa2113c2dfa38b157f69ea6fb6d2ba8e4186893a8e47 WHIRLPOOL 5b0827b1084fef67f5129e0d74f71ea92e0d129e224feaff22b5ebc936f48c17ee6d42803de25d88eb182d3435eeb8051dfe73f3ef97034f1bee29a65d6f0951
 AUX libsoup-gnome-2.44.2-system-lib.patch 7077 SHA256 bcd0fab809dafdc4492bc629c68c63427339870b9562c5c124cf5485bd946769 SHA512 508e9c358e2f84415a7c3f2a778be9cc25e3af0568d9883a1712106fbec68b1f78040e4abc711c49c92d2397732028bece0ddd5c6a6f47c6104afbfd8dbc52ea WHIRLPOOL 8c6651d42d39e94d16dc016ed4ed633cc69c6da4ea4652641dfadf8ef7c8ba69c4a65ffa862a5e7e997c725d7805b48c048d2b312ffe6458e40168379a3fc386
-DIST libsoup-2.38.1.tar.xz 620832 SHA256 71b8923fc7a5fef9abc5420f7f3d666fdb589f43a8c50892d584d58b3c513f9a SHA512 57d4327abb59bee0def4fe8419fbb63e3112255a12792405329a25fafa4e8cf2a531a3eade13304adbd27cd94c9a8e6bd25d7f83674978f351ea62de27222127 WHIRLPOOL 38e19a1060270d76685ca3a99a93d441acf8775621f022b6a1a475701848f839189bf868a08736bfec6160fda64f2dd4f6ac1fef8f2ffea98c9f554a506e2e8f
-DIST libsoup-2.40.3.tar.xz 709124 SHA256 82c92f1f6f4cbfd501df783ed87e7de9410b4a12a3bb0b19c64722e185d2bbc9 SHA512 2452e918b09206abdc5418b383b4c1d84fda8bffb09eef2a2d6b0c9cb13e625a50fc2ba07b2f6175f886bf906df80f85c47075cf72ead74532c1c656f6126632 WHIRLPOOL 0dac1a330d2e4195ad00efe7324cdde8092d7ffbce7e65aaa9cf86c74b4629bb8be4027b00efae2455add9956c0e433d92aa33edee9f056869c2f6b8fd951b45
-DIST libsoup-2.42.3.1.tar.xz 740164 SHA256 97a6be94daabd21fcfba7bde4939c44d0f260bb123d7e260fb71551458da6651 SHA512 3d4dabc989f02b11b4f1f4994b0dab2fc069b4997f59bf90e43062fcda1e3b6741b7f25ac5460004916ba7101c853dd2a44345a1d7caaefc6d867ffaa5494f6b WHIRLPOOL 21cd761c98f6176263cf605e6958eea373848b51aedbc21c7528ee4710a0bfa4fdbcac8ee63b46b8f7c9f8b0f858aaadf4b9bcba5f030ba2e52ead3f4164fe0d
 DIST libsoup-2.44.2.tar.xz 748592 SHA256 e7e4b5ab74a6c00fc267c9f5963852d28759ad3154dab6388e2d6e1962d598f3 SHA512 f24c318d11aaf0f98d05a673ab87e17da391f1da9d22c63d32532304473ac77a9cc324978346a42a9a21165abd182c11122a33dd7e5d81c8953ba4b0b8e5ae30 WHIRLPOOL 87f201adf26caca64002943e788cf80b07d0fd95b1917a34b90188ae3f0c514cdf41cd1f1e928b0c1083ec7f89a19d031bef014d02fb4f1d9e399c159e2eec1d
-EBUILD libsoup-gnome-2.38.1.ebuild 1532 SHA256 aa1c7dc6a9082805f5e30e375b4464145440de66df8c0bfa6536ee537f290e31 SHA512 21b0b0f77b04c25b60bd9e8b4d951b548cc0f2f404e72976344a202468b6572ff0594aff9e195e0c821ca581cca17d351f756ddd56957f141ca9c6b12074e489 WHIRLPOOL b05a4b022e85a2af2110e180181e5858d288d0f6fda365d335673936426d03b20d9944dc90418518230b6dd208a948b476b62b4e7f05632e045b59def2ca43ff
-EBUILD libsoup-gnome-2.40.3.ebuild 1556 SHA256 7eaa4d6ee180074452840c5e0a8971bdd6d3d822bc45265b8b84afb3be675efd SHA512 1985f1099cfaad638e6a28f702ca922d81ca05b94f555b41f0fa1634e8098d39023b7cffa63e7181b01c2cdcf91fb5a8d462c5c9adce55aa4fa732cbad4105b8 WHIRLPOOL 64b1a5d9266f8359d511e6c31d51fffb0639d1329aba756abc146860b9cf47979cd5d8ebf4d8a390b2eb0ff5f473acc72f6b4813185213f2b1735f0e6797a41b
-EBUILD libsoup-gnome-2.42.3.1.ebuild 1522 SHA256 ca595a117faac6d10b4bfbb886dbc75bece96625ae37362a6f802bfb5e38618e SHA512 1f2afe8058ac1d7930991cccbe299227717ae5fb57d7b5cdb19d5967d76e56bca60dfd5557fe789cbdd48bb14c28b8ad2dadcd269084b99acbb034ea00064c4b WHIRLPOOL 65675a37367147a98ebd1e827bf20f790f12df52ccdf66f10ea18133544de63fe9ef9300fd817fab9b36b4c16108687e837efa8b9774b2c1a03912bc075baf39
 EBUILD libsoup-gnome-2.44.2.ebuild 1485 SHA256 2fa1e95ac84587505446661572e6e92a2ba2bf16adfa31e292bdbe99ea403ab5 SHA512 f15eed8a8b33b9a703c483723dadab1e54fffc08cacc552c6117cfb71cc842327604152ce7284720c155fca6311440b1975f9d3b975d3f3b00d34f3779e73824 WHIRLPOOL 4d5410fe4bf43b162f12e45d0a57b86d606de973c9ce5c349769a38df97a67567af09504f4448e05c6146bef74f44ec69ca89abe151fdbff5ef0c574b244aee5
-MISC ChangeLog 16303 SHA256 846c10bff3283c96988eac3627da0d30d1c842ffb985c4edd3504045ca182584 SHA512 a5c3824c2ce3798b8543089dc0772252d6f34300f0564e858bfe21525ec4b72fec3132f0a6c70941d734c259e0241ee1c9a02cc3e46d58f7dd10ab1b597de2da WHIRLPOOL eee581cc6d528f3702937519586ec76416d11dc0abf71dd76492c7f460777dc39c5193cc444889f4b9024b53e8eb462402dd238ec004d87a7ca8b4b529e1b770
+MISC ChangeLog 16601 SHA256 5501dcf1e10c1ab2b919ec6ec58168e5f4195e1b52c05584422056908636daec SHA512 52350162da154978ed0f3f56c4aaf5c7004094ba0ffd413a3a9d9568f1b0f9a197623addfac124959448b691e35e9b0623e9b10d46d0536e0093aa4ef3ebaa19 WHIRLPOOL a7e4da2d7c885c7d7db73ef234e881e7dda22b61a98c4fbb46b1d523eb0f9928596d9e81dfab32f17d0f40ed6243daca2554a244076a715952e5a0cace0c1651
 MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTVPM7AAoJELp701BxlEWfqbAQAJc8T/G+3GRW/HN1M8M94DPj
-8Fj9USEl/TGDrJI0XcF7qgZhvMPS1fHjrR1dZvo51lxWLl8gBa1dU9J+DacieGBT
-3GG8f61KX1LBb+n9XvE5ao7UlPhbhJytmcVSZ5FIKuj5igQt4Q/5tmN27HC34ZP4
-q52FtA/UQYo9kVD5mx+LAKIDORDwOnYLVSzhqNGy8hG8ZRafghSlcSGmPi/9VP6A
-jssCa024UyLEtWr+sGqRZsafdhPquxc+jTOQS4Jq2sIOI3eVFlP4o0xSqfC4AdRN
-qN72IaNE+f9pFaVvQh/H0saMHm8QZNqVyT32QewOWIp60eeGuuVkrD+eJATxdtUF
-3C7KQChmN/mHDa6TXJsRF7YTMtVY2CFQcmK6aJ8STJtHrfNU0wa3VjIgDYpROeTZ
-NfedLhkbktVeJcJuzNSuXuiMGvKa4yf7M5Rsfgb79sanggatLJek/1pFs2v+Inat
-FP8H4PR0meE6Us9iZFrWHgZIpy9EjKjGaT0h54KgEplEl3ay7K2rWs9aFvCPqBMR
-otH3aQYfjExOS2Liy2TphpCYS/wgX+A4hI5hzMN+or24/4QIU3G2mY9BdrZugh7V
-KDF2auc1QLf66uFZGM/oQDpisBSr8e5NIENd1A/GzDIOp0I2hPns5luG2bup7QOD
-Vrdl8KWwv9Ru/XumkO/w
-=wVlQ
+iEYEAREIAAYFAlNcvu4ACgkQCaWpQKGI+9TAfwCdFLPJFB6BP2aghzF6MJ7SKroT
+ZpoAnieyM6iamVL41z+0jHeAWGyfKh8a
+=Xof3
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.38.0-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.38.0-system-lib.patch
deleted file mode 100644
index 0c6259a3bf1d..000000000000
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.38.0-system-lib.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-From b39aaca2ec6c551d7646bcb086afb8083492938b Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Tue, 20 Dec 2011 15:42:44 +0200
-Subject: [PATCH] Split support for libsoup-gnome
-
-Original patch by Romain Perier.
----
- Makefile.am         |   12 ++++++++++--
- configure.ac        |   47 +++++++++++++++++++++++++++++------------------
- libsoup/Makefile.am |   48 ++++++++++++++++++++++++++++++++++++++----------
- 3 files changed, 77 insertions(+), 30 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 8b86fb7..7f628f4 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,11 @@
- ## Process this file with automake to produce Makefile.in
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- 
--SUBDIRS = libsoup tests docs
-+SUBDIRS = libsoup
-+
-+if BUILD_LIBSOUP
-+SUBDIRS += tests docs
-+endif
- 
- EXTRA_DIST =			\
- 	libsoup-2.4.pc.in	\
-@@ -15,7 +19,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
- 
- pkgconfigdir = $(libdir)/pkgconfig
- 
--pkgconfig_DATA = libsoup-2.4.pc
-+pkgconfig_DATA =
-+
-+if BUILD_LIBSOUP
-+pkgconfig_DATA += libsoup-2.4.pc
-+endif
- 
- if BUILD_LIBSOUP_GNOME
- pkgconfig_DATA += libsoup-gnome-2.4.pc
-diff --git a/configure.ac b/configure.ac
-index eee8636..f9d6e47 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -72,19 +72,33 @@ dnl ***********************
- dnl *** Checks for glib ***
- dnl ***********************
- 
--GLIB_REQUIRED=2.31.7
--AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
--if test "$GLIB_LIBS" = ""; then
--   AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
-+PKG_PROG_PKG_CONFIG
-+AC_ARG_WITH(libsoup-system,
-+   AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]),
-+   [with_libsoup_system=$withval], [with_libsoup_system=no])
-+if test "$with_libsoup_system" = "no"; then
-+	GLIB_REQUIRED=2.31.7
-+	AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
-+	if test "$GLIB_LIBS" = ""; then
-+	   AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
-+	fi
-+	GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
-+	GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
-+	AC_SUBST(GLIB_MAKEFILE)
-+
-+	PKG_CHECK_MODULES(XML, libxml-2.0)
-+	AC_SUBST(XML_CFLAGS)
-+	AC_SUBST(XML_LIBS)
-+
-+	dnl *******************
-+	dnl *** Misc checks ***
-+	dnl *******************
-+	AC_CHECK_FUNCS(gmtime_r)
-+	AC_CHECK_FUNCS(mmap)
-+	AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
- fi
--GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
--
--GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
--AC_SUBST(GLIB_MAKEFILE)
- 
--PKG_CHECK_MODULES(XML, libxml-2.0)
--AC_SUBST(XML_CFLAGS)
--AC_SUBST(XML_LIBS)
-+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
- 
- dnl ***********************
- dnl *** Check for Win32 ***
-@@ -103,13 +117,6 @@ esac
- AC_MSG_RESULT([$os_win32])
- AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
- 
--dnl *******************
--dnl *** Misc checks ***
--dnl *******************
--AC_CHECK_FUNCS(gmtime_r)
--AC_CHECK_FUNCS(mmap)
--AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
--
- dnl *********************
- dnl *** GNOME support ***
- dnl *********************
-@@ -134,6 +141,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
- if test $with_gnome != no; then
- 	AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
- 
-+	if test $with_libsoup_system != no; then
-+		PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
-+	fi
-+
- 	PKG_CHECK_MODULES(SQLITE, sqlite3, :, [AC_MSG_ERROR(dnl
- [Could not find sqlite3 devel files:
- 
-diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
-index aa13eec..ef0c870 100644
---- a/libsoup/Makefile.am
-+++ b/libsoup/Makefile.am
-@@ -6,15 +6,18 @@ if OS_WIN32
- LIBWS2_32 = -lws2_32
- endif
- 
--INCLUDES = 				\
-+INCLUDES =
-+lib_LTLIBRARIES =
-+CLEANFILES =
-+
-+if BUILD_LIBSOUP
-+INCLUDES += 				\
- 	-DG_LOG_DOMAIN=\"libsoup\" 	\
- 	-I$(top_srcdir)			\
- 	$(SOUP_DEBUG_FLAGS)		\
- 	$(SOUP_MAINTAINER_FLAGS)	\
- 	$(GLIB_CFLAGS)			\
--	$(XML_CFLAGS)			\
--	$(SQLITE_CFLAGS)		\
--	$(GNOME_KEYRING_CFLAGS)
-+	$(XML_CFLAGS)
- 
- libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
- 
-@@ -67,7 +70,7 @@ libsoupinclude_HEADERS =	\
- 	$(soup_headers)		\
- 	soup-enum-types.h
- 
--lib_LTLIBRARIES = libsoup-2.4.la
-+lib_LTLIBRARIES += libsoup-2.4.la
- 
- libsoup_2_4_la_LDFLAGS =	\
- 	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
-@@ -152,6 +155,7 @@ libsoup_2_4_la_SOURCES =		\
- 	soup-uri.c			\
- 	soup-value-utils.c		\
- 	soup-xmlrpc.c
-+endif
- 
- if BUILD_LIBSOUP_GNOME
- 
-@@ -165,6 +169,10 @@ endif
- 
- libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
- 
-+INCLUDES += $(LIBSOUP_CFLAGS)		\
-+    $(SQLITE_CFLAGS)			\
-+    $(GNOME_KEYRING_CFLAGS)
-+
- libsoupgnomeinclude_HEADERS =	\
- 	soup-cookie-jar-sqlite.h\
- 	soup-gnome.h		\
-@@ -172,14 +180,24 @@ libsoupgnomeinclude_HEADERS =	\
- 
- lib_LTLIBRARIES += libsoup-gnome-2.4.la
- 
-+if BUILD_LIBSOUP
- libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
-+else
-+libsoup_gnome_2_4_la_LDFLAGS =		\
-+	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
-+endif
- 
- libsoup_gnome_2_4_la_LIBADD =		\
--	libsoup-2.4.la			\
- 	$(GLIB_LIBS)			\
- 	$(SQLITE_LIBS)			\
- 	$(GNOME_KEYRING_LIBS)
- 
-+if BUILD_LIBSOUP
-+libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la
-+else
-+libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS)
-+endif
-+
- libsoup_gnome_2_4_la_SOURCES =		\
- 	soup-cookie-jar-sqlite.c	\
- 	soup-gnome-features.c		\
-@@ -207,6 +225,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
- 
- if HAVE_INTROSPECTION
- 
-+if BUILD_LIBSOUP
-+
- # Core library
- gi_soup_files = \
- 	$(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\
-@@ -228,20 +248,28 @@ Soup_2_4_gir_FILES = \
- 
- INTROSPECTION_GIRS += Soup-2.4.gir
- 
-+endif
-+
- if BUILD_LIBSOUP_GNOME
- 
-+if BUILD_LIBSOUP
-+SOUP_GIR = Soup-2.4.gir
-+else
-+SOUP_GIR =
-+endif
-+
- # GNOME extensions
- gi_soup_gnome_files = $(filter-out soup-gnome.h,\
- 		          $(libsoupgnomeinclude_HEADERS) \
- 	                  $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES)))
--SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir
-+SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR)
-+SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
- SoupGNOME_2_4_gir_SCANNERFLAGS =			\
- 	--identifier-prefix=Soup			\
- 	--symbol-prefix=soup				\
--	--c-include "libsoup/soup-gnome.h"		\
--	--include-uninstalled=$(builddir)/Soup-2.4.gir
-+	--c-include "libsoup/soup-gnome.h"
- SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES)
--SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
-+SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la
- SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
- SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
- 
--- 
-1.7.8.4
-
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.40.2-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.40.2-system-lib.patch
deleted file mode 100644
index d236e0c92823..000000000000
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.40.2-system-lib.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-From 41200f48909dbf48fd2c96f305b71797634aca3e Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Tue, 20 Dec 2011 15:42:44 +0200
-Subject: [PATCH] Split support for libsoup-gnome
-
-https://bugzilla.gnome.org/show_bug.cgi?id=595065
-
-Original patch by Romain Perier.
----
- Makefile.am         | 12 ++++++++--
- configure.ac        | 35 +++++++++++++++++++----------
- libsoup/Makefile.am | 63 ++++++++++++++++++++++++++++++++++++++---------------
- 3 files changed, 79 insertions(+), 31 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 18bf80a..046f945 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,11 @@
- ## Process this file with automake to produce Makefile.in
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- 
--SUBDIRS = libsoup po tests docs
-+SUBDIRS = libsoup
-+
-+if BUILD_LIBSOUP
-+SUBDIRS += po tests docs
-+endif
- 
- EXTRA_DIST =				\
- 	data/effective_tld_names.dat	\
-@@ -16,7 +20,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
- 
- pkgconfigdir = $(libdir)/pkgconfig
- 
--pkgconfig_DATA = libsoup-2.4.pc
-+pkgconfig_DATA =
-+
-+if BUILD_LIBSOUP
-+pkgconfig_DATA += libsoup-2.4.pc
-+endif
- 
- if BUILD_LIBSOUP_GNOME
- pkgconfig_DATA += libsoup-gnome-2.4.pc
-diff --git a/configure.ac b/configure.ac
-index 95410de..1f00bdd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -71,20 +71,27 @@ LT_INIT([win32-dll])
- dnl ***********************
- dnl *** Checks for glib ***
- dnl ***********************
-+PKG_PROG_PKG_CONFIG
-+enable_ssl=no
-+AC_ARG_WITH(libsoup-system,
-+   AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]),
-+   [with_libsoup_system=$withval], [with_libsoup_system=no])
-+if test "$with_libsoup_system" = "no"; then
-+    GLIB_REQUIRED=2.33.1
-+    AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
-+	if test "$GLIB_LIBS" = ""; then
-+       AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
-+	fi
-+    GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_34"
-+    GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
-+    AC_SUBST(GLIB_MAKEFILE)
- 
--GLIB_REQUIRED=2.33.1
--AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
--if test "$GLIB_LIBS" = ""; then
--   AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
--fi
--GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_34"
--
--GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
--AC_SUBST(GLIB_MAKEFILE)
-+	PKG_CHECK_MODULES(XML, libxml-2.0)
-+	AC_SUBST(XML_CFLAGS)
-+	AC_SUBST(XML_LIBS)
- 
--PKG_CHECK_MODULES(XML, libxml-2.0)
--AC_SUBST(XML_CFLAGS)
--AC_SUBST(XML_LIBS)
-+fi
-+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
- 
- dnl ***********************
- dnl *** Check for Win32 ***
-@@ -143,6 +150,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
- if test $with_gnome != no; then
- 	AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
- 
-+	if test $with_libsoup_system != no; then
-+		PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
-+	fi
-+
- 	PKG_CHECK_MODULES(SQLITE, sqlite3, :, [AC_MSG_ERROR(dnl
- [Could not find sqlite3 devel files:
- 
-diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
-index cc99e75..f9b25fc 100644
---- a/libsoup/Makefile.am
-+++ b/libsoup/Makefile.am
-@@ -1,23 +1,26 @@
- ## Process this file with automake to produce Makefile.in
- 
- EXTRA_DIST =
--
-+BUILT_SOURCES =
- include $(GLIB_MAKEFILE)
- 
- if OS_WIN32
- LIBWS2_32 = -lws2_32
- endif
- 
--INCLUDES = 				\
-+INCLUDES =
-+lib_LTLIBRARIES =
-+CLEANFILES =
-+
-+if BUILD_LIBSOUP
-+INCLUDES += 				\
- 	-DG_LOG_DOMAIN=\"libsoup\" 	\
- 	-DLOCALEDIR=\"$(localedir)\"	\
- 	-I$(top_srcdir)			\
- 	$(SOUP_DEBUG_FLAGS)		\
- 	$(SOUP_MAINTAINER_FLAGS)	\
- 	$(GLIB_CFLAGS)			\
--	$(XML_CFLAGS)			\
--	$(SQLITE_CFLAGS)		\
--	$(GNOME_KEYRING_CFLAGS)
-+	$(XML_CFLAGS)
- 
- libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
- 
-@@ -72,7 +75,7 @@ libsoupinclude_HEADERS =	\
- 	$(soup_headers)		\
- 	soup-enum-types.h
- 
--lib_LTLIBRARIES = libsoup-2.4.la
-+lib_LTLIBRARIES += libsoup-2.4.la
- 
- libsoup_2_4_la_LDFLAGS =	\
- 	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
-@@ -173,14 +176,17 @@ libsoup_2_4_la_SOURCES =		\
- 	soup-value-utils.c		\
- 	soup-xmlrpc.c
- 
--# TLD rules
--EXTRA_DIST += tld-parser.py
--
-+BUILT_SOURCES = tld_data.inc
- TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat
- 
- tld_data.inc: tld-parser.py $(TLD_DATA_FILE)
- 	$(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
- 
-+# TLD rules
-+EXTRA_DIST += tld-parser.py
-+
-+endif
-+
- if BUILD_LIBSOUP_GNOME
- 
- if OS_WIN32
-@@ -193,6 +199,10 @@ endif
- 
- libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
- 
-+INCLUDES += $(LIBSOUP_CFLAGS)		\
-+    $(SQLITE_CFLAGS)			\
-+    $(GNOME_KEYRING_CFLAGS)
-+
- libsoupgnomeinclude_HEADERS =	\
- 	soup-cookie-jar-sqlite.h\
- 	soup-gnome.h		\
-@@ -200,14 +210,24 @@ libsoupgnomeinclude_HEADERS =	\
- 
- lib_LTLIBRARIES += libsoup-gnome-2.4.la
- 
-+if BUILD_LIBSOUP
- libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
-+else
-+libsoup_gnome_2_4_la_LDFLAGS =		\
-+	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
-+endif
- 
- libsoup_gnome_2_4_la_LIBADD =		\
--	libsoup-2.4.la			\
- 	$(GLIB_LIBS)			\
- 	$(SQLITE_LIBS)			\
- 	$(GNOME_KEYRING_LIBS)
- 
-+if BUILD_LIBSOUP
-+libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la
-+else
-+libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS)
-+endif
-+
- libsoup_gnome_2_4_la_SOURCES =		\
- 	soup-cookie-jar-sqlite.c	\
- 	soup-gnome-features.c		\
-@@ -219,9 +239,8 @@ endif
- 
- GLIB_GENERATED = soup-marshal.c soup-marshal.h
- GLIB_GENERATED += soup-enum-types.c soup-enum-types.h
--BUILT_SOURCES = \
--	$(GLIB_GENERATED)   \
--	tld_data.inc
-+BUILT_SOURCES += \
-+	$(GLIB_GENERATED)
- 
- soup_marshal_sources = $(libsoup_2_4_la_SOURCES) $(libsoup_gnome_2_4_la_SOURCES)
- soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
-@@ -237,6 +256,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
- 
- if HAVE_INTROSPECTION
- 
-+if BUILD_LIBSOUP
-+
- # Core library
- gi_soup_files = \
- 	$(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\
-@@ -258,20 +279,28 @@ Soup_2_4_gir_FILES = \
- 
- INTROSPECTION_GIRS += Soup-2.4.gir
- 
-+endif
-+
- if BUILD_LIBSOUP_GNOME
- 
-+if BUILD_LIBSOUP
-+SOUP_GIR = Soup-2.4.gir
-+else
-+SOUP_GIR =
-+endif
-+
- # GNOME extensions
- gi_soup_gnome_files = $(filter-out soup-gnome.h,\
- 		          $(libsoupgnomeinclude_HEADERS) \
- 	                  $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES)))
--SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir
-+SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR)
-+SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
- SoupGNOME_2_4_gir_SCANNERFLAGS =			\
- 	--identifier-prefix=Soup			\
- 	--symbol-prefix=soup				\
--	--c-include "libsoup/soup-gnome.h"		\
--	--include-uninstalled=$(builddir)/Soup-2.4.gir
-+	--c-include "libsoup/soup-gnome.h"
- SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES)
--SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
-+SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la
- SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
- SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
- 
--- 
-1.7.12
-
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.42.2-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.42.2-system-lib.patch
deleted file mode 100644
index 383cfe4f637f..000000000000
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.42.2-system-lib.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-From 722a7d3935c5b3ec5c28e337247471821ede7c59 Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Tue, 20 Dec 2011 15:42:44 +0200
-Subject: [PATCH] Split support for libsoup-gnome
-
-https://bugzilla.gnome.org/show_bug.cgi?id=595065
-
-Original patch by Romain Perier.
----
- Makefile.am         | 12 +++++++++--
- configure.ac        | 34 +++++++++++++++++++-----------
- libsoup/Makefile.am | 60 +++++++++++++++++++++++++++++++++++++++--------------
- 3 files changed, 76 insertions(+), 30 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 66992d9..046f945 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,11 @@
- ## Process this file with automake to produce Makefile.in
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- 
--SUBDIRS = libsoup po tests examples docs
-+SUBDIRS = libsoup
-+
-+if BUILD_LIBSOUP
-+SUBDIRS += po tests docs
-+endif
- 
- EXTRA_DIST =				\
- 	data/effective_tld_names.dat	\
-@@ -16,7 +20,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
- 
- pkgconfigdir = $(libdir)/pkgconfig
- 
--pkgconfig_DATA = libsoup-2.4.pc
-+pkgconfig_DATA =
-+
-+if BUILD_LIBSOUP
-+pkgconfig_DATA += libsoup-2.4.pc
-+endif
- 
- if BUILD_LIBSOUP_GNOME
- pkgconfig_DATA += libsoup-gnome-2.4.pc
-diff --git a/configure.ac b/configure.ac
-index 013deae..1c606df 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,20 +76,26 @@ LT_INIT([win32-dll])
- dnl ***********************
- dnl *** Checks for glib ***
- dnl ***********************
-+PKG_PROG_PKG_CONFIG
-+enable_ssl=no
-+AC_ARG_WITH(libsoup-system,
-+   AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]),
-+   [with_libsoup_system=$withval], [with_libsoup_system=no])
-+if test "$with_libsoup_system" = "no"; then
-+    GLIB_REQUIRED=2.36.0
-+    AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
-+    if test "$GLIB_LIBS" = ""; then
-+        AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
-+    fi
-+    GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36"
-+    GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
-+    AC_SUBST(GLIB_MAKEFILE)
- 
--GLIB_REQUIRED=2.36.0
--AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
--if test "$GLIB_LIBS" = ""; then
--   AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
-+    PKG_CHECK_MODULES(XML, libxml-2.0)
-+    AC_SUBST(XML_CFLAGS)
-+    AC_SUBST(XML_LIBS)
- fi
--GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36"
--
--GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
--AC_SUBST(GLIB_MAKEFILE)
--
--PKG_CHECK_MODULES(XML, libxml-2.0)
--AC_SUBST(XML_CFLAGS)
--AC_SUBST(XML_LIBS)
-+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
- 
- PKG_CHECK_MODULES(SQLITE, sqlite3)
- AC_SUBST(SQLITE_CFLAGS)
-@@ -138,6 +144,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
- 
- if test $with_gnome != no; then
- 	AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
-+
-+	if test $with_libsoup_system != no; then
-+		PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
-+	fi
- fi
- AC_SUBST(HAVE_GNOME)
- 
-diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
-index 508bf9c..dc3c5f2 100644
---- a/libsoup/Makefile.am
-+++ b/libsoup/Makefile.am
-@@ -1,14 +1,19 @@
- ## Process this file with automake to produce Makefile.in
- 
- EXTRA_DIST =
--
-+BUILT_SOURCES =
- include $(GLIB_MAKEFILE)
- 
- if OS_WIN32
- LIBWS2_32 = -lws2_32
- endif
- 
--INCLUDES = 				\
-+INCLUDES =
-+lib_LTLIBRARIES =
-+CLEANFILES =
-+
-+if BUILD_LIBSOUP
-+INCLUDES += 				\
- 	-DG_LOG_DOMAIN=\"libsoup\" 	\
- 	-DLOCALEDIR=\"$(localedir)\"	\
- 	-DSOUP_COMPILATION		\
-@@ -77,7 +82,7 @@ libsoupinclude_HEADERS =	\
- nodist_libsoupinclude_HEADERS =	\
- 	soup-version.h
- 
--lib_LTLIBRARIES = libsoup-2.4.la
-+lib_LTLIBRARIES += libsoup-2.4.la
- 
- libsoup_2_4_la_LDFLAGS =	\
- 	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
-@@ -187,18 +192,23 @@ libsoup_2_4_la_SOURCES =		\
- 	soup-version.c			\
- 	soup-xmlrpc.c
- 
--# TLD rules
--EXTRA_DIST += tld-parser.py
--
-+BUILT_SOURCES += tld_data.inc
- TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat
- 
- tld_data.inc: tld-parser.py $(TLD_DATA_FILE)
--	$(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
-+	$(AM_V_GEN) python $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
-+
-+# TLD rules
-+EXTRA_DIST += tld-parser.py
-+
-+endif
- 
- if BUILD_LIBSOUP_GNOME
- 
- libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
- 
-+INCLUDES += $(LIBSOUP_CFLAGS)
-+
- libsoupgnomeinclude_HEADERS =	\
- 	soup-cookie-jar-sqlite.h\
- 	soup-gnome.h		\
-@@ -206,17 +216,26 @@ libsoupgnomeinclude_HEADERS =	\
- 
- lib_LTLIBRARIES += libsoup-gnome-2.4.la
- 
-+if BUILD_LIBSOUP
-+libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
-+else
- libsoup_gnome_2_4_la_LDFLAGS =	\
- 	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
- 	-no-undefined \
- 	-export-symbols $(srcdir)/libsoup-gnome-2.4.sym
-+endif
- 
- EXTRA_DIST += libsoup-gnome-2.4.sym
- 
- libsoup_gnome_2_4_la_LIBADD =		\
--	libsoup-2.4.la			\
- 	$(GLIB_LIBS)
- 
-+if BUILD_LIBSOUP
-+libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la
-+else
-+libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS)
-+endif
-+
- libsoup_gnome_2_4_la_SOURCES =		\
- 	soup-cookie-jar-sqlite.c	\
- 	soup-gnome-features.c		\
-@@ -229,9 +248,8 @@ endif
- 
- GLIB_GENERATED = soup-marshal.c soup-marshal.h
- GLIB_GENERATED += soup-enum-types.c soup-enum-types.h
--BUILT_SOURCES = \
--	$(GLIB_GENERATED)   \
--	tld_data.inc
-+BUILT_SOURCES += \
-+	$(GLIB_GENERATED)
- 
- soup_marshal_sources = $(libsoup_2_4_la_SOURCES) $(libsoup_gnome_2_4_la_SOURCES)
- soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
-@@ -247,6 +265,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
- 
- if HAVE_INTROSPECTION
- 
-+if BUILD_LIBSOUP
-+
- # Core library
- gi_soup_files = \
- 	$(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\
-@@ -268,20 +288,28 @@ Soup_2_4_gir_FILES = \
- 
- INTROSPECTION_GIRS += Soup-2.4.gir
- 
-+endif
-+
- if BUILD_LIBSOUP_GNOME
- 
-+if BUILD_LIBSOUP
-+SOUP_GIR = Soup-2.4.gir
-+else
-+SOUP_GIR =
-+endif
-+
- # GNOME extensions
- gi_soup_gnome_files = $(filter-out soup-gnome.h,\
- 		          $(libsoupgnomeinclude_HEADERS) \
- 	                  $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES)))
--SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir
-+SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR)
-+SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
- SoupGNOME_2_4_gir_SCANNERFLAGS =			\
- 	--identifier-prefix=Soup			\
- 	--symbol-prefix=soup				\
--	--c-include "libsoup/soup-gnome.h"		\
--	--include-uninstalled=$(builddir)/Soup-2.4.gir
-+	--c-include "libsoup/soup-gnome.h"
- SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES)
--SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
-+SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la
- SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
- SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
- 
-@@ -295,6 +323,6 @@ gir_DATA = $(INTROSPECTION_GIRS)
- typelibdir = $(libdir)/girepository-1.0
- typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
- 
--CLEANFILES = $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
-+CLEANFILES += $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
- 
- endif
--- 
-1.8.3.2
-
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.38.1.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.38.1.ebuild
deleted file mode 100644
index b619435b0c7a..000000000000
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.38.1.ebuild
+++ /dev/null
@@ -1,60 +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/libsoup-gnome/libsoup-gnome-2.38.1.ebuild,v 1.14 2013/05/16 18:16:55 pacho Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-MY_PN=${PN/-gnome}
-MY_P=${MY_PN}-${PV}
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="GNOME plugin for libsoup"
-HOMEPAGE="http://live.gnome.org/LibSoup"
-SRC_URI="${SRC_URI//-gnome}"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-solaris"
-IUSE="debug +introspection"
-
-RDEPEND="~net-libs/libsoup-${PV}[introspection?]
-	|| ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
-	dev-db/sqlite:3
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	!>=net-libs/libsoup-2.42
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.10
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-tls-check
-		$(use_enable introspection)
-		--with-libsoup-system
-		--with-gnome
-		--without-apache-httpd"
-	DOCS="AUTHORS NEWS README"
-}
-
-src_prepare() {
-	# Use lib present on the system
-	epatch "${FILESDIR}"/${PN}-2.38.0-system-lib.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-	gnome2_src_configure
-}
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.40.3.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.40.3.ebuild
deleted file mode 100644
index fc0d7c4187d0..000000000000
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.40.3.ebuild
+++ /dev/null
@@ -1,58 +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/libsoup-gnome/libsoup-gnome-2.40.3.ebuild,v 1.5 2013/10/17 20:38:54 maekke Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-MY_PN=${PN/-gnome}
-MY_P=${MY_PN}-${PV}
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="GNOME plugin for libsoup"
-HOMEPAGE="http://live.gnome.org/LibSoup"
-SRC_URI="${SRC_URI//-gnome}"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-IUSE="debug +introspection"
-KEYWORDS="~alpha ~amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="~net-libs/libsoup-${PV}[introspection?]
-	|| ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
-	dev-db/sqlite:3=
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	!>=net-libs/libsoup-2.42
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Use lib present on the system
-	epatch "${FILESDIR}"/${PN}-2.40.2-system-lib.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tls-check \
-		$(use_enable introspection) \
-		--with-libsoup-system \
-		--with-gnome \
-		--without-apache-httpd
-}
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.42.3.1.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.42.3.1.ebuild
deleted file mode 100644
index 08dc2f8f78b8..000000000000
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.42.3.1.ebuild
+++ /dev/null
@@ -1,59 +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/libsoup-gnome/libsoup-gnome-2.42.3.1.ebuild,v 1.3 2013/12/08 19:25:33 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-MY_PN=${PN/-gnome}
-MY_P=${MY_PN}-${PV}
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="GNOME plugin for libsoup"
-HOMEPAGE="https://wiki.gnome.org/LibSoup"
-SRC_URI="${SRC_URI//-gnome}"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-IUSE="debug +introspection"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	~net-libs/libsoup-${PV}[introspection?]
-	dev-db/sqlite:3=
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	>=net-libs/libsoup-2.42.2-r1
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Use lib present on the system
-	epatch "${FILESDIR}"/${PN}-2.42.2-system-lib.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--disable-tls-check \
-		$(use_enable introspection) \
-		--with-libsoup-system \
-		--with-gnome \
-		--without-apache-httpd
-}
diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index dd562bab2e90..b65dde1f962a 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.329 2014/04/21 10:30:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.330 2014/04/27 08:25:59 pacho Exp $
+
+  27 Apr 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/libsoup-2.42.1-ipv6-tests.patch, -libsoup-2.38.1.ebuild,
+  -libsoup-2.40.3.ebuild, -libsoup-2.42.3.1.ebuild:
+  drop old
 
   21 Apr 2014; Agostino Sarubbo <ago@gentoo.org> libsoup-2.44.2.ebuild:
   Stable for arm, wrt bug #507568
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index dac3b58a1421..3073729f1041 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,31 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libsoup-2.42.1-ipv6-tests.patch 869 SHA256 95ec662c9d7ad6a006f83b1b6ea341c8b31d4396eea8784a63bf0b033c9f19d0 SHA512 170d2026542f4b6a1eb064efdeea1b26320fe68d94418c088aef0bc9902babfd25bef3b4b88a2464c6d20e032602c9a66d3afae6c62f6eee429b12d5bc0d7f1c WHIRLPOOL 65e30dc864a7a1412c3b7d1678f51d9b3b0d20503ed06a06b142db06665e8faa8fdf0008461250d97f61c6e0468070633b0d295f464e007491a01abc30c810c1
-DIST libsoup-2.38.1.tar.xz 620832 SHA256 71b8923fc7a5fef9abc5420f7f3d666fdb589f43a8c50892d584d58b3c513f9a SHA512 57d4327abb59bee0def4fe8419fbb63e3112255a12792405329a25fafa4e8cf2a531a3eade13304adbd27cd94c9a8e6bd25d7f83674978f351ea62de27222127 WHIRLPOOL 38e19a1060270d76685ca3a99a93d441acf8775621f022b6a1a475701848f839189bf868a08736bfec6160fda64f2dd4f6ac1fef8f2ffea98c9f554a506e2e8f
-DIST libsoup-2.40.3.tar.xz 709124 SHA256 82c92f1f6f4cbfd501df783ed87e7de9410b4a12a3bb0b19c64722e185d2bbc9 SHA512 2452e918b09206abdc5418b383b4c1d84fda8bffb09eef2a2d6b0c9cb13e625a50fc2ba07b2f6175f886bf906df80f85c47075cf72ead74532c1c656f6126632 WHIRLPOOL 0dac1a330d2e4195ad00efe7324cdde8092d7ffbce7e65aaa9cf86c74b4629bb8be4027b00efae2455add9956c0e433d92aa33edee9f056869c2f6b8fd951b45
-DIST libsoup-2.42.3.1.tar.xz 740164 SHA256 97a6be94daabd21fcfba7bde4939c44d0f260bb123d7e260fb71551458da6651 SHA512 3d4dabc989f02b11b4f1f4994b0dab2fc069b4997f59bf90e43062fcda1e3b6741b7f25ac5460004916ba7101c853dd2a44345a1d7caaefc6d867ffaa5494f6b WHIRLPOOL 21cd761c98f6176263cf605e6958eea373848b51aedbc21c7528ee4710a0bfa4fdbcac8ee63b46b8f7c9f8b0f858aaadf4b9bcba5f030ba2e52ead3f4164fe0d
 DIST libsoup-2.44.2.tar.xz 748592 SHA256 e7e4b5ab74a6c00fc267c9f5963852d28759ad3154dab6388e2d6e1962d598f3 SHA512 f24c318d11aaf0f98d05a673ab87e17da391f1da9d22c63d32532304473ac77a9cc324978346a42a9a21165abd182c11122a33dd7e5d81c8953ba4b0b8e5ae30 WHIRLPOOL 87f201adf26caca64002943e788cf80b07d0fd95b1917a34b90188ae3f0c514cdf41cd1f1e928b0c1083ec7f89a19d031bef014d02fb4f1d9e399c159e2eec1d
-EBUILD libsoup-2.38.1.ebuild 1995 SHA256 b03f25e36298ebdb5d576ec2b068e0748b6d7584e4d8886cada0b613cc59dd61 SHA512 2914117d4494a8f34b42ae2483028b84d90d9e1c5c84789a094d548b79463e5736fef2070e16734bbf624afb53845261340fbc5c9d7da8ee420266f1698294a5 WHIRLPOOL 8d8dd7c571ed9ccd0121007ce6da55b688b04afa1379b34dea1f4439b26dd3177eba8d1b9a56d6c00a01be79175b2963f95f93f34066b985ca4b805774936d32
-EBUILD libsoup-2.40.3.ebuild 2070 SHA256 a7399b55c5e3c8be6125b05549e65d6c642c429b79dba2495fec625891cc84cd SHA512 c3ab2962d1bbb612595ec1e35744dc3d0823bb864228a986306397a1170067eaa8852adc9f922a7842b2984c570110ce195cd17f06008a3167d8a32cba46ae9f WHIRLPOOL 7343f6910ae941f6c7f97609eda600bb806fe86f63aa0eb34253e9ca1ebd0aee28bb7a95d58ae8a1a861bfb1dadeb7d34307d62497fe5f61d8df700bb3c7abab
-EBUILD libsoup-2.42.3.1.ebuild 2223 SHA256 2ca7d96323da72a5d044160aa67338d5d7d4887c27f4a3a07eeb7b06dabf5e5b SHA512 e1e6e59bf6a76d82de690f5fcbec794ec1a471cdd93c37dbcca2d219f08d7e571a4a546571dec0b5c5492a56ec5eaf73f49984c3f4538b296f767106eee2784f WHIRLPOOL dd50f45a93a31786b6aaa0a7f3a948bfce266320f02b6da3f33d02f60ce5f391e809b8912e52ec8b306a08fc0c1427a47ca4ab94e8591ee19ae8d9e41aaab025
 EBUILD libsoup-2.44.2.ebuild 2084 SHA256 348e77f8610d5dbf9215a97688fd989dde6acf23ef5ea6f7c4e7388b5802d93d SHA512 14f0521b1ee0e882bd6689802761d3e438798ffd6f7dcc57ed5376ff652eb8c736f77255fa2c1e69fff1935517dfb7559522b155d82df5c963ffcb7f510e1d09 WHIRLPOOL 160791901cc08d39dc7fac1e2508d0008175bd5d604899034850feb26e8891ee732e5dfc07388bba60fa6e3667e9895250c1953aa172b984b2a373bf47c82150
-MISC ChangeLog 43414 SHA256 e14ed10f222cb4d09258e7175c8a6e5eb0bce306d49f08d4fd4f6b6fb189d190 SHA512 b4d39478bacaceefc12e15d34b96ff1012f54800545ca77f4a095304544690ded2ae116229b678806edec059eebe5b727a76f7a4086bdacef86b3bbd87502bee WHIRLPOOL 13b7f4b2556efb19b6e7c83bb0b55a2b2e01d5639725421a841d80c4beb54f8d6913d212d1eb6e1b0ea8f6482ac32e40d1267a81930454a554f875628dc186ae
+MISC ChangeLog 43592 SHA256 13745382013fe49ef1570b799dcd21e6f5e3a341a6c41d6544bb320f6e912d7e SHA512 7510c73889c7eeede121215ffe71d8651bda7a5eae1387d4fd44496040459f5c7c06135dee6c24da96be77427a60cb00c4cc7f3e40b44cdc499ff2dada829b37 WHIRLPOOL 6b538f473a4db1376db85ddf72349b70166967c92514dbed86b8eb55184856bfcf826903c1e5d565d2a1ea72edd08cf4ff129d84f2db1e6422e1ba78be62720a
 MISC metadata.xml 257 SHA256 ee7dfc9e6af8bfc278c145d407d4a9c39458109886dba15303cc1c4c9d1c3ea2 SHA512 68402e9d9c7f3aea455729538fd16d692acad9a52861fa5088f2d170c9da1080c3c284fad0232ea042b5efd765e4988802778802979b927f90853ab26a01eb32 WHIRLPOOL 6d61388c9de173897cb4cff9bd1cf5799eea1e57383ace5f5e2a93193eaac9567e548c1faed6d0703c011e81ef98fff413e8801dbf27fb1f2e351d95ebc6699e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTVPM5AAoJELp701BxlEWfWdYQAIVmiio/dlDV8h/u8P/cDb5c
-X6TiIYp/HJoyBPxtKNCye11wHnTCnTSV+PJBIfXDxBoYr50X3ygA6Cz+RUbfVBPR
-w5UJh7OJs5c3G2HevAOjRx6emzHCdKvJXKQ0iYDR/M4pVdxF7KmhaxwikSn1PUjR
-FT0PIbWjIuPR45VpOSki64J1ExdpQSWkmgx4DqGeNb3GNgXx3H1Ng4+ehuyflN0g
-8TMS/mKiAJuUayx4FN7DgaSffUF5EIZkBkdFHI7/zVwNwn168zGu61VN4JhJkNcn
-O/QK9e1VFracCMzHLTFkomrVRTpEQIig1cGHo0GO3jgcCI+qLzt6JITAOSPK8Oj7
-oWLquteOrin/TrXz3I1QOhJ8n3itQfwmN+qldYOVgyiqKldl2ledQtZQEiPieSvu
-6gIBW3UYNoFRPrBLLqKaukn7keBz6JpEup+7c29hzDBjmXis0kpZ+FW9/3BIF6hI
-sT6fDKEeA25Z4vawVSLqpOFhIOmU4GooXh2keNWKPkmuVX9W7OHIoB1XPH6/kEdn
-GozAfx99gubOmtK1w7y1zQzPW/Lydu4Ng0h2sNu9okBfOnRfuXFZE8vd2bJZAo8/
-nkDVZDk+uV0vfaRujL9M3M8QNIo9xDRM6jq0EPFhdgaqvhmKtaVLCk9S8GxgKto8
-MB+dLLNGpfK8O8TLpeoe
-=uQPw
+iEYEAREIAAYFAlNcvxgACgkQCaWpQKGI+9RVTACfTgRFTssi9XC013aI9LFMpoLy
+G3YAn285uj7KvI8xYPt0fUvA2ogJuuyA
+=n++F
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsoup/files/libsoup-2.42.1-ipv6-tests.patch b/net-libs/libsoup/files/libsoup-2.42.1-ipv6-tests.patch
deleted file mode 100644
index cc71213adc8e..000000000000
--- a/net-libs/libsoup/files/libsoup-2.42.1-ipv6-tests.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ce2043a7a81d2d8c9fba3b87a03df52df99e4115 Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Thu, 18 Apr 2013 15:40:55 -0400
-Subject: [PATCH] misc-test: skip the IPv6 server test if there's no IPv6
- support
-
-https://bugzilla.gnome.org/show_bug.cgi?id=698220
----
- tests/misc-test.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/tests/misc-test.c b/tests/misc-test.c
-index a9150a1..39ee960 100644
---- a/tests/misc-test.c
-+++ b/tests/misc-test.c
-@@ -1110,6 +1110,11 @@ do_ipv6_test (void)
- 	ipv6_server = soup_server_new (SOUP_SERVER_INTERFACE, ipv6_addr,
- 				       NULL);
- 	g_object_unref (ipv6_addr);
-+	if (!ipv6_server) {
-+		debug_printf (1, "  skipping due to lack of IPv6 support\n");
-+		return;
-+	}
-+
- 	soup_server_add_handler (ipv6_server, NULL, ipv6_server_callback, NULL, NULL);
- 	soup_server_run_async (ipv6_server);
- 
--- 
-1.8.1.4
\ No newline at end of file
diff --git a/net-libs/libsoup/libsoup-2.38.1.ebuild b/net-libs/libsoup/libsoup-2.38.1.ebuild
deleted file mode 100644
index ba2b63def000..000000000000
--- a/net-libs/libsoup/libsoup-2.38.1.ebuild
+++ /dev/null
@@ -1,61 +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/libsoup/libsoup-2.38.1.ebuild,v 1.14 2012/10/28 16:28:10 armin76 Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="http://live.gnome.org/LibSoup"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="debug +introspection samba ssl test"
-
-RDEPEND=">=dev-libs/glib-2.31.7:2
-	>=dev-libs/libxml2-2:2
-	>=net-libs/glib-networking-2.30.0[ssl?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	samba? ( net-fs/samba )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.10"
-#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
-#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
-#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-
-pkg_setup() {
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	DOCS="AUTHORS NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-tls-check
-		--without-gnome
-		--without-apache-httpd
-		$(use_enable introspection)
-		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)"
-}
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests (bug #226271)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-	gnome2_src_configure
-}
diff --git a/net-libs/libsoup/libsoup-2.40.3.ebuild b/net-libs/libsoup/libsoup-2.40.3.ebuild
deleted file mode 100644
index e400524fa712..000000000000
--- a/net-libs/libsoup/libsoup-2.40.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/libsoup/libsoup-2.40.3.ebuild,v 1.4 2013/10/17 20:38:30 maekke Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit gnome2 python-any-r1
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="http://live.gnome.org/LibSoup"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="debug +introspection samba ssl test"
-
-RDEPEND=">=dev-libs/glib-2.33.1:2
-	>=dev-libs/libxml2-2:2
-	>=net-libs/glib-networking-2.30.0[ssl?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	samba? ( net-fs/samba )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/intltool-0.35
-	>=dev-util/gtk-doc-am-1.10
-	sys-devel/gettext
-	virtual/pkgconfig"
-#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
-#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
-#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests (bug #226271)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tls-check \
-		--without-gnome \
-		--without-apache-httpd \
-		$(use_enable introspection) \
-		$(use_with samba ntlm-auth "${EPREFIX}"/usr/bin/ntlm_auth)
-}
diff --git a/net-libs/libsoup/libsoup-2.42.3.1.ebuild b/net-libs/libsoup/libsoup-2.42.3.1.ebuild
deleted file mode 100644
index 59061bc21f34..000000000000
--- a/net-libs/libsoup/libsoup-2.42.3.1.ebuild
+++ /dev/null
@@ -1,71 +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/libsoup/libsoup-2.42.3.1.ebuild,v 1.5 2013/12/22 16:21:50 jer Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit gnome2 python-any-r1 virtualx
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="https://wiki.gnome.org/LibSoup"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="debug +introspection samba ssl test"
-
-RDEPEND="
-	>=dev-libs/glib-2.36.0:2
-	>=dev-libs/libxml2-2:2
-	dev-db/sqlite:3
-	>=net-libs/glib-networking-2.30.0[ssl?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	samba? ( net-fs/samba )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/intltool-0.35
-	>=dev-util/gtk-doc-am-1.10
-	sys-devel/gettext
-	virtual/pkgconfig"
-#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
-#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
-#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests (bug #226271)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--disable-tls-check \
-		--without-gnome \
-		--without-apache-httpd \
-		$(use_enable introspection) \
-		$(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
-}
-
-src_test() {
-	# Try to prevent more test failures, bug #413233#c7
-	dbus-launch
-	Xemake check
-}
diff --git a/net-libs/rest/ChangeLog b/net-libs/rest/ChangeLog
index 71be7b3a3a0d..37897fc22525 100644
--- a/net-libs/rest/ChangeLog
+++ b/net-libs/rest/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/rest
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rest/ChangeLog,v 1.20 2013/12/08 19:27:15 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rest/ChangeLog,v 1.21 2014/04/27 08:26:57 pacho Exp $
+
+  27 Apr 2014; Pacho Ramos <pacho@gentoo.org> -rest-0.7.12.ebuild:
+  drop old
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> rest-0.7.90.ebuild:
   x86 stable, bug #478252
diff --git a/net-libs/rest/Manifest b/net-libs/rest/Manifest
index 89c6f7d7def7..3f77c91fa7a6 100644
--- a/net-libs/rest/Manifest
+++ b/net-libs/rest/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST rest-0.7.12.tar.xz 299480 SHA256 16ffa4929078dabfcfac31f9ce942072ebab67e3339ce9f378127457b03baf3a SHA512 fdca8c9e3f7e320f5710052fb357902335ee805b7f29f67d3eac833f6d7eeee1a79c938581c314b57933c6ef374a1c4ea418ceb6bf3d5c1fee2e7dbd284fa22b WHIRLPOOL aa017f99dacce783a7429e575df13dc595f1f7a4b650eda3113eef677659878398786f98554b471ab381dfe410c0039a86ece603f6a3cf811c1a61f904243971
 DIST rest-0.7.90.tar.xz 305472 SHA256 1d682acaac4d946cc7c98a2dd9d65a8c83a6fdb8ca6759e70b8b5042fe66c022 SHA512 bbd779b4fce6f893f0603064ca7cb7683eb8a509bf65d9861b4377177a9a537a03da46781d01b366f5be46ab894c8183f8a6e70ea713496f28e334ee4e72f05f WHIRLPOOL 21895777497d246ebcb6dbfd0e69dd7d92db28764ed49305779d3e2740a93dd1b4216d8379323504ca958b06e996a4b35f24afeda2c3b916aa62abebb68d3f08
-EBUILD rest-0.7.12.ebuild 1138 SHA256 47b3c7d37008cd52b20b0ecef3712915b452143a7c8294c4885f90e432dd8624 SHA512 dd99b52313c056b8def78b3772ebaa03c02846e81833ff02b4ba1094cdaaf6aef7d0e17de5512b6346b76eafa95afbc899976ee937b3ec3a8147f830b4bb87ab WHIRLPOOL 89fdc27a54cce3dbe1ba770d90f64f5766594976998aaf9987c25547c92d9f9a8f5cffa38cceef693034f0146206f501743893a8554905f68e5ab1ecff83414c
 EBUILD rest-0.7.90.ebuild 1145 SHA256 e92935b4875ea9d0555846cf24c345c1ac9256db059965bfa4318e538ad5a302 SHA512 a8f41f5daebb939af89b851991d989d603838ad88e71c9d8d94cc294f66eae55efe9745462a02537a3c7aab3a67df95812580e8cb09a18b90cad2ff287a59c79 WHIRLPOOL 1ba67c823e4162c2555e90a19ebd05eacdda3cf52d9e6b897b2c33d275f07b3a98055b8f6b99154e43eeeac4214ad121f54d241bb5bae025d2a017bf6b29fdba
-MISC ChangeLog 2773 SHA256 39023f3e72e1bb111ec3be14a4b532d1bde779f3a366ba81765eac9856f39807 SHA512 5572cfc410dd65108df403df0eed5bf651061c4ff3a9c593b24657dbff8803e8544e99a6b34702cafab91915185f85da504e847a47199bf32ecd4ba87803ada5 WHIRLPOOL 459f1ed3041ed69f6555d1c38af7f7be75d93c0e3c8892a290a9ee499efeb8568b9eba4e607ddc280941874d79ed191292de94df65c1686e073b46500867c8a8
+MISC ChangeLog 2852 SHA256 9628ae1c4adb8b6224ae5dd5e712bed5c905a05aa3189be5e57229ad1340b75e SHA512 46bcac5757dde3d314b83270f9c80bcdf46677bb7da1659d9ff5ba22bb84e49e421ef104f67919f9dec77c11763affd10357e1c89d1fcccb2cdde856559d2152 WHIRLPOOL c57d5be9306e93725227b959f22626e8992be9a3d768c9664e9915e1e906d5f5efd162af1c488c70af0ec505e75c55d382326a9939447410621b9c09906cc2ef
 MISC metadata.xml 279 SHA256 688824d65296493f7c53e26eef986d647df2c137a419bc2e55b31eb77c7bd5a0 SHA512 449d5f4daa7de31f2aae7228e492f826fea80c3243255f5be61ef401bf8fc45880528e4e922e9ecd1060f0039c7f0ef37ec0f825f295f9594ae4ed8d9af8fa1c WHIRLPOOL 1aca9c991f4f47907eb08bf9dc75e5d7c7197822948519cb4bc44c6dca3514bd94068b774555ed6d1a527be1c72671c517efe0c40532db12ecf95a99a8e09447
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkyBQACgkQCaWpQKGI+9QdqQCfQ9ZtVcY8EH+WVsMHqp/znTZS
-qFMAnAiIerfQp5FTsBPPeva6XCAiGYgx
-=mZdV
+iEYEAREIAAYFAlNcv1IACgkQCaWpQKGI+9Se9QCfdE2NvAHYyf4aCylVbgyypOfM
+lBQAni9Fxk05w7AjU1JD0ueAG796pPew
+=ZRDB
 -----END PGP SIGNATURE-----
diff --git a/net-libs/rest/rest-0.7.12.ebuild b/net-libs/rest/rest-0.7.12.ebuild
deleted file mode 100644
index 50e9ff6f90dc..000000000000
--- a/net-libs/rest/rest-0.7.12.ebuild
+++ /dev/null
@@ -1,46 +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/rest/rest-0.7.12.ebuild,v 1.9 2013/08/30 22:47:47 eva Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 virtualx
-
-DESCRIPTION="Helper library for RESTful services"
-HOMEPAGE="http://git.gnome.org/browse/librest"
-
-LICENSE="LGPL-2.1"
-SLOT="0.7"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
-IUSE="doc +gnome +introspection test"
-
-# Coverage testing should not be enabled
-RDEPEND="app-misc/ca-certificates
-	>=dev-libs/glib-2.22:2
-	dev-libs/libxml2:2
-	net-libs/libsoup:2.4
-	gnome? ( >=net-libs/libsoup-gnome-2.25.1:2.4 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.13 )
-	test? ( sys-apps/dbus )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-gcov
-		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		$(use_with gnome)
-		$(use_enable introspection)"
-	DOCS="AUTHORS README"
-}
-
-src_test() {
-	# Tests need dbus
-	Xemake check || die
-}
diff --git a/net-libs/telepathy-farstream/ChangeLog b/net-libs/telepathy-farstream/ChangeLog
index 7b027def7f06..23b925e29377 100644
--- a/net-libs/telepathy-farstream/ChangeLog
+++ b/net-libs/telepathy-farstream/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/telepathy-farstream
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-farstream/ChangeLog,v 1.25 2014/04/06 10:48:30 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-farstream/ChangeLog,v 1.26 2014/04/27 08:30:06 pacho Exp $
+
+  27 Apr 2014; Pacho Ramos <pacho@gentoo.org> -telepathy-farstream-0.6.0.ebuild:
+  drop old
 
   06 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
   telepathy-farstream-0.4.0.ebuild:
diff --git a/net-libs/telepathy-farstream/Manifest b/net-libs/telepathy-farstream/Manifest
index c1aeca21dfae..40b16ad2446d 100644
--- a/net-libs/telepathy-farstream/Manifest
+++ b/net-libs/telepathy-farstream/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA256
 
 DIST telepathy-farstream-0.4.0.tar.gz 656983 SHA256 cdfe69c8996fab439a89af2f5ee79c3b8eec709914e17f7780302cd2dda3b48e SHA512 67df6a25ca71b8a118568c70b75d7dcd668a66f5ba81ab62b4a1d8ba7e7005cc5ce76ca2284bb025da8fb4b1e505f59f6270b5e98971b840b2a43cea030120ff WHIRLPOOL f8714318a59a56345fa72a5ea54bdd4c000343103fa55c71f15d778bbf2b1a69610469b9571de3b0638c41fa85879725379c60b68b1ae6ac8bbc4d42b6d5a3b9
-DIST telepathy-farstream-0.6.0.tar.gz 595317 SHA256 0524e09f6f3a9617b9dcb5a1c1cb75fa80afb722709f9967386a091925096413 SHA512 84827826ee71ac3717e52d23e29f0fc0f6bb1b69558a30742551ab834d349d57a852c2bd28d089711e17f2ca2ef722ecf503c17fc3367def2a874d5306b3a5e4 WHIRLPOOL cedff4f0f096b906127a39f59de8eb7b4c824a7c4fb909f4dd6b79ae6a497a2042e2038012510ce44804d86673104fb2bef8716694449688971705e156398031
 DIST telepathy-farstream-0.6.1.tar.gz 601129 SHA256 a3d26f37ae0e60c40ce9607a3cf411353307258b4a984cef66c1aade1bb54845 SHA512 4fe7c07ac7d75719c37c28ae007a9ffef7d7e63f6f663face1ff0f98f12ab3baa5226ffda6603d17cd24ba410bcb05421299384f190fb7d77ccc489504562705 WHIRLPOOL 6803665cb09039c500a320be6682e83daccfb6a9e9fa1cc3edee7ae81f1375ea72a12582670df1cde3c2362eec55e86fd26c81efbee3eade1d704f5bd888792e
 EBUILD telepathy-farstream-0.4.0.ebuild 1616 SHA256 8c6335c3e2fe53efac6b40942c3d00d32b26faff494f6e9e259b24e61b2d9c81 SHA512 63839e0a2dcec64c3de97bece79a23cfd2ed98995c7cb3924258f4fba3d0fc5eca7729c5c74d143cb889ece76f21e74d26e419ab442bea32f1cec7d4c1b7aad1 WHIRLPOOL bbd07f92a25a42b2dfc4e3febe4c6ff419afa383979f385535e96fe0d69e5816072e79a4a02b0abd35432a1006dbfa30d57f1fb9fcf690de56c228d24bf68856
-EBUILD telepathy-farstream-0.6.0.ebuild 1242 SHA256 f343ba8dbe3725e6b8bfe5ca01bb635f65c4cddcecbacfc72b05930fe96bd75d SHA512 60b6b7eeda52997099561961e024c2ef535b315ab4a4a2a8081f2a49f809bc9be884c759f3a9fd527a14adae7ff2ec85651a9bba4c8ed04a2e563ce75ca9d974 WHIRLPOOL 63247923e45e8d1b0ef82615344e5a287d88a11cc1c02e14957acb3e97a6c577d80a277df8d3e8dff11c64c6ae80c34c65c1f6bb619f4ccac0f9424125973ea0
 EBUILD telepathy-farstream-0.6.1.ebuild 1273 SHA256 b3c8272ae43bbd11ed3168c101c62b125f7c5d160b97e21c92073d2ffc8d028b SHA512 9aef54341b499cf7f6af30dd36fbbeaebb6ae498c8fa23a5b884d11ae2ce766a44f3b644cd47cb9be52e8b5e40f4cc2720ab88bb327046c54b57b96e9c746b3a WHIRLPOOL b53f277d52cd0fcf304f328dff3b885f20f37302638634b6a6d4207a8531a6534f1175ffd375f53b8f0dd90dbf5beded5e6107b0a1682c2bfb10121d672469c5
-MISC ChangeLog 3824 SHA256 0be89fa421322ac95d5ba592191e43e10972501768664ed67a3beb190cae5e44 SHA512 29bdd3df317f8b36bb7b753e8286de29799e88922b04e32056b8c726c807420c7cffe0f3009605bb720ecbd16df58def659be6f0ae7c5ab35a2a43da49b035d4 WHIRLPOOL ac6efa36ee3d9208520efd98ffa7923e36e4ab8218a38bffadea023e39cb9093426b526987164bf4d0df47906084472db3a92065a004b15a8aee1f58b3e040e2
+MISC ChangeLog 3919 SHA256 7e56a1d66beee0cb3c009cbf15a29f4cf04c5d18fb2eed75d34d154fd01e2b35 SHA512 37c5d1a917056699f72d7c8d3e10a3fe5608486e03ca960536bdf789ecf5a1d84f506401180e39b17f5a81cf65d9dda936147e8e7fe9271f811b1ea272fcf299 WHIRLPOOL 6bac5e4da49a2df38a2a0c45c2cbfe8f90e4ecdc94a4cf7860f45971b0335ae05a05761885e3615d25c3b92036f0c235b9b3b6f4bd5c6228d4ffdd5905b4765c
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNBMP8ACgkQ1fmVwcYIWAbOygCfccXqtIGrMxiqcS4KyF7p7Bcf
-YNgAnj0Xx7PwIaMFIupdDU0LAlB+a0Hk
-=lpgq
+iEYEAREIAAYFAlNcwA8ACgkQCaWpQKGI+9QqmgCeM6LVrbiJlUjYY5Xh8vr4TI1b
+c0YAni0iSyTEYkNcUsY1f8tFZrXdonnv
+=kClj
 -----END PGP SIGNATURE-----
diff --git a/net-libs/telepathy-farstream/telepathy-farstream-0.6.0.ebuild b/net-libs/telepathy-farstream/telepathy-farstream-0.6.0.ebuild
deleted file mode 100644
index 926269e115a3..000000000000
--- a/net-libs/telepathy-farstream/telepathy-farstream-0.6.0.ebuild
+++ /dev/null
@@ -1,49 +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-farstream/telepathy-farstream-0.6.0.ebuild,v 1.8 2013/03/25 16:36:50 ago Exp $
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Telepathy client library that uses Farstream to handle Call channels"
-HOMEPAGE="http://telepathy.freedesktop.org"
-SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="examples +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=sys-apps/dbus-0.60
-	>=dev-libs/dbus-glib-0.60
-	media-libs/gstreamer:1.0[introspection?]
-	>=net-libs/telepathy-glib-0.19[introspection?]
-	net-libs/farstream:0.2[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.17
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf \
-		--disable-static \
-		--disable-Werror \
-		$(use_enable introspection)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-		insinto /usr/share/doc/${PF}/examples/python
-		doins examples/python/*.py
-	fi
-}