drop old

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

3 files changed, 8 insertions, 91 deletions

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
-}