summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2017-05-16 22:52:57 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2017-08-26 13:51:23 +0200
commit7e19251abed38fa62e9897b9d02ef611303e8baf (patch)
tree3b09d61e993ba717622a417a3d61295e5d5df4b1
parent9d1fc80d88058d956e673f39cc82639b8a48739b (diff)
downloadoffice-7e19251abed38fa62e9897b9d02ef611303e8baf.tar.gz
office-7e19251abed38fa62e9897b9d02ef611303e8baf.tar.xz
xmlsec: Versiom bump to 1.2.24
-rw-r--r--packages/dev-libs/xmlsec/xmlsec-1.2.24.exheres-0 (renamed from packages/dev-libs/xmlsec/xmlsec-1.2.23.exheres-0)4
-rw-r--r--packages/dev-libs/xmlsec/xmlsec.exlib22
2 files changed, 8 insertions, 18 deletions
diff --git a/packages/dev-libs/xmlsec/xmlsec-1.2.23.exheres-0 b/packages/dev-libs/xmlsec/xmlsec-1.2.24.exheres-0
index 5ff29d4..8c8dd29 100644
--- a/packages/dev-libs/xmlsec/xmlsec-1.2.23.exheres-0
+++ b/packages/dev-libs/xmlsec/xmlsec-1.2.24.exheres-0
@@ -5,7 +5,3 @@ require xmlsec
PLATFORMS="~amd64"
-DEFAULT_SRC_PREPARE_PATCHES+=(
- "${FILES}"/${PN}-Fix-libressl-and-openssl-1.1.0-48.patch
-)
-
diff --git a/packages/dev-libs/xmlsec/xmlsec.exlib b/packages/dev-libs/xmlsec/xmlsec.exlib
index df682a3..547771a 100644
--- a/packages/dev-libs/xmlsec/xmlsec.exlib
+++ b/packages/dev-libs/xmlsec/xmlsec.exlib
@@ -1,10 +1,6 @@
-# Copyright 2013-2014 Heiko Becker <heirecka@exherbo.org>
+# Copyright 2013-2014, 2017 Heiko Becker <heirecka@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
-
-export_exlib_phases src_prepare
-
MY_PNV=${PN}1-${PV}
SUMMARY="Library and tools supporting XML Digital Signature and XML Encryption"
@@ -37,6 +33,7 @@ MYOPTIONS="debug doc
DEPENDENCIES="
build:
+ sys-devel/libtool
virtual/pkg-config[>=0.9]
build+run:
dev-libs/libxml2:2.0[>=2.7.4]
@@ -44,7 +41,7 @@ DEPENDENCIES="
gcrypt? ( dev-libs/libgcrypt[>=1.4.0] )
gnutls? ( dev-libs/gnutls[>=2.8.0] )
nss? (
- dev-libs/nss[>=3.9]
+ dev-libs/nss[>=3.11.1]
dev-libs/nspr[>=4.4.1]
)
openssl? (
@@ -56,6 +53,7 @@ DEPENDENCIES="
WORK=${WORKBASE}/${MY_PNV}
DEFAULT_SRC_CONFIGURE_PARAMS=(
+ --enable-apps
--disable-docs-build
--disable-manpages-build
--disable-static
@@ -69,12 +67,8 @@ DEFAULT_SRC_CONFIGURE_OPTIONS=(
'nss --with-nspr= --without-nspr'
'openssl --with-openssl= --without-openssl'
)
-DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( debug )
-
-xmlsec_src_prepare() {
- if option !doc ; then
- edo sed -e '/^SUBDIRS/s/docs//' -i Makefile.am
- fi
- autotools_src_prepare
-}
+DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=(
+ debug
+ 'doc docs'
+)