Version bump.

(Portage version: 14278-svn/cvs/Linux x86_64)

3 files changed, 22 insertions, 35 deletions

diff --git a/dev-libs/xmlsec/ChangeLog b/dev-libs/xmlsec/ChangeLog
index 37cdfa716d20..cff31568e8e3 100644
--- a/dev-libs/xmlsec/ChangeLog
+++ b/dev-libs/xmlsec/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/xmlsec
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/ChangeLog,v 1.17 2009/07/29 16:37:41 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/ChangeLog,v 1.18 2009/09/17 13:36:42 arfrever Exp $
+
+*xmlsec-1.2.13 (17 Sep 2009)
+
+  17 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -xmlsec-1.2.11.ebuild, -files/xmlsec-1.2.11-gnutls.patch,
+  +xmlsec-1.2.13.ebuild:
+  Version bump.
 
 *xmlsec-1.2.12 (29 Jul 2009)
 
diff --git a/dev-libs/xmlsec/files/xmlsec-1.2.11-gnutls.patch b/dev-libs/xmlsec/files/xmlsec-1.2.11-gnutls.patch
deleted file mode 100644
index 087a844605ba..000000000000
--- a/dev-libs/xmlsec/files/xmlsec-1.2.11-gnutls.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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.13.ebuild
index 3dd930ba1866..92492741c07f 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.11.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.13.ebuild
@@ -1,12 +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/xmlsec/xmlsec-1.2.11.ebuild,v 1.4 2009/05/03 18:08:54 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/xmlsec-1.2.13.ebuild,v 1.1 2009/09/17 13:36:42 arfrever Exp $
 
 EAPI="2"
 
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="command line tool for signing, verifying, encrypting and decrypting XML"
+DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML"
 HOMEPAGE="http://www.aleksey.com/xmlsec"
 SRC_URI="http://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
 
@@ -15,40 +13,39 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="gnutls mozilla ssl"
 
-RDEPEND=">=dev-libs/libxslt-1.0.20
-	ssl? ( >=dev-libs/openssl-0.9.7 )
+RDEPEND=">=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxslt-1.0.20
 	gnutls? ( >=net-libs/gnutls-0.8.1 )
 	mozilla? ( >=dev-libs/nspr-4.0
-		>=dev-libs/nss-3.2 )"
+		>=dev-libs/nss-3.2 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )"
 DEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.4.2
 	dev-util/pkgconfig"
 
 S="${WORKDIR}/${PN}1-${PV}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gnutls.patch"
-	eautoreconf
-}
+#src_prepare() {
+#	eautoreconf
+#	append-cppflags '-DLTDL_OBJDIR=\".libs\"' '-DLTDL_SHLIB_EXT=\".so\"'
+#}
 
 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) \
+		$(use_with ssl openssl /usr) \
 		--with-html-dir=/usr/share/doc/${PF} \
 		${myconf}
 }
 
 src_test() {
-	TMPFOLDER="${T}" make check || die
+	TMPFOLDER="${T}" emake check || die "emake check failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS README NEWS
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS README NEWS || die "dodoc failed"
 }