diff options
| author |   Ben de Groot <yngwin@gentoo.org> | 2012-11-28 07:37:32 +0000 |
|---|---|---|
| committer | Ben de Groot <yngwin@gentoo.org> | 2012-11-28 07:37:32 +0000 |
| commit | eebf81b3b7ea4335858c18cfe9bfd5dc27024134 (patch) | |
| tree | fac876f81eca75f59551a4551d80c5321bb1fd7a /mail-client | |
| parent | Add to crypto herd. (diff) | |
| download | gentoo-2-eebf81b3b7ea4335858c18cfe9bfd5dc27024134.tar.gz gentoo-2-eebf81b3b7ea4335858c18cfe9bfd5dc27024134.tar.bz2 gentoo-2-eebf81b3b7ea4335858c18cfe9bfd5dc27024134.zip | |
Apply changes from bug #444062
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'mail-client')
| -rw-r--r-- | mail-client/trojita/ChangeLog | 7 | ||||
| -rw-r--r-- | mail-client/trojita/trojita-0.3.ebuild | 11 | ||||
| -rw-r--r-- | mail-client/trojita/trojita-9999.ebuild | 14 |
3 files changed, 20 insertions, 12 deletions
diff --git a/mail-client/trojita/ChangeLog b/mail-client/trojita/ChangeLog index 431bc7a53931..53c0c812e292 100644 --- a/mail-client/trojita/ChangeLog +++ b/mail-client/trojita/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mail-client/trojita # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v 1.14 2012/03/30 10:34:00 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v 1.15 2012/11/28 07:37:32 yngwin Exp $ + + 28 Nov 2012; Ben de Groot <yngwin@gentoo.org> trojita-0.3.ebuild, + trojita-9999.ebuild: + Apply changes from bug #444062 *trojita-0.3 (30 Mar 2012) @@ -68,4 +72,3 @@ +metadata.xml: Initial commit. I am proxying it for jkt. All credit for ebuild goes for him. Per bug #283372. - diff --git a/mail-client/trojita/trojita-0.3.ebuild b/mail-client/trojita/trojita-0.3.ebuild index aba5aa8866dd..fcb9464e7456 100644 --- a/mail-client/trojita/trojita-0.3.ebuild +++ b/mail-client/trojita/trojita-0.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-0.3.ebuild,v 1.1 2012/03/30 10:34:00 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-0.3.ebuild,v 1.2 2012/11/28 07:37:32 yngwin Exp $ EAPI=4 @@ -23,14 +23,11 @@ LICENSE="|| ( GPL-2 GPL-3 )" SLOT="0" IUSE="debug test" -RDEPEND=" - >=x11-libs/qt-gui-${QT_REQUIRED}:4 +RDEPEND=">=x11-libs/qt-gui-${QT_REQUIRED}:4 >=x11-libs/qt-sql-${QT_REQUIRED}:4[sqlite] >=x11-libs/qt-webkit-${QT_REQUIRED}:4 -" -DEPEND="${RDEPEND} - test? ( >=x11-libs/qt-test-${QT_REQUIRED}:4 ) -" + >=x11-libs/qt-test-${QT_REQUIRED}:4" +DEPEND=${RDEPEND} src_configure() { eqmake4 PREFIX=/usr diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild index 6e08fc5c8718..3f25a7377211 100644 --- a/mail-client/trojita/trojita-9999.ebuild +++ b/mail-client/trojita/trojita-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v 1.10 2012/03/30 10:34:00 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v 1.11 2012/11/28 07:37:32 yngwin Exp $ EAPI=4 @@ -21,7 +21,7 @@ fi LICENSE="|| ( GPL-2 GPL-3 )" SLOT="0" -IUSE="debug test" +IUSE="debug test +zlib" RDEPEND=" >=x11-libs/qt-gui-${QT_REQUIRED}:4 @@ -30,8 +30,16 @@ RDEPEND=" " DEPEND="${RDEPEND} test? ( >=x11-libs/qt-test-${QT_REQUIRED}:4 ) + zlib? ( + virtual/pkgconfig + sys-libs/zlib + ) " src_configure() { - eqmake4 PREFIX=/usr + local myopts="" + use debug && myopts="$myopts CONFIG+=debug" + use test || myopts="$myopts CONFIG+=disable_tests" + use zlib || myopts="$myopts CONFIG+=disable_zlib" + eqmake4 PREFIX=/usr $myopts } |