Updated to EAPI=2 for USE dependencies.

Package-Manager: portage-2.1.7.17/cvs/Linux i686

diff --git a/x11-misc/matchbox-keyboard/ChangeLog b/x11-misc/matchbox-keyboard/ChangeLog
index 8a0fd14a8f127f170bb95f76bea914c679d63631..7148ef4c3df90396b782475d79907ec5e0e2d7db 100644 (file)
--- a/x11-misc/matchbox-keyboard/ChangeLog
+++ b/x11-misc/matchbox-keyboard/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/matchbox-keyboard
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/matchbox-keyboard/ChangeLog,v 1.9 2010/04/15 13:11:26 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/matchbox-keyboard/ChangeLog,v 1.10 2010/04/15 13:18:22 yvasilev Exp $
+
+  15 Apr 2010; Yuri Vasilevski <yvasilev@gentoo.org>
+  matchbox-keyboard-0.1.ebuild:
+  Updated to EAPI=2 for USE dependencies.
 
   15 Apr 2010; Yuri Vasilevski <yvasilev@gentoo.org>
   matchbox-keyboard-0.1.ebuild:

diff --git a/x11-misc/matchbox-keyboard/Manifest b/x11-misc/matchbox-keyboard/Manifest
index c4fdd3e3bbe23819f827779564469236af214222..9853b94f5257a882f2e135fe40d9afffee1d3d65 100644 (file)
--- a/x11-misc/matchbox-keyboard/Manifest
+++ b/x11-misc/matchbox-keyboard/Manifest
@@ -1,4 +1,4 @@
 DIST matchbox-keyboard-0.1.tar.bz2 103222 RMD160 88ed115ef7f0b62fe7cacda822ff7b5236014d85 SHA1 ebf5308f8ca93e193c3e79d0fb8304396f478baf SHA256 682614fa3682c4bd31e26b6f76e04bb579c2e70dbf060083e20077f4e93fb4b3
-EBUILD matchbox-keyboard-0.1.ebuild 1165 RMD160 bdf41b0376783e1328ec4e0c747f0ce21c4ce0eb SHA1 eab3f06dac9ac06c38912de3bbc03864175b83ff SHA256 e7745a5b5271aed16ed8103a78b00a40b2ff0ae11102ce31067fb8b153bad226
-MISC ChangeLog 1382 RMD160 b4b8ec1f52af84d883552b22cacab3a6ac0fefbb SHA1 a3295483411564f918c2da5fd5e184bd5bf37420 SHA256 096c93851427844614e8b112d067878274dd7b56d972f8a597c5a2081870e68f
+EBUILD matchbox-keyboard-0.1.ebuild 902 RMD160 63d17664db9136d5ffedc71bc4f0236ce4f60c9c SHA1 209b6d5abba90287717fd07bc4b5dcb7fa16027a SHA256 d01e87c4f995df7a16e8b83ad2c515376a3b951bc9e2f1c7b063c49d4ddb683c
+MISC ChangeLog 1511 RMD160 18964486adb1ebec3f92dd943184624bc70a5d9f SHA1 9889f9fd852b189e2c401cdf32b61fd9a9c612ae SHA256 ca0a95fc7be82cafa4b4a6c162c92798825881e31b2a5414fe8a8406f2ee57cb
 MISC metadata.xml 247 RMD160 49e7f36b66be574d7f3341589ebff702e1c8c8a9 SHA1 af1f5473be400926e7bf9a98a354866150c8b7a7 SHA256 09c798d19a28d8e2ee2b8494e011929f5fc1617190315d82bd03c32e911def55

diff --git a/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild b/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild
index 22684d8cd59c43b9528772922283bf3f977b0087..dad8ce5c668a4aaa86bca9c44b3f21b49eaa04f4 100644 (file)
--- a/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild
+++ b/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild,v 1.8 2010/04/15 13:11:26 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild,v 1.9 2010/04/15 13:18:22 yvasilev Exp $
+
+EAPI="2"
 
 inherit versionator eutils
 
@@ -14,23 +16,13 @@ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
 IUSE="debug cairo"
 
 DEPEND="x11-libs/libfakekey
-       cairo? ( x11-libs/cairo )
+       cairo? ( x11-libs/cairo[X] )
        !cairo? ( x11-libs/libXft )"
 
-pkg_setup() {
-       if use cairo && ! built_with_use x11-libs/cairo X ; then
-               eerror "In order to install ${PN} with cairo support you"
-               eerror "need to reinstall x11-libs/cairo with USE='X'."
-               die "x11-libs/cairo built without USE='X'"
-       fi
-}
-
-src_compile() {
+src_configure() {
        econf   $(use_enable debug) \
                $(use_enable cairo) \
                || die "Configuration failed"
-
-       emake || die "Compilation failed"
 }
 
 src_install() {