dev-db/metakit: Fix linking, #252474

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

4 files changed, 154 insertions, 4 deletions

diff --git a/dev-db/metakit/ChangeLog b/dev-db/metakit/ChangeLog
index 17e6c634848a..c7c6f512bd56 100644
--- a/dev-db/metakit/ChangeLog
+++ b/dev-db/metakit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/metakit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/ChangeLog,v 1.56 2012/02/21 07:00:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/ChangeLog,v 1.57 2012/06/21 09:07:52 jlec Exp $
+
+*metakit-2.4.9.7-r1 (21 Jun 2012)
+
+  21 Jun 2012; Justin Lecher <jlec@gentoo.org> +metakit-2.4.9.7-r1.ebuild,
+  +files/metakit-2.4.9.7-linking.patch, metadata.xml:
+  Fix linking, #252474
 
   21 Feb 2012; Patrick Lauer <patrick@gentoo.org> metakit-2.4.9.7.ebuild:
   Restricting jython
diff --git a/dev-db/metakit/files/metakit-2.4.9.7-linking.patch b/dev-db/metakit/files/metakit-2.4.9.7-linking.patch
new file mode 100644
index 000000000000..55453a2d8e4a
--- /dev/null
+++ b/dev-db/metakit/files/metakit-2.4.9.7-linking.patch
@@ -0,0 +1,45 @@
+ unix/Makefile.in |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/unix/Makefile.in b/unix/Makefile.in
+index bf187ba..763558f 100755
+--- a/unix/Makefile.in
++++ b/unix/Makefile.in
+@@ -43,7 +43,7 @@ CXX_FLAGS = @CPPFLAGS@ @CXXFLAGS@ @MK_THREADS@ @SHLIB_CFLAGS@ \
+ # (e.g. in Mk4py).  This does not affect standard operation, *only* errors.
+ # Happens in gcc 2.95.3, it has been disabled for now (even though slower).
+ #CXXFLAGS = -fomit-frame-pointer $(CXX_FLAGS)
+-CXXFLAGS = $(CXX_FLAGS)
++CXXFLAGS +=   -I$(srcdir)/../include
+ #CXXFLAGS = -Dq4_CHECK $(CXX_FLAGS)
+ #CXXFLAGS = -Wall -pedantic -Wno-unused $(CXX_FLAGS)
+ 
+@@ -134,24 +134,24 @@ libmk4$(LIB_SUFFIX): $(LOBJS)
+ 	ranlib $@
+ 
+ libmk4$(SHLIB_SUFFIX): $(LOBJS) $(LINK_SPECIAL_FILES)
+-	$(SHLIB_LD) -o $@ $(LOBJS) $(LINK_SPECIAL_FLAGS)
++	$(SHLIB_LD) $(LDFLAGS) -o $@ $(LOBJS) $(LINK_SPECIAL_FLAGS)
+ 
+ Mk4tcl$(LIB_SUFFIX): mk4tcl.o mk4too.o $(LOBJS)
+ 	ar rcu $@ mk4tcl.o mk4too.o $(LOBJS)
+ 	ranlib $@
+ 
+ Mk4tcl$(SHLIB_SUFFIX): mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FILES)
+-	$(SHLIB_LD) -o $@ mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FLAGS)
++	$(SHLIB_LD) $(LDFLAGS) -o $@ mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FLAGS)
+ 
+ Mk4py$(LIB_SUFFIX): $(PYOBJS) $(LOBJS)
+ 	ar cru $@ $(PYOBJS) $(LOBJS)
+ 	ranlib $@
+ 
+ Mk4py$(SHLIB_SUFFIX): $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FILES)
+-	$(SHLIB_LD) -o $@ $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FLAGS)
++	$(SHLIB_LD) $(LDFLAGS) -o $@ $(PYOBJS) -L. -lmk4 $(LINK_SPECIAL_FLAGS) $(PYTHON_LIB)
+ 
+ Mk4lua$(SHLIB_SUFFIX): mk4lua.o $(LOBJS) $(LINK_SPECIAL_FILES)
+-	$(SHLIB_LD) -o $@ mk4lua.o $(LOBJS) $(LINK_SPECIAL_FLAGS)
++	$(SHLIB_LD) $(LDFLAGS) -o $@ mk4lua.o $(LOBJS) $(LINK_SPECIAL_FLAGS)
+ 
+ demo: $(srcdir)/../demos/demo.cpp libmk4$(LIBEXT)
+ 	$(CXX) $(CXX_SWITCHES) -o $@$(EXEEXT) \
diff --git a/dev-db/metakit/metadata.xml b/dev-db/metakit/metadata.xml
index d9cd2cad66c2..91f4e72fb544 100644
--- a/dev-db/metakit/metadata.xml
+++ b/dev-db/metakit/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-db/metakit/metakit-2.4.9.7-r1.ebuild b/dev-db/metakit/metakit-2.4.9.7-r1.ebuild
new file mode 100644
index 000000000000..0e5bae5e8d59
--- /dev/null
+++ b/dev-db/metakit/metakit-2.4.9.7-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.7-r1.ebuild,v 1.1 2012/06/21 09:07:52 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+
+inherit eutils flag-o-matic multilib python toolchain-funcs
+
+DESCRIPTION="Embedded database library"
+HOMEPAGE="http://www.equi4.com/metakit/"
+SRC_URI="http://www.equi4.com/pub/mk/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~s390 ~sparc ~x86"
+IUSE="python static tcl"
+
+DEPEND="tcl? ( dev-lang/tcl )"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+pkg_setup() {
+	use python && python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-linking.patch"
+}
+
+src_configure() {
+	local myconf mycxxflags
+	use tcl && myconf+=" --with-tcl=${EPREFIX}/usr/include,${EPREFIX}/usr/$(get_libdir)"
+	use static && myconf+=" --disable-shared"
+	use static || append-cxxflags -fPIC
+
+	CXXFLAGS="${CXXFLAGS} ${mycxxflags}" unix/configure \
+		${myconf} \
+		--host=${CHOST} \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--infodir="${EPREFIX}/usr/share/info" \
+		--mandir="${EPREFIX}/usr/share/man"
+}
+
+src_compile() {
+	emake SHLIB_LD="$(tc-getCXX) -shared -Wl,-soname,libmk4.so.2.4"
+
+	if use python; then
+		python_copy_sources
+
+		building() {
+			emake \
+				SHLIB_LD="$(tc-getCXX) -shared" \
+				pyincludedir="$(python_get_includedir)" \
+				PYTHON_LIB="$(python_get_library)" \
+				python
+		}
+		python_execute_function -s building
+	fi
+}
+
+src_install () {
+	default
+
+	mv "${ED}"//usr/$(get_libdir)/libmk4.so{,.2.4}
+	dosym libmk4.so.2.4 /usr/$(get_libdir)/libmk4.so.2
+	dosym libmk4.so.2.4 /usr/$(get_libdir)/libmk4.so
+
+	if use python; then
+		installation() {
+			dodir "$(python_get_sitedir)" || return 1
+			emake \
+				DESTDIR="${D}" \
+				pylibdir="$(python_get_sitedir)" \
+				install-python
+		}
+		python_execute_function -s installation
+	fi
+
+	dohtml Metakit.html
+	dohtml -a html,gif,png,jpg -r doc/*
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize metakit.py
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup metakit.py
+	fi
+}