diff options
| -rw-r--r-- | app-crypt/pinentry/ChangeLog | 6 | ||||
| -rw-r--r-- | app-crypt/pinentry/Manifest | 4 | ||||
| -rw-r--r-- | app-crypt/pinentry/pinentry-0.7.6.ebuild | 13 |
3 files changed, 13 insertions, 10 deletions
diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog index f8edece29ca2..d5f62d2b668d 100644 --- a/app-crypt/pinentry/ChangeLog +++ b/app-crypt/pinentry/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-crypt/pinentry # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.95 2009/07/04 18:35:11 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.96 2009/07/15 21:04:10 arfrever Exp $ + + 15 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + pinentry-0.7.6.ebuild: + Disable support for Qt-4 when "static" USE flag is enabled (bug #277963). 04 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> pinentry-0.7.6.ebuild, -files/pinentry-0.7.6-qt4-moc-fix.diff: diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest index 3bb65eb5257c..16ba15a5b73a 100644 --- a/app-crypt/pinentry/Manifest +++ b/app-crypt/pinentry/Manifest @@ -4,6 +4,6 @@ DIST pinentry-0.7.5.tar.gz 422801 RMD160 4ed9d06981b647f9fd39b9d30651a36307869c2 DIST pinentry-0.7.6.tar.gz 475101 RMD160 6e69eee88b5cbb919ced79971cd4794f5e659023 SHA1 0c525ce81e5589bc9a4f2eb72705bed2b3e9a8b9 SHA256 14670c18f4a042ffcbd7a937aa3f15de392816c56b472588383d8378f65b42ab EBUILD pinentry-0.7.5-r1.ebuild 2585 RMD160 8b2ffa6e650a29a6d764bade182973f8d063954f SHA1 584e27493300e9633f9dcf77d2f68af82d23f908 SHA256 d6a4cb6d6963900a7fa6147a9670814f071d08ac49be922ae038b3d99a2744a0 EBUILD pinentry-0.7.5.ebuild 2135 RMD160 5d7f62ddfb798c37d78679dd5188b4280e39c905 SHA1 02807101b19e9bd66f53751cd8ab5dfebe818d87 SHA256 f17d67266771bd12fa532fe4a58949b61545ff0627c62e2ce293266e4bf227bf -EBUILD pinentry-0.7.6.ebuild 2775 RMD160 493c203182359e1104db4f0256567249af5de4af SHA1 5897da99280892143cca9b0a964243ba44e7f296 SHA256 4176f1a59ee46823745abacb8853e2c0c45a6b3a2d3565fd4f2e4a56dee6bf82 -MISC ChangeLog 12709 RMD160 84ac6d80ee135d21e355969e853b4ccd80f148ac SHA1 71393bf14d9ff2308462134f936c3fc86ed6aac4 SHA256 0b9a058006284e33c605d139e54884bd9ac87a0fd82d7c1da7cb4da3e9be1a39 +EBUILD pinentry-0.7.6.ebuild 2801 RMD160 d1916d0d93cddc6cefb34436b5cad07133e1f92d SHA1 e4e34a679200f405daea23887fd8eac9c2531337 SHA256 4e16f393554701e6bb2b534bbef92bfb69e1e554ad13acab068ea9c10d2ca7a4 +MISC ChangeLog 12884 RMD160 bc9bbaf9714fb39eadd0c072cdf3a40917e82734 SHA1 c3f1088636e98f617b1abcb4b5c262bf97413fac SHA256 e369123b50d1f4c4b750e5bc4b7cd25326e0975c1cd6803804d47963970734a1 MISC metadata.xml 275 RMD160 7aca4724ede81b0eaad9b4536f00a6a805727cef SHA1 b1a92ff0d6bfacd26122ac4dbd4725ef2b023f81 SHA256 1e9c7343efc06a4d4143421f4bf3740c30f71ed6ce5011231505e7e911f31548 diff --git a/app-crypt/pinentry/pinentry-0.7.6.ebuild b/app-crypt/pinentry/pinentry-0.7.6.ebuild index f3d2af3ef413..922cbb570a81 100644 --- a/app-crypt/pinentry/pinentry-0.7.6.ebuild +++ b/app-crypt/pinentry/pinentry-0.7.6.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/app-crypt/pinentry/pinentry-0.7.6.ebuild,v 1.2 2009/07/04 18:35:11 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.6.ebuild,v 1.3 2009/07/15 21:04:10 arfrever Exp $ EAPI="1" @@ -29,10 +29,10 @@ RDEPEND="${DEPEND}" pkg_setup() { use static && append-ldflags -static - if use static && ( use gtk || use qt3 ) + if use static && { use gtk || use qt3 || use qt4; } then ewarn - ewarn "The static USE flag is only supported with the ncurses USE flags, disabling the gtk and qt3 USE flags." + ewarn "The static USE flag is only supported with the ncurses USE flags, disabling the gtk, qt3 and qt4 USE flags." ewarn fi } @@ -54,12 +54,12 @@ src_unpack() { src_compile() { local myconf="" - if ! ( use qt3 || use gtk || use ncurses ) + if ! { use qt3 || use qt4 || use gtk || use ncurses; } then myconf="--enable-pinentry-curses --enable-fallback-curses" elif use static then - myconf="--enable-pinentry-curses --enable-fallback-curses --disable-pinentry-gtk2 --disable-pinentry-qt" + myconf="--enable-pinentry-curses --enable-fallback-curses --disable-pinentry-gtk2 --disable-pinentry-qt --disable-pinentry-qt4" fi # Issues finding qt on multilib systems @@ -75,8 +75,7 @@ src_compile() { $(use_enable ncurses fallback-curses) \ $(use_enable qt4 pinentry-qt4) \ $(use_with caps libcap) \ - ${myconf} \ - || die "econf failed" + ${myconf} emake || die "emake failed" } |