diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2011-03-15 18:59:36 +0000 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2011-03-15 18:59:36 +0000 |
| commit | d7da8489b48cb5924ca333e641cb8ca9fbed3233 (patch) | |
| tree | 57e094e82a5a94ca67d0b82d5c277386bf24b7c5 | |
| parent | Restored keywords, those were dropped by accident (diff) | |
| download | gentoo-2-d7da8489b48cb5924ca333e641cb8ca9fbed3233.tar.gz gentoo-2-d7da8489b48cb5924ca333e641cb8ca9fbed3233.tar.bz2 gentoo-2-d7da8489b48cb5924ca333e641cb8ca9fbed3233.zip | |
Fix gnutls automagic, bug #358619. Bump EAPI
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
| -rw-r--r-- | net-libs/libgadu/ChangeLog | 8 | ||||
| -rw-r--r-- | net-libs/libgadu/libgadu-1.10.0-r1.ebuild (renamed from net-libs/libgadu/libgadu-1.10.0.ebuild) | 30 |
2 files changed, 31 insertions, 7 deletions
diff --git a/net-libs/libgadu/ChangeLog b/net-libs/libgadu/ChangeLog index e52b62b38d54..3f5fe572717d 100644 --- a/net-libs/libgadu/ChangeLog +++ b/net-libs/libgadu/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-libs/libgadu # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libgadu/ChangeLog,v 1.52 2011/03/12 14:45:49 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libgadu/ChangeLog,v 1.53 2011/03/15 18:59:36 reavertm Exp $ + +*libgadu-1.10.0-r1 (15 Mar 2011) + + 15 Mar 2011; Maciej Mrozowski <reavertm@gentoo.org> -libgadu-1.10.0.ebuild, + +libgadu-1.10.0-r1.ebuild: + Fix gnutls automagic, bug #358619. Bump EAPI. 12 Mar 2011; Tobias Klausmann <klausman@gentoo.org> libgadu-1.9.1.ebuild: Stable on alpha, bug #357289 diff --git a/net-libs/libgadu/libgadu-1.10.0.ebuild b/net-libs/libgadu/libgadu-1.10.0-r1.ebuild index 08bd77290644..8830114b0068 100644 --- a/net-libs/libgadu/libgadu-1.10.0.ebuild +++ b/net-libs/libgadu/libgadu-1.10.0-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libgadu/libgadu-1.10.0.ebuild,v 1.1 2011/03/04 00:11:20 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libgadu/libgadu-1.10.0-r1.ebuild,v 1.1 2011/03/15 18:59:36 reavertm Exp $ -EAPI="2" +EAPI="4" MY_P="${P/_/-}" @@ -15,10 +15,16 @@ SRC_URI="http://toxygen.net/libgadu/files/${MY_P}.tar.gz" LICENSE="LGPL-2.1" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos" SLOT="0" -IUSE="doc ssl static-libs threads" +IUSE="doc gnutls ssl static-libs threads" +REQUIRED_USE=" + gnutls? ( ssl ) +" COMMON_DEPEND=" - ssl? ( >=dev-libs/openssl-0.9.6m ) + ssl? ( + gnutls? ( net-libs/gnutls ) + !gnutls? ( >=dev-libs/openssl-0.9.6m ) + ) " DEPEND="${COMMON_DEPEND} doc? ( app-doc/doxygen ) @@ -35,10 +41,22 @@ AUTOTOOLS_IN_SOURCE_BUILD=1 DOCS=(AUTHORS ChangeLog NEWS README) src_configure() { - myeconfargs=( - $(use_with ssl openssl) + local myeconfargs=( $(use_with threads pthread) ) + + if use ssl; then + myeconfargs+=( + $(use_with gnutls gnutls) + $(use_with !gnutls openssl) + ) + else + myeconfargs+=( + '--without-gnutls' + '--without-openssl' + ) + fi + autotools-utils_src_configure } |