summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi Cardona <remi@gentoo.org>2009-10-06 10:58:16 +0000
committerRemi Cardona <remi@gentoo.org>2009-10-06 10:58:16 +0000
commitaad4843e1c4a8e0bdfeb1f754c686c962b19c08a (patch)
treebea323ae2e7370ec4cbed00542e4ee44f15538b1 /x11-misc
parentx11-misc/xkeyboard-config: bump to 1.7, sync with x11 overlay (diff)
downloadhistorical-aad4843e1c4a8e0bdfeb1f754c686c962b19c08a.tar.gz
historical-aad4843e1c4a8e0bdfeb1f754c686c962b19c08a.tar.bz2
historical-aad4843e1c4a8e0bdfeb1f754c686c962b19c08a.zip
x11-misc/xkeyboard-config: make the ebuild more EAPI=2-like
Package-Manager: portage-2.2_rc44/cvs/Linux i686
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/xkeyboard-config/ChangeLog5
-rw-r--r--x11-misc/xkeyboard-config/Manifest4
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-1.7.ebuild8
3 files changed, 9 insertions, 8 deletions
diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog
index 2f6a5c9d0536..9a6e615c9e91 100644
--- a/x11-misc/xkeyboard-config/ChangeLog
+++ b/x11-misc/xkeyboard-config/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-misc/xkeyboard-config
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.73 2009/10/06 10:47:02 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.74 2009/10/06 10:58:16 remi Exp $
+
+ 06 Oct 2009; Rémi Cardona <remi@gentoo.org> xkeyboard-config-1.7.ebuild:
+ make the ebuild more EAPI=2-like
*xkeyboard-config-1.7 (06 Oct 2009)
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 975f021cebb9..5d427a810fc9 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -3,6 +3,6 @@ DIST xkeyboard-config-1.6.tar.bz2 631474 RMD160 a2cf0bc65e90c3244612660fb896dd9f
DIST xkeyboard-config-1.7.tar.bz2 633314 RMD160 aac2a886db8b60261b4b0d3b6fbfb813cc2d1b30 SHA1 d6df43bfc0596be04865f2be7c4e794e198358c8 SHA256 2597bd5ad1a4b9f1f1a763fbde1fc86629a77476860eb21bd80d36973867e440
EBUILD xkeyboard-config-1.5.ebuild 1629 RMD160 5f95cf9b78c4c25150f13726370f91c511826089 SHA1 a20217c5e23769c922498911c66b4ffc8dbb720f SHA256 e246d02effd000ffa04856e25b2e8eca66e0f3d964424307abb2c93bca5d4391
EBUILD xkeyboard-config-1.6.ebuild 1000 RMD160 c4e72565d2ad753cfd88ab24ff888b7498967ac3 SHA1 9a464d51c71c72ef9eebf5d2d75c65bdf1a7ab92 SHA256 f722f2591ec47aaf86d8a530a4da9f437d7086222e961f8063596297d7c471b3
-EBUILD xkeyboard-config-1.7.ebuild 1266 RMD160 fa47ebc1a48983ae06399de9cc4040c90a90e44a SHA1 c52297d07d8f0b15f2ea39a7103867a72b08a20c SHA256 b7f65eb608d6d91286c403004a9e8f2cdf2c84bd60d140b414a8481e4d39afa4
-MISC ChangeLog 11105 RMD160 b33040b42f038b11c10971114f23e74c8ab2b026 SHA1 4f5dd5a2fc898a03aa302d71a17c5ac2cec1f0f9 SHA256 9de0304454e139a0c6606d1bc998fc8f7c78804e0c36f372ae0d01179df76801
+EBUILD xkeyboard-config-1.7.ebuild 1240 RMD160 fcebb27af937f1637f2e70303a443e7a56a4cd26 SHA1 7503bd72bc5b65127abaf11ed61d8d67677d40c6 SHA256 d9791682d95f770dccc2c6f43e6ce43bdcce179ccde6b35dbcd653dd9f33ae4a
+MISC ChangeLog 11217 RMD160 244b1e5fb0537a4766256debcf66cdc2aafd8414 SHA1 10072c489e17bed234ae60d9adcb7c65236cfe15 SHA256 31d9b63303fd3db19864aac0738eba9d08b995d206637c47e92a8f2222456b40
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-1.7.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-1.7.ebuild
index 054b2d94001d..b1405394d435 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-1.7.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-1.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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.1 2009/10/06 10:47:02 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-1.7.ebuild,v 1.2 2009/10/06 10:58:16 remi Exp $
EAPI="2"
@@ -34,19 +34,17 @@ src_prepare() {
fi
}
-src_compile() {
+src_configure() {
econf \
--with-xkb-base=/usr/share/X11/xkb \
--enable-compat-rules \
--disable-xkbcomp-symlink \
--with-xkb-rules-symlink=xorg \
|| die "configure failed"
-
- emake || die "make failed"
}
src_install() {
- make DESTDIR="${D}" install || die "install failed"
+ emake DESTDIR="${D}" install || die "install failed"
echo "CONFIG_PROTECT=\"/usr/share/X11/xkb\"" > "${T}"/10xkeyboard-config
doenvd "${T}"/10xkeyboard-config
}