[gentoo-commits] proj/gnome:master commit in: x11-libs/libwnck/

[Nirbheek Chauhan]

commit:     b452e214ce4cea6386681d83c41fb0d678b5c15c
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 23:51:10 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 23:51:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b452e214

x11-libs/libwnck: bump to 2.91.90, rename binaries

* Rename wnckprop and wnck-urgency-monitor so that they don't collide with SLOT=1

---
 x11-libs/libwnck/libwnck-2.91.6.ebuild             |   55 --------------------
 ...k-2.30.6-r200.ebuild => 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/libwnck-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.ebuild,v 1.6 2011/01/30 19:15:57 armin76 Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="A window navigation construction kit"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-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"
-
-RDEPEND=">=x11-libs/gtk+-2.91.5:3[introspection?]
-	>=dev-libs/glib-2.16:2
-	x11-libs/libX11
-	x11-libs/libXres
-	x11-libs/libXext
-	introspection? ( >=dev-libs/gobject-introspection-0.6.14 )
-	startup-notification? ( >=x11-libs/startup-notification-0.4 )
-	
-	!!<x11-libs/libwnck-2.30.6-r200:1"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	doc? ( >=dev-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="${G2CONF}
-		--disable-static
-		$(use_enable introspection)
-		$(use_enable startup-notification)"
-	DOCS="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/libwnck/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 @@
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
@@ -11,21 +12,18 @@ DESCRIPTION="A window navigation construction kit"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
-SLOT="1"
+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"
 
-COMMON_DEPEND=">=x11-libs/gtk+-2.19.7:2[introspection?]
+RDEPEND=">=x11-libs/gtk+-2.91.5:3[introspection?]
 	>=dev-libs/glib-2.16:2
 	x11-libs/libX11
 	x11-libs/libXres
 	x11-libs/libXext
 	introspection? ( >=dev-libs/gobject-introspection-0.6.14 )
 	startup-notification? ( >=x11-libs/startup-notification-0.4 )"
-RDEPEND="${COMMON_DEPEND}
-	x11-libs/libwnck:3"
-
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.9
@@ -57,7 +55,9 @@ src_prepare() {
 src_install() {
 	gnome2_src_install
 
-	# 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=1
+	mv "${ED}"/usr/bin/wnckprop{,-${SLOT}} || die
+	mv "${ED}"/usr/bin/wnck-urgency-monitor{,-${SLOT}} || die
 }