clean up + move ocaml package out of site-packages

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key C2000586)

3 files changed, 71 insertions, 1 deletions

diff --git a/dev-libs/gmetadom/ChangeLog b/dev-libs/gmetadom/ChangeLog
index 61d47b5e5a57..94b04a51e2d7 100644
--- a/dev-libs/gmetadom/ChangeLog
+++ b/dev-libs/gmetadom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/gmetadom
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/ChangeLog,v 1.39 2013/02/03 12:14:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/ChangeLog,v 1.40 2013/03/16 20:50:48 ottxor Exp $
+
+*gmetadom-0.2.6-r1 (16 Mar 2013)
+
+  16 Mar 2013; Christoph Junghans <ottxor@gentoo.org>
+  +files/gmetadom-0.2.6-gentoo-2.patch, +gmetadom-0.2.6-r1.ebuild:
+  clean up + move ocaml package out of site-packages
 
   03 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due #22900
diff --git a/dev-libs/gmetadom/files/gmetadom-0.2.6-gentoo-2.patch b/dev-libs/gmetadom/files/gmetadom-0.2.6-gentoo-2.patch
new file mode 100644
index 000000000000..ff8e6d328852
--- /dev/null
+++ b/dev-libs/gmetadom/files/gmetadom-0.2.6-gentoo-2.patch
@@ -0,0 +1,23 @@
+diff -Naur gmetadom-0.2.6.orig/src/gdome_caml/Makefile.am gmetadom-0.2.6/src/gdome_caml/Makefile.am
+--- gmetadom-0.2.6.orig/src/gdome_caml/Makefile.am	2006-08-06 17:33:36.000000000 +0900
++++ gmetadom-0.2.6/src/gdome_caml/Makefile.am	2008-01-18 08:48:01.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 -ldconf ignore -destdir $(DESTDIR)$(OCAML_LIB_PREFIX)/ $(PKGNAME) META $(DLL) && \
+ 		$(INSTALL_DATA) $(OCAMLINSTALLDIR).saved/* $(OCAMLINSTALLDIR)/ &&	\
+ 		rm -rf $(OCAMLINSTALLDIR).saved/;	\
+ 	else	\
+diff -Naur gmetadom-0.2.6.orig/src/gdome_cpp_smart/test/Makefile.am gmetadom-0.2.6/src/gdome_cpp_smart/test/Makefile.am
+--- gmetadom-0.2.6.orig/src/gdome_cpp_smart/test/Makefile.am	2007-05-09 00:26:18.000000000 +0900
++++ gmetadom-0.2.6/src/gdome_cpp_smart/test/Makefile.am	2008-01-17 23:41:17.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.6-r1.ebuild b/dev-libs/gmetadom/gmetadom-0.2.6-r1.ebuild
new file mode 100644
index 000000000000..cb186de22fa3
--- /dev/null
+++ b/dev-libs/gmetadom/gmetadom-0.2.6-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmetadom/gmetadom-0.2.6-r1.ebuild,v 1.1 2013/03/16 20:50:48 ottxor Exp $
+
+EAPI=5
+
+inherit autotools-utils flag-o-matic
+
+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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ocaml static-libs"
+
+RDEPEND="dev-libs/glib
+	dev-libs/gdome2
+	dev-libs/libxslt"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	ocaml? (
+		dev-lang/ocaml
+		dev-ml/findlib
+	)"
+
+AUTOTOOLS_IN_SOURCE_BUILD="yes"
+AUTOTOOLS_AUTORECONF="yes"
+MAKEOPTS="${MAKEOPTS} -j1"
+PATCHES=( "${FILESDIR}"/${P}-gentoo-2.patch "${FILESDIR}"/${P}-gcc43.patch )
+
+src_configure() {
+	# Unconditonal use of -fPIC (#55238).
+	append-flags -fPIC
+
+	local myeconfargs=(
+		--with-modules="gdome_cpp_smart $(use ocaml && echo gdome_caml)"
+	)
+	autotools-utils_src_configure
+}