diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-05-03 18:08:55 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-05-03 18:08:55 +0000 |
| commit | 931e7902ea912fb37bbf72bfd089ae1338d0bbfb (patch) | |
| tree | f9701145febf7050483b364d3c8b73baebda0f4d /dev-libs | |
| parent | Stable on alpha, bug #218145 (diff) | |
| download | gentoo-2-931e7902ea912fb37bbf72bfd089ae1338d0bbfb.tar.gz gentoo-2-931e7902ea912fb37bbf72bfd089ae1338d0bbfb.tar.bz2 gentoo-2-931e7902ea912fb37bbf72bfd089ae1338d0bbfb.zip | |
Fix building with >=net-libs/gnutls-2.7.1.
(Portage version: 13599-svn/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/xmlsec/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/xmlsec/files/xmlsec-1.2.11-gnutls.patch | 17 | ||||
| -rw-r--r-- | dev-libs/xmlsec/xmlsec-1.2.11.ebuild | 29 |
3 files changed, 44 insertions, 10 deletions
diff --git a/dev-libs/xmlsec/ChangeLog b/dev-libs/xmlsec/ChangeLog index e861b9cf4253..e3af27f2627e 100644 --- a/dev-libs/xmlsec/ChangeLog +++ b/dev-libs/xmlsec/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/xmlsec -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/ChangeLog,v 1.15 2008/05/11 15:37:17 alonbl Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/ChangeLog,v 1.16 2009/05/03 18:08:54 arfrever Exp $ + + 03 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + xmlsec-1.2.11.ebuild, +files/xmlsec-1.2.11-gnutls.patch: + Fix building with >=net-libs/gnutls-2.7.1. 11 May 2008; Alon Bar-Lev <alonbl@gentoo.org> xmlsec-1.2.11.ebuild: Remove autoconf dependency, bug#221551, fixup RDEPEND diff --git a/dev-libs/xmlsec/files/xmlsec-1.2.11-gnutls.patch b/dev-libs/xmlsec/files/xmlsec-1.2.11-gnutls.patch new file mode 100644 index 000000000000..087a844605ba --- /dev/null +++ b/dev-libs/xmlsec/files/xmlsec-1.2.11-gnutls.patch @@ -0,0 +1,17 @@ +--- configure.in ++++ configure.in +@@ -747,12 +747,12 @@ + AC_MSG_RESULT(no) + GNUTLS_FOUND="without" + elif test "z$with_gnutls" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then +- PKG_CHECK_MODULES(GNUTLS, libgnutls >= $GNUTLS_NEW_MIN_VERSION, ++ PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_NEW_MIN_VERSION, + [GNUTLS_FOUND=yes], + [GNUTLS_FOUND=no]) + + if test "z$GNUTLS_FOUND" = "zno" ; then +- PKG_CHECK_MODULES(GNUTLS, libgnutls >= $GNUTLS_MIN_VERSION, ++ PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_MIN_VERSION, + [GNUTLS_FOUND=yes], + [GNUTLS_FOUND=no]) + if test "z$GNUTLS_FOUND" = "zyes" ; then diff --git a/dev-libs/xmlsec/xmlsec-1.2.11.ebuild b/dev-libs/xmlsec/xmlsec-1.2.11.ebuild index d69a71b67960..3dd930ba1866 100644 --- a/dev-libs/xmlsec/xmlsec-1.2.11.ebuild +++ b/dev-libs/xmlsec/xmlsec-1.2.11.ebuild @@ -1,6 +1,10 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/xmlsec-1.2.11.ebuild,v 1.3 2008/05/11 15:37:17 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/xmlsec-1.2.11.ebuild,v 1.4 2009/05/03 18:08:54 arfrever Exp $ + +EAPI="2" + +inherit autotools eutils flag-o-matic DESCRIPTION="command line tool for signing, verifying, encrypting and decrypting XML" HOMEPAGE="http://www.aleksey.com/xmlsec" @@ -8,8 +12,8 @@ SRC_URI="http://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~x86 ~amd64 ~sparc ~ppc" -IUSE="ssl mozilla gnutls" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="gnutls mozilla ssl" RDEPEND=">=dev-libs/libxslt-1.0.20 ssl? ( >=dev-libs/openssl-0.9.7 ) @@ -22,13 +26,22 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${PN}1-${PV}" -src_compile() { - econf --enable-xkms \ +src_prepare() { + epatch "${FILESDIR}/${P}-gnutls.patch" + eautoreconf +} + +src_configure() { + append-cppflags '-DLTDL_OBJDIR=\".libs\"' '-DLTDL_SHLIB_EXT=\".so\"' + local myconf + use gnutls || myconf="--without-gnutls" + econf \ + --enable-pkgconfig \ + --enable-xkms \ $(use_enable ssl openssl) \ $(use_enable ssl aes) \ --with-html-dir=/usr/share/doc/${PF} \ - || die "configure failed" - emake || die "emake failed" + ${myconf} } src_test() { |