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 1Prfcd-0005Dc-WA for garchives@archives.gentoo.org; Mon, 21 Feb 2011 23:56:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A355A1C028; Mon, 21 Feb 2011 23:56:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5C6431C028 for ; Mon, 21 Feb 2011 23:56:48 +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 9C1591B40D6 for ; Mon, 21 Feb 2011 23:56:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0DB878006A for ; Mon, 21 Feb 2011 23:56:47 +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: Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/libwnck/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-libs/libwnck/libwnck-2.30.6-r200.ebuild x11-libs/libwnck/libwnck-2.91.6.ebuild x11-libs/libwnck/libwnck-2.91.90.ebuild X-VCS-Directories: x11-libs/libwnck/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: b452e214ce4cea6386681d83c41fb0d678b5c15c Date: Mon, 21 Feb 2011 23:56:47 +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: e0b47901a62f61b76b2edec27fa07931 commit: b452e214ce4cea6386681d83c41fb0d678b5c15c Author: Nirbheek Chauhan gentoo org> AuthorDate: Mon Feb 21 23:51:10 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Mon Feb 21 23:51:17 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Db452e214 x11-libs/libwnck: bump to 2.91.90, rename binaries * Rename wnckprop and wnck-urgency-monitor so that they don't collide wit= h SLOT=3D1 --- x11-libs/libwnck/libwnck-2.91.6.ebuild | 55 --------------= ------ ...k-2.30.6-r200.ebuild =3D> libwnck-2.91.90.ebuild} | 16 +++--- 2 files changed, 8 insertions(+), 63 deletions(-) diff --git a/x11-libs/libwnck/libwnck-2.91.6.ebuild b/x11-libs/libwnck/li= bwnck-2.91.6.ebuild deleted file mode 100644 index 8da7cb9..0000000 --- a/x11-libs/libwnck/libwnck-2.91.6.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/libwnck-2.30.6.ebuil= d,v 1.6 2011/01/30 19:15:57 armin76 Exp $ - -EAPI=3D"3" -GCONF_DEBUG=3D"no" -GNOME2_LA_PUNT=3D"yes" - -inherit gnome2 - -DESCRIPTION=3D"A window navigation construction kit" -HOMEPAGE=3D"http://www.gnome.org/" - -LICENSE=3D"LGPL-2" -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" - -IUSE=3D"doc +introspection startup-notification" - -RDEPEND=3D">=3Dx11-libs/gtk+-2.91.5:3[introspection?] - >=3Ddev-libs/glib-2.16:2 - x11-libs/libX11 - x11-libs/libXres - x11-libs/libXext - introspection? ( >=3Ddev-libs/gobject-introspection-0.6.14 ) - startup-notification? ( >=3Dx11-libs/startup-notification-0.4 ) -=09 - !!=3Ddev-util/pkgconfig-0.9 - >=3Ddev-util/intltool-0.40 - doc? ( >=3Ddev-util/gtk-doc-1.9 ) - x86-interix? ( sys-libs/itx-bind )" -# eautoreconf needs -# dev-util/gtk-doc-am -# gnome-base/gnome-common - -pkg_setup() { - G2CONF=3D"${G2CONF} - --disable-static - $(use_enable introspection) - $(use_enable startup-notification)" - DOCS=3D"AUTHORS ChangeLog HACKING NEWS README" -} - -src_prepare() { - gnome2_src_prepare - - if use x86-interix; then - # activate the itx-bind package... - append-flags "-I${EPREFIX}/usr/include/bind" - append-ldflags "-L${EPREFIX}/usr/lib/bind" - fi -} diff --git a/x11-libs/libwnck/libwnck-2.30.6-r200.ebuild b/x11-libs/libwn= ck/libwnck-2.91.90.ebuild similarity index 80% rename from x11-libs/libwnck/libwnck-2.30.6-r200.ebuild rename to x11-libs/libwnck/libwnck-2.91.90.ebuild index 99ad65d..b257cc2 100644 --- a/x11-libs/libwnck/libwnck-2.30.6-r200.ebuild +++ b/x11-libs/libwnck/libwnck-2.91.90.ebuild @@ -4,6 +4,7 @@ =20 EAPI=3D"3" GCONF_DEBUG=3D"no" +GNOME2_LA_PUNT=3D"yes" =20 inherit gnome2 =20 @@ -11,21 +12,18 @@ DESCRIPTION=3D"A window navigation construction kit" HOMEPAGE=3D"http://www.gnome.org/" =20 LICENSE=3D"LGPL-2" -SLOT=3D"1" +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" =20 -COMMON_DEPEND=3D">=3Dx11-libs/gtk+-2.19.7:2[introspection?] +RDEPEND=3D">=3Dx11-libs/gtk+-2.91.5:3[introspection?] >=3Ddev-libs/glib-2.16:2 x11-libs/libX11 x11-libs/libXres x11-libs/libXext introspection? ( >=3Ddev-libs/gobject-introspection-0.6.14 ) startup-notification? ( >=3Dx11-libs/startup-notification-0.4 )" -RDEPEND=3D"${COMMON_DEPEND} - x11-libs/libwnck:3" - DEPEND=3D"${RDEPEND} sys-devel/gettext >=3Ddev-util/pkgconfig-0.9 @@ -57,7 +55,9 @@ src_prepare() { src_install() { gnome2_src_install =20 - # Avoid clash with x11-libs/libwnck:3 slot - rm -v "${ED}/usr/bin/wnck-urgency-monitor" || die - rm -v "${ED}/usr/bin/wnckprop" || die + elog "wnckprop is now called wnckprop-${SLOT}" + elog "wnck-urgency-monitor is now called wnck-urgency-monitor-${SLOT}" + # Don't collide with SLOT=3D1 + mv "${ED}"/usr/bin/wnckprop{,-${SLOT}} || die + mv "${ED}"/usr/bin/wnck-urgency-monitor{,-${SLOT}} || die }