Move libsoup-2.34.1 from the gnome overlay, introspection unmasked. Keywords were dropped, see bug 365331

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

4 files changed, 113 insertions, 17 deletions

diff --git a/net-libs/libsoup-gnome/Manifest b/net-libs/libsoup-gnome/Manifest
index e8687331fbb9..cd984b841a44 100644
--- a/net-libs/libsoup-gnome/Manifest
+++ b/net-libs/libsoup-gnome/Manifest
@@ -10,23 +10,23 @@ DIST libsoup-2.32.2.tar.bz2 668131 RMD160 641d52bfbb9772cf9e69f3050f59b427838519
 DIST libsoup-2.34.1.tar.bz2 683473 RMD160 2897f60c2ad94308cb1dfc40ddd55f800c4f656a SHA1 29186d5de0afb916b0da46f18548f666e890ea3e SHA256 a2f846af2c4c08e15eacc9879c8c9be4d85f8105f960f96a9ba3dbabd9ee517b
 EBUILD libsoup-gnome-2.30.2.ebuild 1871 RMD160 e8e10600f17cf0ee9d803d9c7020d7d2142088ab SHA1 fc4e0bc69cfd1d3fe6e85821dee4a5334e17cfa9 SHA256 4644209f4c8a26a6618fa3cd309df1eff81eb80c47c43d794566ac3c804200c2
 EBUILD libsoup-gnome-2.32.2.ebuild 1420 RMD160 87fbda2a1ddaf19619a761deea168bf22241be7e SHA1 18d13f5dfd59ed39bf56292f995a3aa30b113640 SHA256 93331d48d8da62f5efffd539a3c13f4e2c239112e3e0a6f455ec06113da73842
-EBUILD libsoup-gnome-2.34.1.ebuild 1432 RMD160 13e99dc0cf9436b290c627c2e0beb92a35b9e8e9 SHA1 113056003bc0e712c1a1f922d1287907568dc7b1 SHA256 52c325b9578a11e26cde0226bd4f28054f7881519ad5ce1046402b0fd330587c
-MISC ChangeLog 8172 RMD160 d279a3d72b058fe747fa55ee55a94d7192d8c686 SHA1 385e19eb8f84796b6d888a2c0ac22bae7ed62a26 SHA256 23d72917c69fb20e5c614d83905b30cfeb41d9b9f00674444c16266ce4750750
+EBUILD libsoup-gnome-2.34.1.ebuild 1391 RMD160 f40231ea4788ab8e2e83b18375996e06e219d8bf SHA1 60f76048120a61ed2f8b1c9afa636bcc172f1fc7 SHA256 fd2c1303ce4e5c4f764297d748bd40f31e2a610770b4b2d1bc74132048631a8c
+MISC ChangeLog 8298 RMD160 e77861219c45380037893aa5ed38616e49f110de SHA1 9691f84330a1c9ef9d87f546090787ef4a4eccbb SHA256 2e0031136b13be794b846077108c0540116134080014c43c31d4925353c302c4
 MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNuvxHAAoJEO/kOhxWD91kJj4P/3W2GEbb6411tUa2iIkuf33l
