From 3093ca565f9d0cc896c1602bb4f42404e21c3e64 Mon Sep 17 00:00:00 2001 From: Tristan Heaven Date: Mon, 9 Oct 2006 17:18:11 +0000 Subject: [PATCH] Use qt_min_version for qt3 dependency Package-Manager: portage-2.1.2_pre2-r7 --- games-util/qjoypad/ChangeLog | 5 ++++- games-util/qjoypad/Manifest | 22 +++++++++++----------- games-util/qjoypad/qjoypad-3.4.ebuild | 19 +++++++------------ 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/games-util/qjoypad/ChangeLog b/games-util/qjoypad/ChangeLog index bd0e11d3a607..b3f62288b665 100644 --- a/games-util/qjoypad/ChangeLog +++ b/games-util/qjoypad/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-util/qjoypad # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/qjoypad/ChangeLog,v 1.5 2006/05/08 12:31:16 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-util/qjoypad/ChangeLog,v 1.6 2006/10/09 17:18:11 nyhm Exp $ + + 09 Oct 2006; Tristan Heaven qjoypad-3.4.ebuild: + Use qt_min_version for qt3 dependency 08 May 2006; Chris Gianelloni qjoypad-3.4.ebuild: Added qt3 to the inherit line and closing bug #123043. Thanks to Caleb diff --git a/games-util/qjoypad/Manifest b/games-util/qjoypad/Manifest index cc5c2a08673f..e1c91fee91c4 100644 --- a/games-util/qjoypad/Manifest +++ b/games-util/qjoypad/Manifest @@ -1,17 +1,17 @@ -AUX qjoypad-3.4-gcc41.patch 506 RMD160 687e14148dfa397910937d596e62f14519e860e3 SHA1 560fae68fe10ce3e5a5f8e80d2bee8b16e0ceebe SHA256 cfe7452859aa9d4b1dd2b56db21206be08b4b025184d0e8231ec27811926ec5a size 506 +AUX qjoypad-3.4-gcc41.patch 506 RMD160 687e14148dfa397910937d596e62f14519e860e3 SHA1 560fae68fe10ce3e5a5f8e80d2bee8b16e0ceebe SHA256 cfe7452859aa9d4b1dd2b56db21206be08b4b025184d0e8231ec27811926ec5a MD5 1fa2b982a83d8dc984c2009438c83401 files/qjoypad-3.4-gcc41.patch 506 RMD160 687e14148dfa397910937d596e62f14519e860e3 files/qjoypad-3.4-gcc41.patch 506 SHA256 cfe7452859aa9d4b1dd2b56db21206be08b4b025184d0e8231ec27811926ec5a files/qjoypad-3.4-gcc41.patch 506 -DIST qjoypad-3.4.tgz 92298 RMD160 1c623383b11ffe9e58224e7304eb588d42816ed9 SHA256 b2af48bfc36e919a6e87fbb0bcfe59166e4777aee820416c66e5a02bef3aad24 size 92298 -EBUILD qjoypad-3.4.ebuild 1358 RMD160 91e88c01f11ed280052f55a958c3aa3cd058aafd SHA1 16d9661a1d37e7d8a00417014108a04ba809e487 SHA256 cf72062560b45ed1a2aa63eb349e4277801455aeb96fcbad09c882dd3f4f89e7 size 1358 -MD5 7756ccb23251f814d39e405d4bec89c8 qjoypad-3.4.ebuild 1358 -RMD160 91e88c01f11ed280052f55a958c3aa3cd058aafd qjoypad-3.4.ebuild 1358 -SHA256 cf72062560b45ed1a2aa63eb349e4277801455aeb96fcbad09c882dd3f4f89e7 qjoypad-3.4.ebuild 1358 -MISC ChangeLog 871 RMD160 f7964335baaed40f6a1f75312faa01fbd4acf14b SHA1 388695a5b1ef0f1bd863bc5344ef12c8fbeb4a35 SHA256 ce60354cb6e5e793dcb84805443510a3086b0497ec2cbff0648c39cefcc5592c size 871 -MD5 c75eb484ff6e312f7a58e0b5cbd92e98 ChangeLog 871 -RMD160 f7964335baaed40f6a1f75312faa01fbd4acf14b ChangeLog 871 -SHA256 ce60354cb6e5e793dcb84805443510a3086b0497ec2cbff0648c39cefcc5592c ChangeLog 871 -MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158 +DIST qjoypad-3.4.tgz 92298 RMD160 1c623383b11ffe9e58224e7304eb588d42816ed9 SHA1 132ba5dba7a16b12b053dcd1152a9aa21c248dd7 SHA256 b2af48bfc36e919a6e87fbb0bcfe59166e4777aee820416c66e5a02bef3aad24 +EBUILD qjoypad-3.4.ebuild 1323 RMD160 828b6f80036f784354d1880af2103d790ab479d0 SHA1 a3e311f1f69911ff27c52da1bdd579467a5346cf SHA256 17e89f3d1aced8f1eb6288be4f775ed13573cfccffdfdcb736c8083c0b4c2b99 +MD5 c01dd25897345e9de80a903dec5c41d0 qjoypad-3.4.ebuild 1323 +RMD160 828b6f80036f784354d1880af2103d790ab479d0 qjoypad-3.4.ebuild 1323 +SHA256 17e89f3d1aced8f1eb6288be4f775ed13573cfccffdfdcb736c8083c0b4c2b99 qjoypad-3.4.ebuild 1323 +MISC ChangeLog 976 RMD160 8915f3e74ccacac03c80b3aebfb37e181025663f SHA1 2a0b9a2bb2e82188b1dac99cc882f2f14330c27a SHA256 7e05bdb90d3b7469713aaa907cb1bd2166d4b60e4cd7d068067d04fa8e38ac97 +MD5 f3e09d9d2cdb6bc95aafa5a0c0c2ace4 ChangeLog 976 +RMD160 8915f3e74ccacac03c80b3aebfb37e181025663f ChangeLog 976 +SHA256 7e05bdb90d3b7469713aaa907cb1bd2166d4b60e4cd7d068067d04fa8e38ac97 ChangeLog 976 +MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158 diff --git a/games-util/qjoypad/qjoypad-3.4.ebuild b/games-util/qjoypad/qjoypad-3.4.ebuild index 252b58d60e7b..8b24f484d06b 100644 --- a/games-util/qjoypad/qjoypad-3.4.ebuild +++ b/games-util/qjoypad/qjoypad-3.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/qjoypad/qjoypad-3.4.ebuild,v 1.7 2006/05/08 12:31:16 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-util/qjoypad/qjoypad-3.4.ebuild,v 1.8 2006/10/09 17:18:11 nyhm Exp $ inherit qt3 eutils @@ -13,16 +13,11 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="" -DEPEND="x11-libs/qt - || ( - ( - x11-proto/xextproto - x11-proto/xproto ) - virtual/x11 )" -RDEPEND="x11-libs/qt - || ( - x11-libs/libXtst - virtual/x11 )" +RDEPEND="x11-libs/libXtst + $(qt_min_version 3.3)" +DEPEND="${RDEPEND} + x11-proto/xextproto + x11-proto/xproto" src_unpack() { unpack ${A} @@ -39,7 +34,7 @@ src_unpack() { src_compile() { cd src ./config --prefix=/usr || die "config failed" - emake || die + emake || die "emake failed" } src_install() { -- 2.26.2