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 | 7f7538ef1f2cf29c6df9a7ac678dee908cef934b (patch) | |
| tree | b178280160b3486662bdbd77b096253ae545b945 /net-libs | |
| parent | Restored keywords, those were dropped by accident (diff) | |
| download | historical-7f7538ef1f2cf29c6df9a7ac678dee908cef934b.tar.gz historical-7f7538ef1f2cf29c6df9a7ac678dee908cef934b.tar.bz2 historical-7f7538ef1f2cf29c6df9a7ac678dee908cef934b.zip | |
Fix gnutls automagic, bug #358619. Bump EAPI
Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/libgadu/ChangeLog | 8 | ||||
| -rw-r--r-- | net-libs/libgadu/Manifest | 4 | ||||
| -rw-r--r-- | net-libs/libgadu/libgadu-1.10.0-r1.ebuild (renamed from net-libs/libgadu/libgadu-1.10.0.ebuild) | 30 |
3 files changed, 33 insertions, 9 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/Manifest b/net-libs/libgadu/Manifest index 63d95b531b4d..5823fc69209e 100644 --- a/net-libs/libgadu/Manifest +++ b/net-libs/libgadu/Manifest @@ -2,8 +2,8 @@ AUX libgadu-1.9.0-memleak.patch 1205 RMD160 2aab98ca3daab357460921baecf909ffd7d5 DIST libgadu-1.10.0.tar.gz 531709 RMD160 ebfbb280f03cdcbb3a35bd4156a5997b112d5171 SHA1 8f3fedddad24779d615c920117e3122e9b8d5774 SHA256 82b6e8230f2a4e11ce0d0b0569aaa533de45ca2955e68245fd73c62188fba302 DIST libgadu-1.9.0.tar.gz 508879 RMD160 28b664dbc04174f0ff3d2615cfa98c9b3ccf8da6 SHA1 8b573ebf4d09962491b9a6e5fa2dd451b820c089 SHA256 12fadc0ea8ff31e5c199e8209bc6409dac2f69d4f4cda4adf6ec3838846af5f9 DIST libgadu-1.9.1.tar.gz 512563 RMD160 e17a7efd1b43a2e6d06a0521e8f27ccf4af5f072 SHA1 ec0a53bdbf6791baa5cd90d3d7ac4e0e7cf4df18 SHA256 669267f9b13879bab79923348158e8f545185b17690d5ecfb161125504a6e493 -EBUILD libgadu-1.10.0.ebuild 1128 RMD160 7f620bb325336581f180a0e826d390bcd5b9c407 SHA1 9dff559b79c3693a762ef514893a946aa1c69048 SHA256 4b0d793e65c9992d5fafdf422bd9a43d44663b7e7a440e35e9ee73c6ebd2f06c +EBUILD libgadu-1.10.0-r1.ebuild 1375 RMD160 ab8e74e75d1efbf3e7c813efdc98acd2f5af3cc0 SHA1 c66308414e26cc356cc72253dd8f01be2d2afbe6 SHA256 d7de853860f32874537cba8ca4114373ce7d0699161e8292a5f841abfef50ed0 EBUILD libgadu-1.9.0-r1.ebuild 1164 RMD160 3d36c4a2711840a82221d43d85dc1ecee255575f SHA1 9d2a4fbf2ca56ea651dd9a6f8ecc5352d51a6b31 SHA256 a56a9f9055a54a0b853044a21ee863cc952fa624786c8748ac00f3619d958a93 EBUILD libgadu-1.9.1.ebuild 1124 RMD160 679d123d77668dc3d908facdc20cdec81b2716ce SHA1 67a182352744fe808cbfafb4a18090ab7c034b2d SHA256 05374a78f66b812856251ba898d47a0b8d3993a94b2510bbb9b688967c3cb9ed -MISC ChangeLog 6878 RMD160 cbfb70ea5e09c1ed8d2962ffd666ab3503a49780 SHA1 385ae55cba0b73474f5b1ffdc69897a999966ece SHA256 4edd1ddfe2d22f5726c8f0fd52d68f7ad842288c6c553a7ef1ebaee6ae8fbe73 +MISC ChangeLog 7068 RMD160 513428831d0b8f3936e5e5c6e785d0e5a7328aa5 SHA1 50d68c4c1ff1c85973ee88af6051ce351714ca1e SHA256 c1507bdac23e51b7dd6370785aecc87654ca995149c3d0117596872e20341e21 MISC metadata.xml 258 RMD160 fc4bdbc1fb86c35071fb934c536231e4d3e493bc SHA1 739942443b465ea4a29e1742b7ffdf9d8ec3574f SHA256 2f8c9c8d8671a47521046aeb7ba86a8e407ad25da4f2d31a87d34a6830cae052 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 } |