diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-05-30 21:41:11 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-05-30 21:41:11 +0000 |
| commit | b63f8ca96c7574881ba64e3a716e9131c8ed50da (patch) | |
| tree | fbbf5ead0e6f5a5f6842a9813165635ed4bc3d03 /dev-libs | |
| parent | Fix skin install, bug 271904; change gtk use flag to gmplayer (diff) | |
| download | gentoo-2-b63f8ca96c7574881ba64e3a716e9131c8ed50da.tar.gz gentoo-2-b63f8ca96c7574881ba64e3a716e9131c8ed50da.tar.bz2 gentoo-2-b63f8ca96c7574881ba64e3a716e9131c8ed50da.zip | |
Fix detection of >=net-libs/gnutls-2.7.1 (bug #268472). Fix automagic dependency on net-libs/gnutls.
(Portage version: 13625-svn/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/iksemel/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/iksemel/files/iksemel-1.3-gnutls-2.8.patch | 16 | ||||
| -rw-r--r-- | dev-libs/iksemel/iksemel-1.3.ebuild | 21 |
3 files changed, 37 insertions, 7 deletions
diff --git a/dev-libs/iksemel/ChangeLog b/dev-libs/iksemel/ChangeLog index 8c02023ee563..dd5b0ace993a 100644 --- a/dev-libs/iksemel/ChangeLog +++ b/dev-libs/iksemel/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/iksemel # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/iksemel/ChangeLog,v 1.11 2009/05/03 16:47:36 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/iksemel/ChangeLog,v 1.12 2009/05/30 21:41:11 arfrever Exp $ + + 30 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + iksemel-1.3.ebuild, +files/iksemel-1.3-gnutls-2.8.patch: + Fix detection of >=net-libs/gnutls-2.7.1 (bug #268472). Fix automagic + dependency on net-libs/gnutls. 03 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> iksemel-1.3.ebuild: diff --git a/dev-libs/iksemel/files/iksemel-1.3-gnutls-2.8.patch b/dev-libs/iksemel/files/iksemel-1.3-gnutls-2.8.patch new file mode 100644 index 000000000000..8c0aa49bc431 --- /dev/null +++ b/dev-libs/iksemel/files/iksemel-1.3-gnutls-2.8.patch @@ -0,0 +1,16 @@ +--- configure.ac ++++ configure.ac +@@ -45,7 +45,12 @@ + AC_CHECK_FUNCS(getopt_long) + AC_CHECK_FUNCS(getaddrinfo) + +-AM_PATH_LIBGNUTLS(,AC_DEFINE(HAVE_GNUTLS,,"Use libgnutls")) ++AC_ARG_WITH([gnutls], ++ [AS_HELP_STRING([--with-gnutls], ++ [Enable use of GnuTLS])]) ++if test "$with_gnutls" != "no"; then ++ PKG_CHECK_MODULES(LIBGNUTLS, gnutls, AC_DEFINE(HAVE_GNUTLS,,"Use libgnutls")) ++fi + + dnl Check -Wall flag of GCC + if test "x$GCC" = "xyes"; then diff --git a/dev-libs/iksemel/iksemel-1.3.ebuild b/dev-libs/iksemel/iksemel-1.3.ebuild index 84bdd19e84b0..7d9c04d54b1a 100644 --- a/dev-libs/iksemel/iksemel-1.3.ebuild +++ b/dev-libs/iksemel/iksemel-1.3.ebuild @@ -1,6 +1,10 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/iksemel/iksemel-1.3.ebuild,v 1.6 2009/05/03 16:47:36 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/iksemel/iksemel-1.3.ebuild,v 1.7 2009/05/30 21:41:11 arfrever Exp $ + +EAPI="2" + +inherit autotools eutils DESCRIPTION="eXtensible Markup Language parser library designed for Jabber applications" HOMEPAGE="http://code.google.com/p/iksemel" @@ -12,17 +16,22 @@ KEYWORDS="amd64 ppc x86" IUSE="gnutls" RDEPEND="gnutls? ( net-libs/gnutls )" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + gnutls? ( dev-util/pkgconfig )" # http://code.google.com/p/iksemel/issues/detail?id=4 RESTRICT="test" -src_compile() { - econf $(use_with gnutls libgnutls-prefix /usr) - emake || die "emake failed" +src_prepare() { + epatch "${FILESDIR}/${P}-gnutls-2.8.patch" + eautoreconf +} + +src_configure() { + econf $(use_with gnutls) } src_install() { - emake DESTDIR="${D}" install || die "emake install failed." + emake DESTDIR="${D}" install || die "emake install failed" dodoc AUTHORS ChangeLog HACKING NEWS README TODO } |