Version bump for bug 193863.

Package-Manager: portage-2.1.5_rc5

4 files changed, 91 insertions, 12 deletions

diff --git a/dev-libs/yaz/ChangeLog b/dev-libs/yaz/ChangeLog
index ba4679964dc0..ef858334434a 100644
--- a/dev-libs/yaz/ChangeLog
+++ b/dev-libs/yaz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/yaz
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/yaz/ChangeLog,v 1.46 2008/03/31 21:15:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/yaz/ChangeLog,v 1.47 2008/04/21 19:07:33 drac Exp $
+
+*yaz-3.0.26 (21 Apr 2008)
+
+  21 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  +files/yaz-3.0.26-icu-automagic.patch, +yaz-3.0.26.ebuild:
+  Version bump for bug 193863.
 
   31 Mar 2008; Markus Meier <maekke@gentoo.org> yaz-3.0.16.ebuild:
   amd64 stable, bug #208545
diff --git a/dev-libs/yaz/Manifest b/dev-libs/yaz/Manifest
index 7c6cbbedcdbb..46cefc157a1d 100644
--- a/dev-libs/yaz/Manifest
+++ b/dev-libs/yaz/Manifest
@@ -1,14 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX yaz-2.0.19-notcpd-fix.diff 512 RMD160 0815dd60d34fc2d6fc31cd828ddf1f054c3d15b8 SHA1 3c05604e5942926fca8af3831f9a838c498ab1ff SHA256 595e59468c064ca691ab89691c33284757b6b117ac63a25c176d6fe4dede5466
 AUX yaz-3.0.16-icu-automagic.patch 802 RMD160 87e2b7e5c9c69fe823833f0d9c1acdddc824bb72 SHA1 54bd063e18f407a3fa11476183d8a5c685b27520 SHA256 9b9ae320a202a3c87978b31a8c0b2e25e332faa4e5e4ab69ccc9248a84165d98
+AUX yaz-3.0.26-icu-automagic.patch 957 RMD160 cf93a39dd05a15ae295bc2d45153fdec5d03a9a3 SHA1 e8235b3d341749bae97c31a10ad62c4d1bbd283a SHA256 ac1d3306f046152442445a6cab71ad11adc09584d033618bb66fb7179d25853c
 DIST yaz-2.0.19.tar.gz 1631695 RMD160 97e4f80c033874497b2fcc15b8780be342d77f6e SHA1 6162923a21a91df8d55e7dee20e90ca2c893afd4 SHA256 740234348c3d3b3bb5ea8e0e7ca73815c93d341794c4dd7d3a913b9b90991366
 DIST yaz-2.0.8.tar.gz 1213161 RMD160 abd03e52fee87e32694917aaee42610b4988df01 SHA1 5c6e8aaeb0ea05b2582efa59229cee87155bcbde SHA256 6be9fa0ea9cf4bcd652cfe17a1b05c9e97cceca1dfd6c8b88a6b5b9e391ddd78
 DIST yaz-2.1.10.tar.gz 1765845 RMD160 4f1e1c5dcc3c008d929b70933f84c80ae51468e4 SHA1 2f97b79c8505f592e6ce4551a343bab05c56aea4 SHA256 a4e85ac1ac0b965a4a94194468421b614e02a002f420a040248198a5f41fdd25
 DIST yaz-2.1.42.tar.gz 1710040 RMD160 0a7085708cd3a01d7d83d6afbcb750027d4ad721 SHA1 0ff5e791a7d642af3e44af30c4daac7e408155c3 SHA256 de2ef2fdec4f0664bd2a2c2d3de8eb99297d975f2be91170b5708b39e06002ce
 DIST yaz-2.1.8.tar.gz 1691980 RMD160 c6cdde94bc3358f641ac659062d50e1b14c5de59 SHA1 c4a3ba6e9c0f56f553d282b5b2dbdeda1f10482a SHA256 085cbe3b6e70547fa1c1ff70d984cea69b3d0560f6057f05e8e7695caacb53fd
 DIST yaz-3.0.16.tar.gz 1817589 RMD160 228bd3dea04168debb7a6cc13d9883aba9c53f10 SHA1 917f24c17a6d0fa98442f1068329bd0956ac6aba SHA256 1040c9a8234de250882c54dce10458f23d9064b13a963d888ddae111bc0bb246
