summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorAaron Bauman <bman@gentoo.org>2020-07-03 22:22:37 -0400
committerAaron Bauman <bman@gentoo.org>2020-07-03 22:24:06 -0400
commit17ed872c6334185fdebf3d60b2aa219fc1fe7516 (patch)
tree12e8c60e602df8f5c29d00e701eab0a16ede9847 /dev-db
parentmedia-plugins/kodi-pvr-nextpvr: 3.3.21 version bump (diff)
downloadgentoo-17ed872c6334185fdebf3d60b2aa219fc1fe7516.tar.gz
gentoo-17ed872c6334185fdebf3d60b2aa219fc1fe7516.tar.bz2
gentoo-17ed872c6334185fdebf3d60b2aa219fc1fe7516.zip
*/*: drop last-rited py2 packages
Signed-off-by: Aaron Bauman <bman@gentoo.org>
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/metakit/Manifest1
-rw-r--r--dev-db/metakit/files/metakit-2.4.9.7-linking.patch45
-rw-r--r--dev-db/metakit/files/metakit-2.4.9.7-tcltk86.patch70
-rw-r--r--dev-db/metakit/metadata.xml5
-rw-r--r--dev-db/metakit/metakit-2.4.9.7-r2.ebuild82
5 files changed, 0 insertions, 203 deletions
diff --git a/dev-db/metakit/Manifest b/dev-db/metakit/Manifest
deleted file mode 100644
index 490e378a2695..000000000000
--- a/dev-db/metakit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST metakit-2.4.9.7.tar.gz 868310 BLAKE2B 2c32d17f8f7fcc709c6861834bc08b0dbeb009e73ade98b5103cdc9e58feb4318599ea0253c78e54093763796c16c55b26ca481e6cc883d482af55c3b5534a2f SHA512 94be6ae8ae5f1f24d255a427b0c01eccd2543cd49c5620df7c47f5bf09854ed464a01c52fc8441f7a8e9d5bdc8b966dc77ed34c15cbf9cdfe75a3063572cb8b9
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
deleted file mode 100644
index 55453a2d8e4a..000000000000
--- a/dev-db/metakit/files/metakit-2.4.9.7-linking.patch
+++ /dev/null
@@ -1,45 +0,0 @@
- 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
deleted file mode 100644
index cbf4ce3549f6..000000000000
--- a/dev-db/metakit/files/metakit-2.4.9.7-tcltk86.patch
+++ /dev/null
@@ -1,70 +0,0 @@
- 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
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-db/metakit/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</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
deleted file mode 100644
index 3d8abacaa649..000000000000
--- a/dev-db/metakit/metakit-2.4.9.7-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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/*
-}