EAPI bump. Merge sed script result into patch.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 26 insertions, 22 deletions

diff --git a/dev-libs/libmba/ChangeLog b/dev-libs/libmba/ChangeLog
index f8bf105cf8f1..9f70077082fe 100644
--- a/dev-libs/libmba/ChangeLog
+++ b/dev-libs/libmba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libmba
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmba/ChangeLog,v 1.7 2012/03/18 18:26:14 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmba/ChangeLog,v 1.8 2014/07/18 21:36:23 jer Exp $
+
+  18 Jul 2014; Jeroen Roovers <jer@gentoo.org> libmba-0.9.1-r1.ebuild,
+  files/libmba-0.9.1-qa.patch:
+  EAPI bump. Merge sed script result into patch.
 
   18 Mar 2012; Pacho Ramos <pacho@gentoo.org> -libmba-0.9.1.ebuild,
   metadata.xml:
diff --git a/dev-libs/libmba/files/libmba-0.9.1-qa.patch b/dev-libs/libmba/files/libmba-0.9.1-qa.patch
index 16476dfd1e51..a3edfd527bc6 100644
--- a/dev-libs/libmba/files/libmba-0.9.1-qa.patch
+++ b/dev-libs/libmba/files/libmba-0.9.1-qa.patch
@@ -10,8 +10,8 @@ http://bugs.gentoo.org/show_bug.cgi?id=313673
 
 Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
 
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -1,13 +1,13 @@
  # Makefile for libmba
  # Supported flags: -DVARRAY_INIT_SIZE=N -DUSE_WCHAR
@@ -23,8 +23,9 @@ Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
 -prefix     = /usr/local
 +prefix     = $(DESTDIR)/usr
  includedir = $(prefix)/include
- libdir     = $(prefix)/lib
+-libdir     = $(prefix)/lib
 -mandir     = $(prefix)/man
++libdir     = $(prefix)/$(LIBDIR)
 +mandir     = $(prefix)/share/man
  LIBNAME    = mba
  LIBVERS    = 0.9.1
diff --git a/dev-libs/libmba/libmba-0.9.1-r1.ebuild b/dev-libs/libmba/libmba-0.9.1-r1.ebuild
index 6cb986426cf8..929d67d8b97d 100644
--- a/dev-libs/libmba/libmba-0.9.1-r1.ebuild
+++ b/dev-libs/libmba/libmba-0.9.1-r1.ebuild
@@ -1,37 +1,36 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmba/libmba-0.9.1-r1.ebuild,v 1.3 2011/12/18 19:48:09 phajdan.jr Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmba/libmba-0.9.1-r1.ebuild,v 1.4 2014/07/18 21:36:23 jer Exp $
 
+EAPI=5
 inherit eutils multilib toolchain-funcs
 
-DESCRIPTION="A library of generic C modules."
-HOMEPAGE="http://www.ioplex.com/~miallen/libmba/"
-SRC_URI="http://www.ioplex.com/~miallen/libmba/dl/${P}.tar.gz"
-
+DESCRIPTION="A library of generic C modules"
 LICENSE="MIT"
+HOMEPAGE="http://www.ioplex.com/~miallen/libmba/"
+SRC_URI="${HOMEPAGE}dl/${P}.tar.gz"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="static-libs"
 
-pkg_setup(){
-	use static-libs && export STATIC="1"
-}
-
 src_prepare() {
+	use static-libs && export STATIC="1"
 	epatch "${FILESDIR}"/${P}-qa.patch
+
 	tc-export CC
 	sed -i -e "s:gcc:${CC}:g" mktool.c || die
-	sed -i -e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):" Makefile || die
+}
+
+src_compile() {
+	emake LIBDIR="$(get_libdir)"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 
-	dodoc README.txt docs/*.txt || die
-	dohtml -r docs/*.html docs/www/* docs/ref || die
+	dodoc README.txt docs/*.txt
+	dohtml -r docs/*.html docs/www/* docs/ref
 
 	insinto /usr/share/doc/${PF}/examples
-	doins examples/* || die
+	doins examples/*
 }