From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/libwnck/
Date: Sat, 5 Feb 2011 00:21:45 +0000 (UTC) [thread overview]
Message-ID: <5460cf4ab981498b872876d30e88c8b00a6dde05.nirbheek@gentoo> (raw)
commit: 5460cf4ab981498b872876d30e88c8b00a6dde05
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 5 00:20:53 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Feb 5 00:22:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5460cf4a
x11-libs/libwnck: fix slot and block older libwnck:0
* Hard-blocker to avoid file-collisions b/w old libwnck:0 and libwnck:3
- Yes, users need to temporarily unmerge libwnck:0 to resolve the block
- Shouldn't need to, though, portage should be able to resolve the blocker,
but it doesn't
---
x11-libs/libwnck/Manifest | 4 ++--
x11-libs/libwnck/libwnck-2.30.6-r200.ebuild | 8 ++++----
x11-libs/libwnck/libwnck-2.91.6.ebuild | 6 ++++--
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index 5c4e144..e8da869 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,4 +1,4 @@
DIST libwnck-2.30.6.tar.bz2 724558 RMD160 d9c228bfe1257de9b1b1e8a3fc3b8c38d6e665d9 SHA1 a7ef8842f85249878fd0389ae6c1b303d41e9623 SHA256 4d25984ed5cfe215eb650f960de634300a6cafc9d98bbc7caea8043b7cd96cc5
DIST libwnck-2.91.6.tar.bz2 729224 RMD160 09e2cd5a2fce511ec2234240959adddc5f1ab536 SHA1 25e135452518984e8238c62fb8aab05af452d8d7 SHA256 da397528a9fa80bfa236d5e6b871896fd72e48b6eab0a056ce05231e94766217
-EBUILD libwnck-2.30.6-r200.ebuild 1629 RMD160 a7f3177ade349ec4c1d61f0e4a96ddde9f55389e SHA1 a2e64cf83a6c3f155eabb56a73cb8ad1160e9bed SHA256 5ff1d5b8a7b430d048de94805b731b759b611d5f3e2c8f89b55f0143c06a6570
-EBUILD libwnck-2.91.6.ebuild 1421 RMD160 34922dc212ff35ea626c6ea2fac13b2f0a2d96f9 SHA1 6bef412c1da2e21febd1d908dd1346bf68e952f8 SHA256 17aab6eea2ceda045db2875f85fef4dd8c586aab6dfd88fe43d84f53a283c638
+EBUILD libwnck-2.30.6-r200.ebuild 1646 RMD160 3e249bcad4d91eab3bbac7e8bd079c55cfcc6715 SHA1 a53d1f3d6f798025e12b5b18313433635319fde8 SHA256 b7cbde42c02b2c808058a2596cb82df7b3607d0ef2b50ed38780d194d96122be
+EBUILD libwnck-2.91.6.ebuild 1455 RMD160 c6819c66b5d7eee807f934fe05a52385d1d0d4b5 SHA1 aa5f587d13dcaa3ca82b935dadcc5d198adcb3fa SHA256 84fec44770bd977b2071872f025e7e21075b2c47b311672c97acd31c934479e2
diff --git a/x11-libs/libwnck/libwnck-2.30.6-r200.ebuild b/x11-libs/libwnck/libwnck-2.30.6-r200.ebuild
index 145c425..3de3ecf 100644
--- a/x11-libs/libwnck/libwnck-2.30.6-r200.ebuild
+++ b/x11-libs/libwnck/libwnck-2.30.6-r200.ebuild
@@ -24,7 +24,7 @@ COMMON_DEPEND=">=x11-libs/gtk+-2.19.7:2[introspection?]
introspection? ( >=dev-libs/gobject-introspection-0.6.14 )
startup-notification? ( >=x11-libs/startup-notification-0.4 )"
RDEPEND="${COMMON_DEPEND}
- x11-libs/libwnck:2.90"
+ x11-libs/libwnck:3"
DEPEND="${RDEPEND}
sys-devel/gettext
@@ -57,7 +57,7 @@ src_prepare() {
src_install() {
gnome2_src_install
- # Avoid clash with 2.9x slot
- rm "${ED}/usr/bin/wnck-urgency-monitor" || die
- rm "${ED}/usr/bin/wnckprop" || die
+ # Avoid clash with x11-libs/libwnck:3 slot
+ rm -v "${ED}/usr/bin/wnck-urgency-monitor" || die
+ rm -v "${ED}/usr/bin/wnckprop" || die
}
diff --git a/x11-libs/libwnck/libwnck-2.91.6.ebuild b/x11-libs/libwnck/libwnck-2.91.6.ebuild
index 533987b..6273971 100644
--- a/x11-libs/libwnck/libwnck-2.91.6.ebuild
+++ b/x11-libs/libwnck/libwnck-2.91.6.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A window navigation construction kit"
HOMEPAGE="http://www.gnome.org/"
LICENSE="LGPL-2"
-SLOT="2.90"
+SLOT="3"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="doc +introspection startup-notification"
@@ -22,7 +22,9 @@ RDEPEND=">=x11-libs/gtk+-2.91.5:3[introspection?]
x11-libs/libXres
x11-libs/libXext
introspection? ( >=dev-libs/gobject-introspection-0.6.14 )
- startup-notification? ( >=x11-libs/startup-notification-0.4 )"
+ startup-notification? ( >=x11-libs/startup-notification-0.4 )
+
+ !!<x11-libs/libwnck-2.30.6-r200:0"
DEPEND="${RDEPEND}
sys-devel/gettext
>=dev-util/pkgconfig-0.9
next reply other threads:[~2011-02-05 0:22 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-05 0:21 Nirbheek Chauhan [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-02-09 22:00 [gentoo-commits] proj/gnome:master commit in: x11-libs/libwnck/ Nirbheek Chauhan
2011-02-18 4:40 Nirbheek Chauhan
2011-02-21 23:56 Nirbheek Chauhan
2011-03-23 5:20 Nirbheek Chauhan
2011-04-05 0:57 Nirbheek Chauhan
2011-04-06 13:49 Gilles Dartiguelongue
2011-10-18 7:37 Alexandre Restovtsev
2011-10-29 19:41 Alexandre Restovtsev
2012-04-06 20:46 Stephen Klimaszewski
2013-12-18 23:08 Gilles Dartiguelongue
2014-11-24 18:52 Gilles Dartiguelongue
2014-12-26 21:53 Gilles Dartiguelongue
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5460cf4ab981498b872876d30e88c8b00a6dde05.nirbheek@gentoo \
--to=nirbheek@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox