Bump to 3.8. All locales are in UTF-8. Signal for keyboard connected. Clean up old revisions.

(Portage version: 2.2_rc20/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

4 files changed, 30 insertions, 120 deletions

diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index 71e171a88074..31b50046e4f2 100644
--- a/x11-libs/libxklavier/ChangeLog
+++ b/x11-libs/libxklavier/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/libxklavier
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.116 2008/11/13 19:12:21 ranger Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.117 2009/01/04 00:36:08 eva Exp $
+
+*libxklavier-3.8 (04 Jan 2009)
+
+  04 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -libxklavier-2.2.ebuild, -libxklavier-3.2.ebuild, -libxklavier-3.5.ebuild,
+  +libxklavier-3.8.ebuild:
+  Bump to 3.8. All locales are in UTF-8. Signal for keyboard connected.
+  Clean up old revisions.
 
   13 Nov 2008; Brent Baude <ranger@gentoo.org> libxklavier-3.6.ebuild:
   Marking libxklavier-3.6 ppc64 stable for bug 236971
diff --git a/x11-libs/libxklavier/libxklavier-2.2.ebuild b/x11-libs/libxklavier/libxklavier-2.2.ebuild
deleted file mode 100644
index 3c398cf864e6..000000000000
--- a/x11-libs/libxklavier/libxklavier-2.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-2.2.ebuild,v 1.14 2007/07/22 02:58:03 dberkholz Exp $
-
-inherit eutils
-
-DESCRIPTION="High level XKB library"
-HOMEPAGE="http://www.freedesktop.org/Software/LibXklavier"
-SRC_URI="mirror://sourceforge/gswitchit/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
-IUSE="doc"
-
-RDEPEND="|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-	x11-apps/xkbcomp
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Do not error on warnings (for gcc4 support).  Patch from Fedora.
-	epatch "${FILESDIR}"/${PN}-1.14-werror.patch
-}
-
-src_compile() {
-	local xkbbase
-
-	# see bug #113108
-	if has_version x11-apps/xkbcomp ; then
-		xkbbase=/usr/share/X11/xkb
-	else
-		xkbbase=/usr/$(get_libdir)/X11/xkb
-	fi
-
-	econf \
-		--with-xkb-base=${xkbbase} \
-		--with-xkb-bin-base=/usr/bin \
-		$(use_enable doc doxygen) || die
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	insinto /usr/share/libxklavier
-	use sparc && doins "${FILESDIR}/sun.xml"
-	dodoc AUTHORS CREDITS ChangeLog NEWS README
-}
diff --git a/x11-libs/libxklavier/libxklavier-3.2.ebuild b/x11-libs/libxklavier/libxklavier-3.2.ebuild
deleted file mode 100644
index cb862639d937..000000000000
--- a/x11-libs/libxklavier/libxklavier-3.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.2.ebuild,v 1.9 2007/09/22 05:45:10 tgall Exp $
-
-inherit eutils
-
-DESCRIPTION="High level XKB library"
-HOMEPAGE="http://www.freedesktop.org/Software/LibXklavier"
-SRC_URI="mirror://sourceforge/gswitchit/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="||	( x11-misc/xkeyboard-config x11-misc/xkbdata )
-		 x11-apps/xkbcomp
-		 x11-libs/libX11
-		 x11-libs/libxkbfile
-		 dev-libs/libxml2
-		 >=dev-libs/glib-2.6"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		doc? ( app-doc/doxygen )"
-
-src_compile() {
-	local xkbbase
-
-	# see bug #113108
-	if has_version x11-apps/xkbcomp; then
-		xkbbase=/usr/share/X11/xkb
-	else
-		xkbbase=/usr/$(get_libdir)/X11/xkb
-	fi
-
-	econf --with-xkb-base=${xkbbase} --with-xkb-bin-base=/usr/bin \
-		  $(use_enable doc doxygen) || die
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-
-	insinto /usr/share/libxklavier
-	use sparc && doins "${FILESDIR}/sun.xml"
-
-	dodoc AUTHORS CREDITS ChangeLog NEWS README
-}
diff --git a/x11-libs/libxklavier/libxklavier-3.5.ebuild b/x11-libs/libxklavier/libxklavier-3.8.ebuild
index e9f0b0411641..828a31d26cba 100644
--- a/x11-libs/libxklavier/libxklavier-3.5.ebuild
+++ b/x11-libs/libxklavier/libxklavier-3.8.ebuild
@@ -1,27 +1,31 @@
-# 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/x11-libs/libxklavier/libxklavier-3.5.ebuild,v 1.1 2008/03/17 23:24:13 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.8.ebuild,v 1.1 2009/01/04 00:36:08 eva Exp $
 
 inherit eutils
 
 DESCRIPTION="High level XKB library"
 HOMEPAGE="http://www.freedesktop.org/Software/LibXklavier"
-SRC_URI="mirror://sourceforge/gswitchit/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/gswitchit/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc"
 
-RDEPEND="|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-		 x11-libs/libX11
-		 x11-apps/xkbcomp
-		 x11-libs/libxkbfile
-		 >=dev-libs/glib-2.6
-		 >=dev-libs/libxml2-2.0"
+RDEPEND="|| (
+		x11-misc/xkeyboard-config
+		x11-misc/xkbdata )
+	x11-libs/libX11
+	>=x11-libs/libXi-1.1.3
+	x11-apps/xkbcomp
+	x11-libs/libxkbfile
+	>=dev-libs/glib-2.16
+	>=dev-libs/libxml2-2.0
+	app-text/iso-codes"
 DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		doc? ( app-doc/doxygen )"
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
 
 src_compile() {
 	local xkbbase
@@ -33,14 +37,16 @@ src_compile() {
 		xkbbase=/usr/$(get_libdir)/X11/xkb
 	fi
 
-	econf --with-xkb-base=${xkbbase} --with-xkb-bin-base=/usr/bin \
-		  $(use_enable doc doxygen) || die
+	econf \
+		--with-xkb-base=${xkbbase} \
+		--with-xkb-bin-base=/usr/bin \
+		$(use_enable doc doxygen)
 
 	emake || die "emake failed"
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	emake install DESTDIR="${D}" || die "emake install failed"
 
 	insinto /usr/share/libxklavier
 	use sparc && doins "${FILESDIR}/sun.xml"