From 460d929c6e74bed3383f2800d469e7a9d1f7069e Mon Sep 17 00:00:00 2001
From: Daniel Mierswa <impulze@impulze.org>
Date: Tue, 4 Aug 2009 15:36:04 +0200
Subject: [PATCH] zziplib version bump to 0.13.54

do not make python/zlib/zip optional, they seem to be required
---
 .../zziplib-0.13.49-automagic-deps.patch      | 22 -------------------
 .../files/zziplib-0.13.54-no_xmlto.patch      | 16 ++++++++++++++
 ...53.exheres-0 => zziplib-0.13.54.exheres-0} | 18 ++++++++-------
 3 files changed, 26 insertions(+), 30 deletions(-)
 delete mode 100644 packages/dev-libs/zziplib/files/zziplib-0.13.49-automagic-deps.patch
 create mode 100644 packages/dev-libs/zziplib/files/zziplib-0.13.54-no_xmlto.patch
 rename packages/dev-libs/zziplib/{zziplib-0.13.53.exheres-0 => zziplib-0.13.54.exheres-0} (66%)

diff --git a/packages/dev-libs/zziplib/files/zziplib-0.13.49-automagic-deps.patch b/packages/dev-libs/zziplib/files/zziplib-0.13.49-automagic-deps.patch
deleted file mode 100644
index ac4146f..0000000
--- a/packages/dev-libs/zziplib/files/zziplib-0.13.49-automagic-deps.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Reason: Lots of automagic!
-Upstream: Unknown
-Source: Daniel Mierswa <impulze@impulze.org>
-
---- ./configure.ac.orig	2008-12-03 17:51:41.945131986 +0100
-+++ ./configure.ac	2008-12-03 17:54:49.667132519 +0100
-@@ -85,9 +85,12 @@
- # -----------------------------------------------------------------------
- 
- AC_PATH_PROGS(PERL, perl5 perl, echo no perl found for)
--AC_PATH_PROGS(PYTHON, python2.2 python2.3 python, echo no python found for)
--AC_PATH_PROGS(MKZIP, zip pkzip, :)
--AC_PATH_PROGS(XMLTO, xmlto, :)
-+AC_ARG_WITH([python], [AS_HELP_STRING([--with-python], [use python (default yes)])])
-+test "$with_python" != no && AC_PATH_PROGS(PYTHON, python2.2 python2.3 python, echo no python found for)
-+AC_ARG_WITH([zip], [AS_HELP_STRING([--with-zip], [use zip (default yes)])])
-+test "$with_zip" != no && AC_PATH_PROGS(MKZIP, zip pkzip, :)
-+AC_ARG_WITH([xmlto], [AS_HELP_STRING([--with-xmlto], [use xmlto (default yes)])])
-+test "$with_xmlto" != no && AC_PATH_PROGS(XMLTO, xmlto, :)
- 
- AC_C_INLINE
- AC_C_CONST
diff --git a/packages/dev-libs/zziplib/files/zziplib-0.13.54-no_xmlto.patch b/packages/dev-libs/zziplib/files/zziplib-0.13.54-no_xmlto.patch
new file mode 100644
index 0000000..d4151d7
--- /dev/null
+++ b/packages/dev-libs/zziplib/files/zziplib-0.13.54-no_xmlto.patch
@@ -0,0 +1,16 @@
+Upstream: Unknown
+Reason: xmlto pulls docbook-xml-dtd:4.1.2 dependency though
+        it is optional
+Source: Daniel Mierswa <impulze@impulze.org>
+
+--- ./configure.ac.orig	2009-08-04 15:22:18.000000000 +0200
++++ ./configure.ac	2009-08-04 15:27:00.000000000 +0200
+@@ -90,7 +90,7 @@
+ AC_PATH_PROGS(PERL, perl5 perl, echo no perl found for)
+ AC_PATH_PROGS(PYTHON, python2.2 python2.3 python, echo no python found for)
+ AC_PATH_PROGS(MKZIP, zip pkzip, :)
+-AC_PATH_PROGS(XMLTO, xmlto, :)
++AC_PATH_PROGS(XMLTO, :, :)
+ 
+ AC_C_INLINE
+ AC_C_CONST
diff --git a/packages/dev-libs/zziplib/zziplib-0.13.53.exheres-0 b/packages/dev-libs/zziplib/zziplib-0.13.54.exheres-0
similarity index 66%
rename from packages/dev-libs/zziplib/zziplib-0.13.53.exheres-0
rename to packages/dev-libs/zziplib/zziplib-0.13.54.exheres-0
index 3976f8b..3c87116 100644
--- a/packages/dev-libs/zziplib/zziplib-0.13.53.exheres-0
+++ b/packages/dev-libs/zziplib/zziplib-0.13.54.exheres-0
@@ -12,20 +12,22 @@ DOWNLOADS="mirror://sourceforge/$PN/$PNV.tar.bz2"
 LICENCES="|| ( LGPL-2 MPL-1.1 )"
 SLOT="0"
 PLATFORMS="~amd64"
-MYOPTIONS="python sdl xmlto zlib"
+MYOPTIONS="sdl"
 
 DEPENDENCIES="
     build:
-        python? ( dev-lang/python )
-        xmlto? ( app-text/xmlto )
+        dev-lang/python
+        dev-util/pkg-config
     build+run:
         sdl? ( media-libs/SDL )
-        zlib? ( sys-libs/zlib )
+        sys-libs/zlib
 "
 
-AT_M4DIR="m4"
-
-DEFAULT_SRC_PREPARE_PATCHES+=( "$FILES/$PN-0.13.49-automagic-deps.patch" )
-DEFAULT_SRC_CONFIGURE_OPTION_WITHS+=( zlib python xmlto )
 DEFAULT_SRC_CONFIGURE_OPTION_ENABLES+=( sdl )
 
+# FIXME:
+# xmlto can re-generate man-pages appearently but seems to be unwanted by
+# upstream (or known to be partly broken, also requires docbook-xml-dtd:4.1.2)
+DEFAULT_SRC_PREPARE_PATCHES="${FILES}/${PN}-0.13.54-no_xmlto.patch"
+
+AT_M4DIR="m4"