From 218a4678683f20f37d25e657ffd152ce6812c986 Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Thu, 22 Mar 2007 08:08:24 +0000 Subject: [PATCH] moved USE flag check from src_install to pkg_setup Package-Manager: portage-2.1.2.2 --- app-admin/keepassx/ChangeLog | 6 +++++- app-admin/keepassx/Manifest | 22 +++++++++++----------- app-admin/keepassx/keepassx-0.2.2.ebuild | 6 ++++-- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/app-admin/keepassx/ChangeLog b/app-admin/keepassx/ChangeLog index 525e5df57386..3f74948d62db 100644 --- a/app-admin/keepassx/ChangeLog +++ b/app-admin/keepassx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/keepassx # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.8 2007/01/01 22:18:38 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.9 2007/03/22 08:08:24 opfer Exp $ + + 22 Mar 2007; Christian Faulhammer + keepassx-0.2.2.ebuild: + moved USE flag check from src_install to pkg_setup 01 Jan 2007; Sven Wegener keepassx-0.2.2.ebuild: Quote has_version argument because of > operator. Use full atoms for diff --git a/app-admin/keepassx/Manifest b/app-admin/keepassx/Manifest index ed28019ec7bc..f82052f8e8ba 100644 --- a/app-admin/keepassx/Manifest +++ b/app-admin/keepassx/Manifest @@ -6,14 +6,14 @@ MD5 0056d74f87219bc351b6e1a98b11d386 files/keepassx.desktop 192 RMD160 fa3f17247009dd9c52ae01cca48fe46a40a69eb8 files/keepassx.desktop 192 SHA256 b9c99bcc56b45247e38ec8fbbabf8b944ca157f4eb7cd0abd96509e658a7b72b files/keepassx.desktop 192 DIST KeePassX-0.2.2.tar.gz 302656 RMD160 ba386cca105227120c0c50a500eee3b2b2bf24ec SHA1 bae4b984d32f2bb6220d17a135e3322c4df73fcb SHA256 ee588bd744195e394e7b618b8e0aeb25cbf37ca5b619b1c7e2176fd412b29cbd -EBUILD keepassx-0.2.2.ebuild 977 RMD160 c37e063c8aa15fd7ccb4e2a800546b796ff86c92 SHA1 e44d3dff7a22c874e984b0ea95fce3eeb2614fdc SHA256 0cd43461961e8d85ea8e469379a054dcd979b96f467f9032516cff7d7f6105aa -MD5 3aeeddb217ba1de47665668957ee4abc keepassx-0.2.2.ebuild 977 -RMD160 c37e063c8aa15fd7ccb4e2a800546b796ff86c92 keepassx-0.2.2.ebuild 977 -SHA256 0cd43461961e8d85ea8e469379a054dcd979b96f467f9032516cff7d7f6105aa keepassx-0.2.2.ebuild 977 -MISC ChangeLog 1686 RMD160 813e2edfc0f5044b99df3c25f967077b001b5f56 SHA1 0c460281bf65c362c675791f5e67fa6e5d92de8e SHA256 2f9d2ea421e412f504cc811394ba751bd3f90e468d462758f3418ac756e5e374 -MD5 1c82d56092b751f37792ad6d68240887 ChangeLog 1686 -RMD160 813e2edfc0f5044b99df3c25f967077b001b5f56 ChangeLog 1686 -SHA256 2f9d2ea421e412f504cc811394ba751bd3f90e468d462758f3418ac756e5e374 ChangeLog 1686 +EBUILD keepassx-0.2.2.ebuild 990 RMD160 c27d79de8af103aca625158eff26db6c521c2e51 SHA1 5a13c5a72502cfa4d10e38d9afb6c553e26ece3f SHA256 b525a2a39c4b787e187ad23d54cdf6eba347b6a5c1dbd292cc4f1c077dc33c2f +MD5 9369a4fccd74680b245134232fba3a6a keepassx-0.2.2.ebuild 990 +RMD160 c27d79de8af103aca625158eff26db6c521c2e51 keepassx-0.2.2.ebuild 990 +SHA256 b525a2a39c4b787e187ad23d54cdf6eba347b6a5c1dbd292cc4f1c077dc33c2f keepassx-0.2.2.ebuild 990 +MISC ChangeLog 1817 RMD160 efe552e92fcbd9eddfd4fa875ab6435e4dfe92c8 SHA1 a4a3a26a94e5b1677955e4578540bddf1c408bb6 SHA256 18b087d7cd46832859cd29c116b70821474a52b89120fa4a1a2b7fa6cf5d9155 +MD5 44623587ddcbd2610fbe3fb764e767d3 ChangeLog 1817 +RMD160 efe552e92fcbd9eddfd4fa875ab6435e4dfe92c8 ChangeLog 1817 +SHA256 18b087d7cd46832859cd29c116b70821474a52b89120fa4a1a2b7fa6cf5d9155 ChangeLog 1817 MISC metadata.xml 505 RMD160 aa11034c8925303264818a4be9ae226c5cb47cfd SHA1 bb91e173269a532d2f85a2c7772cf221a6306dc3 SHA256 f7fb98797c71f4a4b3186f8d6526a1db0c6c57107bebafdcb933d1cd4d104fed MD5 5e132b8e1a0ed8e43e12174365b32363 metadata.xml 505 RMD160 aa11034c8925303264818a4be9ae226c5cb47cfd metadata.xml 505 @@ -24,7 +24,7 @@ SHA256 d44e82387d8509e8bdc3771b946df5414b2bfeea46c87182fb6b0685fa16d518 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFmYjFI1lqEGTUzyQRAgZzAKC1sRGjykLh/v3Zj0/IbLXQ4FGymQCgiPMk -3WViU9EFIAZBapFPi/yIAXw= -=37HH +iD8DBQFGAjk2NQqtfCuFneMRAtMtAJ44srGAqZOb00WCY+04srGW1odBVgCfU8lX +vgat39hH3HVmkjVnf1oQibw= +=5aZH -----END PGP SIGNATURE----- diff --git a/app-admin/keepassx/keepassx-0.2.2.ebuild b/app-admin/keepassx/keepassx-0.2.2.ebuild index 280161a49935..a078dcdac5d0 100644 --- a/app-admin/keepassx/keepassx-0.2.2.ebuild +++ b/app-admin/keepassx/keepassx-0.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.2.2.ebuild,v 1.7 2007/01/01 22:18:38 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.2.2.ebuild,v 1.8 2007/03/22 08:08:24 opfer Exp $ inherit eutils @@ -15,14 +15,16 @@ IUSE="" DEPEND=">=x11-libs/qt-4.1" RDEPEND="${DEPEND}" -src_compile() { +pkg_setup() { if has_version ">=x11-libs/qt-4.2.2" && ! built_with_use x11-libs/qt qt3support; then eerror eerror "You need to rebuild x11-libs/qt with USE=qt3support enabled" eerror die "please rebuild x11-libs/qt with USE=qt3support" fi +} +src_compile() { /usr/bin/qmake || die "qmake failed" emake || die "emake failed" } -- 2.26.2