diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-db/metakit | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-db/metakit')
-rw-r--r-- | dev-db/metakit/Manifest | 1 | ||||
-rw-r--r-- | dev-db/metakit/files/metakit-2.4.9.7-linking.patch | 45 | ||||
-rw-r--r-- | dev-db/metakit/files/metakit-2.4.9.7-tcltk86.patch | 70 | ||||
-rw-r--r-- | dev-db/metakit/metadata.xml | 7 | ||||
-rw-r--r-- | dev-db/metakit/metakit-2.4.9.7-r2.ebuild | 83 |
5 files changed, 206 insertions, 0 deletions
diff --git a/dev-db/metakit/Manifest b/dev-db/metakit/Manifest new file mode 100644 index 000000000000..3ff4322ec26f --- /dev/null +++ b/dev-db/metakit/Manifest @@ -0,0 +1 @@ +DIST metakit-2.4.9.7.tar.gz 868310 SHA256 d1ba361d2d8517925cff5c23e8602822da9c8c347a75a15c225ec656ff7ca94d SHA512 94be6ae8ae5f1f24d255a427b0c01eccd2543cd49c5620df7c47f5bf09854ed464a01c52fc8441f7a8e9d5bdc8b966dc77ed34c15cbf9cdfe75a3063572cb8b9 WHIRLPOOL 2736564da532bf50982c9a529fcb50cf95c1e27192bba15ac19606eba98a9c97408ca8888f9ddd38b2a07496e1ee020e2fcd3de77142267b27148cae3ed1a5d9 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 <stdio.h> + #include <string.h> + ++#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..1470e032181b --- /dev/null +++ b/dev-db/metakit/metadata.xml @@ -0,0 +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> +</pkgmetadata> 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..5a874187299e --- /dev/null +++ b/dev-db/metakit/metakit-2.4.9.7-r2.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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: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/* +} |