dev-libs/softhsm: version bump

svn path=/sunrise/; revision=10446

5 files changed, 11 insertions, 46 deletions

diff --git a/dev-libs/softhsm/ChangeLog b/dev-libs/softhsm/ChangeLog
index 814db8558..5c7a9d031 100644
--- a/dev-libs/softhsm/ChangeLog
+++ b/dev-libs/softhsm/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Apr 2010; Tom Hendrikx (whyscream) <tom@whyscream.net>
+  -softhsm-1.1.3.ebuild, -files/softhsm-1.1.3-r2797.patch,
+  -files/softhsm-1.1.3-r2798.patch, +softhsm-1.1.4.ebuild:
+  version bump
+
   14 Feb 2010; Tom Hendrikx (whyscream) <tom@whyscream.net>
   +softhsm-1.1.3.ebuild, +files/softhsm-1.1.3-r2797.patch,
   +files/softhsm-1.1.3-r2798.patch, +metadata.xml:
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index 23b7aa1b8..9004915b1 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,6 +1,4 @@
-AUX softhsm-1.1.3-r2797.patch 429 RMD160 229dae70dd76b008e012a7e0be2c21041749b71a SHA1 007d0623ab29180ee7b0e434757beed31fd9f44e SHA256 946210db696c8e5bd28bad5aa5edddd45198f77018faa7b063ab74ffa20a46b4
-AUX softhsm-1.1.3-r2798.patch 741 RMD160 20a9d8fcc5421b3ee9bb28645a2b849c146263e7 SHA1 87db34cea7f60980df943a65751f81d297f9c0b3 SHA256 efceb121c8511d55a1023d94b928f579585d933d428f73221e76b5e338fd4982
-DIST softhsm-1.1.3.tar.gz 392508 RMD160 b955d9fd3cfd03126108d12845df4d658ec236b8 SHA1 042deb3027262e8f890b92f5ad633f1ca0d84e5c SHA256 3cac3c73be74fc01545a35e89ad457eee179edb74cb86cb3a0e2e4123b6a8c4a
-EBUILD softhsm-1.1.3.ebuild 769 RMD160 aa5282950d24ba728096e6306fde452791086236 SHA1 5c93f6afca4a6a40f3cf00821f575351ec1e0ac9 SHA256 66961d55ee9fa49632137221e39bb9d8d7519103ebfcb8c181637483d876895a
-MISC ChangeLog 331 RMD160 8a684d2498072aaaae4e2fc862bee9ff0bf6a28e SHA1 325bcb207aa39680c51499ee5dfd46dffa4fe743 SHA256 589bc9e477eaae34766626868a918e98b8de3a7300f4c467ae0d668ec1df85a1
+DIST softhsm-1.1.4.tar.gz 389240 RMD160 19201c3801ad91a63a121c6125d0e70922eb0778 SHA1 f9ed10f04d7a6099bdc5b75ee55de5a2354dca90 SHA256 bc65074f4b734d9308a9321de2690efe932f464d1be8650bccb6adf1d9a4bc4e
+EBUILD softhsm-1.1.4.ebuild 585 RMD160 b10593cac81ccaa9322cdd226ae624e0e077635e SHA1 c56667552f8c0b2304264dcbfb66d6b748a4a55b SHA256 c8e70e1cf9534515b062706b968f9c4b70e435d8808061b842f8c3aef286a3b9
+MISC ChangeLog 525 RMD160 48f4ff306c55de4459dd5009ceb585ca8c7bc2f5 SHA1 d0eac9d8215f0a385c032029e809b8094fdd63de SHA256 bc0a7920836d78717c383866086508e7edb15e5ace128f77fde6bc85823f72d3
 MISC metadata.xml 171 RMD160 ed284df01c230fc7990a6b5888b39166d23f29ba SHA1 f3d64a69044b710e23fb874b3ee4cd338858c8b4 SHA256 a7b30fbacd0e4c312c07a3efac112a3794c81d134442d8104325734d03425adf
diff --git a/dev-libs/softhsm/files/softhsm-1.1.3-r2797.patch b/dev-libs/softhsm/files/softhsm-1.1.3-r2797.patch
deleted file mode 100644
index 079038655..000000000
--- a/dev-libs/softhsm/files/softhsm-1.1.3-r2797.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: m4/acx_64bit.m4
-===================================================================
---- m4/acx_64bit.m4	(revision 2796)
-+++ m4/acx_64bit.m4	(revision 2797)
-@@ -4,7 +4,7 @@
- 	AC_ARG_ENABLE(
- 	        [64bit],
-         	[AS_HELP_STRING([--enable-64bit],[enable 64-bit compiling])],
--	        [enable_64bit="yes"],
-+	        [enable_64bit="${enableval}"],
- 	        [enable_64bit="no"])
- 
- 	if test "x$enable_64bit" = "xyes"
diff --git a/dev-libs/softhsm/files/softhsm-1.1.3-r2798.patch b/dev-libs/softhsm/files/softhsm-1.1.3-r2798.patch
deleted file mode 100644
index d3e27175b..000000000
--- a/dev-libs/softhsm/files/softhsm-1.1.3-r2798.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: Makefile.am
-===================================================================
---- Makefile.am	(revision 2797)
-+++ Makefile.am	(revision 2798)
-@@ -18,10 +18,10 @@
- EXTRA_DIST = $(srcdir)/m4/*.m4 $(srcdir)/softhsm.conf.5.in
- 
- install-data-hook:
--	test -d ${sysconfdir} || \
-+	test -d ${DESTDIR}${sysconfdir} || \
- 		${INSTALL} -d ${DESTDIR}${sysconfdir}
--	test -f ${sysconfdir}/softhsm.conf || \
-+	test -f ${DESTDIR}${sysconfdir}/softhsm.conf || \
- 		${INSTALL_DATA} ${top_builddir}/softhsm.conf ${DESTDIR}${sysconfdir}
- 	${INSTALL_DATA} ${top_builddir}/softhsm.conf ${DESTDIR}${sysconfdir}/softhsm.conf.sample
--	test -d ${softhsmdbdir} || \
-+	test -d ${DESTDIR}${softhsmdbdir} || \
- 		${INSTALL} -d -m 700 ${DESTDIR}${softhsmdbdir}
diff --git a/dev-libs/softhsm/softhsm-1.1.3.ebuild b/dev-libs/softhsm/softhsm-1.1.4.ebuild
index 54bcfb708..ce051682b 100644
--- a/dev-libs/softhsm/softhsm-1.1.3.ebuild
+++ b/dev-libs/softhsm/softhsm-1.1.4.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit autotools base eutils
+inherit base
 
 DESCRIPTION="A software PKCS#11 implementation"
 HOMEPAGE="http://www.opendnssec.org/"
@@ -15,20 +15,13 @@ IUSE="debug"
 SLOT="0"
 LICENSE="BSD"
 
-RDEPEND=">=dev-libs/botan-1.8.5[threads]
-	>=dev-db/sqlite-3.4.2"
+RDEPEND="dev-libs/botan[threads]
+	dev-db/sqlite:3"
 
 DEPEND="${RDEPEND}"
 
 DOCS=( "AUTHORS" "NEWS" "README" )
 
-src_prepare() {
-	# fixes for broken configure switches
-	epatch "${FILESDIR}"/"${P}"-r2797.patch
-	epatch "${FILESDIR}"/"${P}"-r2798.patch
-	eautoreconf
-}
-
 src_configure() {
 	local myconf
 	use debug && myconf="--with-loglevel=4"