Adapt to libsoup-2.42 dropping gnome USE and splitting (#463702)

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

4 files changed, 15 insertions, 17 deletions

diff --git a/sys-libs/libosinfo/ChangeLog b/sys-libs/libosinfo/ChangeLog
index 44007be6e1b5..193392dfdfb2 100644
--- a/sys-libs/libosinfo/ChangeLog
+++ b/sys-libs/libosinfo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libosinfo
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libosinfo/ChangeLog,v 1.25 2013/03/30 18:40:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libosinfo/ChangeLog,v 1.26 2013/03/31 19:09:03 pacho Exp $
+
+  31 Mar 2013; Pacho Ramos <pacho@gentoo.org> libosinfo-0.2.4.ebuild,
+  libosinfo-0.2.6.ebuild:
+  Adapt to libsoup-2.42 dropping gnome USE and splitting (#463702)
 
 *libosinfo-0.2.6 (30 Mar 2013)
 
diff --git a/sys-libs/libosinfo/Manifest b/sys-libs/libosinfo/Manifest
index 5ad15e21586a..d9439ff17354 100644
--- a/sys-libs/libosinfo/Manifest
+++ b/sys-libs/libosinfo/Manifest
@@ -4,18 +4,14 @@ Hash: SHA256
 AUX libosinfo-0.2.6-destdir.patch 624 SHA256 a425e51347d95983414b8c58371dc3e183e6e30e1485e58c60d849da64daf143 SHA512 805c2be12406082e4ee2712eea0fe7b84f8d962faacf2f05f1014d6f967cc007d26d3202fa662074218ee2417803badbbd419dbd35698a86c1e550c7f7c8234d WHIRLPOOL 3f8ca1ef4a7fafa1e3a2f5c673542e01b44980365b9c806aaa2ce658d11b2106a15f9ec9ca6e514c8527a3e0a09bed7ac3f0cc2dc646a906c0465cc949e7c6be
 DIST libosinfo-0.2.4.tar.gz 1221090 SHA256 42023d5911feebd49acc15df1edde62c0717598985aff9533a34628bd26c78d7 SHA512 c50791013f4a566aba5ec1b14b2be8dc5d4eae532cecbc8e1cbcc2d4d917f8472b8fce32873f4251f5c5c7b374241c606a3ded17001cf243a62398549751c14e WHIRLPOOL 255ce07ccad6500fc6c4cafadce830e715310773271218683e8c503c5ce6c6263385ffff3b96b0161e7595ff1d91ccb29d1cf79d6107dac159bb643699e32f3c
 DIST libosinfo-0.2.6.tar.gz 1228644 SHA256 4c61a566d71e40936b8c327d63c2fa8287a03b50bac94a4d93cb094f17f71dc9 SHA512 e19d4e87844c79e00fb09d143e1e1cc5ab78ce50a78b45fd4a6235af992ddd499374ba91313863bd1838af2bc65d38e730c08243a2e0ac24827c51d1b5b4c669 WHIRLPOOL 425c6410ff00b4fe99ca7e39214228f16e052a1a294448d2fdaf4d9b74ccc8bbd5518be301933079411e747ea76fd3f5c3525dd0c6205835c0ff02ce180a8ec8
-EBUILD libosinfo-0.2.4.ebuild 1382 SHA256 96fc63857ca68a3822786f16d566fe08f3b6233db5398f8a3c71efe4b3249f9e SHA512 d4d5f7e21667145a1c04995faef02cf9452a8156164c5d7ed3739a696a419e513b7c42625f68ac1ff2ccd38ff2fa260cba5f0cd966b77c1422364a26e34a4c0f WHIRLPOOL 50de455c619a8fc6cd74f5994a1c5ab15babcd68d1987b96f4ef821fbdb023ef8ffa496316376571fa759c5dbb7458b59de8adadb01ef9daf701f1d77439bb9a
-EBUILD libosinfo-0.2.6.ebuild 1632 SHA256 fadeb75c83aba7bddbe3c1795d1f93c9f1845a53fdb2889a61ee19d76d65a6c8 SHA512 9e85479764e2dd2e2c6d378707cd1a317d7bb89c76bf374cb06408978d72b52010f384f68235ba21840e0a8146a629466e5dc861c35546add51be20d08e85a7f WHIRLPOOL 0cc842d0c107fcc8f0a514bd4194f296eab14a2a85588c8e71cc1bb92c80d98626d1c3bc7bbc9b80e429a7ef513ddf2a7d3181d024c1b7db68399a9fa8c441d1
-MISC ChangeLog 4072 SHA256 940c58807ae4bbbf5d22435d589d1f980b3869ed8d95662d5b748012a6858416 SHA512 fe56096180417c4a41a91283cd5b03da0c5b1235b8a5d3d19c975ba523b1e9055bd09f668ab13e77c8fd40aae7b5b37c10a70d997faf1e9e6ce026309e6e13dd WHIRLPOOL d97e143034f740f9f3b57aea70cb5324a4853158616b862f46a549b0610e0d358a93e48e9658a08245e02ff9c84560f6980008d9eab42a680ebefbf19ad490b0
+EBUILD libosinfo-0.2.4.ebuild 1394 SHA256 dc295fd70108f00b19a02195f6a53eb670f4f55fb6d72f734367093a9f69ff99 SHA512 31cfbb4c971fbc3befe5030de23fb5fcd524e054538680af4c42235b7f4064d0fb13ef0962e2d966cb9b48078f19acc85fe1eed7f15a1af681d6322ea69ddf9a WHIRLPOOL c62dc313feb6763191a089e498364023cd70b39093cb7159a2366f5a23d0e4e3a7e9c7ea55097b45724b87899a7de37faf6893c95ebd5e92991d5ebcb5987812
+EBUILD libosinfo-0.2.6.ebuild 1641 SHA256 78b34d33bb9b2e66cccaf7d24e79f5526af0be9639ed7487f4587359ecf28709 SHA512 7f95cea057e82d16ad6d57c4115a31b5983e29c5719bbe4b0f70a667d36cd6407ba589763eb8384b271887f318aa2d640b8fca1df889f41ffd114b0f76962266 WHIRLPOOL 3c036f1989383f7943ed07384a109e98dccb3629367f2073f552450e7112f0596a05269371fd683a2e4645c3ecad4911c5864ffe36be1349cdbc4ff87b1e21e6
+MISC ChangeLog 4232 SHA256 6f790921241a7f42e4aab7ca485c423f64b4b95c843a56890f0dc8f31a5228f7 SHA512 30a074253f9f31619c24295f21954301529407691f7058095bca8a7bc2e4f808438163a824955a190b7b65a6f5f2d5732da99a83ed006e78199e1003a2aa2f0d WHIRLPOOL c47870514f0b3c90c6c614509770ad69666879a4c5b19551309ab2bf4cfcb751f8d1d7385c62fd5596b8d91cb7b9054a954d8c00c2d2b3199492ac0391bf0494
 MISC metadata.xml 343 SHA256 f63e7ac53c26b3597f9b90aa85d0c365d30ca7080aa0b376340f15eef4423a91 SHA512 86f508e16c585c8ee807e356610ff9977b6f907bd394de9fbefa7e6d8dea456c856a80fb025c21113d91c6d8e9570a82853683174383769eba359d64dd7c30ad WHIRLPOOL 60e646074a3273e59d27688f1493af0fb0a07a73523da33b21092a7d88a48f956eefb93414b541b1657361ac89e304feeeca7fa7b1d155ae033ba63de4873a95
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRVzFVAAoJEEdUh39IaPFNhgAH/1l+aXWzsQY/nU5M5hojRf4V
-cTU1vw2atbQ8a/AEmWALX1nIQsuOVGy8V5u4OlQy8hzXOhC4hpNhwjLT6avn2QLb
-oMxSXRt6YW8YTL9DckiO379M0mHB/ONIgni9enf/r+YLSuturYoJkBXEFqy3308Z
-ZEk4QBHnl2rTWoWUHnTeG43ZIr5KlGFurjLOQgTZjsVLhev1eJ0LDEizW/KmR0QL
-Dfjx9d7d9jfrCJi2XG9d9Gq2PPnzefSvkhkM2DJoMXLGmG2HMPaTini8G9xUx+4+
-phmvWZAjEkbQjzSVc3EluR03IntxyWM6Z/PmP1/HaETozuem4yqtMKrYENUkbps=
-=ACR0
+iEYEAREIAAYFAlFYidAACgkQCaWpQKGI+9R9CgCfZ51leasYDn/QuxoMIVe94W3Z
+0goAniSx37Ctc2bM8S8sZ7Dk438K7n6U
+=RDpz
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libosinfo/libosinfo-0.2.4.ebuild b/sys-libs/libosinfo/libosinfo-0.2.4.ebuild
index 381f84fa8a1c..1758b76d213c 100644
--- a/sys-libs/libosinfo/libosinfo-0.2.4.ebuild
+++ b/sys-libs/libosinfo/libosinfo-0.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libosinfo/libosinfo-0.2.4.ebuild,v 1.1 2013/02/24 21:59:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libosinfo/libosinfo-0.2.4.ebuild,v 1.2 2013/03/31 19:09:03 pacho Exp $
 
 EAPI=5
 VALA_MIN_API_VERSION="0.16"
@@ -22,8 +22,7 @@ REQUIRED_USE="vala? ( introspection )"
 RDEPEND=">=dev-libs/glib-2:2
 	>=dev-libs/libxslt-1.0.0:=
 	dev-libs/libxml2:=
-	net-libs/libsoup:2.4
-	net-libs/libsoup-gnome:2.4
+	|| ( >=net-libs/libsoup-2.42:2.4 net-libs/libsoup-gnome:2.4 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )"
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
diff --git a/sys-libs/libosinfo/libosinfo-0.2.6.ebuild b/sys-libs/libosinfo/libosinfo-0.2.6.ebuild
index 767981a8ef20..28a9b2f8e8be 100644
--- a/sys-libs/libosinfo/libosinfo-0.2.6.ebuild
+++ b/sys-libs/libosinfo/libosinfo-0.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libosinfo/libosinfo-0.2.6.ebuild,v 1.1 2013/03/30 18:40:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libosinfo/libosinfo-0.2.6.ebuild,v 1.2 2013/03/31 19:09:03 pacho Exp $
 
 EAPI=5
 VALA_MIN_API_VERSION="0.16"
@@ -22,8 +22,7 @@ REQUIRED_USE="vala? ( introspection )"
 RDEPEND=">=dev-libs/glib-2:2
 	>=dev-libs/libxslt-1.0.0:=
 	dev-libs/libxml2:=
-	net-libs/libsoup:2.4
-	net-libs/libsoup-gnome:2.4
+	|| ( >=net-libs/libsoup-2.42:2.4 net-libs/libsoup-gnome:2.4 )
 	sys-apps/hwids
 	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )"
 DEPEND="${RDEPEND}