Version bump, with a totally new Gentoo patch to fix a bunch of issues (need to send that upstream). Also fix HOMEPAGE on old version.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

5 files changed, 119 insertions, 13 deletions

diff --git a/app-text/libxmlpatch/ChangeLog b/app-text/libxmlpatch/ChangeLog
index bd15b22c130b..5149574fd179 100644
--- a/app-text/libxmlpatch/ChangeLog
+++ b/app-text/libxmlpatch/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/libxmlpatch
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libxmlpatch/ChangeLog,v 1.1 2008/05/19 10:26:03 flameeyes Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/libxmlpatch/ChangeLog,v 1.2 2011/10/31 12:51:22 flameeyes Exp $
+
+*libxmlpatch-0.3.3 (31 Oct 2011)
+
+  31 Oct 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/libxmlpatch-0.3.3-gentoo.patch, +libxmlpatch-0.3.3.ebuild,
+  libxmlpatch-0.3.1.ebuild:
+  Version bump, with a totally new Gentoo patch to fix a bunch of issues (need
+  to send that upstream). Also fix HOMEPAGE on old version.
 
 *libxmlpatch-0.3.1 (19 May 2008)
 
diff --git a/app-text/libxmlpatch/Manifest b/app-text/libxmlpatch/Manifest
index e3a3919d4714..15f721ed660d 100644
--- a/app-text/libxmlpatch/Manifest
+++ b/app-text/libxmlpatch/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX libxmlpatch-0.3.1-asneeded.patch 460 RMD160 418493afa0f778adc26317e7d0b8e61b87f20274 SHA1 d3632e31e0d5bc6b2dcfd149e72171a632202017 SHA256 6c51664e26fa979a459adeb8a9986fe0f1e1da15d533f9f8eb78ae86f66f88d6
+AUX libxmlpatch-0.3.3-gentoo.patch 2029 RMD160 a840e42e35f938d5c67b072c065130cbd115aa3f SHA1 76366e515d32e8ba4721a4d05791a5aa724d862a SHA256 a42ec69d1b4df0881f71ecc96a1f709a198219c9529e6ce7e0958fd52c0d0c96
 DIST libxmlpatch-0.3.1.tar.gz 356298 RMD160 f79148631ff1aef34ad8a9080877a8886a7d3e7e SHA1 8c9f907e2483e306a83f35df99ff0b6b0f1c9f42 SHA256 6af1168118b12bb90b74483aaaceb80154fb9f4f9294abca0505208c6fbb6edb
-EBUILD libxmlpatch-0.3.1.ebuild 811 RMD160 64eeb6dc0e3487744b84ff74ffdc071262359720 SHA1 2c3963514fe29f687d7712dfa0cc3ff0624f9371 SHA256 1a794ae697eea1f9fb5b4392890f178ee441144ce740747a7da399837ad3f98a
-MISC ChangeLog 435 RMD160 e6e2aaa38aa57435b786c5652d6ad3732a045a4c SHA1 205f607bc06df73bee13654daebb5a8e5b18c5f5 SHA256 df6e89f7f617dee74181d7ee9f13246457866ececc33957a4e64a504b4d5eba3
+DIST libxmlpatch-0.3.3.tar.gz 405496 RMD160 2c6445291134bf408711c980401041df127ddf32 SHA1 f47b724b1b6b5fd60c4231e2229e3d60f68e9489 SHA256 7236eec7bc450580c99c2d465ce2573687bb0229aa469e961bcbb0ffcb029d55
+EBUILD libxmlpatch-0.3.1.ebuild 787 RMD160 386e3f111e1231d98cafcfe2f491b9c5f14448a0 SHA1 7a2a0650da4e367e10735fea9e1d3fdf6112d0ef SHA256 97c45d7ec6ee4d8281c2c4dd9e5909323dafbee90a86b4c0037d9ebd98762f82
+EBUILD libxmlpatch-0.3.3.ebuild 908 RMD160 8e400ba5098cd7939aa9e98439ea787b5ad8718f SHA1 1dcedd756c0c2e997593ef72adf965c8d012961e SHA256 0bce574edfaf5bb241436e508ced4df58b511e4ad44a340804c0657b45498ce6
+MISC ChangeLog 761 RMD160 ed0fc89cad04a2931d0f555eb1c06e6ca965289d SHA1 2e7c61a96c644f232a6d1cbdf238f28420b121fe SHA256 dee0bf2778fe4818921f6e5feb4c35daf3802df79964ef13e2b5618825bcc4ee
 MISC metadata.xml 210 RMD160 d62fe1b7fcdb6ed1cf8f29606f11005f72052018 SHA1 c2d95873b2490997439036d93c54c9452c1ed0b1 SHA256 033e97715bc19256fb7c105f739eeb5d7e58c4556fdb08face36c7270ce0c82a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk5/GK4ACgkQfXuS5UK5QB1KnAP8Cy3vnrap+Qo8ALB/6atSPBtw
