fix for bug #46382, and a new version.

6 files changed, 78 insertions, 6 deletions

diff --git a/dev-libs/yaz/ChangeLog b/dev-libs/yaz/ChangeLog
index 3ff80c8aa9be..15c37483111f 100644
--- a/dev-libs/yaz/ChangeLog
+++ b/dev-libs/yaz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/yaz
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/yaz/ChangeLog,v 1.8 2004/02/06 21:52:01 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/yaz/ChangeLog,v 1.9 2004/04/17 02:42:00 robbat2 Exp $
+
+*yaz-2.0.19 (16 Apr 2004)
+
+  16 Apr 2004; Robin Johnson,,604-339-5621,604-298-8414 <robbat2@gentoo.org>
+  yaz-2.0.19.ebuild, yaz-2.0.8.ebuild, files/yaz-2.0.19-notcpd-fix.diff:
+  fix for bug #46382, and a new version
 
   06 Feb 2004; Lars Weiler <pylon@gentoo.org> yaz-2.0.8.ebuild:
   finally stable on ppc.
diff --git a/dev-libs/yaz/Manifest b/dev-libs/yaz/Manifest
index 95e336e8fb89..4ac7df01cde6 100644
--- a/dev-libs/yaz/Manifest
+++ b/dev-libs/yaz/Manifest
@@ -1,3 +1,5 @@
-MD5 4274cd56fadd52bbd4e10eefc9c0e7c4 ChangeLog 1047
-MD5 4f04571f2e3e2512fe5f69eb3b088c6b yaz-2.0.8.ebuild 973
+MD5 db1298d2df466a8bd0504281c71f66f8 yaz-2.0.8.ebuild 972
+MD5 db1298d2df466a8bd0504281c71f66f8 yaz-2.0.19.ebuild 972
+MD5 3b121ce85b6e47633c0b25f53a2439b8 ChangeLog 1046
+MD5 9cabcd5a2b9e4c9f0c8d8ccb5277cb41 files/digest-yaz-2.0.19 63
 MD5 2c601b2958127cb7cfb70ec3fb718177 files/digest-yaz-2.0.8 62
diff --git a/dev-libs/yaz/files/digest-yaz-2.0.19 b/dev-libs/yaz/files/digest-yaz-2.0.19
new file mode 100644
index 000000000000..e4b7796c83c5
--- /dev/null
+++ b/dev-libs/yaz/files/digest-yaz-2.0.19
@@ -0,0 +1 @@
+MD5 3c303759e2aa01ce4fefa139e3e4c656 yaz-2.0.19.tar.gz 1631695
diff --git a/dev-libs/yaz/files/yaz-2.0.19-notcpd-fix.diff b/dev-libs/yaz/files/yaz-2.0.19-notcpd-fix.diff
new file mode 100644
index 000000000000..e500ba2f586d
--- /dev/null
+++ b/dev-libs/yaz/files/yaz-2.0.19-notcpd-fix.diff
@@ -0,0 +1,12 @@
+diff -ur yaz-2.0.19.orig/configure.in yaz-2.0.19/configure.in
+--- yaz-2.0.19.orig/configure.in	2004-03-29 12:13:07.000000000 -0800
++++ yaz-2.0.19/configure.in	2004-04-16 18:28:09.700767448 -0700
+@@ -275,7 +275,7 @@
+ dnl
+ dnl ------ tcpd
+ AC_ARG_ENABLE(tcpd,[  --enable-tcpd[=PREFIX]  enable TCP wrapper for server if available])
+-if test "$enable_tcpd" != ""; then
++if test "$enable_tcpd" != "" && test "$enable_tcpd" != "no"; then
+ 	oldLibs=$LIBS
+ 	oldCPPFLAGS=$CPPFLAGS
+ 	if test "$enable_tcpd" != "yes"; then
diff --git a/dev-libs/yaz/yaz-2.0.19.ebuild b/dev-libs/yaz/yaz-2.0.19.ebuild
new file mode 100644
index 000000000000..e61037727e18
--- /dev/null
+++ b/dev-libs/yaz/yaz-2.0.19.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/yaz/yaz-2.0.19.ebuild,v 1.1 2004/04/17 02:42:00 robbat2 Exp $
+
+DESCRIPTION="YAZ is a C/C++ programmer's toolkit supporting the development of Z39.50v3 clients and servers"
+HOMEPAGE="http://www.indexdata.dk/${PN}"
+SRC_URI="http://ftp.indexdata.dk/pub/${PN}/${P}.tar.gz"
+LICENSE="YAZ"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64 ~alpha ~ia64 ~hppa ~sparc"
+IUSE="tcpd"
+RDEPEND="dev-libs/libxml2
+		dev-libs/openssl
+		tcpd? ( sys-apps/tcp-wrappers )"
+DEPEND="${RDEPEND}
+		app-text/docbook-xml-dtd
+		app-text/docbook-dsssl-stylesheets
+		app-text/docbook-xsl-stylesheets
+		dev-util/pkgconfig
+		sys-devel/autoconf"
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-p1 -d ${S}" \
+	epatch ${FILESDIR}/yaz-2.0.19-notcpd-fix.diff
+	cd ${S}
+	autoconf
+}
+
+src_compile() {
+	local myopts
+	myopts="${myopts} `use_enable tcpd tcpd /usr`"
+
+	econf ${myopts} \
+	--enable-shared \
+	|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	einstall || die "einstall failed"
+}
diff --git a/dev-libs/yaz/yaz-2.0.8.ebuild b/dev-libs/yaz/yaz-2.0.8.ebuild
index b2f8efc9b5b5..e78ad2e072e3 100644
--- a/dev-libs/yaz/yaz-2.0.8.ebuild
+++ b/dev-libs/yaz/yaz-2.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/yaz/yaz-2.0.8.ebuild,v 1.8 2004/02/06 21:52:01 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/yaz/yaz-2.0.8.ebuild,v 1.9 2004/04/17 02:42:00 robbat2 Exp $
 
 DESCRIPTION="YAZ is a C/C++ programmer's toolkit supporting the development of Z39.50v3 clients and servers"
 HOMEPAGE="http://www.indexdata.dk/${PN}"
@@ -16,8 +16,16 @@ DEPEND="${RDEPEND}
 		app-text/docbook-xml-dtd
 		app-text/docbook-dsssl-stylesheets
 		app-text/docbook-xsl-stylesheets
-		dev-util/pkgconfig"
-S=${WORKDIR}/${P}
+		dev-util/pkgconfig
+		sys-devel/autoconf"
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-p1 -d ${S}" \
+	epatch ${FILESDIR}/yaz-2.0.19-notcpd-fix.diff
+	cd ${S}
+	autoconf
+}
 
 src_compile() {
 	local myopts