Remove old. Fix tests, bug 187836

(Portage version: 2.1.3.2)

4 files changed, 12 insertions, 46 deletions

diff --git a/gnome-base/libgnomekbd/ChangeLog b/gnome-base/libgnomekbd/ChangeLog
index cc80c534bb3f..ab2406863779 100644
--- a/gnome-base/libgnomekbd/ChangeLog
+++ b/gnome-base/libgnomekbd/ChangeLog
@@ -1,6 +1,10 @@
 # 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.10 2007/06/29 22:31:23 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.11 2007/08/06 08:14:37 leio Exp $
+
+  06 Aug 2007; Mart Raudsepp <leio@gentoo.org> -libgnomekbd-2.18.1.ebuild,
+  libgnomekbd-2.18.2.ebuild:
+  Remove old. Fix tests, bug 187836
 
 *libgnomekbd-2.18.2 (29 Jun 2007)
 
diff --git a/gnome-base/libgnomekbd/files/digest-libgnomekbd-2.18.1 b/gnome-base/libgnomekbd/files/digest-libgnomekbd-2.18.1
deleted file mode 100644
index c961308242e5..000000000000
--- a/gnome-base/libgnomekbd/files/digest-libgnomekbd-2.18.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4d69db2ad5f7e8e71ed4fa167381e239 libgnomekbd-2.18.1.tar.bz2 354094
-RMD160 461be2a5926103a28ffc49a63a833e87e7211ca9 libgnomekbd-2.18.1.tar.bz2 354094
-SHA256 23813cea003811d4fc27b64fc97de4b71eb4bc1ef79db725d7fc9e369db253ab libgnomekbd-2.18.1.tar.bz2 354094
diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.18.1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.18.1.ebuild
deleted file mode 100644
index e89e75e41e3f..000000000000
--- a/gnome-base/libgnomekbd/libgnomekbd-2.18.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.18.1.ebuild,v 1.4 2007/06/28 23:11:34 vapier 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
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README"
-
-# This collides with
-# /etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas from
-# control-center...
-
-src_compile() {
-	# FreeBSD doesn't like -j
-	MAKEOPTS="${MAKEOPTS} -j1"
-
-	gnome2_src_compile
-}
diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.18.2.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.18.2.ebuild
index 6ebea97811b2..4e9587d16511 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-2.18.2.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-2.18.2.ebuild
@@ -1,6 +1,6 @@
 # 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.18.2.ebuild,v 1.1 2007/06/29 22:31:23 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.18.2.ebuild,v 1.2 2007/08/06 08:14:37 leio Exp $
 
 inherit eutils gnome2
 
@@ -33,6 +33,12 @@ DOCS="AUTHORS ChangeLog INSTALL NEWS README"
 # /etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas from
 # control-center...
 
+src_unpack() {
+	gnome2_src_unpack
+	# Fix tests.
+	echo "capplet/gkbd-indicator-plugins-capplet.desktop.in" >> "${S}/po/POTFILES.skip"
+}
+
 src_compile() {
 	# FreeBSD doesn't like -j
 	MAKEOPTS="${MAKEOPTS} -j1"