Remove incorrect disabling of test, it seems to pass now

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

4 files changed, 22 insertions, 49 deletions

diff --git a/net-libs/rest/ChangeLog b/net-libs/rest/ChangeLog
index 31723dad03cf..6dbc513b6791 100644
--- a/net-libs/rest/ChangeLog
+++ b/net-libs/rest/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/rest
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rest/ChangeLog,v 1.1 2011/04/24 12:02:30 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rest/ChangeLog,v 1.2 2011/04/28 01:46:14 nirbheek Exp $
+
+  28 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org> rest-0.7.10.ebuild,
+  -files/rest-0.7.10-disable-broken-test.patch:
+  Remove incorrect disabling of test, it seems to pass now
 
 *rest-0.7.10 (24 Apr 2011)
 
diff --git a/net-libs/rest/Manifest b/net-libs/rest/Manifest
index 7dc500532e39..3f4189048eff 100644
--- a/net-libs/rest/Manifest
+++ b/net-libs/rest/Manifest
@@ -1,25 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX rest-0.7.10-disable-broken-test.patch 738 RMD160 596fdb3b5323cd32f66498e0853d3b3cf2ee2c0c SHA1 818c1d1352f10304012452ffc85b50afbb4df1e0 SHA256 c9b9676c4fb65d56436943a582b7837003239205cf309dd7e9e23d1cc0183bd7
 DIST rest-0.7.10.tar.bz2 419840 RMD160 39f0f36336503cc32dbd8ad9c8c3bec7f74eeed3 SHA1 392b1144568ce773f2be04f71e3b60987db09ecf SHA256 2908f974ae6cc71af1152d419209f307bcce8ca2dfe0b4b55b3fad8ba4a646a5
-EBUILD rest-0.7.10.ebuild 1290 RMD160 623a86c0bf6c3788662fec5c2804078e15f9b947 SHA1 26e261195c780d422db9b6e0ec097b1c235d57d3 SHA256 e826b6b6a65ef8f7e412ff97adce37d0403daf16c315fff0c5fbe9db9777476e
-MISC ChangeLog 414 RMD160 08435d512798ea3056a5ea34d3b6466a8fb3ac67 SHA1 af01f187b026b351846e3041cef51488342357d1 SHA256 a7879cdb46bd5bdeae607ad0a3cb8be39b23c6d1e1e17494f4d49c0453298f53
+EBUILD rest-0.7.10.ebuild 1041 RMD160 a43800566794d738fd92b18f1a7e16deaf2832e8 SHA1 dfa6ed00fc16fe2c862d2e3ca93fcdaf1830a6ed SHA256 53961a9bdb5f82b4ad5418c17c384a584e374040e8e5855ff19280a9bbe6ad1a
+MISC ChangeLog 596 RMD160 5a7357c982f8b15c8960cae34bc100deee8a3a11 SHA1 8466bd76e3ad74d89f8e6dcc653e106aa50047c0 SHA256 e4b579b1fa4602dc5b51aa05bbf64bd6ce965d0fbda75630f28c3c424060eca3
 MISC metadata.xml 380 RMD160 12b825fea1dbe12b55d10a7dd71c24c063cf2225 SHA1 a2489a6c6d31c5a3942e0412c9d0b69715259b3a SHA256 9af7d55126bb51bb23f37aba94b95f21c07fb068bcc1ab3a92714f2794c69b2f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNtBFcAAoJEO/kOhxWD91kaEcQALPcs/7NM3m0DoXhJsaeYJD/
