[QA] Add missing blocker on colliding versions of dev-util/appdata-tools. Use PDEPEND instead of RDEPEND on the metapackage to solve collisions. Fix overwritten RDEPEND.

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

3 files changed, 27 insertions, 8 deletions

diff --git a/dev-libs/appstream-glib/ChangeLog b/dev-libs/appstream-glib/ChangeLog
index 92d79d9b2358..b0f1cfc0db06 100644
--- a/dev-libs/appstream-glib/ChangeLog
+++ b/dev-libs/appstream-glib/ChangeLog
@@ -1,6 +1,11 @@
 # 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.7 2014/11/23 22:59:55 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/appstream-glib/ChangeLog,v 1.8 2014/11/24 11:13:49 mgorny Exp $
+
+  24 Nov 2014; Michał Górny <mgorny@gentoo.org> appstream-glib-0.3.2.ebuild:
+  [QA] Add missing blocker on colliding versions of dev-util/appdata-tools. Use
+  PDEPEND instead of RDEPEND on the metapackage to solve collisions. Fix
+  overwritten RDEPEND.
 
   23 Nov 2014; Gilles Dartiguelongue <eva@gentoo.org>
   appstream-glib-0.3.2.ebuild:
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index 99385c94e548..4f6afb283ff2 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -4,13 +4,25 @@ 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 1711 SHA256 bcd73d738e347305a45876ce006358d0daf3632d733902f0f1d31d764ba7de8a SHA512 32ca0bf461d9e2e68f370f68008efdf23814ccd42ad0c3ceaa7ee2a1c805eedc4b078dd4a563950c6876ffefe5cbed12fe7505ab2cc62ad9fb58213e5ceffe16 WHIRLPOOL cfe5544751ade2c30b887c60848a9dd6f6a13cb44191b72fd6c26840857c91fa23efc371666085abe5446791b7241e71a7aa4a1ede7e838f0cb5be24d23447d4
-MISC ChangeLog 1185 SHA256 1bea9ea95ac6e963ad62d15519487c03a9f313ec893e3f41dc197d46a3c4ee39 SHA512 b01516e980e67ab0d7e88a73a9c5a39c845dd9a42ea95caacf939c7be15d138aea2a019d2eb0575ac3592dc9caacc4ede58310f5c169e1f93495db2802f41bbf WHIRLPOOL 474571abc214f82e64688447b557db160bcc976c5202d9014354e1e2b442ceb3b92dc510a773310c7ea4a3fccb4e244718188cbdbf27390c3c495bbcc2e44fd6
+EBUILD appstream-glib-0.3.2.ebuild 1770 SHA256 b2a091caaa582ae200be5823b8d23d64789c8a2bd452117088a9c9f4e9a15d73 SHA512 b6c7ed27eb9828d17830aa19ccf259545b59d81966dd664d1c4351a08358d461f915d4aee3e4e24e8b32b53f9c57eeb0d78786c037b3da55a013e659f14720ea WHIRLPOOL be4b60dcef63e614a5259625aa2685e1eea0efd4d1ece4b1de1c91eba1ec25d9dcce4baa51f803914bc4e714da340bfb628b297f981f1bcd3960c9e455fb9b70
+MISC ChangeLog 1444 SHA256 b93e85e90d41545e39add06a4d03e993551c27615679a0bc35a01a501931f728 SHA512 4567e8544d53b4b8a6d39408f5ce6587ddfbcd4aeb85fc9ae49812818f826ea8d8cc5038c6fbacc1bc4c83d473817577b45c89b684f80f138b076c9a768b1907 WHIRLPOOL 10c7f4671d2ce57c1bc4d339850291e03824852a4f1aa26f085f6ed10038d28d4252c7a781d066f8f2698218b76487e3659ea25cab00ca1f0b347b74f7458381
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRyZuwACgkQ1fmVwcYIWAbMEACfeMw8iYWlFyMoRF2v9ZBSdUNb
-yqMAoL2KFEuhcx0DeD9Ov+m1TB2VO4Jc
-=c/yT
+iQJ8BAEBCABmBQJUcxLuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOUXMP/j/bYRm2r9wr6N3hHsaXb8ox
+bTw2x+U2x3hHBcPrri/Tc7wIu8ZCI+FP+oeA5EInud98EjeLVbK50UPGDTNTBlDf
+2klEfla7snrTaXbiOFO/XK1RZJiuHnLsFdsHJ4nzpLS9xW6P2MZW5DcH2n2X7KcU
+c1X3eZGTMH9NubF3UeI//QwXzq9+n/MLPpeTdRFXPLcg2257BNcnq795ataJo+7e
+bB5MDHC+mkFhX6qsIFco36RstvmFqeUufT3/Ic/minwoJvKnEZYSsvLrnG+n0hpF
+/pa1cK1mpNfUp1SCbyDaYtp0YDOOjFT5hnemBqz+m3/HfGAkKQNfICR86/nWxpjL
+qdWQjHsTdCuIH+icA2LPRSIIt5dL6Yj3KPWz2S/90uYjsHQAYWBN4p+By2gny25g
+hAvQ4YncZsQT8+b5W02I4Afz3lcCysK1oKM7bDEzEnM6dfsJhiX9byoZbL3/AgmJ
+iZ/OIyN281P2sNtXXVTnqdzwMTMsJtWlCNE0GF82KrVcb3isXYSddIzRB6JZXRO3
+kZuJUrOjZMkUWuJmeBVh+mnMkdk/7hQbCL1Pk4LliurrWbNcw37sgNpDASvmfXSE
+8j8+MnFYf9FHH8VylXr3fwwr25+oYUbjPtFvd+FPAS3Zes3s1Eiv1ntELrVQxZ/a
+XWquQhH0+5y20TJJ/ta3
+=7PHF
 -----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 d2a37ede103b..067b3a130d70 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.2 2014/11/23 22:59:55 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/appstream-glib/appstream-glib-0.3.2.ebuild,v 1.3 2014/11/24 11:13:49 mgorny Exp $
 
 EAPI=5
 
@@ -42,7 +42,9 @@ DEPEND="${RDEPEND}
 "
 # ${PN} superseeds appdata-tools, require dummy package until all ebuilds
 # are migrated to appstream-glib
-RDEPEND=">=dev-util/appdata-tools-0.1.8-r1"
+RDEPEND="${RDEPEND}
+	!<dev-util/appdata-tools-0.1.8-r1"
+PDEPEND=">=dev-util/appdata-tools-0.1.8-r1"
 
 S="${WORKDIR}/${PN}-${MY_P}"