-+jVIfTz53d0WECEF+RYopR4OWcJuL1TgJoA5rCCP5s6wxHgKECzK91l3DBCDszy9
-IU3vMyV0ju/6XuoCvcRyNy0Wwlj/VjN9tHzbLaRjvPHlNGiapLQPR51+NDy4PdYc
-hfgFwernSdgAnXotHFw=
-=qBmx
+iEYEARECAAYFAk6umasACgkQAiZjviIA2XgbKgCg0JSCZHlkMex2hr74pZ4FxC9N
++psAoKHFtfyVRWPDRiU5TBMg1BO7RQbD
+=kai0
 -----END PGP SIGNATURE-----
diff --git a/app-text/libxmlpatch/files/libxmlpatch-0.3.3-gentoo.patch b/app-text/libxmlpatch/files/libxmlpatch-0.3.3-gentoo.patch
new file mode 100644
index 000000000000..9238f3db04d8
--- /dev/null
+++ b/app-text/libxmlpatch/files/libxmlpatch-0.3.3-gentoo.patch
@@ -0,0 +1,56 @@
+Index: libxmlpatch-0.3.3/tests/check_diff.c
+===================================================================
+--- libxmlpatch-0.3.3.orig/tests/check_diff.c
++++ libxmlpatch-0.3.3/tests/check_diff.c
+@@ -259,7 +259,13 @@ static struct {
+ static void
+ add_test (TCase *tc, int i)
+ {
+-    _tcase_add_test (tc, arr_tests[i].fn, arr_tests[i].name, 0, 0, 1);
++    _tcase_add_test (tc, arr_tests[i].fn, arr_tests[i].name,
++#if CHECK_MAJOR_VERSION > 0 || \
++  (CHECK_MAJOR_VERSION == 0 && CHECK_MINOR_VERSION > 9) || \
++  (CHECK_MAJOR_VERSION == 0 && CHECK_MINOR_VERSION == 9 && CHECK_MICRO_VERSION >= 8)
++                     0,
++#endif
++                     0, 0, 1);
+ }
+ 
+ static void
+Index: libxmlpatch-0.3.3/configure.in
+===================================================================
+--- libxmlpatch-0.3.3.orig/configure.in
++++ libxmlpatch-0.3.3/configure.in
+@@ -74,7 +74,13 @@ fi
+ 
+ PKG_CHECK_MODULES(DEPS_XML, libxml-2.0)
+ PKG_CHECK_MODULES(DEPS_GLIB, glib-2.0)
+-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
++
++AC_ARG_WITH([check],
++  AS_HELP_STRING([--without-check], [Do not build tests based on check package @<:@default=auto@:>@]))
++AS_IF([test "x$with_check" != "xno"], [
++PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], , [with_check=no])
++])
++AM_CONDITIONAL([TESTS], [test "x$with_check" != "xno"])
+ 
+ AC_SUBST(DEPS_XML_CFLAGS)
+ AC_SUBST(DEPS_XML_LIBS)
+Index: libxmlpatch-0.3.3/tests/Makefile.am
+===================================================================
+--- libxmlpatch-0.3.3.orig/tests/Makefile.am
++++ libxmlpatch-0.3.3/tests/Makefile.am
+@@ -1,10 +1,11 @@
++if TESTS
+ TESTS = test-diff
++check_PROGRAMS = test-diff
++endif
+ 
+-test_PROGRAMS = test-diff
+ test_diff_SOURCES = check_diff.c
+ test_diff_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/diff @CHECK_CFLAGS@ $(DEPS_XML_CFLAGS) $(DEPS_GLIB_CFLAGS)
+ test_diff_LDADD = @CHECK_LIBS@ $(top_builddir)/src/libxmlpatch.la $(top_builddir)/diff/libxmldiff.la $(DEPS_XML_LIBS) $(DEPS_GLIB_LIBS)
+-testdir = $(libdir)/tests/xml_diff
+ 
+ bin_PROGRAMS = xml_patch xml_diff
+ 
diff --git a/app-text/libxmlpatch/libxmlpatch-0.3.1.ebuild b/app-text/libxmlpatch/libxmlpatch-0.3.1.ebuild
index 0401c7a4a601..4f12a5bbd527 100644
--- a/app-text/libxmlpatch/libxmlpatch-0.3.1.ebuild
+++ b/app-text/libxmlpatch/libxmlpatch-0.3.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libxmlpatch/libxmlpatch-0.3.1.ebuild,v 1.1 2008/05/19 10:26:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libxmlpatch/libxmlpatch-0.3.1.ebuild,v 1.2 2011/10/31 12:51:22 flameeyes Exp $
 
 inherit eutils autotools
 
 DESCRIPTION="A set of tools to create and apply patch to XML files using XPath"
-HOMEPAGE="http://opensource.nokia.com/projects/xmlpatch/index.html"
+HOMEPAGE="http://xmlpatch.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN/lib}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild b/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild
new file mode 100644
index 000000000000..fbb8839b9223
--- /dev/null
+++ b/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild,v 1.1 2011/10/31 12:51:22 flameeyes Exp $
+
+EAPI=4
+
+inherit eutils autotools
+
+DESCRIPTION="A set of tools to create and apply patch to XML files using XPath"
+HOMEPAGE="http://xmlpatch.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN/lib}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test static-libs"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with test check)
+}
+
+DOCS=( LEGAL_NOTICE README TODO AUTHORS NEWS ChangeLog )
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete
+}
\ No newline at end of file