summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <jcallen@gentoo.org>2010-04-18 22:32:06 +0000
committerJonathan Callen <jcallen@gentoo.org>2010-04-18 22:32:06 +0000
commita1c75f13316b710639e9f366d557f56f6d68ab2a (patch)
tree149c98de3b1989b2739e561f8e881523e7589efc /x11-misc
parentVersion bump. (diff)
downloadhistorical-a1c75f13316b710639e9f366d557f56f6d68ab2a.tar.gz
historical-a1c75f13316b710639e9f366d557f56f6d68ab2a.tar.bz2
historical-a1c75f13316b710639e9f366d557f56f6d68ab2a.zip
Bump to EAPI=3, add prefix keywords
Package-Manager: portage-v2.2_rc67-72-g68e014b/cvs/Linux i686
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/xkeyboard-config/ChangeLog6
-rw-r--r--x11-misc/xkeyboard-config/Manifest14
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-1.7.ebuild12
3 files changed, 23 insertions, 9 deletions
diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog
index ebaf17af3e4d..2cb06298dda8 100644
--- a/x11-misc/xkeyboard-config/ChangeLog
+++ b/x11-misc/xkeyboard-config/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/xkeyboard-config
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.90 2010/01/23 21:17:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.91 2010/04/18 22:32:06 abcd Exp $
+
+ 18 Apr 2010; Jonathan Callen <abcd@gentoo.org>
+ xkeyboard-config-1.7.ebuild:
+ Bump to EAPI=3, add prefix keywords
23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
-xkeyboard-config-1.5.ebuild, -xkeyboard-config-1.6.ebuild:
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 50d3151ec02f..35718519475e 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST xkeyboard-config-1.7.tar.bz2 633314 RMD160 aac2a886db8b60261b4b0d3b6fbfb813cc2d1b30 SHA1 d6df43bfc0596be04865f2be7c4e794e198358c8 SHA256 2597bd5ad1a4b9f1f1a763fbde1fc86629a77476860eb21bd80d36973867e440
-EBUILD xkeyboard-config-1.7.ebuild 1240 RMD160 402c577e327f2b815b345eb5f9b4e594a8300178 SHA1 a5aaa7c4d5b7f8b3a200b40d2179b40ca6223959 SHA256 38cdd35224e591558fb54055863b1cd42f02691407a0644d74351ad7c71f7e18
-MISC ChangeLog 13083 RMD160 cc89b4dba511a5882ed761611ccf635860688077 SHA1 6b3f36714057d2c9ea015b7ebeb93e9d29f57fe1 SHA256 ff85c60139e34704e08701ebc48cee1f7b2e6c9754f89396dc7edfa4cdf08d22
+EBUILD xkeyboard-config-1.7.ebuild 1304 RMD160 637e07ca3cabd46b11eb8b84901be87301c0cf0c SHA1 629d56d8401d6b409d6760c4d906eaf9f757361c SHA256 bb6684f2ef035137f2d359037adf6cbaafd2aac314cbce5a98163aa99ef5a696
+MISC ChangeLog 13197 RMD160 aa1412f613c804a6f22ec796fa087c33aa2f3e1a SHA1 febd0d713c0608d54aec83b545947e6268f68d45 SHA256 cee11ed3bffb3f599679a8037becdb67ef09b943091ae9179deec1f2c584964e
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkvLiG8ACgkQOypDUo0oQOq1oQCfRfB/U4SKu/IGsMwlVc6UwRCv
++qQAoMHDZ5/mM6i9ozc+Uhb3e1XA7d0w
+=aLqG
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-1.7.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-1.7.ebuild
index 153ea7bc222e..0d60a0bec681 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-1.7.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-1.7.ebuild
@@ -1,13 +1,14 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-1.7.ebuild,v 1.11 2010/01/19 20:28:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-1.7.ebuild,v 1.12 2010/04/18 22:32:06 abcd Exp $
-EAPI="2"
+EAPI=3
if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git"
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
else
+ GIT_ECLASS=
SRC_URI="http://xlibs.freedesktop.org/xkbdesc/${P}.tar.bz2"
fi
@@ -16,7 +17,7 @@ inherit ${GIT_ECLASS} autotools
DESCRIPTION="X keyboard configuration database"
HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
LICENSE="MIT"
@@ -36,11 +37,10 @@ src_prepare() {
src_configure() {
econf \
- --with-xkb-base=/usr/share/X11/xkb \
+ --with-xkb-base="${EPREFIX}"/usr/share/X11/xkb \
--enable-compat-rules \
--disable-xkbcomp-symlink \
- --with-xkb-rules-symlink=xorg \
- || die "configure failed"
+ --with-xkb-rules-symlink=xorg
}
src_install() {