4 files changed, 5 insertions, 127 deletions
diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index 99b2219d896d..79f486bc4006 100644
--- a/x11-libs/libxklavier/ChangeLog
+++ b/x11-libs/libxklavier/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libxklavier
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.173 2012/08/19 18:37:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.174 2012/09/22 11:00:27 ssuominen Exp $
+
+  22 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> -libxklavier-5.1.ebuild,
+  -libxklavier-5.2.ebuild, -files/libxklavier-5.2-include-top_srcdir.patch:
+  old
 
   19 Aug 2012; Raúl Porcel <armin76@gentoo.org> libxklavier-5.2.1.ebuild:
   alpha/ia64/sh/sparc stable wrt #422363
diff --git a/x11-libs/libxklavier/files/libxklavier-5.2-include-top_srcdir.patch b/x11-libs/libxklavier/files/libxklavier-5.2-include-top_srcdir.patch
deleted file mode 100644
index 50439efc5013..000000000000
--- a/x11-libs/libxklavier/files/libxklavier-5.2-include-top_srcdir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 57785c952444e4cb9d13e43d4f9cc9713d66958b Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Mon, 16 Jan 2012 15:00:18 +0000
-Subject: Use local include files for building GIR
-
-Add -I argument for g-ir-scanner to use the include files from the local tree
-instead of the ones installed in the system.
----
-diff --git a/libxklavier/Makefile.am b/libxklavier/Makefile.am
-index 6c8631a..c53ff6d 100644
---- a/libxklavier/Makefile.am
-+++ b/libxklavier/Makefile.am
-@@ -94,7 +94,7 @@ introspection_sources = $(xklavier_headers) $(filter %.c, $(libxklavier_la_SOURC
- 
- Xkl-1.0.gir: libxklavier.la
- Xkl_1_0_gir_INCLUDES = GObject-2.0 xlib-2.0
--Xkl_1_0_gir_CFLAGS = $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS)
-+Xkl_1_0_gir_CFLAGS = -I$(top_srcdir) $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS)
- Xkl_1_0_gir_LIBS = libxklavier.la
- Xkl_1_0_gir_FILES = $(xklavier_headers) $(introspection_sources)
- INTROSPECTION_GIRS += Xkl-1.0.gir
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-libs/libxklavier/libxklavier-5.1.ebuild b/x11-libs/libxklavier/libxklavier-5.1.ebuild
deleted file mode 100644
index 75dffbdbb0b2..000000000000
--- a/x11-libs/libxklavier/libxklavier-5.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-5.1.ebuild,v 1.9 2012/05/05 03:52:30 jdhore Exp $
-
-EAPI="3"
-inherit gnome.org eutils libtool multilib
-
-DESCRIPTION="High level XKB library"
-HOMEPAGE="http://www.freedesktop.org/Software/LibXklavier"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="x11-misc/xkeyboard-config
-	x11-libs/libX11
-	>=x11-libs/libXi-1.1.3
-	x11-apps/xkbcomp
-	x11-libs/libxkbfile
-	>=dev-libs/glib-2.16:2
-	dev-libs/libxml2
-	app-text/iso-codes"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-static \
-		--with-html-dir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb" \
-		--with-xkb-bin-base="${EPREFIX}/usr/bin" \
-		$(use_enable doc gtk-doc)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog CREDITS NEWS README || die
-
-	# Remove unnecessary la files
-	find "${D}" -name '*.la' -exec rm -f '{}' + || die
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libxklavier.so.15
-}
diff --git a/x11-libs/libxklavier/libxklavier-5.2.ebuild b/x11-libs/libxklavier/libxklavier-5.2.ebuild
deleted file mode 100644
index aa76f11d1d07..000000000000
--- a/x11-libs/libxklavier/libxklavier-5.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-5.2.ebuild,v 1.3 2012/05/05 03:52:30 jdhore Exp $
-
-EAPI=4
-inherit autotools eutils gnome.org libtool
-
-DESCRIPTION="A library for the X Keyboard Extension (high-level API)"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/LibXklavier"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc +introspection"
-
-RDEPEND="app-text/iso-codes
-	>=dev-libs/glib-2.16
-	dev-libs/libxml2
-	x11-apps/xkbcomp
-	x11-libs/libX11
-	>=x11-libs/libXi-1.1.3
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-DOCS="AUTHORS ChangeLog CREDITS NEWS README"
-
-src_prepare() {
-	if use introspection; then
-		epatch "${FILESDIR}"/${P}-include-top_srcdir.patch
-		eautoreconf
-	else
-		elibtoolize
-	fi
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable doc gtk-doc) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-xkb-base="${EPREFIX}"/usr/share/X11/xkb \
-		--with-xkb-bin-base="${EPREFIX}"/usr/bin
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}