From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-db/metakit/Manifest | 5 ++ dev-db/metakit/files/metakit-2.4.9.7-linking.patch | 45 ++++++++++++ dev-db/metakit/files/metakit-2.4.9.7-tcltk86.patch | 70 ++++++++++++++++++ dev-db/metakit/metadata.xml | 5 ++ dev-db/metakit/metakit-2.4.9.7-r2.ebuild | 82 ++++++++++++++++++++++ 5 files changed, 207 insertions(+) create mode 100644 dev-db/metakit/Manifest create mode 100644 dev-db/metakit/files/metakit-2.4.9.7-linking.patch create mode 100644 dev-db/metakit/files/metakit-2.4.9.7-tcltk86.patch create mode 100644 dev-db/metakit/metadata.xml create mode 100644 dev-db/metakit/metakit-2.4.9.7-r2.ebuild (limited to 'dev-db/metakit') diff --git a/dev-db/metakit/Manifest b/dev-db/metakit/Manifest new file mode 100644 index 000000000000..49ea87413af7 --- /dev/null +++ b/dev-db/metakit/Manifest @@ -0,0 +1,5 @@ +AUX metakit-2.4.9.7-linking.patch 1802 BLAKE2B f1fce55fd9a8ea551752e290a86539c4f585ac3481965909428913b8a487adde302aa6b2c891516a4fff5dc27a1320eb25f1dca226133ed7eefd39f69bc33d23 SHA512 911675e8ed060ba662df4bed55a9357bcbebaecb5bf4abe37218f8030aa057c36ed01a851c6d266d8d8fdb94a81ee78d547d86b99f96f8e81809dc4d94209f37 +AUX metakit-2.4.9.7-tcltk86.patch 2449 BLAKE2B 69415f4525e47952fba3f22e10c502e56a550e549c88ce50d989bb6fdcc8f9bc5116960b33b6153d58ac3a87d484fe200f970eac9ca148f975552b5b22c691c3 SHA512 1d17157ea8e384bb9094ab937b1ac6854c5a140feb574fa53adf6fcc0dab4060a0f6da9008509f3d924bc1e0e84d6663778605ca506fdec99af39610f1f509b7 +DIST metakit-2.4.9.7.tar.gz 868310 BLAKE2B 2c32d17f8f7fcc709c6861834bc08b0dbeb009e73ade98b5103cdc9e58feb4318599ea0253c78e54093763796c16c55b26ca481e6cc883d482af55c3b5534a2f SHA512 94be6ae8ae5f1f24d255a427b0c01eccd2543cd49c5620df7c47f5bf09854ed464a01c52fc8441f7a8e9d5bdc8b966dc77ed34c15cbf9cdfe75a3063572cb8b9 +EBUILD metakit-2.4.9.7-r2.ebuild 1838 BLAKE2B f94ee1d7bdf5918b63abb2e69fa758c63bf01d6694d3945c78a76277b6f115a2e7ce0d0e21ecf046c932b3e6005b69673e088f0c5b93ac1159ba6ded2b0b991c SHA512 eb8b3e0e8305e44c751d46c468bb6719a89f8b5e8b206a80c61c3461437c6b65916167c31d031aaa30cb6cfa9913999dc5b413ca5bc2b069a15022080439ae91 +MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 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/files/metakit-2.4.9.7-tcltk86.patch b/dev-db/metakit/files/metakit-2.4.9.7-tcltk86.patch new file mode 100644 index 000000000000..cbf4ce3549f6 --- /dev/null +++ b/dev-db/metakit/files/metakit-2.4.9.7-tcltk86.patch @@ -0,0 +1,70 @@ + tcl/mk4tcl.cpp | 10 +++++++--- + tcl/mk4too.cpp | 6 +++++- + 2 files changed, 12 insertions(+), 4 deletions(-) + +diff --git a/tcl/mk4tcl.cpp b/tcl/mk4tcl.cpp +index 049bf8e..8d2249e 100755 +--- a/tcl/mk4tcl.cpp ++++ b/tcl/mk4tcl.cpp +@@ -28,6 +28,10 @@ + #define MyInitStubs(x) 1 + #endif + ++#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 86 ++#define Tcl_GetErrorLine(interp) (interp)->errorLine ++#endif ++ + // definition of valid property name - alpha numerics, underscore, percent, + // or any extended utf-8 character + #define ISNAME(c) (isalnum((c)) || (c) == '_' || (c) == '%' || (c) & 0x80) +@@ -979,7 +983,7 @@ const c4_Property &AsProperty(Tcl_Obj *objPtr, const c4_View &view_) { + void *tag = (&view_[0])._seq; // horrific hack to get at c4_Sequence pointer + if (objPtr->typePtr != &mkPropertyType || objPtr + ->internalRep.twoPtrValue.ptr1 != tag) { +- Tcl_ObjType *oldTypePtr = objPtr->typePtr; ++ CONST86 Tcl_ObjType *oldTypePtr = objPtr->typePtr; + + char type = 'S'; + +@@ -1083,7 +1087,7 @@ int SetCursorFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr) { + } + + if (objPtr->typePtr != &mkCursorType) { +- Tcl_ObjType *oldTypePtr = objPtr->typePtr; ++ CONST86 Tcl_ObjType *oldTypePtr = objPtr->typePtr; + + const char *string = Tcl_GetStringFromObj(objPtr, 0); + +@@ -2156,7 +2160,7 @@ int MkTcl::LoopCmd() { + _error = TCL_OK; + else if (_error == TCL_ERROR) { + char msg[100]; +- sprintf(msg, "\n (\"mk::loop\" body line %d)", interp->errorLine); ++ sprintf(msg, "\n (\"mk::loop\" body line %d)", Tcl_GetErrorLine(interp)); + Tcl_AddObjErrorInfo(interp, msg, - 1); + } + break; +diff --git a/tcl/mk4too.cpp b/tcl/mk4too.cpp +index 7c845c0..ffcbc4e 100644 +--- a/tcl/mk4too.cpp ++++ b/tcl/mk4too.cpp +@@ -7,6 +7,10 @@ + #include + #include + ++#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 86 ++#define Tcl_GetErrorLine(interp) (interp)->errorLine ++#endif ++ + /////////////////////////////////////////////////////////////////////////////// + // Defined in this file: + +@@ -612,7 +616,7 @@ int MkView::LoopCmd() { + _error = TCL_OK; + else if (_error == TCL_ERROR) { + char msg[100]; +- sprintf(msg, "\n (\"mk::loop\" body line %d)", interp->errorLine); ++ sprintf(msg, "\n (\"mk::loop\" body line %d)", Tcl_GetErrorLine(interp)); + Tcl_AddObjErrorInfo(interp, msg, - 1); + } + break; diff --git a/dev-db/metakit/metadata.xml b/dev-db/metakit/metadata.xml new file mode 100644 index 000000000000..6f49eba8f496 --- /dev/null +++ b/dev-db/metakit/metadata.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/dev-db/metakit/metakit-2.4.9.7-r2.ebuild b/dev-db/metakit/metakit-2.4.9.7-r2.ebuild new file mode 100644 index 000000000000..6f734ed0c15c --- /dev/null +++ b/dev-db/metakit/metakit-2.4.9.7-r2.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +inherit eutils flag-o-matic multilib python-single-r1 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 ppc x86" +IUSE="python static tcl" + +DEPEND=" + python? ( ${PYTHON_DEPS} ) + tcl? ( >=dev-lang/tcl-8.6:0= )" +RDEPEND="${DEPEND}" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RESTRICT="test" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-linking.patch \ + "${FILESDIR}"/${P}-tcltk86.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 + emake \ + SHLIB_LD="$(tc-getCXX) -shared" \ + pyincludedir="$(python_get_includedir)" \ + PYTHON_LIB="-l${EPYTHON}" \ + python + 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 + mkdir -p "${D%/}$(python_get_sitedir)" || die + emake \ + DESTDIR="${D}" \ + pylibdir="$(python_get_sitedir)" \ + install-python + fi + + dohtml Metakit.html + dohtml -a html,gif,png,jpg -r doc/* +} -- cgit v1.2.3