Fixed emerge fails with libtool mismatch. Bug 81569.

(Portage version: 2.0.51-r15)

5 files changed, 98 insertions, 2 deletions

diff --git a/dev-libs/gmetadom/ChangeLog b/dev-libs/gmetadom/ChangeLog
index 32849721ef31..9876cef561ac 100644
--- a/dev-libs/gmetadom/ChangeLog
+++ b/dev-libs/gmetadom/ChangeLog
@@ -1,6 +1,12 @@
 # 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.11 2005/01/03 07:27:39 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/ChangeLog,v 1.12 2005/02/12 00:51:51 matsuu Exp $
+
+*gmetadom-0.2.2-r1 (12 Feb 2005)
+
+  12 Feb 2005; MATSUU Takuto <matsuu@gentoo.org>
+  +files/gmetadom-0.2.2-gentoo.patch, +gmetadom-0.2.2-r1.ebuild:
+  Fixed emerge fails with libtool mismatch. Bug 81569.
 
   03 Jan 2005; MATSUU Takuto <matsuu@gentoo.org> -gmetadom-0.2.0.ebuild,
   -gmetadom-0.2.1-r1.ebuild, -gmetadom-0.2.1.ebuild:
diff --git a/dev-libs/gmetadom/Manifest b/dev-libs/gmetadom/Manifest
index 426dd3e75705..1e8a91f9ad7b 100644
--- a/dev-libs/gmetadom/Manifest
+++ b/dev-libs/gmetadom/Manifest
@@ -1,12 +1,15 @@
 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 da6495e58663771b0f84a255f3b64e43 ChangeLog 1628
+MD5 5b1b86d2e6d2d272db08b63ca0fb2924 gmetadom-0.2.2-r1.ebuild 1165
+MD5 a4666c13dffefb3dae7aa97cc4b0cfd3 ChangeLog 1832
 MD5 66f606b975a4b66c5572d166e0d871d1 gmetadom-0.2.2.ebuild 1196
 MD5 e10a0da4fac2882942ffa8360ccdd921 metadata.xml 201
 MD5 61a42bb68511dea925d7f7860eb7027c files/digest-gmetadom-0.1.8 66
 MD5 8d971df6e209b8eee4244293fca7b04b files/digest-gmetadom-0.2.2 66
+MD5 53221ec88d4b81a5575d819f720941d2 files/gmetadom-0.2.2-gentoo.patch 1693
 MD5 326c113f108983dcacee65c42b42b766 files/gmetadom-0.2.1-gentoo.patch 2344
 MD5 7192830dc2daf239e593ee9d302af67e files/digest-gmetadom-0.0.3-r3 66
 MD5 51735b8a4a855394319affc43667b6de files/digest-gmetadom-0.2.1-r2 66
+MD5 8d971df6e209b8eee4244293fca7b04b files/digest-gmetadom-0.2.2-r1 66
 MD5 07657f960b260c0ab18b3022b6c115a4 files/gmetadom-0.0.3-gcc3.diff 863
diff --git a/dev-libs/gmetadom/files/digest-gmetadom-0.2.2-r1 b/dev-libs/gmetadom/files/digest-gmetadom-0.2.2-r1
new file mode 100644
index 000000000000..97df1a9a35f0
--- /dev/null
+++ b/dev-libs/gmetadom/files/digest-gmetadom-0.2.2-r1
@@ -0,0 +1 @@
+MD5 9fe1ee842bcbbe53ac013e9001c05c08 gmetadom-0.2.2.tar.gz 478558
diff --git a/dev-libs/gmetadom/files/gmetadom-0.2.2-gentoo.patch b/dev-libs/gmetadom/files/gmetadom-0.2.2-gentoo.patch
new file mode 100644
index 000000000000..f416062684f4
--- /dev/null
+++ b/dev-libs/gmetadom/files/gmetadom-0.2.2-gentoo.patch
@@ -0,0 +1,35 @@
+diff -urN gmetadom-0.2.1.orig/configure.ac gmetadom-0.2.1/configure.ac
+--- gmetadom-0.2.1.orig/configure.ac	2003-10-08 06:49:32.000000000 +0900
++++ gmetadom-0.2.1/configure.ac	2004-07-14 08:37:25.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 -urN gmetadom-0.2.1.orig/src/gdome_caml/Makefile.am gmetadom-0.2.1/src/gdome_caml/Makefile.am
+--- gmetadom-0.2.1.orig/src/gdome_caml/Makefile.am	2003-10-08 15:00:50.000000000 +0900
++++ gmetadom-0.2.1/src/gdome_caml/Makefile.am	2004-07-14 09:09:26.028761996 +0900
+@@ -81,7 +81,7 @@
+ 	done
+ 	if [ "x$(OCAMLFIND)" != "x" ]; then \
+ 		mv $(OCAMLINSTALLDIR) $(OCAMLINSTALLDIR).saved;	\
+-		$(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 -urN gmetadom-0.2.2.orig/src/gdome_cpp_smart/test/Makefile.am gmetadom-0.2.2/src/gdome_cpp_smart/test/Makefile.am
+--- gmetadom-0.2.2.orig/src/gdome_cpp_smart/test/Makefile.am	2005-02-10 22:17:55.766735918 -0500
++++ gmetadom-0.2.2/src/gdome_cpp_smart/test/Makefile.am	2005-02-10 22:12:31.497162475 -0500
+@@ -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.2-r1.ebuild b/dev-libs/gmetadom/gmetadom-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..573c1c4b64a1
--- /dev/null
+++ b/dev-libs/gmetadom/gmetadom-0.2.2-r1.ebuild
@@ -0,0 +1,51 @@
+# 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.2-r1.ebuild,v 1.1 2005/02/12 00:51:51 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="~x86 ~ppc ~amd64"
+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
+	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 LICENSE NEWS README
+}