diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-07-15 21:04:10 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-07-15 21:04:10 +0000 |
| commit | d364170e23cc4b654767b6b2d4bc03932e9faec9 (patch) | |
| tree | 132e60d3e61cadc09e14a50f14d1aac156f1adb7 /app-crypt/pinentry | |
| parent | Version bump (diff) | |
| download | gentoo-2-d364170e23cc4b654767b6b2d4bc03932e9faec9.tar.gz gentoo-2-d364170e23cc4b654767b6b2d4bc03932e9faec9.tar.bz2 gentoo-2-d364170e23cc4b654767b6b2d4bc03932e9faec9.zip | |
Disable support for Qt-4 when "static" USE flag is enabled (bug #277963).
(Portage version: 13827-svn/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt/pinentry')
| -rw-r--r-- | app-crypt/pinentry/ChangeLog | 6 | ||||
| -rw-r--r-- | app-crypt/pinentry/pinentry-0.7.6.ebuild | 13 |
2 files changed, 11 insertions, 8 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/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" } |