diff options
| author |   Sergey Popov <pinkbyte@gentoo.org> | 2012-10-21 13:23:53 +0000 |
|---|---|---|
| committer | Sergey Popov <pinkbyte@gentoo.org> | 2012-10-21 13:23:53 +0000 |
| commit | f0d5838d538a3844858c3f84b1ad5011c2f69383 (patch) | |
| tree | ead2df17ba50831efb2b817b3dcdd690cab51203 /dev-libs/ucommon | |
| parent | Added checkpath -d to init-script, see Bug 429750 (diff) | |
| download | gentoo-2-f0d5838d538a3844858c3f84b1ad5011c2f69383.tar.gz gentoo-2-f0d5838d538a3844858c3f84b1ad5011c2f69383.tar.bz2 gentoo-2-f0d5838d538a3844858c3f84b1ad5011c2f69383.zip | |
Fix for bug #438354, thanks to Anthony Basile
(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-libs/ucommon')
| -rw-r--r-- | dev-libs/ucommon/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/ucommon/ucommon-5.2.2-r3.ebuild | 13 |
2 files changed, 15 insertions, 3 deletions
diff --git a/dev-libs/ucommon/ChangeLog b/dev-libs/ucommon/ChangeLog index c5a8669cc884..562b0f0539ab 100644 --- a/dev-libs/ucommon/ChangeLog +++ b/dev-libs/ucommon/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/ucommon # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ChangeLog,v 1.8 2012/10/16 02:38:01 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ChangeLog,v 1.9 2012/10/21 13:23:53 pinkbyte Exp $ + + 21 Oct 2012; Sergey Popov <pinkbyte@gentoo.org> ucommon-5.2.2-r3.ebuild: + Fix for bug #438354, thanks to Anthony Basile 16 Oct 2012; Anthony G. Basile <blueness@gentoo.org> ucommon-5.2.2-r3.ebuild: stable ppc ppc64, bug #438284 diff --git a/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild b/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild index 4c2b625dd80b..ee0232f0ebbe 100644 --- a/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild +++ b/dev-libs/ucommon/ucommon-5.2.2-r3.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/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild,v 1.3 2012/10/16 02:38:01 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild,v 1.4 2012/10/21 13:23:53 pinkbyte Exp $ EAPI="4" @@ -15,7 +15,8 @@ SLOT="0" KEYWORDS="~amd64 ppc ppc64 ~x86 ~amd64-linux" IUSE="doc static-libs socks +cxx debug ssl gnutls" -RDEPEND="ssl? ( dev-libs/openssl )" +RDEPEND="ssl? ( dev-libs/openssl ) + gnutls? ( net-libs/gnutls )" DEPEND="virtual/pkgconfig doc? ( app-doc/doxygen ) @@ -26,6 +27,8 @@ PATCHES=( "${FILESDIR}"/disable_rtf_gen_doxy.patch "${FILESDIR}/${P}-address.patch") AUTOTOOLS_IN_SOURCE_BUILD=1 +REQUIRED_USE="^^ ( ssl gnutls )" + src_configure() { local myconf="" if ! use ssl && ! use gnutls; then @@ -34,6 +37,12 @@ src_configure() { if use ssl; then myconf=" --with-sslstack=ssl " + ewarn "Using openssl for ssl stack" + fi + + if use gnutls; then + myconf=" --with-sslstack=gnu " + ewarn "Using gnutls for ssl stack" fi local myeconfargs=( |