summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-11-28 22:39:35 +0000
committerZac Medico <zmedico@gentoo.org>2011-11-28 22:39:35 +0000
commitdf3854415ae4acaa6b05e0ea79f47caa4ebe8ab0 (patch)
treeebb6b2914a02fab1ceee6c763898b93f62b1b929 /dev-libs/libdbusmenu
parentVersion bump (diff)
downloadhistorical-df3854415ae4acaa6b05e0ea79f47caa4ebe8ab0.tar.gz
historical-df3854415ae4acaa6b05e0ea79f47caa4ebe8ab0.tar.bz2
historical-df3854415ae4acaa6b05e0ea79f47caa4ebe8ab0.zip
Bug #392309 - Move blockers to RDEPEND due to file collisions.
Package-Manager: portage-2.2.0_alpha79/cvs/Linux i686
Diffstat (limited to 'dev-libs/libdbusmenu')
-rw-r--r--dev-libs/libdbusmenu/ChangeLog6
-rw-r--r--dev-libs/libdbusmenu/libdbusmenu-0.5.1-r200.ebuild8
-rw-r--r--dev-libs/libdbusmenu/libdbusmenu-0.5.1-r300.ebuild8
3 files changed, 13 insertions, 9 deletions
diff --git a/dev-libs/libdbusmenu/ChangeLog b/dev-libs/libdbusmenu/ChangeLog
index a9b0d58ec367..537f7e0ed01a 100644
--- 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 dd2349c7fe91..2e1ca8c8e8a4 100644
--- 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 f7c0d0b26ceb..39f4bf7b91a0 100644
--- 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