zziplib version bump to 0.13.54

do not make python/zlib/zip optional, they seem to be required
This commit is contained in:
Daniel Mierswa 2009-08-04 15:36:04 +02:00
parent 9f5cc8091f
commit 460d929c6e
3 changed files with 26 additions and 30 deletions

View file

@ -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

View file

@ -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

View file

@ -12,20 +12,22 @@ DOWNLOADS="mirror://sourceforge/$PN/$PNV.tar.bz2"
LICENCES="|| ( LGPL-2 MPL-1.1 )" LICENCES="|| ( LGPL-2 MPL-1.1 )"
SLOT="0" SLOT="0"
PLATFORMS="~amd64" PLATFORMS="~amd64"
MYOPTIONS="python sdl xmlto zlib" MYOPTIONS="sdl"
DEPENDENCIES=" DEPENDENCIES="
build: build:
python? ( dev-lang/python ) dev-lang/python
xmlto? ( app-text/xmlto ) dev-util/pkg-config
build+run: build+run:
sdl? ( media-libs/SDL ) 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 ) 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"