Version bumped. Fixed for gcc 4.1, Bug 115918.

Package-Manager: portage-2.0.53

6 files changed, 133 insertions, 8 deletions

diff --git a/dev-libs/gmetadom/ChangeLog b/dev-libs/gmetadom/ChangeLog
index 92831b1a363d..652f47eb32be 100644
--- a/dev-libs/gmetadom/ChangeLog
+++ b/dev-libs/gmetadom/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/gmetadom
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/ChangeLog,v 1.14 2005/10/31 19:51:16 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/ChangeLog,v 1.15 2005/12/24 16:14:25 matsuu Exp $
+
+*gmetadom-0.2.3 (24 Dec 2005)
+
+  24 Dec 2005; MATSUU Takuto <matsuu@gentoo.org>
+  +files/gmetadom-0.2.3-gcc41.patch, +files/gmetadom-0.2.3-gentoo.patch,
+  +gmetadom-0.2.3.ebuild:
+  Version bumped.
+  Fixed for gcc 4.1, Bug 115918.
 
   31 Oct 2005; Brent Baude <ranger@gentoo.org> gmetadom-0.2.2-r1.ebuild:
   marking gmetadom-0.2.2-r1 in support of bug 110858
diff --git a/dev-libs/gmetadom/Manifest b/dev-libs/gmetadom/Manifest
index 527bc99b8fcd..266aff0c57b4 100644
--- a/dev-libs/gmetadom/Manifest
+++ b/dev-libs/gmetadom/Manifest
@@ -1,15 +1,19 @@
-MD5 5f5b3ed0ea234608f16e8f47888ae159 ChangeLog 2072
-MD5 78bfc4c074695496ebe116fc8e565cb6 gmetadom-0.0.3-r3.ebuild 1469
-MD5 1efffaeae461cb2e5c3a26b73985e367 gmetadom-0.1.8.ebuild 732
-MD5 4a0d1d405250503757bedff7ef793dd6 gmetadom-0.2.1-r2.ebuild 1184
-MD5 5578c616df51a968ff3887634a5d3afb gmetadom-0.2.2-r1.ebuild 1283
-MD5 66f606b975a4b66c5572d166e0d871d1 gmetadom-0.2.2.ebuild 1196
-MD5 e10a0da4fac2882942ffa8360ccdd921 metadata.xml 201
+MD5 e0fb26d8ee36056ece32d2783684f7a2 ChangeLog 2303
 MD5 7192830dc2daf239e593ee9d302af67e files/digest-gmetadom-0.0.3-r3 66
 MD5 61a42bb68511dea925d7f7860eb7027c files/digest-gmetadom-0.1.8 66
 MD5 51735b8a4a855394319affc43667b6de files/digest-gmetadom-0.2.1-r2 66
 MD5 8d971df6e209b8eee4244293fca7b04b files/digest-gmetadom-0.2.2 66
 MD5 8d971df6e209b8eee4244293fca7b04b files/digest-gmetadom-0.2.2-r1 66
+MD5 2e59d3cc422028eea6b6d23bc9b4eda3 files/digest-gmetadom-0.2.3 66
 MD5 07657f960b260c0ab18b3022b6c115a4 files/gmetadom-0.0.3-gcc3.diff 863
 MD5 326c113f108983dcacee65c42b42b766 files/gmetadom-0.2.1-gentoo.patch 2344
 MD5 53221ec88d4b81a5575d819f720941d2 files/gmetadom-0.2.2-gentoo.patch 1693
