Version bump. cleanup

Package-Manager: portage-2.1.3.19

7 files changed, 28 insertions, 193 deletions

diff --git a/dev-libs/xmlsec/ChangeLog b/dev-libs/xmlsec/ChangeLog
index cfd612005543..ba270cb5cec6 100644
--- a/dev-libs/xmlsec/ChangeLog
+++ b/dev-libs/xmlsec/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/xmlsec
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/ChangeLog,v 1.13 2007/06/04 18:55:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/ChangeLog,v 1.14 2007/11/10 15:29:03 alonbl Exp $
+
+*xmlsec-1.2.11 (10 Nov 2007)
+
+  10 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org> -xmlsec-1.2.9.ebuild,
+  -xmlsec-1.2.9-r1.ebuild, -xmlsec-1.2.10.ebuild, +xmlsec-1.2.11.ebuild:
+  Version bump, cleanup.
 
 *xmlsec-1.2.10 (04 Jun 2007)
 
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 51c13c6e5b79..c73fef8f5b3e 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,35 +1,16 @@
-AUX nss.patch 3553 RMD160 87bda06103ad10d589babe62ad1acf91d71051af SHA1 6722cce15ecfc637a6102713e3b6d96054b3d479 SHA256 031bafee6adabbe42e3f0e0bb81812e6bab80d851237cd95b3f97117a27dd491
-MD5 7bd7372eafe63f0c148bb188dc395665 files/nss.patch 3553
-RMD160 87bda06103ad10d589babe62ad1acf91d71051af files/nss.patch 3553
-SHA256 031bafee6adabbe42e3f0e0bb81812e6bab80d851237cd95b3f97117a27dd491 files/nss.patch 3553
-DIST xmlsec1-1.2.10.tar.gz 5028566 RMD160 5cf070cdead38447c4304c1145c99c2a66168a30 SHA1 9d623bc2a8671fb6f098f80feb0bf68d32f80d6f SHA256 020f54ff5ebbc846e0f13b7aa79b2bdf0fe4554d5fe581fb7db5636f72c0d21a
-DIST xmlsec1-1.2.9.tar.gz 1667363 RMD160 445275fd90d4c9304feea2353172ead8de3556d5 SHA1 a0f6615971198afa4bb4fc62306d10a1a16c6d13 SHA256 2ab5834d0d0488df9862ae9ccc6920a826584e2740dd0be1c8cc9d4f17249814
-EBUILD xmlsec-1.2.10.ebuild 1263 RMD160 1c507808c93253e41494130cb40d5e155e3736c3 SHA1 278cb45e4fec744e09fd037dce886704d4a835dd SHA256 03f03d81869236d8c7118e0787e49e84aaf15219f3f950b295c628e18962c055
-MD5 d7d9cc5d9417d57495565758343fac57 xmlsec-1.2.10.ebuild 1263
-RMD160 1c507808c93253e41494130cb40d5e155e3736c3 xmlsec-1.2.10.ebuild 1263
-SHA256 03f03d81869236d8c7118e0787e49e84aaf15219f3f950b295c628e18962c055 xmlsec-1.2.10.ebuild 1263
-EBUILD xmlsec-1.2.9-r1.ebuild 1219 RMD160 9162c8814503e00f17f18978536745b19996e7d5 SHA1 5241c2e0d168d20c855809f473dbbd6f993a7d4d SHA256 01eb700976345533534d02d0f7126dffbcb98e4d60e577e815abcc3596bc9486
-MD5 e5bb1d466d5e52e75252dea76eb9465c xmlsec-1.2.9-r1.ebuild 1219
-RMD160 9162c8814503e00f17f18978536745b19996e7d5 xmlsec-1.2.9-r1.ebuild 1219
-SHA256 01eb700976345533534d02d0f7126dffbcb98e4d60e577e815abcc3596bc9486 xmlsec-1.2.9-r1.ebuild 1219
-EBUILD xmlsec-1.2.9.ebuild 1190 RMD160 f61402cb9f8b73d0a6e2f26a8b4180661c544a9e SHA1 64b2110d03cde331faa0a9daae72a29648516b6c SHA256 3d2bd229cec50becc3900c78921dd343ce72c0893030a6b5465b4673cdded75b
-MD5 be08c01e30f47b52df9837e3914d10c4 xmlsec-1.2.9.ebuild 1190
-RMD160 f61402cb9f8b73d0a6e2f26a8b4180661c544a9e xmlsec-1.2.9.ebuild 1190
-SHA256 3d2bd229cec50becc3900c78921dd343ce72c0893030a6b5465b4673cdded75b xmlsec-1.2.9.ebuild 1190
-MISC ChangeLog 1911 RMD160 0190f42d0416c5e4222d4eedddbb211effe362bb SHA1 85bab5dafe141aa3b8e4b0e2bfb58a7e613734b4 SHA256 60357d0b913e850776612876381278f6f728ce1932d37e8f9d9f02eca4c2ef7c
-MD5 80aa5bb40a62f7fb60bdec5b988229db ChangeLog 1911
-RMD160 0190f42d0416c5e4222d4eedddbb211effe362bb ChangeLog 1911
-SHA256 60357d0b913e850776612876381278f6f728ce1932d37e8f9d9f02eca4c2ef7c ChangeLog 1911
+DIST xmlsec1-1.2.11.tar.gz 1641811 RMD160 9336620005a7cd933a75db4b287daab655b87c9c SHA1 b7ec2bfd1b44b29dabf8ba5d37661da1143f0f64 SHA256 d802bb84e8ef6b95abab45c6e9c381a62d0e38fb40a44044eff126add57fdc96
+EBUILD xmlsec-1.2.11.ebuild 1132 RMD160 2fa320594387395c62badbabc0fc2be85fd54098 SHA1 0d4ad247d69bfc2f28a4d6934117451b1eecc787 SHA256 705e9ae2e52764b342ecc4dae69b2bb7dec74326c8f7849b04e426d7e4db8618
+MD5 d2a10ff03f16c86f014436d8a6f83ae5 xmlsec-1.2.11.ebuild 1132
+RMD160 2fa320594387395c62badbabc0fc2be85fd54098 xmlsec-1.2.11.ebuild 1132
+SHA256 705e9ae2e52764b342ecc4dae69b2bb7dec74326c8f7849b04e426d7e4db8618 xmlsec-1.2.11.ebuild 1132
+MISC ChangeLog 2109 RMD160 3d6a238ea3c42f9efb81d49f988fd9383eceebd0 SHA1 b6c8830556d953d28ade8d494756ec723ab8dce5 SHA256 c4f6248366bf8c3b85f62eea8765ab600db5cf446fcc603ea5d56a1ce448dd3f
+MD5 a13d06bce441be877c12385ec6c2f08e ChangeLog 2109
+RMD160 3d6a238ea3c42f9efb81d49f988fd9383eceebd0 ChangeLog 2109
+SHA256 c4f6248366bf8c3b85f62eea8765ab600db5cf446fcc603ea5d56a1ce448dd3f ChangeLog 2109
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
 MD5 1c3665b87d1e39c6799909da58f41b26 metadata.xml 160
 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf metadata.xml 160
 SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10 metadata.xml 160
