fix build breakage with newer popt

Package-Manager: portage-2.1.4_rc9

5 files changed, 85 insertions, 5 deletions

diff --git a/gnome-base/libgnomekbd/ChangeLog b/gnome-base/libgnomekbd/ChangeLog
index 3c94a91c41e8..fdbe237761bb 100644
--- a/gnome-base/libgnomekbd/ChangeLog
+++ b/gnome-base/libgnomekbd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/libgnomekbd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.25 2007/11/29 05:26:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.26 2007/12/11 23:05:36 compnerd Exp $
+
+*libgnomekbd-2.20.0-r1 (11 Dec 2007)
+
+  11 Dec 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/libgnomekbd-2.21.1-no-libbonobo.patch,
+  +libgnomekbd-2.20.0-r1.ebuild:
+  Fix compilation with newer popt.
 
   29 Nov 2007; Jeroen Roovers <jer@gentoo.org> libgnomekbd-2.20.0.ebuild:
   Stable for HPPA (bug #199740).
diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest
index b67157e9b202..aa365506fad2 100644
--- a/gnome-base/libgnomekbd/Manifest
+++ b/gnome-base/libgnomekbd/Manifest
@@ -1,17 +1,25 @@
+AUX libgnomekbd-2.21.1-no-libbonobo.patch 373 RMD160 8c277c8263cbc27b4c3144f19839f202d9e785a7 SHA1 1031226ba7b1e632b88508cf68d1369bc98a14cc SHA256 e5bce7d1d9ed9be4d9ec008341aafbf66312e86bda5c9f5fdd70e5fb5086eb6d
+MD5 1ceacb394b01ee269d498e6a5b39d8c2 files/libgnomekbd-2.21.1-no-libbonobo.patch 373
+RMD160 8c277c8263cbc27b4c3144f19839f202d9e785a7 files/libgnomekbd-2.21.1-no-libbonobo.patch 373
+SHA256 e5bce7d1d9ed9be4d9ec008341aafbf66312e86bda5c9f5fdd70e5fb5086eb6d files/libgnomekbd-2.21.1-no-libbonobo.patch 373
 DIST libgnomekbd-2.18.2.tar.bz2 359702 RMD160 328dcb2e10c5c19ad3ad71dfbbb0dc9e73db1262 SHA1 7328ad1967b45e4964f75df6d394df22f831a2ea SHA256 af7d2135e404564bafa8bb580ed7668098c507f1a4c6385d5d09a2eba02f3799
 DIST libgnomekbd-2.20.0.tar.bz2 392206 RMD160 594ce4e66300fcd468d25f9d65624d8789f46de1 SHA1 f48867cf237e9d0bc8508f5e5966b7307c902759 SHA256 b82310e5d319ac1ba33d008360c4fae128f1b68768f1e51ff1021b60c19a900c
 EBUILD libgnomekbd-2.18.2.ebuild 1194 RMD160 701686ab3e996d80944b0da0a8d466539c63cba7 SHA1 0120a6acab3fbfa3c21a51d46398d9ea779b5c15 SHA256 60c7ff7c0075372b940442bfd08d65f837d5fc69606704e900f050b80e51611e
 MD5 3e76188c5d141e02496f7c508397f9c9 libgnomekbd-2.18.2.ebuild 1194
 RMD160 701686ab3e996d80944b0da0a8d466539c63cba7 libgnomekbd-2.18.2.ebuild 1194
 SHA256 60c7ff7c0075372b940442bfd08d65f837d5fc69606704e900f050b80e51611e libgnomekbd-2.18.2.ebuild 1194
+EBUILD libgnomekbd-2.20.0-r1.ebuild 1170 RMD160 2c228329c8331ed1604db4a086063129eb88416e SHA1 a1306c65f6d09ba22813eb89f4859901df155f45 SHA256 5c39a654399038a3fcc7d00afdc1f43390f604d6f970ea289b641cb72280f230
+MD5 b867eb5684108c8458f22756a6ea57d4 libgnomekbd-2.20.0-r1.ebuild 1170
+RMD160 2c228329c8331ed1604db4a086063129eb88416e libgnomekbd-2.20.0-r1.ebuild 1170
+SHA256 5c39a654399038a3fcc7d00afdc1f43390f604d6f970ea289b641cb72280f230 libgnomekbd-2.20.0-r1.ebuild 1170
 EBUILD libgnomekbd-2.20.0.ebuild 1063 RMD160 4bd4b6bd0061d1d6c03d4ad989b4dab98f60d6fb SHA1 e5b16b02d726a5cdb3cd4a957f44656ee1a6f35a SHA256 d5e5c517cd8dbbbe74fc9a759235ea18ad89f10161aed34306091c296b69648b
 MD5 eb4d3b87da294f5d28e8b7fc52bdf3a6 libgnomekbd-2.20.0.ebuild 1063
 RMD160 4bd4b6bd0061d1d6c03d4ad989b4dab98f60d6fb libgnomekbd-2.20.0.ebuild 1063
 SHA256 d5e5c517cd8dbbbe74fc9a759235ea18ad89f10161aed34306091c296b69648b libgnomekbd-2.20.0.ebuild 1063
-MISC ChangeLog 2674 RMD160 07c09170360111e6b5e9cd871838f31a889acc5c SHA1 19e4021e2c485b0f31136a2b535b99bf864e157d SHA256 d441b1aac874bdd8dc5bfaf7e1b5f3f570c0c8408c779db7e59bce75a08fd08e
-MD5 d0a9b4a5fce012d0bdfe2412bf5b04bf ChangeLog 2674
-RMD160 07c09170360111e6b5e9cd871838f31a889acc5c ChangeLog 2674
-SHA256 d441b1aac874bdd8dc5bfaf7e1b5f3f570c0c8408c779db7e59bce75a08fd08e ChangeLog 2674
+MISC ChangeLog 2890 RMD160 c566051b99d2bfbb2fa0869a071b7a07e6008313 SHA1 4b2a34489a77ba6ef3a87781ccc19b2cbbfd14b5 SHA256 fa8d616c48993a3c1822a259837dc0eba2f5d4342cf1b8777293efc994d101fd
+MD5 a724612ef52c113e4e294a5a394ad268 ChangeLog 2890
+RMD160 c566051b99d2bfbb2fa0869a071b7a07e6008313 ChangeLog 2890
+SHA256 fa8d616c48993a3c1822a259837dc0eba2f5d4342cf1b8777293efc994d101fd ChangeLog 2890
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -22,3 +30,6 @@ SHA256 a88d5ef448bd4f9f730733060e8a47b063aa3488c31430245d90d649feb1432a files/di
 MD5 86e5a34056f26b8b3ae7aaa796529437 files/digest-libgnomekbd-2.20.0 259
 RMD160 351f9c4f3c403da1c9abd150fd9cf28262d989ec files/digest-libgnomekbd-2.20.0 259
 SHA256 387e39a1ac111983e3e6f7815d75463428ab8a2ee5ca70612bb7660c3b4ac8ac files/digest-libgnomekbd-2.20.0 259
+MD5 86e5a34056f26b8b3ae7aaa796529437 files/digest-libgnomekbd-2.20.0-r1 259
+RMD160 351f9c4f3c403da1c9abd150fd9cf28262d989ec files/digest-libgnomekbd-2.20.0-r1 259
+SHA256 387e39a1ac111983e3e6f7815d75463428ab8a2ee5ca70612bb7660c3b4ac8ac files/digest-libgnomekbd-2.20.0-r1 259
diff --git a/gnome-base/libgnomekbd/files/digest-libgnomekbd-2.20.0-r1 b/gnome-base/libgnomekbd/files/digest-libgnomekbd-2.20.0-r1
new file mode 100644
index 000000000000..7c532e4cbcad
--- /dev/null
+++ b/gnome-base/libgnomekbd/files/digest-libgnomekbd-2.20.0-r1
@@ -0,0 +1,3 @@
+MD5 0b495d355e25c3531419cb3996be7e28 libgnomekbd-2.20.0.tar.bz2 392206
+RMD160 594ce4e66300fcd468d25f9d65624d8789f46de1 libgnomekbd-2.20.0.tar.bz2 392206
+SHA256 b82310e5d319ac1ba33d008360c4fae128f1b68768f1e51ff1021b60c19a900c libgnomekbd-2.20.0.tar.bz2 392206
diff --git a/gnome-base/libgnomekbd/files/libgnomekbd-2.21.1-no-libbonobo.patch b/gnome-base/libgnomekbd/files/libgnomekbd-2.21.1-no-libbonobo.patch
new file mode 100644
index 000000000000..706aabf973ee
--- /dev/null
+++ b/gnome-base/libgnomekbd/files/libgnomekbd-2.21.1-no-libbonobo.patch
@@ -0,0 +1,13 @@
+Index: gkbd-indicator-plugins-add.c
+===================================================================
+--- capplet/gkbd-indicator-plugins-add.c	(revision 200)
++++ capplet/gkbd-indicator-plugins-add.c	(working copy)
+@@ -26,7 +26,7 @@
+ 
+ #include <gdk/gdkx.h>
+ #include <glade/glade.h>
+-#include <libbonobo.h>
++#include <glib/gi18n.h>
+ 
+ #include <libxklavier/xklavier.h>
+ 
diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.20.0-r1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.20.0-r1.ebuild
new file mode 100644
index 000000000000..a882b297e297
--- /dev/null
+++ b/gnome-base/libgnomekbd/libgnomekbd-2.20.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2007 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.1 2007/12/11 23:05:36 compnerd 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/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
+}