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 | 83e0d8ced2553a5ee2a81b13502938aff1994a17 (patch) | |
| tree | d13c185a78d8e40e509332b0629f3536c761f6a9 /dev-libs/xmlsec | |
| parent | Stable on alpha, bug #218145 (diff) | |
| download | historical-83e0d8ced2553a5ee2a81b13502938aff1994a17.tar.gz historical-83e0d8ced2553a5ee2a81b13502938aff1994a17.tar.bz2 historical-83e0d8ced2553a5ee2a81b13502938aff1994a17.zip | |
Fix building with >=net-libs/gnutls-2.7.1.
Package-Manager: portage-13599-svn/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/xmlsec')
| -rw-r--r-- | dev-libs/xmlsec/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/xmlsec/Manifest | 5 | ||||
| -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 |
4 files changed, 47 insertions, 12 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/Manifest b/dev-libs/xmlsec/Manifest index 6de7a674b0fb..536bdd036fe3 100644 --- a/dev-libs/xmlsec/Manifest +++ b/dev-libs/xmlsec/Manifest @@ -1,4 +1,5 @@ +AUX xmlsec-1.2.11-gnutls.patch 624 RMD160 c04f4640d27471a49bb7cf9a77af9a494c399595 SHA1 bccbe8d0acc940bf62dee46baf06bb72d0954c68 SHA256 3b367d0bc7b36da95692eb5d70b28c8651e956c23b4563c48bed2b9672c2f46a DIST xmlsec1-1.2.11.tar.gz 1641811 RMD160 9336620005a7cd933a75db4b287daab655b87c9c SHA1 b7ec2bfd1b44b29dabf8ba5d37661da1143f0f64 SHA256 d802bb84e8ef6b95abab45c6e9c381a62d0e38fb40a44044eff126add57fdc96 -EBUILD xmlsec-1.2.11.ebuild 1107 RMD160 ef04d9ab291725364fd7e2a23a209bd05fd4f209 SHA1 1a63ad94c9aa01ffdb90ee5b14dce9d740a1d6d4 SHA256 c313d46a72f2da09f3d6aefa92c63f3f861359a79302699203f1dfeede0d0f0d -MISC ChangeLog 2236 RMD160 0c8b964ebf45008f621b05647c24c96ae93177d1 SHA1 d117fe3461ef50f662aad33d455584cdd4c39376 SHA256 301a797e9a5d6e78a1faad9065f1c397f01ffac738a8acb760c9af87b63fcc2d +EBUILD xmlsec-1.2.11.ebuild 1339 RMD160 5e3d7b38c81da4e7b74d9e1c636f28d45687c55a SHA1 62f0c296f8983938decf9ea1654c47d859720122 SHA256 1e76794e5c222b78939138dcd1b3ba8e5ae1cef874f69642f0fe6f6241ade19f +MISC ChangeLog 2416 RMD160 c5a305feccd6ffa7750f888af5b1ce8dd6241128 SHA1 aa0f230361f085dc1a2edb0da9b1338695aa8898 SHA256 f33aa6d67c60577a7cbcf535f942125df2632670860a18e7f34883b5be43d2f9 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10 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() { |