mgorny 14/11/24 11:13:49 Modified: appstream-glib-0.3.2.ebuild ChangeLog Log: [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. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.3 dev-libs/appstream-glib/appstream-glib-0.3.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/appstream-glib/appstream-glib-0.3.2.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/appstream-glib/appstream-glib-0.3.2.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/appstream-glib/appstream-glib-0.3.2.ebuild?r1=1.2&r2=1.3 Index: appstream-glib-0.3.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/appstream-glib/appstream-glib-0.3.2.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- appstream-glib-0.3.2.ebuild 23 Nov 2014 22:59:55 -0000 1.2 +++ appstream-glib-0.3.2.ebuild 24 Nov 2014 11:13:49 -0000 1.3 @@ -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 @@ " # ${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}" 1.8 dev-libs/appstream-glib/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/appstream-glib/ChangeLog?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/appstream-glib/ChangeLog?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/appstream-glib/ChangeLog?r1=1.7&r2=1.8 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/appstream-glib/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ChangeLog 23 Nov 2014 22:59:55 -0000 1.7 +++ ChangeLog 24 Nov 2014 11:13:49 -0000 1.8 @@ -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 <[email protected]> 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 <[email protected]> appstream-glib-0.3.2.ebuild:
