Do not block apptools-data for now but require dummy package instead.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

3 files changed, 14 insertions, 9 deletions

diff --git a/dev-libs/appstream-glib/ChangeLog b/dev-libs/appstream-glib/ChangeLog
index 14a4c31dad77..92d79d9b2358 100644
--- a/dev-libs/appstream-glib/ChangeLog
+++ b/dev-libs/appstream-glib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/appstream-glib
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/appstream-glib/ChangeLog,v 1.6 2014/11/23 22:49:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/appstream-glib/ChangeLog,v 1.7 2014/11/23 22:59:55 eva Exp $
+
+  23 Nov 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  appstream-glib-0.3.2.ebuild:
+  Do not block apptools-data for now but require dummy package instead.
 
 *appstream-glib-0.3.2 (23 Nov 2014)
 
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index 077df4d07233..99385c94e548 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 DIST appstream-glib-0.3.0.tar.gz 1837336 SHA256 0bc7043d97974a70ddd9e383ff74c7aa2da6d663783e43250668c2228a7a1616 SHA512 55617248a7331fd2c51da6325eb3a704bf0da0f9e99f0c2c1b020988f4f5def72e1cceda801d5d4798fe1ac829defa88c01d9abb2dd68ebd880139ef41e3d204 WHIRLPOOL eed8ba5a24986a8e5ae25be759eead71780ff8f7abe874370dbcfb805070b01b90fef6cae623e03e48d7b322917c65eee595acca64bfa99274e1f3aff8b6f710
 DIST appstream-glib-0.3.2.tar.gz 2234904 SHA256 b75130cb4e74cc87577f88b44659658c5fbb8352cf71549d8a1dad746bb9af6b SHA512 8dde460011b2b989a9535f16770c28827a92b4f87b9aac7a1d6c806237247767f51e83de85bfea2d1a200e6c6dfecd01eb27fb0943df325c7410d30326474ea4 WHIRLPOOL 406d4471ec209b9ddb1760c2c0aaa16a5ade26a7ff171cf84e24346a65b6af4b02984c4b2eda4bdd44bf7d05f47cd8c1c926958eb0bcef5247eed53362f00591
 EBUILD appstream-glib-0.3.0.ebuild 1563 SHA256 81140878f7f5cdde3286b36231fcd3a0015de0a1a34415008076e1857659abc1 SHA512 85d632bd69cf44c5dd82f8e6edfef46ae93d15f99b008c6da175d1532532b06355a309dfcb9e09243b00e9fd34bb972a01893a499cc4a1ed635023c5c03b4367 WHIRLPOOL 7a3eb38d3b54ffde419952510133f13243635c3431907799a432d1ca2ab5e057fb767113952c23e4d93c9f9211b6fe02b437b6753874912c588cf42cacf668d3
-EBUILD appstream-glib-0.3.2.ebuild 1627 SHA256 da4df27a124839c7075572e849b4c91490e68a04b7e47b8ea766fb8217eb6866 SHA512 4a04bf9abbd5dc5e4e417efafb41d33e2d14391d8681814d20d5624ca69024d7a4a63f9767d4594040a6adf62cc8e54f0f7092c3cdc04a4cb2c3f77bbf0c3234 WHIRLPOOL 1871da158c2d35b96d054fb0e8d87e238623d627fa1683a63c20bd320a7f94ef5480967c3d8d0f86798fc8fe91b8a2aab55957f0b3cf5d9e575ac567c5ec2ebe
-MISC ChangeLog 1027 SHA256 2ca33cebffa380ba783146b43c00e1d89cc2ffd2df89a701b2dc0fe625557039 SHA512 3a1eb3c86c217a25ad8097c10f9ef40da62f2e105ba0075128e92c45cf3ad1328cdbf1d1e7fe1b18e10b378515c1bb71846f831eaf1a331e4d8deb38250f7e63 WHIRLPOOL 665c44db11b9a5d5bd0936d9befb463df2723e23c34744119f6bd65863758231400dea6e1885c3e1308fdd9d6cb9c55745099c634a0bae12012308ac73bb4487
+EBUILD appstream-glib-0.3.2.ebuild 1711 SHA256 bcd73d738e347305a45876ce006358d0daf3632d733902f0f1d31d764ba7de8a SHA512 32ca0bf461d9e2e68f370f68008efdf23814ccd42ad0c3ceaa7ee2a1c805eedc4b078dd4a563950c6876ffefe5cbed12fe7505ab2cc62ad9fb58213e5ceffe16 WHIRLPOOL cfe5544751ade2c30b887c60848a9dd6f6a13cb44191b72fd6c26840857c91fa23efc371666085abe5446791b7241e71a7aa4a1ede7e838f0cb5be24d23447d4
+MISC ChangeLog 1185 SHA256 1bea9ea95ac6e963ad62d15519487c03a9f313ec893e3f41dc197d46a3c4ee39 SHA512 b01516e980e67ab0d7e88a73a9c5a39c845dd9a42ea95caacf939c7be15d138aea2a019d2eb0575ac3592dc9caacc4ede58310f5c169e1f93495db2802f41bbf WHIRLPOOL 474571abc214f82e64688447b557db160bcc976c5202d9014354e1e2b442ceb3b92dc510a773310c7ea4a3fccb4e244718188cbdbf27390c3c495bbcc2e44fd6
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRyZGcACgkQ1fmVwcYIWAZ6cACghxld+FeCbVH8ya4dPFNm0UT1
-CZkAn3mqJXfJeBdS0taPaI69nfYjWbnP
-=xkxa
+iEYEAREIAAYFAlRyZuwACgkQ1fmVwcYIWAbMEACfeMw8iYWlFyMoRF2v9ZBSdUNb
+yqMAoL2KFEuhcx0DeD9Ov+m1TB2VO4Jc
+=c/yT
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/appstream-glib/appstream-glib-0.3.2.ebuild b/dev-libs/appstream-glib/appstream-glib-0.3.2.ebuild
index 143473a044fa..d2a37ede103b 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.3.2.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/appstream-glib/appstream-glib-0.3.2.ebuild,v 1.1 2014/11/23 22:49:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/appstream-glib/appstream-glib-0.3.2.ebuild,v 1.2 2014/11/23 22:59:55 eva Exp $
 
 EAPI=5
 
@@ -40,8 +40,9 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 "
-# ${PN} superseeds appdata-tools
-RDEPEND="!dev-util/appdata-tools"
+# ${PN} superseeds appdata-tools, require dummy package until all ebuilds
+# are migrated to appstream-glib
+RDEPEND=">=dev-util/appdata-tools-0.1.8-r1"
 
 S="${WORKDIR}/${PN}-${MY_P}"