-B23IgMyxbrHu4/tFbaZRS+00oVJ/WD6JyVLgpYL627Xx4MybLIrPsqc5LewiIgHD
-Y8He4Cg/gnfAgz+Vmo3q9qwOHTy6sjekLQhoBqE7Viz/kU0FdJwBrrpFugmyM7kp
-z8iRgKVxgQey1++2O2CYcb1bgUc1SlC+IGIMFvcGwgO3amCdcrO8npCelL1ljZQg
-0e08VckndlyLBcgXHLmmbfXCdZYR0bagAGCWZF7w7lgr06wTUNBHiyg/8mTAgKvY
-xn5pot6s8Zi7BWL4T+VuDy3SJoKNUB1BvoPEz6R6roQcrUVh1Fafte1PHB6KSWEd
-k/o5iztAv+OJQfEe19SGl7fi/hNjYgStVUhsGsKeRUyhTX7ZabFyCnmqb0HVXAjk
-4+PxVw4Vx6WncJRj5O2rDVbjUMtXQVOS/PuUiU2jmvjgyDsezps0zvYmCaYEds9l
-LTSjFEHtz54U5WJV5pAOUYvucC23j/KxLddewzjuoKVLmC2DoeEhlQalWmLp/Ixz
-djfIGUwqkgh/cVXJuKqHiRt0Op15UXHC4MTn0Lta4iTRBJiC7MMhgGAaWWUvpSut
-Wq4lXb2XZIw/6shswlTBIuTM65F3mZniXS3IYRME6p2HCxKd6YI60xCYYabis5Z0
-b3uz2BcJ5VV6e2rMJZqD
-=eiIJ
+iQIcBAEBAgAGBQJNuv9ZAAoJEO/kOhxWD91kahMQAKCGL8JujAknazo1XSb6EVAe
+BjwkNDtW0bHn3vF14PkhrCh6ugJlTcqF+PAcn4e2dA2rTRel5BR/7B/s2p+bvRlu
+aYIcLr3M+OK0lAGbUYa9j82XfJynPVsIXB2GZGEbCDHLF2cNNaxHQ6GIFAT+7aSo
+Z2fXbcrem0TIOaHPy4yMyBZoRGaHJZmzz/mmjmgdj/HaKY2t4uRTRsZin+/9AJ02
+HPb4kne0oDEUHHVTNRgd675xLTMnU0sf7XCrSaG+7bhkwshqQS2RoieaSL+pi07j
+dwc/3FpBGzfBNmMgHaLPl02tsiiFSs6G/r6hbW54KsZjaEchT9hReebgOIs7T+wa
+AVGvOWxJ8PpoO5qkEkMVhw3EcKJltk+/TWY/yWOhW/JWuoSi0AX26D/PjkE6+5hg
+Ddp58TyYa5GNfj3Z+Hdp9GIXHr5jMuBQt9PS1ZJZSO4NVIioEO2AqHQ0scW1PMBa
+qbIjyCaNAwe0tcju8Ndi0usfodz+vhSwm3Rgd1a7PjjSInKlk2VuU0OVXBfzoJB5
+sSXnVHibLXItQcPo1tGBATaI/bg34Lp2P3CDabi/Q+dSeZMK++48b++/u+xJi56i
+QrJRq+rTrnmlwKoxkRIf3bH/fihyYq3j+OQ/7MuXzJh3oQeUvYp/ppUQzs/q/EAe
+sxHzUMYvmNAwLtJtimOP
+=ULs0
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index 0d538b177886..3623ef9f1724 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.248 2011/04/15 16:18:32 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.249 2011/04/29 18:09:29 nirbheek Exp $
+
+*libsoup-2.34.1 (29 Apr 2011)
+
+  29 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +libsoup-2.34.1.ebuild:
+  Move libsoup-2.34.1 from the gnome overlay, introspection unmasked.
+  Keywords were dropped, see bug 365331
 
   15 Apr 2011; Jeremy Olexa <darkside@gentoo.org> libsoup-2.32.2.ebuild:
   Add prefix keywords as tested in the overlay
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index c00fd24201f7..fa0167ae620f 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,9 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libsoup-2.30.1-fix-build-without-gnome-with-doc.patch 1818 RMD160 e68eb491f87c83517c59107931ba185d29e4ffa1 SHA1 085fc78a332a356ce2cddc2d0b0af510eb21bf74 SHA256 f385b68a7a6db02634e2189e775bc2eea54529ccebe1eefc4b81a12c28ff0e89
 AUX libsoup-2.30.2-disable-tls1.2.patch 1289 RMD160 0bace30f6e158f8188c192a9864e3dce0b64caaf SHA1 b48eb37ddbc38306f49dff679f9f3692b34226b6 SHA256 0818ba3dcb53bf58bd0dafe06d66e19aa3ccbab80d2ab403ec9f787717f50ee3
 DIST libsoup-2.30.1-build-gir-patches.tar.bz2 8678 RMD160 2043a4847d1d5830e1f2f204aa33d2027c39ead7 SHA1 30c54c319484e17512c66e0f1b0124bc51021176 SHA256 880de0050e92dbab2d9d94735fc3abce0d1ad1996810a0875b3a81c3d0d3fd25
 DIST libsoup-2.30.2.tar.bz2 644337 RMD160 e714287d93cf10d0775bfcb48676b4a4c487bff3 SHA1 bf3ce2efb5452f79758a05b010d21bdaa1ba985c SHA256 78ccbce84fccc74a49fb8168eeb409a6429a8a5854f197261d4108b8bb106bf6
 DIST libsoup-2.32.2.tar.bz2 668131 RMD160 641d52bfbb9772cf9e69f3050f59b42783851926 SHA1 d93cfbd8a44c8b8759c98bfc83d2e3a003973708 SHA256 96e6973c8b7459523c0f44e7aec69528ff2fbd388e8ddc415f91bcc42f50777f
