Bump to EAPI=3, add prefix keywords

Package-Manager: portage--svn/cvs/Linux i686

diff --git a/dev-libs/beecrypt/ChangeLog b/dev-libs/beecrypt/ChangeLog
index 54630915f8ff63de808ee99bd0bf14905180c744..cdc8bdeff438abf64a78e480e435faf316fb131e 100644 (file)
--- a/dev-libs/beecrypt/ChangeLog
+++ b/dev-libs/beecrypt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/beecrypt
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.65 2009/11/15 12:23:28 swegener Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.66 2010/04/06 09:17:57 abcd Exp $
+
+  06 Apr 2010; Jonathan Callen <abcd@gentoo.org> beecrypt-4.2.1.ebuild:
+  Bump to EAPI=3, add prefix keywords
 
 *beecrypt-4.2.1 (15 Nov 2009)
 

diff --git a/dev-libs/beecrypt/beecrypt-4.2.1.ebuild b/dev-libs/beecrypt/beecrypt-4.2.1.ebuild
index 6d24123d9a6c345eb541179ccd588cd5dc9b4ce6..de3acfb3e1997b06b6d3296e39c9e835a4e22d0a 100644 (file)
--- a/dev-libs/beecrypt/beecrypt-4.2.1.ebuild
+++ b/dev-libs/beecrypt/beecrypt-4.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1.ebuild,v 1.1 2009/11/15 12:23:28 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1.ebuild,v 1.2 2010/04/06 09:17:57 abcd Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit eutils multilib autotools java-pkg-opt-2
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/beecrypt/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="java nocxx python threads doc"
 
 COMMONDEPEND="python? ( >=dev-lang/python-2.2 )
@@ -40,10 +40,9 @@ src_configure() {
        econf \
                --disable-expert-mode \
                $(use_enable threads) \
-               $(use_with python python /usr/bin/python) \
+               $(use_with python python "${EPREFIX}"/usr/bin/python) \
                $(use threads && use_with !nocxx cplusplus || echo --without-cplusplus) \
-               $(use_with java) \
-               || die
+               $(use_with java)
 }
 
 src_compile() {
@@ -57,13 +56,15 @@ src_compile() {
 }
 
 src_test() {
+       export BEECRYPT_CONF_FILE="${T}/beecrypt-test.conf"
+       echo "provider.1=${S}/c++/provider/.libs/base.so" > "${BEECRYPT_CONF_FILE}"
        make check || die "self test failed"
        make bench || die "self benchmark test failed"
 }
 
 src_install() {
        emake DESTDIR="${D}" install || die "make install failed"
-       rm -f "${D}"/usr/$(get_libdir)/python*/site-packages/_bc.*a
+       rm -f "${ED}"/usr/$(get_libdir)/python*/site-packages/_bc.*a
 
        dodoc BUGS README BENCHMARKS NEWS || die "dodoc failed"
        if use doc

diff --git a/dev-libs/libaio/ChangeLog b/dev-libs/libaio/ChangeLog
index 197ac11e7fa5222fbfe9e240c7e46f95d416cd35..4f357693295a9f4a57c92dc8d1b554ac60befad6 100644 (file)
--- a/dev-libs/libaio/ChangeLog
+++ b/dev-libs/libaio/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/libaio
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.49 2009/09/12 02:14:07 vostorga Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.50 2010/04/06 09:19:27 abcd Exp $
+
+  06 Apr 2010; Jonathan Callen <abcd@gentoo.org> libaio-0.3.107.ebuild:
+  Bump to EAPI=3, add prefix keywords
 
   12 Sep 2009; Víctor Ostorga <vostorga@gentoo.org>
   -files/libaio-0.3.15-2.5-2-Makefile.patch,

diff --git a/dev-libs/libaio/libaio-0.3.107.ebuild b/dev-libs/libaio/libaio-0.3.107.ebuild
index 207a2494ec168454a7a1f53639dd15f6993a6710..574c547464352e5cbfcc30ffdb323410840f5cf8 100644 (file)
--- a/dev-libs/libaio/libaio-0.3.107.ebuild
+++ b/dev-libs/libaio/libaio-0.3.107.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.107.ebuild,v 1.12 2009/05/06 17:03:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.107.ebuild,v 1.13 2010/04/06 09:19:27 abcd Exp $
+
+EAPI="3"
 
 inherit eutils multilib toolchain-funcs
 
@@ -14,22 +16,21 @@ LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
+
 RESTRICT="test"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+src_prepare() {
        epatch "${FILESDIR}"/${P}-sparc.patch
        epatch "${FILESDIR}"/${P}-install-to-slash.patch
        epatch "${FILESDIR}"/${PN}-0.3.107-ar-ranlib.patch
        epatch "${FILESDIR}"/${PN}-0.3.106-build.patch
        epatch "${FILESDIR}"/${PN}-0.3.107-generic-arch.patch
        sed -i "/^libdir=/s:lib$:$(get_libdir):" src/Makefile Makefile
+       sed -i "/^prefix=/s:/usr:${EPREFIX}/usr:" src/Makefile Makefile
 }
 
-src_compile() {
+src_configure() {
        tc-export AR CC RANLIB
-       emake || die "emake failed"
 }
 
 src_test() {
@@ -44,5 +45,5 @@ src_install() {
        dodoc ChangeLog TODO
 
        # remove stuff provided by man-pages now
-       rm "${D}"usr/share/man/man3/aio_{cancel,error,fsync,read,return,suspend,write}.*
+       rm "${ED}"usr/share/man/man3/aio_{cancel,error,fsync,read,return,suspend,write}.*
 }