New version for GNOME 2.28. Clean up old revision.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 17 insertions, 34 deletions

diff --git a/x11-libs/libwnck/ChangeLog b/x11-libs/libwnck/ChangeLog
index 89419961fbdb..0fc91ddcd863 100644
--- a/x11-libs/libwnck/ChangeLog
+++ b/x11-libs/libwnck/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libwnck
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/ChangeLog,v 1.224 2009/10/24 16:17:22 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/ChangeLog,v 1.225 2009/10/29 21:25:20 eva Exp $
+
+*libwnck-2.28.0 (29 Oct 2009)
+
+  29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -libwnck-2.26.2.ebuild, -libwnck-2.26.2-r1.ebuild, +libwnck-2.28.0.ebuild:
+  New version for GNOME 2.28. Clean up old revision.
 
   24 Oct 2009; nixnut <nixnut@gentoo.org> libwnck-2.26.2-r2.ebuild:
   ppc stable #281427
diff --git a/x11-libs/libwnck/libwnck-2.26.2.ebuild b/x11-libs/libwnck/libwnck-2.26.2.ebuild
deleted file mode 100644
index 80812500908b..000000000000
--- a/x11-libs/libwnck/libwnck-2.26.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/libwnck-2.26.2.ebuild,v 1.1 2009/07/19 20:50:37 eva Exp $
-
-GCONF_DEBUG="no"
-
-inherit gnome2 eutils
-
-DESCRIPTION="A window navigation construction kit"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND=">=x11-libs/gtk+-2.11.3
-	>=dev-libs/glib-2.16.0
-	>=x11-libs/startup-notification-0.4
-	x11-libs/libX11
-	x11-libs/libXres
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
diff --git a/x11-libs/libwnck/libwnck-2.26.2-r1.ebuild b/x11-libs/libwnck/libwnck-2.28.0.ebuild
index 2e5a8b14fb10..1d72f1b68d08 100644
--- a/x11-libs/libwnck/libwnck-2.26.2-r1.ebuild
+++ b/x11-libs/libwnck/libwnck-2.28.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/libwnck-2.26.2-r1.ebuild,v 1.2 2009/08/08 23:34:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/libwnck-2.28.0.ebuild,v 1.1 2009/10/29 21:25:21 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc startup-notification"
 
-RDEPEND=">=x11-libs/gtk+-2.11.3
+RDEPEND=">=x11-libs/gtk+-2.16.0
 	>=dev-libs/glib-2.16.0
 	x11-libs/libX11
 	x11-libs/libXres
@@ -40,9 +40,15 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	# Fix automagic startup-notification, bug #278464
-	epatch "${FILESDIR}"/${P}-automagic.patch
+	# Fix glib-mkenum auto generation (bug #279832)
+	epatch "${FILESDIR}"/${PN}-2.26.2-fix-glib-mkenums.diff
+	# required to force regeneration of wnck-enum-types.h
+	rm libwnck/wnck-enum-types.h
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
+
+	# Make it libtool-1 compatible, bug #280876
+	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
+
 	AT_M4DIR="m4" eautoreconf
 }