Bug #392309 - Move blockers to RDEPEND due to file collisions.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux i686

diff --git a/dev-libs/libdbusmenu/ChangeLog b/dev-libs/libdbusmenu/ChangeLog
index a9b0d58ec367f950a5cb26b009b95dd0760a2b44..537f7e0ed01aff6830cee375b4d5a64e98c140c3 100644 (file)
--- a/dev-libs/libdbusmenu/ChangeLog
+++ b/dev-libs/libdbusmenu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libdbusmenu
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/ChangeLog,v 1.14 2011/11/28 16:50:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/ChangeLog,v 1.15 2011/11/28 22:37:34 zmedico Exp $
+
+  28 Nov 2011; Zac Medico <zmedico@gentoo.org> libdbusmenu-0.5.1-r200.ebuild,
+  libdbusmenu-0.5.1-r300.ebuild:
+  Bug #392309 - Move blockers to RDEPEND due to file collisions.
 
   28 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
   Remove unused description for "gtk3" and "vala"

diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.5.1-r200.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.5.1-r200.ebuild
index dd2349c7fe918acddb3df7f814a19af7898b3c1e..2e1ca8c8e8a44da999cd81e5d879b526d1f8fb89 100644 (file)
--- a/dev-libs/libdbusmenu/libdbusmenu-0.5.1-r200.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-0.5.1-r200.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-0.5.1-r200.ebuild,v 1.2 2011/11/28 16:54:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-0.5.1-r200.ebuild,v 1.3 2011/11/28 22:37:34 zmedico Exp $
 
 EAPI=4
 
@@ -23,7 +23,8 @@ RDEPEND=">=dev-libs/glib-2.26
        dev-libs/libxml2
        gtk? ( >=x11-libs/gtk+-2.16:2 )
        introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-       ${CATEGORY}/${PN}:3"