+MD5 2addb20d4214c3fe7248d128872ad394 files/gmetadom-0.2.3-gcc41.patch 1138
+MD5 01f8ca61d1c2a2699842c0ea7bb9ea66 files/gmetadom-0.2.3-gentoo.patch 1743
+MD5 78bfc4c074695496ebe116fc8e565cb6 gmetadom-0.0.3-r3.ebuild 1469
+MD5 1efffaeae461cb2e5c3a26b73985e367 gmetadom-0.1.8.ebuild 732
+MD5 4a0d1d405250503757bedff7ef793dd6 gmetadom-0.2.1-r2.ebuild 1184
+MD5 5578c616df51a968ff3887634a5d3afb gmetadom-0.2.2-r1.ebuild 1283
+MD5 66f606b975a4b66c5572d166e0d871d1 gmetadom-0.2.2.ebuild 1196
+MD5 3c931ae1ecbddf163d1b2409f1a432f8 gmetadom-0.2.3.ebuild 1335
+MD5 e10a0da4fac2882942ffa8360ccdd921 metadata.xml 201
diff --git a/dev-libs/gmetadom/files/digest-gmetadom-0.2.3 b/dev-libs/gmetadom/files/digest-gmetadom-0.2.3
new file mode 100644
index 000000000000..5e1126e39e7f
--- /dev/null
+++ b/dev-libs/gmetadom/files/digest-gmetadom-0.2.3
@@ -0,0 +1 @@
+MD5 da5f6f9f39a09aacbf9d3bb17804e787 gmetadom-0.2.3.tar.gz 479336
diff --git a/dev-libs/gmetadom/files/gmetadom-0.2.3-gcc41.patch b/dev-libs/gmetadom/files/gmetadom-0.2.3-gcc41.patch
new file mode 100644
index 000000000000..c87b7ecc2bc6
--- /dev/null
+++ b/dev-libs/gmetadom/files/gmetadom-0.2.3-gcc41.patch
@@ -0,0 +1,22 @@
+--- src/gdome_cpp_smart/include/GdomeSmartDOMEventTarget.hh.old	2005-12-18 10:37:54.000000000 +0100
++++ src/gdome_cpp_smart/include/GdomeSmartDOMEventTarget.hh	2005-12-18 10:38:17.000000000 +0100
+@@ -36,7 +36,7 @@
+     EventTarget(const EventTarget&);
+   ~EventTarget();
+ 
+-  EventTarget::EventTarget(const class Node&);EventTarget& operator=(const EventTarget&);
++  EventTarget(const class Node&);EventTarget& operator=(const EventTarget&);
+   bool operator==(const EventTarget& obj) const { return gdome_obj == obj.gdome_obj; }
+   bool operator!=(const EventTarget& obj) const { return !(*this == obj); }
+   
+--- src/gdome_cpp_smart/include/GdomeSmartDOMNode.hh.old	2005-12-18 10:38:39.000000000 +0100
++++ src/gdome_cpp_smart/include/GdomeSmartDOMNode.hh	2005-12-18 10:38:55.000000000 +0100
+@@ -36,7 +36,7 @@
+     Node(const Node&);
+   ~Node();
+ 
+-  Node::Node(const class EventTarget&);Node& operator=(const Node&);
++  Node(const class EventTarget&);Node& operator=(const Node&);
+   bool operator==(const Node& obj) const { return gdome_obj == obj.gdome_obj; }
+   bool operator!=(const Node& obj) const { return !(*this == obj); }
+   
diff --git a/dev-libs/gmetadom/files/gmetadom-0.2.3-gentoo.patch b/dev-libs/gmetadom/files/gmetadom-0.2.3-gentoo.patch
new file mode 100644
index 000000000000..faed22839dd3
--- /dev/null
+++ b/dev-libs/gmetadom/files/gmetadom-0.2.3-gentoo.patch
@@ -0,0 +1,35 @@
+diff -Naur gmetadom-0.2.3.orig/configure.ac gmetadom-0.2.3/configure.ac
+--- gmetadom-0.2.3.orig/configure.ac	2005-07-08 18:51:02.000000000 +0900
++++ gmetadom-0.2.3/configure.ac	2005-12-25 01:02:22.000000000 +0900
+@@ -312,7 +312,7 @@
+ 	HAVE_OCAMLC=no
+ else
+ 	HAVE_OCAMLC=yes
+-	OCAML_LIB=`$OCAMLC -v | tail -1 | cut -d ':' -f2 | tr -d ' '`
++	OCAML_LIB=`$OCAMLC -v | tail -n 1 | cut -d ':' -f2 | tr -d ' '`
+ 
+ 	if test $OCAML_INCLUDE_PREFIX = no; then
+ 		OCAML_CFLAGS=-I$OCAML_LIB
+diff -Naur gmetadom-0.2.3.orig/src/gdome_caml/Makefile.am gmetadom-0.2.3/src/gdome_caml/Makefile.am
+--- gmetadom-0.2.3.orig/src/gdome_caml/Makefile.am	2005-07-08 18:51:02.000000000 +0900
++++ gmetadom-0.2.3/src/gdome_caml/Makefile.am	2005-12-25 01:03:12.000000000 +0900
+@@ -83,7 +83,7 @@
+ 	if [ "x$(OCAMLFIND)" != "x" ]; then \
+ 		mv $(OCAMLINSTALLDIR) $(OCAMLINSTALLDIR).saved;	\
+ 		$(mkinstalldirs) $(DESTDIR)$(OCAML_LIB_PREFIX)/; \
+-		$(OCAMLFIND) install -destdir $(DESTDIR)$(OCAML_LIB_PREFIX)/ $(PKGNAME) META $(DLL); \
++		$(OCAMLFIND) install -destdir $(DESTDIR)$(OCAML_LIB_PREFIX)/site-packages $(PKGNAME) META $(DLL); \
+ 		$(INSTALL_DATA) $(OCAMLINSTALLDIR).saved/* $(OCAMLINSTALLDIR)/;	\
+ 		rm -rf $(OCAMLINSTALLDIR).saved/;	\
+ 	else	\
+diff -Naur gmetadom-0.2.3.orig/src/gdome_cpp_smart/test/Makefile.am gmetadom-0.2.3/src/gdome_cpp_smart/test/Makefile.am
+--- gmetadom-0.2.3.orig/src/gdome_cpp_smart/test/Makefile.am	2005-07-08 18:51:04.000000000 +0900
++++ gmetadom-0.2.3/src/gdome_cpp_smart/test/Makefile.am	2005-12-25 01:03:41.000000000 +0900
+@@ -7,7 +7,6 @@
+ 
+ LDADDS = \
+   $(GDOME_LIBS) \
+-  $(top_builddir)/src/gdome_cpp_smart/.libs/libgmetadom_gdome_cpp_smart.a \
+   $(top_builddir)/src/gdome_cpp_smart/libgmetadom_gdome_cpp_smart.la \
+   -lstdc++
+ 
diff --git a/dev-libs/gmetadom/gmetadom-0.2.3.ebuild b/dev-libs/gmetadom/gmetadom-0.2.3.ebuild
new file mode 100644
index 000000000000..35edb2f05c30
--- /dev/null
+++ b/dev-libs/gmetadom/gmetadom-0.2.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/gmetadom-0.2.3.ebuild,v 1.1 2005/12/24 16:14:25 matsuu Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="A library providing bindings for multiple languages of multiple C DOM implementations"
+HOMEPAGE="http://gmetadom.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gmetadom/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ocaml"
+
+RDEPEND=">=dev-libs/gdome2-0.8.0"
+DEPEND="${RDEPEND}
+	>=dev-libs/libxslt-1.0.0
+	ocaml? ( >=dev-lang/ocaml-3.05
+		>=dev-ml/findlib-0.8 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+
+	# Fix gcc 4.1 problems
+	epatch ${FILESDIR}/${P}-gcc41.patch
+
+	WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.7" autoreconf --install --force || die
+}
+
+src_compile() {
+	local mymod="gdome_cpp_smart"
+
+	# Unconditonal use of -fPIC (#55238).
+	append-flags -fPIC
+	use ocaml && mymod="${mymod} gdome_caml"
+
+	econf --with-modules="${mymod}" || die
+	#emake || die
+	make || die
+}
+
+src_install() {
+	local destdir=`ocamlfind printconf destdir`
+
+	make \
+		DESTDIR=${D} \
+		OCAMLINSTALLDIR=${D}${destdir}/gdome2 \
+		OCAMLFIND_LDCONF=dummy \
+		install || die
+
+	dodoc AUTHORS BUGS ChangeLog HISTORY NEWS README
+}