From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PlVuU-0007u1-NB for garchives@archives.gentoo.org; Sat, 05 Feb 2011 00:22:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C05D8E08F0; Sat, 5 Feb 2011 00:21:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7A2E9E08F0 for ; Sat, 5 Feb 2011 00:21:46 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E84EE1B40C6 for ; Sat, 5 Feb 2011 00:21:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 554378006A for ; Sat, 5 Feb 2011 00:21:45 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <5460cf4ab981498b872876d30e88c8b00a6dde05.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/libwnck/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-libs/libwnck/Manifest x11-libs/libwnck/libwnck-2.30.6-r200.ebuild x11-libs/libwnck/libwnck-2.91.6.ebuild X-VCS-Directories: x11-libs/libwnck/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 5460cf4ab981498b872876d30e88c8b00a6dde05 Date: Sat, 5 Feb 2011 00:21:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: eadf17319b7cd4fc948330f13054b06e commit: 5460cf4ab981498b872876d30e88c8b00a6dde05 Author: Nirbheek Chauhan gentoo org> AuthorDate: Sat Feb 5 00:20:53 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Sat Feb 5 00:22:09 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D5460cf4a 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 bloc= ker, 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 d9c228bfe1257de9b1b1e8a3fc3b8c= 38d6e665d9 SHA1 a7ef8842f85249878fd0389ae6c1b303d41e9623 SHA256 4d25984ed= 5cfe215eb650f960de634300a6cafc9d98bbc7caea8043b7cd96cc5 DIST libwnck-2.91.6.tar.bz2 729224 RMD160 09e2cd5a2fce511ec2234240959add= dc5f1ab536 SHA1 25e135452518984e8238c62fb8aab05af452d8d7 SHA256 da397528a= 9fa80bfa236d5e6b871896fd72e48b6eab0a056ce05231e94766217 -EBUILD libwnck-2.30.6-r200.ebuild 1629 RMD160 a7f3177ade349ec4c1d61f0e4a= 96ddde9f55389e SHA1 a2e64cf83a6c3f155eabb56a73cb8ad1160e9bed SHA256 5ff1d= 5b8a7b430d048de94805b731b759b611d5f3e2c8f89b55f0143c06a6570 -EBUILD libwnck-2.91.6.ebuild 1421 RMD160 34922dc212ff35ea626c6ea2fac13b2= f0a2d96f9 SHA1 6bef412c1da2e21febd1d908dd1346bf68e952f8 SHA256 17aab6eea2= ceda045db2875f85fef4dd8c586aab6dfd88fe43d84f53a283c638 +EBUILD libwnck-2.30.6-r200.ebuild 1646 RMD160 3e249bcad4d91eab3bbac7e8bd= 079c55cfcc6715 SHA1 a53d1f3d6f798025e12b5b18313433635319fde8 SHA256 b7cbd= e42c02b2c808058a2596cb82df7b3607d0ef2b50ed38780d194d96122be +EBUILD libwnck-2.91.6.ebuild 1455 RMD160 c6819c66b5d7eee807f934fe05a5238= 5d1d0d4b5 SHA1 aa5f587d13dcaa3ca82b935dadcc5d198adcb3fa SHA256 84fec44770= bd977b2071872f025e7e21075b2c47b311672c97acd31c934479e2 diff --git a/x11-libs/libwnck/libwnck-2.30.6-r200.ebuild b/x11-libs/libwn= ck/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=3D">=3Dx11-libs/gtk+-2.19.7:2[introspecti= on?] introspection? ( >=3Ddev-libs/gobject-introspection-0.6.14 ) startup-notification? ( >=3Dx11-libs/startup-notification-0.4 )" RDEPEND=3D"${COMMON_DEPEND} - x11-libs/libwnck:2.90" + x11-libs/libwnck:3" =20 DEPEND=3D"${RDEPEND} sys-devel/gettext @@ -57,7 +57,7 @@ src_prepare() { src_install() { gnome2_src_install =20 - # 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/li= bwnck-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=3D"A window navigation construction kit" HOMEPAGE=3D"http://www.gnome.org/" =20 LICENSE=3D"LGPL-2" -SLOT=3D"2.90" +SLOT=3D"3" KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fb= sd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solari= s" =20 IUSE=3D"doc +introspection startup-notification" @@ -22,7 +22,9 @@ RDEPEND=3D">=3Dx11-libs/gtk+-2.91.5:3[introspection?] x11-libs/libXres x11-libs/libXext introspection? ( >=3Ddev-libs/gobject-introspection-0.6.14 ) - startup-notification? ( >=3Dx11-libs/startup-notification-0.4 )" + startup-notification? ( >=3Dx11-libs/startup-notification-0.4 ) +=09 + !!=3Ddev-util/pkgconfig-0.9