Version bump, fixes bugs #251102 and #281440

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

5 files changed, 261 insertions, 7 deletions

diff --git a/games-util/loki_patch/ChangeLog b/games-util/loki_patch/ChangeLog
index d9c5004d6f98..30d115f427ca 100644
--- a/games-util/loki_patch/ChangeLog
+++ b/games-util/loki_patch/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-util/loki_patch
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/loki_patch/ChangeLog,v 1.10 2008/03/04 15:53:30 wolf31o2 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/loki_patch/ChangeLog,v 1.11 2009/11/05 06:33:46 nyhm Exp $
+
+*loki_patch-20091105 (05 Nov 2009)
+
+  05 Nov 2009; Tristan Heaven <nyhm@gentoo.org> +loki_patch-20091105.ebuild,
+  +files/loki_patch-20091105-build.patch,
+  +files/loki_patch-20091105-patchdata.patch:
+  Version bump, fixes bugs #251102 and #281440
 
   04 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   -loki_patch-20051209.ebuild:
diff --git a/games-util/loki_patch/Manifest b/games-util/loki_patch/Manifest
index efd971622242..6ef0af29ef26 100644
--- a/games-util/loki_patch/Manifest
+++ b/games-util/loki_patch/Manifest
@@ -3,14 +3,19 @@ Hash: SHA1
 
 AUX loki_patch-20050324-amd64.patch 398 RMD160 f2469f40312b08d43bf29845bf7c7433a6f455b6 SHA1 0938aa4803762134c1f53136f9e9773e4dba5380 SHA256 b71149b6745aa6f5a9cfa72854fb11d8264acbd20a80f149711151fc0a66e765
 AUX loki_patch-20050324-gcc4.patch 375 RMD160 d3585078dcd7d8c0740b92c52264982be51b8466 SHA1 190117306237e500b4a2c8cf093268211e3f7e81 SHA256 e7cf093fab7b2c96142a09565f10f6b6ba7180912af47afce91665a285c015b1
+AUX loki_patch-20091105-build.patch 4617 RMD160 c412409048de6c3447c95fe2bb2c08a5258837c2 SHA1 01a83eed3e0f440c863c01a6cb0e6afd72163f72 SHA256 3d553cd3c7660101f5ae6a5ccf1bd44097da48eb417897bc83c2a5ef14979fc9
+AUX loki_patch-20091105-patchdata.patch 257 RMD160 8be40539fa82e935cf6fb54e1ab399f43478a396 SHA1 3652d1ac59bd2eeec331c3e08a3e38a1917bca07 SHA256 a2778ea796929318f34c43a31221da74aa58de59b32d1384aa9b6b22685d53e5
 DIST loki_patch-20050324.tar.bz2 410111 RMD160 2a9d10584159035f67e477dd9bd39d517e8830ec SHA1 8343e3f789d0f66edab439c1b51b2c9607687a74 SHA256 70c6d05eea58828305923ddbe28ac6d75ca1851562606efccd4f5d0528b86500
+DIST loki_patch-20091105.tar.bz2 331725 RMD160 d68d53baffd690d5b7fdfeeeca45f3edf027e52d SHA1 deaa48069e90b2e4401bc26f1ca114c5f1cd93c2 SHA256 0a46562a9902719a2876e042c2c23b6343f53c68af502928c108d7f5b7a9e573
+DIST loki_setupdb-20091105.tar.bz2 60725 RMD160 397315f91673275cabcedd88473018807544d178 SHA1 05c6eb536af08bbf155a08bcbadb6723ffda0774 SHA256 34c4c2079b70f47bb4b2f05411b07107ee0d17654bf1977b6bb7d8841a837bc2
 EBUILD loki_patch-20050324.ebuild 1053 RMD160 93eda231e196e0748091b1cef7bd8864332123cb SHA1 c929b252d7590f0b8972f18d767fa64266fe0cd5 SHA256 3e60162b5b59369f337a52932b35d12ad21ef9cc7d0e4a29b4c0077fc9443a8b