+DIST yaz-3.0.26.tar.gz 1915958 RMD160 c6171849485c1a0fecd8316058bd568cfabad225 SHA1 752a3ef3cf1b0ab2aff96c6044cd14540e212e45 SHA256 0d7a1ddb8dc5c06122101eac6247018f64e8e9811b727dcc8ff5e43b0e7134a6
 EBUILD yaz-2.0.19.ebuild 1129 RMD160 0f42f6232ddf0d16d99f805942e98836dc91be39 SHA1 bafdec0fe61cbe4a056cc7062b3655f5f93d7edf SHA256 2607fef0d3ec2c75cf218fdfedde699b0d0acd369d0fdf0651e1d320834119bc
 EBUILD yaz-2.0.8.ebuild 1117 RMD160 73c9b328272ab0103a11a61a8c54650442754aaa SHA1 abc014517f7347c78bf1eed05491e6251f39bd20 SHA256 15436c2d0abe9416e454d87a17c9c28c2ec12f33ef8cc740fa8d0b486710e308
 EBUILD yaz-2.1.10.ebuild 1253 RMD160 182b9b69f1160c3151344f9730753c117cb2098b SHA1 210cf954a2d312564e156a2f10dd6035c8b4047f SHA256 a56ccee0e3656bdaf0618061174533773466dbc4a5df0dc5302110314056ae4e
@@ -16,12 +15,6 @@ EBUILD yaz-2.1.42.ebuild 1296 RMD160 e0d2f3e63f9f7bf710a266dd530161b4982db706 SH
 EBUILD yaz-2.1.8-r1.ebuild 1243 RMD160 2569eb0545270f236c8f06351ba68eeeb0da2800 SHA1 9d7f2bd7169d206398fac799b8a3ba587f80c23d SHA256 0c4d14c9abc9eb1e65145a34f7efed59dd395c51e3097274c7cf1174b4aea4bf
 EBUILD yaz-2.1.8.ebuild 1079 RMD160 a7b06e080f0abbb7121e8201d383643ba7345ca3 SHA1 a050d020a7c2973945413faeed0cc5c0fc658493 SHA256 9556e02b908b8f57792ea769c1a528990170cf9738a87d0a38d7bd7f8a4911cd
 EBUILD yaz-3.0.16.ebuild 1640 RMD160 b8e3f7baf1152cfd8d43e282bc8cb9b2a455d112 SHA1 5b0cf568590e9716212058cd06556c5bcff60f8a SHA256 ecca6eea98e3b27b3e63a75ab3f0863aea085ca2a2cb29abc61acffc7eac008b
