New version for GNOME 2.26. Small bug fixes.

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

3 files changed, 22 insertions, 63 deletions

diff --git a/gnome-base/libgnomekbd/ChangeLog b/gnome-base/libgnomekbd/ChangeLog
index e145976f996b..d963240ae3e8 100644
--- a/gnome-base/libgnomekbd/ChangeLog
+++ b/gnome-base/libgnomekbd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/libgnomekbd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.53 2009/04/28 11:23:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.54 2009/05/10 19:24:32 eva Exp $
+
+*libgnomekbd-2.26.0 (10 May 2009)
+
+  10 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -libgnomekbd-2.20.0-r1.ebuild, -libgnomekbd-2.22.0.ebuild,
+  +libgnomekbd-2.26.0.ebuild:
+  New version for GNOME 2.26. Small bug fixes.
 
   28 Apr 2009; Raúl Porcel <armin76@gentoo.org> libgnomekbd-2.24.0.ebuild:
   sh stable
diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.20.0-r1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.20.0-r1.ebuild
deleted file mode 100644
index 434eec8a3399..000000000000
--- a/gnome-base/libgnomekbd/libgnomekbd-2.20.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.20.0-r1.ebuild,v 1.9 2008/06/05 11:55:52 remi Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome keyboard configuration library"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-libs/dbus-glib
-	>=sys-apps/dbus-0.92
-	>=gnome-base/gconf-2.14
-	>=x11-libs/gtk+-2.10.3
-	>=gnome-base/libglade-2.6
-	>=gnome-base/libgnome-2.16
-	>=gnome-base/libgnomeui-2.16
-	>=x11-libs/libxklavier-3
-	!<gnome-base/gnome-control-center-2.17.0"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.59
-	=sys-devel/automake-1.8*
-	>=dev-util/intltool-0.35
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-# This collides with
-# /etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas from
-# <=control-center-2.16...
-
-src_unpack() {
-	gnome2_src_unpack
-	epatch "${FILESDIR}/${PN}-2.21.1-no-libbonobo.patch"
-}
-
-src_compile() {
-	# FreeBSD doesn't like -j
-	MAKEOPTS="${MAKEOPTS} -j1"
-
-	gnome2_src_compile
-}
diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.26.0.ebuild
index a02448f6f800..890a990e721e 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-2.26.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild,v 1.9 2009/04/26 22:36:49 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.26.0.ebuild,v 1.1 2009/05/10 19:24:32 eva Exp $
 
 EAPI="2"
+GCONF_DEBUG="no"
 
 inherit autotools eutils gnome2
 
@@ -11,39 +12,36 @@ HOMEPAGE="http://www.gnome.org"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.6
+RDEPEND=">=dev-libs/glib-2.16
 	>=sys-apps/dbus-0.92
 	>=dev-libs/dbus-glib-0.34
 	>=gnome-base/gconf-2.14
-	>=x11-libs/gtk+-2.10.3
+	>=x11-libs/gtk+-2.13
 	>=gnome-base/libglade-2.6
-	>=gnome-base/libgnome-2.16
-	>=gnome-base/libgnomeui-2.16
-	>=x11-libs/libxklavier-3.2
-	!<gnome-base/gnome-control-center-2.17.0"
+	>=x11-libs/libxklavier-3.2"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.19"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
-# This collides with
-# /etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas from
-# <=control-center-2.17...
-
 pkg_setup() {
 	# Only user interaction required graphical tests at the time of 2.22.0 - not useful for us
-	G2CONF="${G2CONF} --disable-tests"
+	G2CONF="${G2CONF} --disable-tests --disable-static"
 }
 
 src_prepare() {
 	# Fix linking to system's library, bug #265428
-	epatch "${FILESDIR}/${P}-system-relink.patch"
+	epatch "${FILESDIR}/${PN}-2.22.0-system-relink.patch"
+
+	# Make it libtool-1 compatible
+	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
 
-	eautomake
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
 }
 
 src_compile() {