summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-04-26 08:29:52 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-04-26 08:29:52 +0000
commit1a416827960069990c7b23fdbe895e3f1b342e64 (patch)
treea60dc7e05cdb510594ed390d71d135c333df5459 /x11-libs/libxklavier
parentx86 stable wrt bug #314853 (diff)
downloadgentoo-2-1a416827960069990c7b23fdbe895e3f1b342e64.tar.gz
gentoo-2-1a416827960069990c7b23fdbe895e3f1b342e64.tar.bz2
gentoo-2-1a416827960069990c7b23fdbe895e3f1b342e64.zip
old
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/libxklavier')
-rw-r--r--x11-libs/libxklavier/Manifest6
-rw-r--r--x11-libs/libxklavier/files/libxklavier-3.8-tests.patch43
-rw-r--r--x11-libs/libxklavier/files/sun.xml183
-rw-r--r--x11-libs/libxklavier/libxklavier-3.6.ebuild57
-rw-r--r--x11-libs/libxklavier/libxklavier-3.8.ebuild71
5 files changed, 0 insertions, 360 deletions
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index d4c72181e2bd..77086a50d4d0 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,12 +1,6 @@
-AUX libxklavier-3.8-tests.patch 1613 RMD160 901bfda51ceb81feca2e9ce62a768408e2b1f03c SHA1 c930cc465210f6be1e5cc052b248c1e6052ba279 SHA256 b919844340dd88603a664a3b21d8022908432441fe04a771f7e661b956307b28
AUX libxklavier-4.0-tests.patch 619 RMD160 1903ba08a7f3632ace5356a5e1c63a31f1b9394f SHA1 0bf730273e44efb08a7f06b26bb5c590cd1404e6 SHA256 915fbbf645d627dcc28bd02b47aef72b7ee4d9d2301ec269f194692210305ee1
-AUX sun.xml 4572 RMD160 3255a22dafebb60df1fb115a39eccf349f63d658 SHA1 cb9fb9f87879090ef20082054b0fa730b067a89f SHA256 ba4be6b7737b09875adf109384fb375377540fbb213d62b647ba36baad28a7a0
-DIST libxklavier-3.6.tar.gz 462046 RMD160 34f68b11f523cab3b9c6b1da75f19c787ead932c SHA1 fdbf95a615a8daea7d9f417f42cb8ea6ecfcb192 SHA256 92e2044414b86b820f85333ae626f3ca9d5bd0b1be35148f3c50f88a87c4d5ce
-DIST libxklavier-3.8.tar.bz2 343107 RMD160 0c853a18056193802e74a7f30f3df1eef1820e5d SHA1 2c30ecc46cf0a909566cee29f1c477aaf38c5019 SHA256 68c29039109fa84e64b87338de97f4259a6a486710c8eb8d6d0bf4347a09dd2e
DIST libxklavier-4.0.tar.bz2 354149 RMD160 e99904f7886701c7d37177999dff87261fd94ef3 SHA1 37c6e9fb8b436d6a646a6eea09cf196baad28756 SHA256 210ed5803109a8cef3b2ab1195bc73fe3385a97a8749d01673e020642d8e5a71
DIST libxklavier-5.0.tar.bz2 357862 RMD160 771dffe92efa1b992ea6ee78535c81d859a2b090 SHA1 e914adc00a7b1d39c5057aa415a5181856a697ae SHA256 dfd94b17a752b2839281764f0a16af2b338024c8867c10fba7015f276dec4db0
-EBUILD libxklavier-3.6.ebuild 1483 RMD160 b9c0b2596b48a002be11a0ff5c45534891b1aad4 SHA1 618f0e963e83451c4d5d9df3b3b01b225e07432c SHA256 24ff4e6c4e61a9a7864a9888240615e5b03858b899ef67510d5fc26c4f7331d5
-EBUILD libxklavier-3.8.ebuild 1701 RMD160 b7d208e95d829c23dbd35c7e168dc6bf184cf1e4 SHA1 08a4cfb1b474abccd158995d3746ce2793d665ec SHA256 9bc541cb23f0bc574504fc978986a6362f3d359bdd75bd71d7f2f86f2100a6cf
EBUILD libxklavier-4.0.ebuild 1565 RMD160 a50970bd17923f01919cf0ca99e7ea1e6258e1c8 SHA1 4803307c2c3b79293440c98ac027b619382a98bd SHA256 3b7a440d37bccd7b25753f5b5a1e32ed5bed528f9ffcf2ac3b477b525e24b919
EBUILD libxklavier-5.0.ebuild 1478 RMD160 acd8767f1aa1a676b0cffebcf9b635f0c5e565c0 SHA1 87a4566285f6d9d9a94db657aebef253bcc44f9d SHA256 fa0288a3f1e2476e22b24511d27780aad38f7a79b1f187a229964843bbffc2c3
MISC ChangeLog 17365 RMD160 131f922acde4c0f5d32417d8a729ce34e55d6d62 SHA1 da15282c80539f604ac0f95c919a0b5d2a9a283f SHA256 1ec9f592b6d95230600696fbb8597baaa8f676b9040cd05556616bb4672fdfda
diff --git a/x11-libs/libxklavier/files/libxklavier-3.8-tests.patch b/x11-libs/libxklavier/files/libxklavier-3.8-tests.patch
deleted file mode 100644
index 4da489911f81..000000000000
--- a/x11-libs/libxklavier/files/libxklavier-3.8-tests.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-# https://bugs.freedesktop.org/show_bug.cgi?id=19645
-# https://bugs.gentoo.org/show_bug.cgi?id=253773
---- a/libxklavier-3.8/configure.in
-+++ b/libxklavier-3.8/configure.in
-@@ -126,9 +126,9 @@
- AM_CONDITIONAL(ENABLE_XMODMAP_SUPPORT, test "$enable_xmodmap_support" = "yes")
-
- AC_MSG_CHECKING(whether at least one libxklavier backend is enabled)
--if test \( "$enable_xkb_support" == "yes" -a \
-- "$libxkbfile_present" == "yes" \) -o \
-- "$enable_xmodmap_support" == "yes" ; then
-+if test \( "$enable_xkb_support" = "yes" -a \
-+ "$libxkbfile_present" = "yes" \) -o \
-+ "$enable_xmodmap_support" = "yes" ; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
-@@ -184,8 +184,8 @@
-
- echo '**********************************************************'
- echo ' Libxklavier is configured with the following backends:'
--if test "$enable_xkb_support" == "yes" ; then
-- if test "$libxkbfile_present" == "yes" ; then
-+if test "$enable_xkb_support" = "yes" ; then
-+ if test "$libxkbfile_present" = "yes" ; then
- echo " XKB, libxkbfile is present"
- echo " default ruleset: $xkb_default_ruleset"
- echo " base: $xkb_base"
-@@ -195,12 +195,12 @@
- echo " XKB, libxkbfile is NOT present"
- fi
- fi
--if test "$enable_xmodmap_support" == "yes" ; then
-+if test "$enable_xmodmap_support" = "yes" ; then
- echo " xmodmap, default ruleset: $xmodmap_default_ruleset"
- echo " base: $xmodmap_base"
- fi
-
--if test "$enable_gtk_doc" == "yes" ; then
-+if test "$enable_gtk_doc" = "yes" ; then
- echo " gtk-doc enabled"
- else
- echo " gtk-doc disabled"
diff --git a/x11-libs/libxklavier/files/sun.xml b/x11-libs/libxklavier/files/sun.xml
deleted file mode 100644
index bb7c9220abe5..000000000000
--- a/x11-libs/libxklavier/files/sun.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
-<xkbConfigRegistry>
- <modelList>
- <model>
- <configItem>
- <name>type4</name>
- <description>Sun type4</description>
- </configItem>
- </model>
- <model>
- <configItem>
- <name>type5</name>
- <description>Sun type5</description>
- </configItem>
- </model>
- <model>
- <configItem>
- <name>type5_euro</name>
- <description>Sun type5 with euro symbol</description>
- </configItem>
- </model>
- <model>
- <configItem>
- <name>type5_unix</name>
- <description>Sun type5 unix</description>
- </configItem>
- </model>
- </modelList>
- <layoutList>
- <layout>
- <configItem>
- <name>us</name>
- <description>U.S. English</description>
- </configItem>
- <variantList/>
- </layout>
- <layout>
- <configItem>
- <name>en_US</name>
- <description>U.S. English w/ ISO8859-3</description>
- </configItem>
- <variantList/>
- </layout>
- <layout>
- <configItem>
- <name>de</name>
- <description>German</description>
- </configItem>
- <variantList/>
- </layout>
- <layout>
- <configItem>
- <name>es</name>
- <description>Spanish</description>
- </configItem>
- <variantList/>
- </layout>
- <layout>
- <configItem>
- <name>fi</name>
- <description>Finnish</description>
- </configItem>
- <variantList/>
- </layout>
- <layout>
- <configItem>
- <name>fr</name>
- <description>French</description>
- </configItem>
- <variantList/>
- </layout>
- <layout>
- <configItem>
- <name>no</name>
- <description>Norweigan</description>
- </configItem>
- <variantList/>
- </layout>
- <layout>
- <configItem>
- <name>pl</name>
- <description>Polish</description>
- </configItem>
- <variantList/>
- </layout>
- <layout>
- <configItem>
- <name>ru</name>
- <description>Russian</description>
- </configItem>
- <variantList/>
- </layout>
- <layout>
- <configItem>
- <name>se</name>
- <description>Swedish</description>
- </configItem>
- <variantList/>
- </layout>
- <layout>
- <configItem>
- <name>uk</name>
- <description>U.K. English</description>
- </configItem>
- <variantList/>
- </layout>
- </layoutList>
- <optionList>
- <group allowMultipleSelection="true">
- <configItem>
- <name>grp</name>
- <description>Group Shift/Lock behavior</description>
- </configItem>
- <option>
- <configItem>
- <name>grp:switch</name>
- <description>R-Alt switches group while pressed</description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:toggle</name>
- <description>Right Alt key changes group</description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:caps_toggle</name>
- <description>Caps Lock key changes group</description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:shift_toggle</name>
- <description>Both Shift keys together change group</description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:ctrl_shift_toggle</name>
- <description>Control+Shift changes group</description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:ctrl_alt_toggle</name>
- <description>Alt+Control changes group</description>
- </configItem>
- </option>
- </group>
- <group allowMultipleSelection="false">
- <configItem>
- <name>ctrl</name>
- <description>Control Key Position</description>
- </configItem>
- <option>
- <configItem>
- <name>ctrl:nocaps</name>
- <description>Make CapsLock an additional Control</description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>ctrl:swapcaps</name>
- <description>Swap Control and Caps Lock</description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>ctrl:ctrl_ac</name>
- <description>Control key at left of 'A'</description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>ctrl:ctrl_aa</name>
- <description>Control key at bottom left</description>
- </configItem>
- </option>
- </group>
- </optionList>
-</xkbConfigRegistry>
diff --git a/x11-libs/libxklavier/libxklavier-3.6.ebuild b/x11-libs/libxklavier/libxklavier-3.6.ebuild
deleted file mode 100644
index 5ba7b69b4b28..000000000000
--- a/x11-libs/libxklavier/libxklavier-3.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.6.ebuild,v 1.11 2009/07/20 20:53:16 ssuominen 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-libs/libX11
- 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 )"
-
-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
-}
-
-pkg_postinst() {
- ewarn "Please note that the soname of the library changed!"
- ewarn "If you are upgrading from a version prior to 3.4 you need"
- ewarn "to fix dynamic linking inconsistencies by executing:"
- ewarn "revdep-rebuild --library libxklavier.so.11"
-}
diff --git a/x11-libs/libxklavier/libxklavier-3.8.ebuild b/x11-libs/libxklavier/libxklavier-3.8.ebuild
deleted file mode 100644
index 1b5de96b6479..000000000000
--- a/x11-libs/libxklavier/libxklavier-3.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.8.ebuild,v 1.10 2009/07/20 20:53:16 ssuominen Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="High level XKB library"
-HOMEPAGE="http://www.freedesktop.org/Software/LibXklavier"
-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-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? ( >=dev-util/gtk-doc-1.4 )
- dev-util/gtk-doc-am"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # Fix tests in configure.in, bug #253773
- epatch "${FILESDIR}/${P}-tests.patch"
-
- eautoreconf
-}
-
-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 gtk-doc)
-
- emake || die "emake failed"
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die "emake install failed"
-
- insinto /usr/share/libxklavier
- use sparc && doins "${FILESDIR}/sun.xml"
-
- dodoc AUTHORS CREDITS ChangeLog NEWS README
-}
-
-pkg_postinst() {
- ewarn "Please note that the soname of the library changed!"
- ewarn "If you are upgrading from a version prior to 3.4 you need"
- ewarn "to fix dynamic linking inconsistencies by executing:"
- ewarn "revdep-rebuild --library libxklavier.so.11"
-}