-MISC ChangeLog 1958 RMD160 a3fc3dacf54b308c99a5e4e0488a9a179f38ae04 SHA1 01a6c98869a672a5ed2b9fe7c068801d85a6ce96 SHA256 ce2dc10333da7250044a8625fe8986981a44b104b1f15d5142197e7f0336265d
+EBUILD loki_patch-20091105.ebuild 1093 RMD160 5e721c5b4faad627b8be3747614d72d525147e0b SHA1 71ce71972da7e44f435e8ba232f0966b46c55086 SHA256 124650c2e9ee5058bb23a2ee633ead4d848953a6a23850ec5fa53480935a1bf5
+MISC ChangeLog 2203 RMD160 d07079f2d9bdbc74143211b3bca5b4d2ac7cb336 SHA1 074951af6ddd77b503270e23e71604657a6b6c3d SHA256 ae70bac25bcea40fbbe15f6de3c412d441865d4cacfe8c1b831fb6c097fb23dd
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.12 (GNU/Linux)
 
-iD8DBQFHzXCHkT4lNIS36YERAiHDAJ9lY7P57rsrYa6z0eFwEEY7niSa8ACaAjBs
-hZWfZvGKCkLe5NjlzA9OCgI=
-=YtA2
+iEYEARECAAYFAkrycc8ACgkQdz7hIScOURHeTQCglWtO1jgLrMV+GHRPxZQ6BZgf
+q1MAoPXbXKPLYqd4V2GgMYz2J6uDBwRV
+=9Yth
 -----END PGP SIGNATURE-----