-MD5 cfa378dc4ac484c2b1d7df839f2e1f83 files/digest-xmlsec-1.2.10 247
-RMD160 36e47739da25508d6bceef58ad618725f7f74148 files/digest-xmlsec-1.2.10 247
-SHA256 5016ef99ee9f53d9e9d13d9da32eb4a183b4a6c6a98cb30400dd1baa6ccfbcd1 files/digest-xmlsec-1.2.10 247
-MD5 ce083730c1b2a980a1b9117ff583b608 files/digest-xmlsec-1.2.9 244
-RMD160 533ae6ef4c83e852fc828464976c424243dd4b47 files/digest-xmlsec-1.2.9 244
-SHA256 a817293d1183571891896b9e138c21087b42827bfeeda5bb725b50bd3ea60b0c files/digest-xmlsec-1.2.9 244
-MD5 ce083730c1b2a980a1b9117ff583b608 files/digest-xmlsec-1.2.9-r1 244
-RMD160 533ae6ef4c83e852fc828464976c424243dd4b47 files/digest-xmlsec-1.2.9-r1 244
-SHA256 a817293d1183571891896b9e138c21087b42827bfeeda5bb725b50bd3ea60b0c files/digest-xmlsec-1.2.9-r1 244
+MD5 2ab32b679ebf6aa34e2125e2c4a8c290 files/digest-xmlsec-1.2.11 247
+RMD160 bb2ed5b33b5971b72534418b03268fddfd44bf85 files/digest-xmlsec-1.2.11 247
+SHA256 f72a4f64975a0cf369ae94f45aa01c82bc893b81e6032e8379766402fd0c1ea9 files/digest-xmlsec-1.2.11 247
diff --git a/dev-libs/xmlsec/files/digest-xmlsec-1.2.11 b/dev-libs/xmlsec/files/digest-xmlsec-1.2.11
new file mode 100644
index 000000000000..0040294b5bec
--- /dev/null
+++ b/dev-libs/xmlsec/files/digest-xmlsec-1.2.11
@@ -0,0 +1,3 @@
+MD5 5652d44eec1375a399a6c61f5f6091f1 xmlsec1-1.2.11.tar.gz 1641811
+RMD160 9336620005a7cd933a75db4b287daab655b87c9c xmlsec1-1.2.11.tar.gz 1641811
+SHA256 d802bb84e8ef6b95abab45c6e9c381a62d0e38fb40a44044eff126add57fdc96 xmlsec1-1.2.11.tar.gz 1641811
diff --git a/dev-libs/xmlsec/files/nss.patch b/dev-libs/xmlsec/files/nss.patch
deleted file mode 100644
index ec90dfc39c4d..000000000000
--- a/dev-libs/xmlsec/files/nss.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- xmlsec1-1.2.9/configure.in.orig	2005-11-25 15:22:14.000000000 +0100
-+++ xmlsec1-1.2.9/configure.in	2005-11-25 15:27:25.000000000 +0100
-@@ -540,7 +540,7 @@
-     AC_MSG_RESULT(no)
-     NSS_FOUND="without"
- elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then
--    PKG_CHECK_MODULES(NSS, mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION,
-+    PKG_CHECK_MODULES(NSS, nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION,
- 	[NSS_FOUND=yes],
- 	[NSS_FOUND=no])
- fi
---- xmlsec1-1.2.9/configure.orig	2006-01-23 12:23:43.000000000 +0100
-+++ xmlsec1-1.2.9/configure	2006-01-23 12:24:00.000000000 +0100
-@@ -25929,23 +25929,23 @@
-   else
-      PKG_CONFIG_MIN_VERSION=0.9.0
-      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
--        echo "$as_me:$LINENO: checking for mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" >&5
--echo $ECHO_N "checking for mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
-+        echo "$as_me:$LINENO: checking for nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION" >&5
-+echo $ECHO_N "checking for nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION... $ECHO_C" >&6
- 
--        if $PKG_CONFIG --exists "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" ; then
-+        if $PKG_CONFIG --exists "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION" ; then
-             echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-             succeeded=yes
- 
-             echo "$as_me:$LINENO: checking NSS_CFLAGS" >&5
- echo $ECHO_N "checking NSS_CFLAGS... $ECHO_C" >&6
--            NSS_CFLAGS=`$PKG_CONFIG --cflags "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
-+            NSS_CFLAGS=`$PKG_CONFIG --cflags "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION"`
-             echo "$as_me:$LINENO: result: $NSS_CFLAGS" >&5
- echo "${ECHO_T}$NSS_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking NSS_LIBS" >&5
- echo $ECHO_N "checking NSS_LIBS... $ECHO_C" >&6
--            NSS_LIBS=`$PKG_CONFIG --libs "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
-+            NSS_LIBS=`$PKG_CONFIG --libs "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION"`
-             echo "$as_me:$LINENO: result: $NSS_LIBS" >&5
- echo "${ECHO_T}$NSS_LIBS" >&6
-         else
-@@ -25953,7 +25953,7 @@
-             NSS_LIBS=""
-             ## If we have a custom action on failure, don't print errors, but
-             ## do set a variable so people can do so.
--            NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
-+            NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION"`
- 
-         fi
- 
---- xmlsec1-1.2.9/xmlsec-nss.pc.in.orig	2005-11-30 15:05:31.000000000 +0100
-+++ xmlsec1-1.2.9/xmlsec-nss.pc.in	2005-11-30 15:07:00.000000000 +0100
-@@ -7,6 +7,6 @@
- Name: xmlsec1-nss
- Version: @VERSION@
- Description: XML Security Library implements XML Signature and XML Encryption standards
--Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@ mozilla-nss >= @MOZILLA_MIN_VERSION@
-+Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@ nss >= @NSS_MIN_VERSION@
- Cflags: -DXMLSEC_CRYPTO=\\\"nss\\\" -DXMLSEC_CRYPTO_NSS=1 @XMLSEC_CORE_CFLAGS@
- Libs: -L${libdir} -lxmlsec1-nss @XMLSEC_CORE_LIBS@
diff --git a/dev-libs/xmlsec/xmlsec-1.2.10.ebuild b/dev-libs/xmlsec/xmlsec-1.2.11.ebuild
index be2d2007c439..59dfaca36d7d 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.10.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.11.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/xmlsec-1.2.10.ebuild,v 1.1 2007/06/04 18:55:05 robbat2 Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/xmlsec-1.2.11.ebuild,v 1.1 2007/11/10 15:29:03 alonbl Exp $
 
 DESCRIPTION="command line tool for signing, verifying, encrypting and decrypting XML"
 HOMEPAGE="http://www.aleksey.com/xmlsec"
@@ -24,17 +22,11 @@ DEPEND=">=sys-devel/autoconf-2.2
 
 S="${WORKDIR}/${PN}1-${PV}"
 
-# nss.patch is not needed as of 1.2.10
-##src_unpack() {
-##	unpack ${A}
-##	cd "${S}"
-##	epatch "${FILESDIR}"/nss.patch
-##}
-
 src_compile() {
-
 	econf --enable-xkms \
-		$(use_enable ssl openssl) $(use_enable ssl aes) --with-html-dir=/usr/share/doc/${PF} \
+		$(use_enable ssl openssl) \
+		$(use_enable ssl aes) \
+		--with-html-dir=/usr/share/doc/${PF} \
 		|| die "configure failed"
 	emake || die "emake failed"
 }
@@ -42,7 +34,9 @@ src_compile() {
 src_test() {
 	TMPFOLDER="${T}" make check || die
 }
+
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
 	dodoc AUTHORS README NEWS
 }
+
diff --git a/dev-libs/xmlsec/xmlsec-1.2.9-r1.ebuild b/dev-libs/xmlsec/xmlsec-1.2.9-r1.ebuild
deleted file mode 100644
index 8d9994eb762c..000000000000
--- a/dev-libs/xmlsec/xmlsec-1.2.9-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/xmlsec-1.2.9-r1.ebuild,v 1.1 2006/01/26 22:31:04 vanquirius Exp $
-
-inherit eutils
-
-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"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
-IUSE="ssl mozilla gnutls"
-
-DEPEND=">=sys-devel/autoconf-2.2
-	>=dev-libs/libxml2-2.4.2
-	>=dev-libs/libxslt-1.0.20
-	dev-util/pkgconfig
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	gnutls? ( >=net-libs/gnutls-0.8.1 dev-libs/libgcrypt )
-	mozilla? ( >=dev-libs/nspr-4.0
-		>=dev-libs/nss-3.2 )"
-
-S="${WORKDIR}/${PN}1-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nss.patch
-}
-
-src_compile() {
-
-	econf --enable-xkms \
-		$(use_enable ssl openssl) $(use_enable ssl aes) --with-html-dir=/usr/share/doc/${PF} \
-		|| die "configure failed"
-	emake || die "emake failed"
-}
-
-src_test() {
-	TMPFOLDER="${T}" make check || die
-}
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS README NEWS
-}
diff --git a/dev-libs/xmlsec/xmlsec-1.2.9.ebuild b/dev-libs/xmlsec/xmlsec-1.2.9.ebuild
deleted file mode 100644
index b8f943154a1c..000000000000
--- a/dev-libs/xmlsec/xmlsec-1.2.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/xmlsec-1.2.9.ebuild,v 1.3 2007/07/12 02:25:34 mr_bones_ Exp $
-
-inherit eutils
-
-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"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
-IUSE="ssl mozilla gnutls"
-
-DEPEND=">=sys-devel/autoconf-2.2
-	>=dev-libs/libxml2-2.4.2
-	>=dev-libs/libxslt-1.0.20
-	dev-util/pkgconfig
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	gnutls? ( >=net-libs/gnutls-0.8.1 dev-libs/libgcrypt )
-	mozilla? ( >=dev-libs/nspr-4.0
-		>=dev-libs/nss-3.2 )"
-
-S="${WORKDIR}/${PN}1-${PV}"
-
-src_compile() {
-
-	econf --enable-xkms $(use_with mozilla nss) $(use_with mozilla nspr) \
-		$(use_enable ssl openssl) $(use_enable ssl aes) --with-html-dir=/usr/share/doc/${PF} \
-		|| die "configure failed"
-	emake || die "emake failed"
-}
-
-src_test() {
-	TMPFOLDER="${T}" make check || die
-}
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS README NEWS
-}