-MISC ChangeLog 5020 RMD160 4cd99e48d75a466a7ce795220ec0cc954c1db392 SHA1 1721c0aa39ad8696c3f9b16f7662ca9f039ae52c SHA256 9bf40e8b2bef21ffc1d34766f5fa5fa013dfe3196d878d6b77e9560183690b81
+EBUILD yaz-3.0.26.ebuild 1483 RMD160 cee0b1af4b79351b1bc38733025c67e9333497e5 SHA1 74105ae2d913544e48c79df3e06af049936ec2a6 SHA256 1c17a84889b507c2c5b1dd5853a1d5cd1523fb7ef3bc67c978efb565c45e149e
+MISC ChangeLog 5187 RMD160 34003d5587cc99324cc8cd1e67a1167652ee4885 SHA1 129a7ac077a2e625ebe46208b8460b608371cf62 SHA256 4d6834d1173b82d4dcb0e53ae5f8b3fb34ab3d9cf6f37d1f94db508abecd8864
 MISC metadata.xml 279 RMD160 f84566b5a463b59cc5ddd8a2210a54de9492ed2f SHA1 98caf044b8fce3f5ff202c7f7b71f0dcb9d51947 SHA256 785db7b7f8e4f9a526dc574ce2aa10024cc83af170f38ec9af9f56c23fc15543
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkfxVLIACgkQkKaRLQcq0GIxjgCgpll3lbPLsOj3hAcIGSgkDLlP
-1fgAn0H+22BxH94Mavm0lluT8U0wilTW
-=YTRc
------END PGP SIGNATURE-----
diff --git a/dev-libs/yaz/files/yaz-3.0.26-icu-automagic.patch b/dev-libs/yaz/files/yaz-3.0.26-icu-automagic.patch
new file mode 100644
index 000000000000..c0b243d7fe0a
--- /dev/null
+++ b/dev-libs/yaz/files/yaz-3.0.26-icu-automagic.patch
@@ -0,0 +1,26 @@
+diff -ur yaz-3.0.26.orig/configure.ac yaz-3.0.26/configure.ac
+--- yaz-3.0.26.orig/configure.ac	2008-02-21 12:48:44.000000000 +0200
++++ yaz-3.0.26/configure.ac	2008-04-21 20:58:13.000000000 +0300
+@@ -349,14 +349,14 @@
+ 
+ dnl
+ dnl 
+-AC_CHECK_ICU([3.6],[
+-	if test "$xml_enabled" = "true"; then
+-	    ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1"
+-	else
+-	    ICU_CPPFLAGS=""
+-	    AC_MSG_WARN([ICU support disabled because XML support is unavailable])
+-	fi
+-])
+++dnl ------ ICU
++AC_ARG_ENABLE(icu, [  --enable-icu            enable ICU support],[enable_icu=$enableval],[enable_icu=no])
++if test "$enable_icu" = "yes"; then
++    AC_CHECK_ICU([3.6],[
++	    ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1"],[
++	    AC_MSG_ERROR([For ICU support please install libicu36-dev or similar])
++    ])
++fi
+ dnl
+ dnl ------ Memory debugging
+ AC_ARG_ENABLE(memdebug, [  --enable-memdebug       enable memory debugging],[enable_memdebug=$enableval],[enable_memdebug=none])
diff --git a/dev-libs/yaz/yaz-3.0.26.ebuild b/dev-libs/yaz/yaz-3.0.26.ebuild
new file mode 100644
index 000000000000..0d89a1537f6a
--- /dev/null
+++ b/dev-libs/yaz/yaz-3.0.26.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/yaz/yaz-3.0.26.ebuild,v 1.1 2008/04/21 19:07:33 drac Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="C/C++ programmer's toolkit supporting the development of Z39.50v3 clients and servers"
+HOMEPAGE="http://www.indexdata.dk/yaz"
+SRC_URI="http://ftp.indexdata.dk/pub/${PN}/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug icu tcpd"
+
+RDEPEND="dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/openssl
+	icu? ( dev-libs/icu )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ziffy? ( net-libs/libpcap )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-lang/tcl"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-icu-automagic.patch
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	econf \
+		--enable-static \
+		--enable-shared \
+		$(use_enable debug memdebug) \
+		$(use_enable icu) \
+		$(use_enable tcpd tcpd /usr)
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	local docdir="/usr/share/doc/${PF}"
+	emake DESTDIR="${D}" docdir="${docdir}" install || die "install failed"
+
+	dodir ${docdir}/html
+	mv -f "${D}"/${docdir}/*.{html,png} "${D}"/${docdir}/html/ || die "Failed to move HTML docs"
+	mv -f "${D}"/usr/share/doc/${PN}/common "${D}"/${docdir}/html/ || die "Failed to move HTML docs"
+	rm -rf "${D}"/usr/share/doc/${PN}
+
+	dodoc ChangeLog NEWS README TODO
+}