Migrate to xorg-2 eclass.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog
index 5ba16140077c968d92e26c49ea492cdb7d18d225..57b73196e93ffae3773aeeb4b0497ab2997ccf82 100644 (file)
--- 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.92 2010/06/20 19:23:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.93 2010/07/11 09:51:26 scarabeus Exp $
+
+  11 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  xkeyboard-config-1.9.ebuild:
+  Migrate to xorg-2 eclass.
 
 *xkeyboard-config-1.9 (20 Jun 2010)
 

diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 0b77a2590101aeecf198c45ee35d567fe7914fac..b83404faf59ec9dacf811cf8840d25e8b6929e53 100644 (file)
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST xkeyboard-config-1.7.tar.bz2 633314 RMD160 aac2a886db8b60261b4b0d3b6fbfb813cc2d1b30 SHA1 d6df43bfc0596be04865f2be7c4e794e198358c8 SHA256 2597bd5ad1a4b9f1f1a763fbde1fc86629a77476860eb21bd80d36973867e440
 DIST xkeyboard-config-1.9.tar.bz2 650829 RMD160 a5d5561b4bcfc3c442c0b8c82ee4478d9e630398 SHA1 2a3f29d003c0fe23cb6c8b4389bb7002c66b557c SHA256 2b519c2ce4a013a00f68c288ced573002a9ce37120f4f9dde0fda2549a8ac235
 EBUILD xkeyboard-config-1.7.ebuild 1304 RMD160 637e07ca3cabd46b11eb8b84901be87301c0cf0c SHA1 629d56d8401d6b409d6760c4d906eaf9f757361c SHA256 bb6684f2ef035137f2d359037adf6cbaafd2aac314cbce5a98163aa99ef5a696
-EBUILD xkeyboard-config-1.9.ebuild 1287 RMD160 f27dc6a65e21bb8d7ba03cde6819229aa4c5a8b5 SHA1 f52849d3dd8f51478c77e4f7026e2f6e421fc48d SHA256 89c5749229006483734635eb88e05af98df3d37d33bedde7a6f0f7e23f914f60
-MISC ChangeLog 13343 RMD160 0b5198322e46a94043002a5a37d6ae07e0bd8f98 SHA1 fdf8796d0cbadae4c3833777c5625b4bb628f122 SHA256 a48e23223973712afbc278ffe61e2827db5616606c44a64efe592dae971465a3
+EBUILD xkeyboard-config-1.9.ebuild 1104 RMD160 7e61300cd81474bb4dd875359d70ddea6e800f18 SHA1 6f33b8a0b0696e776cd1396c4fd9d180886aa885 SHA256 77085f0ae47e3b7d99ab90b676bb1dee38423faeffcd0792f99d0b9e3af885bc
+MISC ChangeLog 13458 RMD160 4d1701a7f5382a1e3e30b47520c0a6f462e962b9 SHA1 4b8d652106ed7b8ae6fc190d2c822f5a586378a7 SHA256 563038e1b4c4451abe2ae90eea8cc79fd4db5cafa5a557d1256269390343e1e1
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwearIACgkQHB6c3gNBRYfCnwCgplBd3Hgj1kN8B4VsQQQyxpZu
-924AoLanNrZRZJBxoGsYZDINiNZNwTsq
-=ZWS6
------END PGP SIGNATURE-----

diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-1.9.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-1.9.ebuild
index 4256efe27ba54243ce1386059963d156abb978e4..086023ce9c7fa31ebe8cd4f5ffae8d28c1943871 100644 (file)
--- a/x11-misc/xkeyboard-config/xkeyboard-config-1.9.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-1.9.ebuild
@@ -1,21 +1,17 @@
 # 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.9.ebuild,v 1.1 2010/06/20 19:23:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-1.9.ebuild,v 1.2 2010/07/11 09:51:26 scarabeus Exp $
 
 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://people.freedesktop.org/~svu/${P}.tar.bz2"
-fi
+XORG_STATIC=no
+inherit xorg-2
 
-inherit ${GIT_ECLASS} autotools
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
 
 DESCRIPTION="X keyboard configuration database"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+SRC_URI="${BASE_INDIVIDUAL_URI}/data/xkeyboard-config/${P}.tar.bz2"
 
 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=""
@@ -28,22 +24,14 @@ DEPEND="${RDEPEND}
        >=dev-util/intltool-0.30
        dev-perl/XML-Parser"
 
-src_prepare() {
-       if [[ ${PV} = 9999* ]]; then
-               intltoolize
-               eautoreconf
-       fi
-}
-
-src_configure() {
-       econf \
-               --with-xkb-base="${EPREFIX}"/usr/share/X11/xkb \
-               --enable-compat-rules \
-               --with-xkb-rules-symlink=xorg
-}
+CONFIGURE_OPTIONS="
+       --with-xkb-base=${EPREFIX}/usr/share/X11/xkb
+       --enable-compat-rules
+       --with-xkb-rules-symlink=xorg"
 
 src_install() {
-       emake DESTDIR="${D}" install || die "install failed"
-       echo "CONFIG_PROTECT=\"/usr/share/X11/xkb\"" > "${T}"/10xkeyboard-config
+       xorg-2_src_install
+
+       echo "CONFIG_PROTECT=\"${EPREFIX}/usr/share/X11/xkb\"" > "${T}"/10xkeyboard-config
        doenvd "${T}"/10xkeyboard-config
 }