3 files changed, 5 insertions, 130 deletions
diff --git a/dev-db/metakit/ChangeLog b/dev-db/metakit/ChangeLog
index 41015ab6af43..ada3d91cc1c2 100644
--- a/dev-db/metakit/ChangeLog
+++ b/dev-db/metakit/ChangeLog
@@ -1,6 +1,10 @@
 # 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.61 2012/09/23 08:38:53 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/ChangeLog,v 1.62 2012/09/26 13:02:23 kensington Exp $
+
+  26 Sep 2012; Michael Palimaka <kensington@gentoo.org>
+  -files/metakit-2.4.9.7-LDFLAGS.patch, -metakit-2.4.9.7.ebuild:
+  Remove old.
 
   23 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   metakit-2.4.9.7-r1.ebuild:
diff --git a/dev-db/metakit/files/metakit-2.4.9.7-LDFLAGS.patch b/dev-db/metakit/files/metakit-2.4.9.7-LDFLAGS.patch
deleted file mode 100644
index 210e42939717..000000000000
--- a/dev-db/metakit/files/metakit-2.4.9.7-LDFLAGS.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- unix/Makefile.in
-+++ unix/Makefile.in
-@@ -134,24 +134,24 @@
- 	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) $(LOBJS) $(LINK_SPECIAL_FLAGS)
- 
- 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/metakit-2.4.9.7.ebuild b/dev-db/metakit/metakit-2.4.9.7.ebuild
deleted file mode 100644
index 66a25d3acce7..000000000000
--- a/dev-db/metakit/metakit-2.4.9.7.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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.ebuild,v 1.15 2012/09/09 15:13:33 armin76 Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit eutils 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 ppc x86"
-IUSE="python static tcl"
-
-DEPEND="tcl? ( >=dev-lang/tcl-8.3.3-r2 )"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-pkg_setup() {
-	if use python; then
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-LDFLAGS.patch"
-}
-
-src_configure() {
-	local myconf mycxxflags
-	use tcl && myconf+=" --with-tcl=/usr/include,/usr/$(get_libdir)"
-	use static && myconf+=" --disable-shared"
-	use static || mycxxflags="-fPIC"
-
-	sed -i -e "s:^\(CXXFLAGS = \).*:\1${CXXFLAGS} ${mycxxflags} -I\$(srcdir)/../include:" unix/Makefile.in || die
-
-	CXXFLAGS="${CXXFLAGS} ${mycxxflags}" unix/configure \
-		${myconf} \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man
-}
-
-src_compile() {
-	emake SHLIB_LD="$(tc-getCXX) -shared"
-
-	if use python; then
-		python_copy_sources
-
-		building() {
-			emake \
-				SHLIB_LD="$(tc-getCXX) -shared" \
-				pyincludedir="$(python_get_includedir)" \
-				python
-		}
-		python_execute_function -s building
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-
-	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
-
-	dodoc CHANGES README
-	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
-}