+       ${CATEGORY}/${PN}:3
+       !<${CATEGORY}/${PN}-0.5.1-r200"
 DEPEND="${RDEPEND}
        test? (
                dev-libs/json-glib[introspection?]
@@ -32,8 +33,7 @@ DEPEND="${RDEPEND}
        dev-lang/vala:${PN_vala_version}[vapigen]
        app-text/gnome-doc-utils
        dev-util/intltool
-       dev-util/pkgconfig
-       !<${CATEGORY}/${PN}-0.5.1-r200"
+       dev-util/pkgconfig"
 
 src_prepare() {
        # Drop DEPRECATED flags, bug #391103

diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.5.1-r300.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.5.1-r300.ebuild
index f7c0d0b26ceb3b39414628ae9a7ee1e3985d478e..39f4bf7b91a0c725f3b3e9364c9810505cb446b6 100644 (file)
--- a/dev-libs/libdbusmenu/libdbusmenu-0.5.1-r300.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-0.5.1-r300.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-0.5.1-r300.ebuild,v 1.2 2011/11/28 16:54:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-0.5.1-r300.ebuild,v 1.3 2011/11/28 22:37:34 zmedico Exp $
 
 EAPI=4
 
@@ -21,7 +21,8 @@ RDEPEND=">=dev-libs/glib-2.26
        dev-libs/dbus-glib
        dev-libs/libxml2
        gtk? ( x11-libs/gtk+:3 )
-       introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
+       introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+       !<${CATEGORY}/${PN}-0.5.1-r200"
 DEPEND="${RDEPEND}
        test? (
                dev-libs/json-glib[introspection?]
@@ -30,8 +31,7 @@ DEPEND="${RDEPEND}
        dev-lang/vala:${PN_vala_version}[vapigen]
        app-text/gnome-doc-utils
        dev-util/intltool
-       dev-util/pkgconfig
-       !<${CATEGORY}/${PN}-0.5.1-r200"
+       dev-util/pkgconfig"
 
 src_prepare() {
        # Drop DEPRECATED flags, bug #391103

diff --git a/dev-libs/libindicate/ChangeLog b/dev-libs/libindicate/ChangeLog
index b1b22c23de55335d9e5fb37a2510bc665d9461d8..03b0cb3682a402e581c5154d8545ab4bcaa30f69 100644 (file)
--- a/dev-libs/libindicate/ChangeLog
+++ b/dev-libs/libindicate/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libindicate
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/ChangeLog,v 1.27 2011/11/28 16:51:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/ChangeLog,v 1.28 2011/11/28 22:39:35 zmedico Exp $
+
+  28 Nov 2011; Zac Medico <zmedico@gentoo.org> libindicate-0.6.1-r201.ebuild,
+  libindicate-0.6.1-r300.ebuild:
+  Bug #392309 - Move blockers to RDEPEND due to file collisions.
 
   28 Nov 2011; Samuli Suominen <ssuominen@gentoo.org>
   libindicate-0.6.1-r201.ebuild, libindicate-0.6.1-r300.ebuild:

diff --git a/dev-libs/libindicate/libindicate-0.6.1-r201.ebuild b/dev-libs/libindicate/libindicate-0.6.1-r201.ebuild
index 383dd162b840c2f322cec15f69b3a581c6488e11..eb9934071c6df1c77f0faec659386130f5fabbd8 100644 (file)
--- a/dev-libs/libindicate/libindicate-0.6.1-r201.ebuild
+++ b/dev-libs/libindicate/libindicate-0.6.1-r201.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.6.1-r201.ebuild,v 1.2 2011/11/28 16:51:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.6.1-r201.ebuild,v 1.3 2011/11/28 22:39:35 zmedico Exp $
 
 EAPI=4
 
@@ -27,14 +27,14 @@ RDEPEND=">=dev-libs/dbus-glib-0.76
        dev-python/pygtk:2
        >=x11-libs/gtk+-2.12:2
        ${CATEGORY}/${PN}:3
-       introspection? ( dev-libs/gobject-introspection )"
+       introspection? ( dev-libs/gobject-introspection )
+       !<${CATEGORY}/${PN}-0.6.1-r201"
 DEPEND="${RDEPEND}
        gnome-base/gnome-common
        app-text/gnome-doc-utils
        dev-util/gtk-doc-am
        dev-util/pkgconfig
-       dev-lang/vala:${PV_vala_version}[vapigen]
-       !<${CATEGORY}/${PN}-0.6.1-r201"
+       dev-lang/vala:${PV_vala_version}[vapigen]"
 
 RESTRICT="test" # for -no-mono.patch
 

diff --git a/dev-libs/libindicate/libindicate-0.6.1-r300.ebuild b/dev-libs/libindicate/libindicate-0.6.1-r300.ebuild
index b6f2d61a29e9dbf138ff7b1544d8d483d61c8a5d..fdf1e0717f88fd51ea0499aad72cba293e1d46a4 100644 (file)
--- a/dev-libs/libindicate/libindicate-0.6.1-r300.ebuild
+++ b/dev-libs/libindicate/libindicate-0.6.1-r300.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.6.1-r300.ebuild,v 1.2 2011/11/28 16:51:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.6.1-r300.ebuild,v 1.3 2011/11/28 22:39:35 zmedico Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -21,14 +21,14 @@ RDEPEND=">=dev-libs/dbus-glib-0.76
        >=dev-libs/libdbusmenu-0.3.97:3[introspection?]
        dev-libs/libxml2:2
        x11-libs/gtk+:3
-       introspection? ( dev-libs/gobject-introspection )"
+       introspection? ( dev-libs/gobject-introspection )
+       !<${CATEGORY}/${PN}-0.6.1-r201"
 DEPEND="${RDEPEND}
        gnome-base/gnome-common
        app-text/gnome-doc-utils
        dev-util/gtk-doc-am
        dev-util/pkgconfig
-       dev-lang/vala:${PV_vala_version}[vapigen]
-       !<${CATEGORY}/${PN}-0.6.1-r201"
+       dev-lang/vala:${PV_vala_version}[vapigen]"
 
 RESTRICT="test" # for -no-mono.patch