diff --git a/games-util/loki_patch/files/loki_patch-20091105-build.patch b/games-util/loki_patch/files/loki_patch-20091105-build.patch
new file mode 100644
index 000000000000..8e2b5bbf1557
--- /dev/null
+++ b/games-util/loki_patch/files/loki_patch-20091105-build.patch
@@ -0,0 +1,179 @@
+--- loki_patch/configure.in
++++ loki_patch/configure.in
+@@ -1,4 +1,4 @@
+-AC_INIT(README)
++AC_INIT(loki_patch, 1.0.2)
+ 
+ dnl Define the release numbers here
+ 
+@@ -10,13 +10,14 @@
+ AC_CANONICAL_HOST
+ AC_CANONICAL_TARGET
+ 
++AM_INIT_AUTOMAKE(foreign no-dependencies)
+ AC_PROG_CC
+ AC_PROG_MAKE_SET
+ AC_PROG_INSTALL
+ 
+ AC_CHECK_HEADERS(unistd.h)
+ 
+-CFLAGS="-fsigned-char -funroll-loops -Wall -g -O2"
++CFLAGS="$CFLAGS -fsigned-char -Wall"
+ 
+ case "$target" in
+     *i?86*)
+@@ -32,17 +33,12 @@
+ OS=`uname -s`
+ 
+ dnl Look for the XML libraries
++PKG_CHECK_MODULES(XML, libxml-2.0)
++AC_SUBST(XML_LIBS)
+ 
+-AC_PATH_PROG(HAVEXML, xml-config, $PATH)
+-if test ! -z "$HAVEXML"; then
+-    XML_CFLAGS=`$HAVEXML --cflags`
+-    XML_PREFIX=`$HAVEXML --prefix`
+-
+-    CFLAGS="$CFLAGS $XML_CFLAGS"
+-    LIBS="$LIBS $XML_PREFIX/lib/libxml.a"
+-else
+-    AC_MSG_ERROR([*** xml-config not found. You need a working libxml installation.])
+-fi
++PKG_CHECK_MODULES(XDELTA, xdelta)
++AC_SUBST(XDELTA_CFLAGS)
++AC_SUBST(XDELTA_LIBS)
+ 
+ SETUPDB_VERSION=1.0.0
+ SETUPDB="`pwd`/../loki_setupdb-$SETUPDB_VERSION"
+@@ -57,14 +53,6 @@
+         SETUPDB=$with_setupdb
+ fi
+ 
+-dnl Check for correct setupdb installation
+-
+-if test -f $SETUPDB/$ARCH/libsetupdb.a; then
+-    AC_MSG_RESULT([SetupDB library found in $SETUPDB/$ARCH])
+-else
+-    AC_MSG_ERROR([*** Please compile setupdb first!])
+-fi
+-
+ CFLAGS="$CFLAGS -I$SETUPDB"
+ 
+ AC_SUBST(SETUPDB)
+--- loki_patch/loki_xdelta.c
++++ loki_patch/loki_xdelta.c
+@@ -49,7 +49,7 @@
+ 
+ #define LOKI_PATCH
+ 
+-#include "xdelta_inc/xdelta.h"
++#include <xdelta.h>
+ 
+ static HandleFuncTable xd_handle_table;
+ 
+--- loki_patch/Makefile.am
++++ loki_patch/Makefile.am
+@@ -0,0 +1,12 @@
++COMMONSRC = load_patch.c size_patch.c print_patch.c \
++	loki_xdelta.c mkdirhier.c log_output.c
++
++bin_PROGRAMS = make_patch loki_patch
++
++make_patch_SOURCES = $(COMMONSRC) make_patch.c tree_patch.c save_patch.c
++
++loki_patch_SOURCES = $(COMMONSRC) loki_patch.c apply_patch.c registry.c
++
++AM_CPPFLAGS = $(XDELTA_CFLAGS)
++
++LDADD = $(top_builddir)/../loki_setupdb/libsetupdb.a $(XDELTA_LIBS) $(XML_LIBS) -lz
+--- loki_setupdb/configure.in
++++ loki_setupdb/configure.in
+@@ -1,4 +1,4 @@
+-AC_INIT
++AC_INIT(setupdb, 1.6.5)
+ AC_CONFIG_HEADER(config.h)
+ 
+ dnl Define the release numbers here
+@@ -12,8 +12,7 @@
+ PACKAGE_VERSION="$SETUPDB_VERSION_MAJOR.$SETUPDB_VERSION_MINOR.$SETUPDB_VERSION_RELEASE"
+ PACKAGE_STRING="$PACKAGE_NAME v$PACKAGE_VERSION"
+ 
+-test "x$CFLAGS" = x && CFLAGS="-O2"
+-CFLAGS="$CFLAGS -fsigned-char -Wall -g -I."
++CFLAGS="$CFLAGS -fsigned-char -Wall"
+ REENTRANT="-D_REENTRANT"
+ 
+ if test -d /usr/codehost/lib; then
+@@ -33,9 +32,11 @@
+ AC_CANONICAL_HOST
+ AC_CANONICAL_TARGET
+ 
++AM_INIT_AUTOMAKE(foreign no-dependencies)
+ AC_PROG_CC
+ AC_PROG_MAKE_SET
+ AC_PATH_PROGS(AR, [ar gar])
++AC_PROG_RANLIB
+ 
+ AC_CHECK_HEADERS(unistd.h)
+ AC_CHECK_HEADERS(strings.h)
+@@ -128,7 +129,7 @@
+ 
+ AC_CHECK_FUNCS(getopt, , GETOPT_C="getopt.c")
+ AC_CHECK_FUNCS(getopt_long, , GETOPT_C="getopt.c")
+-AC_CHECK_LIB(gnugetopt, getopt_long, LIBS="$LIBS $BSTATIC -lgnugetopt"; GETOPT_C="")
++AC_CHECK_LIB(gnugetopt, getopt_long, LIBS="$LIBS -lgnugetopt"; GETOPT_C="")
+ 
+ AC_SUBST(ARCH)
+ AC_SUBST(STATIC)
+@@ -139,37 +140,8 @@
+ 
+ dnl Look for the XML libraries
+ 
+-XMLVER=""
+-AC_ARG_WITH(libxml2,
+-[  --with-libxml2          use libxml2 [default=libxml1]],
+-	,	with_libxml2=no)
+-if test x$with_libxml2 != xno; then
+-	XMLVER="2"
+-fi
+-
+-AC_PATH_PROG(HAVEXML, xml${XMLVER}-config, $PATH)
+-if test ! -z "$HAVEXML"; then
+-    XML_CFLAGS=`$HAVEXML --cflags`
+-    XML_PREFIX=`$HAVEXML --prefix`
+-
+-	if "$HAVEXML" --help|grep libtool-libs > /dev/null; then
+-		XML_LIBTOOL=`$HAVEXML --libtool-libs`
+-		if test -f "$XML_LIBTOOL"; then
+-			. "$XML_LIBTOOL"
+-			XML_LIBS="$dependency_libs"
+-		else
+-			XML_LIBS="-lm"
+-		fi
+-	elif "$HAVEXML" --libs | grep thread > /dev/null; then
+-		XML_LIBS="$PTHREAD -lm"
+-	fi
+-	EXTRA_LIBS="$EXTRA_LIBS $XML_LIBS"
+-
+-    CFLAGS="$CFLAGS $XML_CFLAGS"
+-    LIBS="$LIBS $XML_PREFIX/lib$LIBSUFFIX/libxml${XMLVER}.a $BSTATIC $ZLIB $BDYNAMIC $EXTRA_LIBS"
+-else
+-    AC_MSG_ERROR([*** xml-config not found. You need a working libxml installation.])
+-fi
++PKG_CHECK_MODULES(XML, libxml-2.0)
++AC_SUBST(XML_CFLAGS)
+ 
+ AC_ARG_WITH(vendor,
+ [  --with-vendor           with specified vendor prefix  [default=loki]], 
+--- loki_setupdb/Makefile.am
++++ loki_setupdb/Makefile.am
+@@ -0,0 +1,9 @@
++noinst_LIBRARIES = libsetupdb.a
++
++libsetupdb_a_SOURCES = \
++	arch.c brandelf.c convert.c md5.c register.c setupdb.c
++
++libsetupdb_a_CPPFLAGS = \
++	-DSETUPDB_VERSION_MAJOR=$(SETUPDB_VERSION_MAJOR) \
++	-DSETUPDB_VERSION_MINOR=$(SETUPDB_VERSION_MINOR) \
++	$(XML_CFLAGS)
diff --git a/games-util/loki_patch/files/loki_patch-20091105-patchdata.patch b/games-util/loki_patch/files/loki_patch-20091105-patchdata.patch
new file mode 100644
index 000000000000..74ec3dae7568
--- /dev/null
+++ b/games-util/loki_patch/files/loki_patch-20091105-patchdata.patch
@@ -0,0 +1,11 @@
+--- loki_patch/load_patch.c
++++ loki_patch/load_patch.c
+@@ -8,7 +8,7 @@
+ #include "load_patch.h"
+ #include "log_output.h"
+ 
+-#define BASE "patchdata"
++#define BASE "data"
+ 
+ 
+ int load_add_file(FILE *file, int *line_num, const char *dst, loki_patch *patch)
diff --git a/games-util/loki_patch/loki_patch-20091105.ebuild b/games-util/loki_patch/loki_patch-20091105.ebuild
new file mode 100644
index 000000000000..22a711a5e2e0
--- /dev/null
+++ b/games-util/loki_patch/loki_patch-20091105.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/loki_patch/loki_patch-20091105.ebuild,v 1.1 2009/11/05 06:33:46 nyhm Exp $
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="Loki Software binary patch tool"
+HOMEPAGE="http://www.icculus.org/loki_setup/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	mirror://gentoo/loki_setupdb-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="=dev-util/xdelta-1*
+	dev-libs/libxml2
+	dev-libs/glib:2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-patchdata.patch
+	cd loki_setupdb
+	eautoreconf
+	cd "${S}"/${PN}
+	eautoreconf
+}
+
+src_configure() {
+	cd loki_setupdb
+	econf
+	cd "${S}"/${PN}
+	econf
+}
+
+src_compile() {
+	emake -C loki_setupdb || die "emake loki_setupdb failed"
+	emake -C loki_patch || die "emake loki_patch failed"
+}
+
+src_install() {
+	cd ${PN}
+	dobin loki_patch make_patch || die "dobin failed"
+	dodoc CHANGES NOTES README TODO
+}