+DIST libsoup-2.34.1.tar.bz2 683473 RMD160 2897f60c2ad94308cb1dfc40ddd55f800c4f656a SHA1 29186d5de0afb916b0da46f18548f666e890ea3e SHA256 a2f846af2c4c08e15eacc9879c8c9be4d85f8105f960f96a9ba3dbabd9ee517b
 EBUILD libsoup-2.30.2-r1.ebuild 2050 RMD160 e8736dd121396246991da98415ee0b2ce60bf30e SHA1 8219519756d7d1949bec1e4e8ce956d0d4ba2e61 SHA256 1c8ec6f16be3ba48efbacd7cd9af988dfdcd8525e57e9f76edb5fd9768a61154
 EBUILD libsoup-2.32.2.ebuild 2146 RMD160 4dda2dadb7006b30ecc822a4831df3bb32b71ed1 SHA1 eb32635ee89a931f5833a0d9284706c355361a85 SHA256 89d71003b5bad22340f858c68312290c60bc3a36fcfd053041e4c59bff9f2908
-MISC ChangeLog 32357 RMD160 eb87a8452861d49a4d739f9afb14c21b1e6b371e SHA1 14423daad65c334f63d9b24a5b5da09312970e9f SHA256 8921329b0d6a1c2bc3c3ee3f5293b3e8edc3462b4f78cbcd41fc6fa5d54d08a0
+EBUILD libsoup-2.34.1.ebuild 2167 RMD160 3b2baa00a0f8ac33705c1b34c6c002cf7959b392 SHA1 10fd6b219e993734bf6c1781230e800fc50251e2 SHA256 5e6c8def6aa73cfd4c6c6915af3cf8ac00fcc3f30577264ed2ac61e7fe85efc9
+MISC ChangeLog 32579 RMD160 d2d9bb38a1cca30500da98a6cc0e84359af5f005 SHA1 09b8c5d8a48b2c14e05eb1c7f058ef1cbc5be518 SHA256 cb811219450df19e4e6db70ba6aa6ef5c72fcd067d540ad7aeb3ecc792650932
 MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNuv7fAAoJEO/kOhxWD91kYOcQAK+MqnraPrZSfqjp0dOncq3d
+/3RicrOqaY/H0prCpzxcg7TIarZP5N/yEIwNGpamUUAYNQlHtK/6tGiamz0yCsvF
+qQdfnm/tXbeXgQcZlFRpaPdIhAAkoI+jaumSiX6XqDG3V7GYYWwwshFfdNL3H9do
+S7Ht9hBMxY0TCmhsZkIEfPiIJQqIYiedi7rptYLzJibpIdP7AjMxKThyDL3vfXZD
+vb6enVAe31eiAyynqmP7001U8KeYrHDiz2QEX50Z4eFku4vPunSmESxwbYxnzsDs
+LuiZS4XgT2M2iL4W8n5SNeP0C/LhfRN9D33GvbBBJqjmoG8ymBSp9Bl2BdcudYx5
+jjlnjvzAGYAv0/JSXTBkWd7uB7X0oRyF0p/ckv32zpfXKpDt9AunkYODYfDEFWqL
+4z2tqo24EB1HQwSsuhvGq1VWpyIR9U47yw65GbOsyaR7vjdxllV8qOu6zJcNHNwv
+3e+EKGIFIyjOfLRgYorTb0rp15L7irfIS7VnYYCwx3XCfqK2UQwbGePQt79s6TrY
+p3310W6FO2E5xOX7WK8lWE/BBSkYZGI285cCv8AObV+rrooCydpQMV3Qs6vSEfn7
+sHHsLo8N5668Z5jc8dmermJ2M4VaJvzc6RvOR8ghRYSZ3gw2/khU2KHCbDWtl3ZW
+1pDU3OzUeDmJAxqSZIKx
+=yLtR
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libsoup/libsoup-2.34.1.ebuild b/net-libs/libsoup/libsoup-2.34.1.ebuild
new file mode 100644
index 000000000000..c87e78edae3d
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.34.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.34.1.ebuild,v 1.1 2011/04/29 18:09:29 nirbheek Exp $
+
+EAPI="3"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="An HTTP library implementation in C"
+HOMEPAGE="http://live.gnome.org/LibSoup"
+
+LICENSE="LGPL-2"
+SLOT="2.4"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="debug doc +introspection ssl test"
+
+RDEPEND=">=dev-libs/glib-2.27.5:2
+	>=dev-libs/libxml2-2:2
+	net-libs/glib-networking[ssl?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/gtk-doc-am-1.10
+	doc? ( >=dev-util/gtk-doc-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() {
+	# Set invalid apache module dir until apache tests are ready, bug #326957
+	DOCS="AUTHORS NEWS README"
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-tls-check
+		--without-gnome
+		--with-apache-module-dir="${T}"
+		$(use_enable introspection)"
+}
+
+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
+}
+
+src_prepare() {
+	gnome2_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
+
+	# Patch *must* be applied conditionally (see patch for details)
+	if use doc; then
+		# Fix bug 268592 (upstream #573685) (build fails without gnome && doc)
+		epatch "${FILESDIR}/${PN}-2.30.1-fix-build-without-gnome-with-doc.patch"
+		eautoreconf
+	fi
+}