old

Package-Manager: portage-2.2.0_alpha128/cvs/Linux x86_64

5 files changed, 15 insertions, 138 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/Manifest b/x11-libs/libxklavier/Manifest
index ae925dba89da..996185cfb70f 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX libxklavier-5.2-include-top_srcdir.patch 1019 SHA256 d2caabab0c46f6bd122ac7842005b85538f26ed1ee63b2b11febabb580fa8a1a SHA512 685f76d9597e2a50017cdff3c5021e274ffcc0789c857a5822e61f40443a89515cd20d1874ddf304bcf8757bd0d08177e216fe27d4bbd2128aee548811a0bb3d WHIRLPOOL ec8a25233856f65fd4718f0733e5de6ef2f1ab09ca3fd72bfac33fbb3aa3ece60ebf034fbdcb0063d696f6e3a79119cd6fa48ec2a3682d7e52d65dcf247c1de1
-DIST libxklavier-5.1.tar.bz2 346858 SHA256 1d7e8a6ed842d415d2f95b827e7d04ecf515ed5be2aaee262a8dd1c5cbe10ff1 SHA512 9acef506a2d12ef588dbd7b2e2defc6ecb952e5b643f43c0ce8bc67b8a36b43d99ed3ead768949a51390a9fb15cbf0d0fc9ff32fabf1d5ce8bb59336b285b955 WHIRLPOOL 78ba0d3fabe0e76eef808c5040e6556625f9c12549d616a309ec15119c1d1941ba21f494f76f2f6793d47cf53017633b79d3019639d1d81890b435788472aa03
 DIST libxklavier-5.2.1.tar.xz 312944 SHA256 a7a1ca8ae493fb652e3456a6b3a0b07514447161aab41feed96b968f2d338b5e SHA512 8e69b8129cfbf2e2649dc81c49dd168e31a095ea9f8b2c4b5c01ffb97533d4556fa25ad3e17ecaa6b207ebaabdd9ac6f9e629561c8b9bbf890a7d3247d039f33 WHIRLPOOL e2bf2959349552f0bd5f0d062f18f092701589d467cafc18c4c526150d339f8e3c706ca2c37c476a31161f5492fb7ac3105f1076cf540b1296c72577f0ec5143
-DIST libxklavier-5.2.tar.xz 312864 SHA256 7c1f04a80035e03cec992e16b89bc708a32b3578d6e133343d2cb56385d25dfe
-EBUILD libxklavier-5.1.ebuild 1343 SHA256 2790ab180aab2614b186940d66f7ecbfa0866bac51d5081c220419d8eb90c2c2 SHA512 68e37937576d8cb4d49a60aecbcb4663ffe47fa92623e643b033b0f7671d8f12ba157ebbfba164b264ed8fd8f7f39eeba97ff8fec302fe15ad321d84f2722421 WHIRLPOOL c8ffa3324b63d11adf2032445db93c04382decda031905797c311f04f155d86178594b019c9c9c001bebe4cbcd9d8f36c1159ea383b85a7b210d17ef4b3f277e
 EBUILD libxklavier-5.2.1.ebuild 1341 SHA256 f3ae8db93be90b54d35903e6ee5e83b91cde8bd09ceba5ecee10c834e64fd577 SHA512 26ab1d0ee127280996adeccb28f9a684b8cd430b0a36368d74833abbd570a3a5ffe9547fc6f6043730af7d54487683fab7d2857cf3e4eb716a1a5a5aff66a8df WHIRLPOOL 6ee6424bf7f6beab73e333fd73a83006aef9ec100efd762fe05d2ab9f20d74e1b2426e77917c0e5e394738797e1c9fe6e08b1949fb90bb8049d16d5c36903396
-EBUILD libxklavier-5.2.ebuild 1441 SHA256 8005a83922b86c1d4f843fec1a53884f6dbf91326d57c85c55d59b6085981f42 SHA512 769f12c15e449cba5cee01b6e0e3059a960fa499a410c61f9bd32c451c01b3cf96abf0d8d5b801dc62796f2506b37ed86c1678d9c8111620c15f1a879d427f6a WHIRLPOOL 8ac2cefee1ccbe8537d8bda6d82a56169bb5aa70f162ac906b9067e718366596793a76102191aef4f845f85a72763aadba9a6048ec7062bbbbcc0cc4174cd9a4
-MISC ChangeLog 20975 SHA256 2dec3d4e3f7c4df42ad6857ed8a7069377271b4da9830cdc3601db415c1675a7 SHA512 ececca2d5c5c0e6c80f24a6fa33031df81edede489cd55287c731ec6d9a5a3027d612c438518c812af242be58d88b035220c284131802fd1d979ef1a21051bb0 WHIRLPOOL 65f0b93c788f6d65a77c80cfb0bc30a2aecdaa5cc8978b2892478373efa37595da194a87527fa5fb9687bfb828ee02790f505a8aea8ba51bcfb389c375409943
+MISC ChangeLog 21139 SHA256 1dda9426f051ed2cdd3a3681dcd0521bb1289b0c0fdc13c07e29a91811ed4e89 SHA512 d4e4f0c19f479192d3403fcefcbfb7b865bdbb2688fb84cb257fecb87ebbb4a3a52c897b5bb4013f86956fd522e98e75084050f4af78305e764f5d9b8146d34d WHIRLPOOL a3c7ba35a975ab8e84de4596aaf32bb643bbde58981329c83e12e338bdb62c64fb11954d3a80bec211c4b0cbd77bad94ca599eb58d0d8eb04cd8bba33b5cbdc3
 MISC metadata.xml 363 SHA256 f1b88f406775d90ec7d414d51e38c4742fdc4dcf4ab0282df8c44e7a2f180543 SHA512 191cb24c3cda3e5ad15fceceadd772d6f6e5d4496cc2df654b666773cec67ebadd08178cff3bcf8e966a65fb30d9f151e4b9842673dd4f69f5c98444d407dbc1 WHIRLPOOL d10d68f8ba1bea1311ccae93be860cff7c3be10284917747636ca75cebdd615038ead180b4807253319eb039e83de4201f6eb490cbae307e4d828d0544bce187
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAxMlQACgkQuQc30/atMkA9KACcC/JbpLU8KYoEJNcV6Ud+tOOM
-CRAAn3UKahLT7XWNePGQm5To+v7rpsDU
-=0+Zk
+iQEcBAEBCAAGBQJQXZnAAAoJEEdUh39IaPFNk4EH/07RZlb+fyyFtT9Re0A27yvn
+0pU6cTaL4MX6s7Fpj7HYsq0S/XbHU9srkBK3erd4KpII9UIL1E9mwoABNPb4XOAQ
+TRkUz2qfrSTKbVAV2A9ul07NMEHMWG+YZROwIfgnIUb/7urOTn8jY46fI840ihvy
+Ldu3OCJjrGSv7QH44qkOn0tQf18aVC1+UHjcy1hgLnt5gvpeT9iilkuxnlxyYi+r
+2i5HYNNiCEKgAu0hRhysJqRdHZCltDNC9OfN5QpUT14J04cc6tvrEPxcg2CdOhMt
+2dceIQu8I1ZsVeUhxtIwRL/CqhXb2rM06dA/4kO32nrKiT2EJY5HHbauz6YsWBE=
+=t2i6
 -----END PGP SIGNATURE-----
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 {} +
-}