diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2010-06-14 00:16:52 +0300 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2010-06-14 00:16:52 +0300 |
| commit | c162db899b493febac3e9b05fedfafdfbb85d79e (patch) | |
| tree | 89ebaf0ee36229d5c672a51258fa07469d9cb9df /app-crypt | |
| parent | PyQt4/sip: Automatic version bump, remove old (diff) | |
| download | qt-c162db899b493febac3e9b05fedfafdfbb85d79e.tar.gz qt-c162db899b493febac3e9b05fedfafdfbb85d79e.tar.bz2 qt-c162db899b493febac3e9b05fedfafdfbb85d79e.zip | |
[QA]: Many QA fixes and clean ups
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/pinentry/Manifest | 2 | ||||
| -rw-r--r-- | app-crypt/pinentry/pinentry-9999.ebuild | 16 |
2 files changed, 5 insertions, 13 deletions
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest index 2a255f28..f6fd1b73 100644 --- a/app-crypt/pinentry/Manifest +++ b/app-crypt/pinentry/Manifest @@ -1,2 +1,2 @@ -EBUILD pinentry-9999.ebuild 2736 RMD160 c17fd2e5c944bce9dc29aae56b7731e75908a7d3 SHA1 6fec504fb988a93be9cedc24d99fe57066887329 SHA256 91f8a0c3952f60fb09c3bf55af869b04cb2c9c83616aba740b65e0dc6bd0ef15 +EBUILD pinentry-9999.ebuild 2514 RMD160 ef77d5730d5742b504bed7990f52a0a8ba69dc23 SHA1 2000e20dc413628ad73225945145addfe26a51cc SHA256 ea823a27ed43fb09e230bc8351298ec8fcd4aed8e0e943da39d9afcae46c5bdc MISC metadata.xml 275 RMD160 7aca4724ede81b0eaad9b4536f00a6a805727cef SHA1 b1a92ff0d6bfacd26122ac4dbd4725ef2b023f81 SHA256 1e9c7343efc06a4d4143421f4bf3740c30f71ed6ce5011231505e7e911f31548 diff --git a/app-crypt/pinentry/pinentry-9999.ebuild b/app-crypt/pinentry/pinentry-9999.ebuild index 75048178..dbc76364 100644 --- a/app-crypt/pinentry/pinentry-9999.ebuild +++ b/app-crypt/pinentry/pinentry-9999.ebuild @@ -13,7 +13,7 @@ ESVN_REPO_URI="svn://cvs.gnupg.org/pinentry/trunk" LICENSE="GPL-2" KEYWORDS="" SLOT="0" -IUSE="caps gtk ncurses qt3 qt4 static" +IUSE="caps gtk ncurses qt4 static" DEPEND=" caps? ( sys-libs/libcap ) @@ -26,7 +26,6 @@ DEPEND=" ) ) ncurses? ( sys-libs/ncurses ) - qt3? ( x11-libs/qt:3 ) qt4? ( x11-libs/qt-gui:4 ) ) " @@ -35,9 +34,9 @@ RDEPEND="${DEPEND}" pkg_setup() { if use static; then append-ldflags -static - if use gtk || use qt3 || use qt4; then + if use gtk || use qt4; then ewarn - ewarn "The static USE flag is only supported with the ncurses USE flags, disabling the gtk, qt3 and qt4 USE flags." + ewarn "The static USE flag is only supported with the ncurses USE flags, disabling the gtk and qt4 USE flags." ewarn fi fi @@ -51,24 +50,17 @@ src_prepare() { src_configure() { local myconf="" - if use gtk || use ncurses || use qt3 || use qt4; then + if use gtk || use ncurses || use qt4; 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 --disable-pinentry-qt4" fi - if use qt3; then - # Issues finding qt on multilib systems - export QTDIR="/usr/qt/3" - export QTLIB="${QTDIR}/$(get_libdir)" - fi - econf \ --disable-dependency-tracking \ --enable-maintainer-mode \ --disable-pinentry-gtk \ $(use_enable gtk pinentry-gtk2) \ - $(use_enable qt3 pinentry-qt) \ $(use_enable qt4 pinentry-qt4) \ $(use_enable ncurses pinentry-curses) \ $(use_enable ncurses fallback-curses) \ |