Version bump.

(Portage version: 2.1.5_rc10)

5 files changed, 95 insertions, 111 deletions

diff --git a/app-text/xml2/ChangeLog b/app-text/xml2/ChangeLog
index d60e467ba384..3f383f6f7c31 100644
--- a/app-text/xml2/ChangeLog
+++ b/app-text/xml2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/xml2
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xml2/ChangeLog,v 1.7 2008/01/19 15:12:46 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xml2/ChangeLog,v 1.8 2008/05/14 18:16:25 drac Exp $
+
+*xml2-0.4 (14 May 2008)
+
+  14 May 2008; Samuli Suominen <drac@gentoo.org>
+  -files/xml2-0.3-libxml2.patch, +files/xml2-0.4-libxml2.patch,
+  -xml2-0.3-r1.ebuild, +xml2-0.4.ebuild:
+  Version bump.
 
   19 Jan 2008; Fabian Groffen <grobian@gentoo.org> xml2-0.3-r1.ebuild:
   Dropped ppc-macos keyword, see you in prefix
diff --git a/app-text/xml2/files/xml2-0.3-libxml2.patch b/app-text/xml2/files/xml2-0.3-libxml2.patch
deleted file mode 100644
index f0e1f37f2af2..000000000000
--- a/app-text/xml2/files/xml2-0.3-libxml2.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -pruN a/2xml.c b/2xml.c
---- a/2xml.c	2001-01-02 18:27:07.000000000 +0000
-+++ b/2xml.c	2004-09-15 02:49:23.000000000 +0100
-@@ -24,7 +24,7 @@
- #include <assert.h>
- #include <ctype.h>
- 
--#include <HTMLparser.h>
-+#include <libxml/HTMLparser.h>
- 
- int do_html;
- int in_tag = 0;
-@@ -116,7 +116,7 @@ static void leave(const char *name)
- 	}
- }
- 
--static void characters(const char *stuff,const char *context)
-+static void LOCAL_characters(const char *stuff,const char *context)
- {
- 	switch (context[0]) {
- 	case '!':
-@@ -183,7 +183,7 @@ static void line(char *data)
- 	}
- 
- 	if (NULL == name && NULL == *ptr && NULL != content)
--		characters("\n",context);
-+		LOCAL_characters("\n",context);
- 
- 	release(ptr);
- 
-@@ -204,7 +204,7 @@ static void line(char *data)
- 	}
- 
- 	*ptr = NULL;
--	if (NULL != content) characters(content,context);
-+	if (NULL != content) LOCAL_characters(content,context);
- }
- 
- int main(int argc,char *argv[])
-diff -pruN a/makefile b/makefile
---- a/makefile	2001-01-31 17:59:53.000000000 +0000
-+++ b/makefile	2004-09-15 02:43:25.000000000 +0100
-@@ -4,9 +4,9 @@ FILES=xml2 html2 2html 2xml csv2 2csv
- TAR=xml2-$(VERSION).tar.gz
- DIR=xml2-$(VERSION)
- 
--CFLAGS=-g -Wall `xml-config --cflags`
--# CFLAGS=-O2 `xml-config --cflags`
--LDLIBS=`xml-config --libs`
-+CFLAGS=-g -Wall $(shell pkg-config --cflags libxml-2.0)
-+# CFLAGS=-O2 $(shell pkg-config --cflags libxml-2.0)
-+LDLIBS=$(shell pkg-config --libs libxml-2.0)
- 
- all: $(FILES)
- 
-diff -pruN a/xml2.c b/xml2.c
---- a/xml2.c	2000-03-20 01:01:32.000000000 +0000
-+++ b/xml2.c	2004-09-15 02:41:59.000000000 +0100
-@@ -24,8 +24,8 @@
- #include <string.h>
- #include <ctype.h>
- 
--#include <parser.h>
--#include <HTMLparser.h>
-+#include <libxml/parser.h>
-+#include <libxml/HTMLparser.h>
- 
- struct node
- {
diff --git a/app-text/xml2/files/xml2-0.4-libxml2.patch b/app-text/xml2/files/xml2-0.4-libxml2.patch
new file mode 100644
index 000000000000..065049188c5f
--- /dev/null
+++ b/app-text/xml2/files/xml2-0.4-libxml2.patch
@@ -0,0 +1,53 @@
+diff -ur xml2-0.4.orig/2xml.c xml2-0.4/2xml.c
+--- xml2-0.4.orig/2xml.c	2003-12-24 22:28:48.000000000 +0200
++++ xml2-0.4/2xml.c	2008-05-14 20:02:40.000000000 +0300
+@@ -24,7 +24,7 @@
+ #include <assert.h>
+ #include <ctype.h>
+ 
+-#include <HTMLparser.h>
++#include <libxml/HTMLparser.h>
+ 
+ int do_html;
+ int in_tag = 0;
+diff -ur xml2-0.4.orig/configure.ac xml2-0.4/configure.ac
+--- xml2-0.4.orig/configure.ac	2008-02-07 18:11:54.000000000 +0200
++++ xml2-0.4/configure.ac	2008-05-14 20:05:12.000000000 +0300
+@@ -11,7 +11,7 @@
+ AC_PROG_CC
+ 
+ # Checks for libraries.
+-PKG_CHECK_MODULES(XML, libxml)
++PKG_CHECK_MODULES(XML, libxml-2.0)
+ AC_SUBST(XML_LIBS)
+ AC_SUBST(XML_CFLAGS)
+ 
+diff -ur xml2-0.4.orig/Makefile.am xml2-0.4/Makefile.am
+--- xml2-0.4.orig/Makefile.am	2008-02-07 17:58:13.000000000 +0200
++++ xml2-0.4/Makefile.am	2008-05-14 20:06:10.000000000 +0300
+@@ -1,9 +1,9 @@
+ AM_CPPFLAGS = $(XML_CFLAGS)
+ bin_PROGRAMS = xml2 2xml csv2 2csv
+ xml2_SOURCES = xml2.c
+-xml2_LDADD = -lxml
++xml2_LDADD = -lxml2
+ 2xml_SOURCES = 2xml.c
+-2xml_LDADD = -lxml
++2xml_LDADD = -lxml2
+ csv2_SOURCES = csv2.c
+ 2csv_SOURCES = 2csv.c
+ 
+diff -ur xml2-0.4.orig/xml2.c xml2-0.4/xml2.c
+--- xml2-0.4.orig/xml2.c	2001-10-28 06:29:46.000000000 +0200
++++ xml2-0.4/xml2.c	2008-05-14 20:03:31.000000000 +0300
+@@ -24,8 +24,8 @@
+ #include <string.h>
+ #include <ctype.h>
+ 
+-#include <parser.h>
+-#include <HTMLparser.h>
++#include <libxml/parser.h>
++#include <libxml/HTMLparser.h>
+ 
+ struct node
+ {
diff --git a/app-text/xml2/xml2-0.3-r1.ebuild b/app-text/xml2/xml2-0.3-r1.ebuild
deleted file mode 100644
index 5cc8a34a8a2b..000000000000
--- a/app-text/xml2/xml2-0.3-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xml2/xml2-0.3-r1.ebuild,v 1.4 2008/01/19 15:12:46 grobian Exp $
-
-inherit eutils
-
-DESCRIPTION="Converts XML to line-oriented file format"
-
-HOMEPAGE="http://dan.egnor.name/xml2/"
-
-SRC_URI="http://download.gale.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-
-KEYWORDS="~x86"
-
-IUSE=""
-
-DEPEND="dev-libs/libxml2"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	epatch ${FILESDIR}/${P}-libxml2.patch
-	sed -i -e "s:CFLAGS=-g -Wall:CFLAGS=${CFLAGS}:" makefile || \
-		die "Sed expression failed"
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	dobin 2csv 2xml csv2 xml2
-	# HTML support symlinks, upstream considers it be necessary
-	dosym /usr/bin/2xml /usr/bin/2html
-	dosym /usr/bin/xml2 /usr/bin/html2
-}
diff --git a/app-text/xml2/xml2-0.4.ebuild b/app-text/xml2/xml2-0.4.ebuild
new file mode 100644
index 000000000000..168c553819af
--- /dev/null
+++ b/app-text/xml2/xml2-0.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xml2/xml2-0.4.ebuild,v 1.1 2008/05/14 18:16:25 drac Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="These tools are used to convert XML and HTML to and from a line-oriented format."
+HOMEPAGE="http://dan.egnor.name/xml2"
+SRC_URI="http://download.ofb.net/gale/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-libxml2.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf --disable-dependency-tracking
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+}