-MtrpFU6b0MgwVMr+Kp29VbYxqz9pZav+Gkbav1j33MkWbmmLioYA5pK0Bri3dAYb
-yQun+13Yz7nutU+NT4sB1yllNb+xnke8v4GqpfJNUWckzbWBEPHN091LiT8aVXtD
-eTnlGiBpDK5R/smhnR9nk44lUeNHGyHm0fRjQJDYvW+YCfAbYWd+SO61CSVirXkx
-8juBtjnF4wv06RzGjIdq//UIDVDcLaJ5zh5FAN/itNqxooWxCwyhDGFOphMT14vg
-bJYDl4gTm/W8VtiDQzucY39w6K0Ccd2p97s/673QOZrrf+3MjIyFcx51bVoWusvi
-CztYA6/3H3R8ntsRme3+OyxWxBNw3vaq3E5P/leMAq9iQnhx7ZRVIwtUoa409YLa
-WC/LIbrWh8FTU7kmss3HoEKQSmH7fePprrOoW4rrXklQ3d2bD6Z1QHUxCEnipPsQ
-oQtPTKHrmVU5RwU0JxXt0Unl2AD63/HFbdCO1tYWVP7qcyXPR+HqeAPhiPganqW4
-HC3anQeJD7NBpulq4bHuOxDzR8+JsWMxhOy/9/puxctK4E/TF229/xGrmM+kvsQ0
-DWx5tMUU2FqcdeKV4sgMKNk8I54ea86H8u6l00h5NnJjmf9P5bDXS46iKsZRncxk
-ihnnhTNn03y5XkCFEQB7
-=z41G
+iQIcBAEBAgAGBQJNuMbtAAoJEO/kOhxWD91k6RoQAJsi0/ujXwnjLkJexJg+lydJ
+oRYrIZ/eVfYK7LEKBf3D1Vk3TduGJ97m40tILjdjg/oGiEmpB9QECf7ukYV2GNFs
+pK6sv3uxGy1A5NuljTACMw4aq3fZnKtf3Dognc39zL7UN6xszeEi2cBhzYTxwn50
+YInQx3PdOo2tGPmKLkVhmGrfi0FSOyep3E88TeW3bkBqZpitFNofVukgerpK8bwC
+VwixDH61/hMLB2A+tzGTyEcpfPTiAmvpZYCBpkg8jQgmc0lWuhlaOjEmWSpdZO0e
+kjATVYSvu+YJHiOTESFczwlsiubSEBAuTQ9aoR20fQjPsQmBEvPJ8bXdTbo3IR3O
+cVwUCw9VUxQlYvIOm9dFoVoA9WIK12gD/NMo2sbCFpbpjD6QePkuP1exl1yQ8Fe3
+s8UlRf2w0prir3rsnAUqXkFn98sC/q4OG2V7S0HHwnK1f+WR+Qo0vPgi1WvZh2+T
+wn4hzGDfx+hbVsGjBu8XzWpFyZ1bxu+JZY9GIHxPuQIHFFKU6R9ExlfmXJN+HhHX
+6BzqoNj3ChlCVdd8G9bMJ2pF4vudZWVRAPasX9DqO5laTdUlLcKncIGEKL+p8WEn
+zAJDlyU/iuY4wM6kOqFHgNz3i4eEvTGKQABJJMqYOgwkW3trjf2cobEwisbfvgXD
+wlZR38/DX+vFMPYI5UqC
+=OGU0
 -----END PGP SIGNATURE-----
diff --git a/net-libs/rest/files/rest-0.7.10-disable-broken-test.patch b/net-libs/rest/files/rest-0.7.10-disable-broken-test.patch
deleted file mode 100644
index 32478540d3a2..000000000000
--- a/net-libs/rest/files/rest-0.7.10-disable-broken-test.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- tests/Makefile.am
-+++ tests/Makefile.am
-@@ -1,6 +1,6 @@
- TESTS = proxy proxy-continuous threaded oauth oauth-async oauth2 flickr lastfm xml custom-serialize
- # TODO: fix this test case
--XFAIL_TESTS = xml
-+XFAIL_TESTS = xml custom-serialize
- 
- AM_CPPFLAGS = $(SOUP_CFLAGS) -I$(top_srcdir) $(GCOV_CFLAGS)
- AM_LDFLAGS = $(SOUP_LIBS) $(GCOV_LDFLAGS) \
---- tests/Makefile.in
-+++ tests/Makefile.in
-@@ -37,7 +37,7 @@
- 	oauth$(EXEEXT) oauth-async$(EXEEXT) oauth2$(EXEEXT) \
- 	flickr$(EXEEXT) lastfm$(EXEEXT) xml$(EXEEXT) \
- 	custom-serialize$(EXEEXT)
--XFAIL_TESTS = xml$(EXEEXT)
-+XFAIL_TESTS = xml$(EXEEXT) custom-serialize$(EXEEXT)
- check_PROGRAMS = $(am__EXEEXT_1)
- subdir = tests
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
diff --git a/net-libs/rest/rest-0.7.10.ebuild b/net-libs/rest/rest-0.7.10.ebuild
index 26e854d2c3ca..73ead263c87f 100644
--- a/net-libs/rest/rest-0.7.10.ebuild
+++ b/net-libs/rest/rest-0.7.10.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rest/rest-0.7.10.ebuild,v 1.1 2011/04/24 12:02:30 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rest/rest-0.7.10.ebuild,v 1.2 2011/04/28 01:46:14 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 virtualx
+inherit gnome2 virtualx
 
 DESCRIPTION="Helper library for RESTful services"
 HOMEPAGE="http://git.gnome.org/browse/librest"
@@ -38,15 +38,6 @@ pkg_setup() {
 	DOCS="AUTHORS NEWS README"
 }
 
-src_prepare() {
-	# Conditional patching because the test passes without libsoup
-	if use test && use gnome; then
-		# https://bugs.meego.com/show_bug.cgi?id=16650
-		epatch "${FILESDIR}/${P}-disable-broken-test.patch"
-	fi
-	gnome2_src_prepare
-}
-
 src_test() {
 	# Tests need dbus
 	Xemake check || die