Version bump, fix bug 325355 (install to /lib), add static-libs support

(Portage version: 2.2_rc69/cvs/Linux x86_64)

3 files changed, 103 insertions, 1 deletions

diff --git a/dev-libs/libaio/ChangeLog b/dev-libs/libaio/ChangeLog
index 4f357693295a..5cdfe70347f9 100644
--- a/dev-libs/libaio/ChangeLog
+++ b/dev-libs/libaio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libaio
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.51 2010/08/25 21:41:02 reavertm Exp $
+
+*libaio-0.3.109 (25 Aug 2010)
+
+  25 Aug 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  +libaio-0.3.109.ebuild, +files/libaio-0.3.109-install.patch:
+  Version bump, fix bug 325355 (install to /lib)
 
   06 Apr 2010; Jonathan Callen <abcd@gentoo.org> libaio-0.3.107.ebuild:
   Bump to EAPI=3, add prefix keywords
diff --git a/dev-libs/libaio/files/libaio-0.3.109-install.patch b/dev-libs/libaio/files/libaio-0.3.109-install.patch
new file mode 100644
index 000000000000..3498fee95280
--- /dev/null
+++ b/dev-libs/libaio/files/libaio-0.3.109-install.patch
@@ -0,0 +1,43 @@
+diff -ru ../libaio-0.3.109/Makefile ./Makefile
+--- ../libaio-0.3.109/Makefile	2009-10-09 20:17:02.000000000 +0200
++++ ./Makefile	2010-08-25 23:04:18.963033260 +0200
+@@ -5,9 +5,9 @@
+ CVSTAG = $(NAME)_$(subst .,-,$(VERSION))_$(subst .,-,$(RELEASE))
+ RPMBUILD=$(shell `which rpmbuild >&/dev/null` && echo "rpmbuild" || echo "rpm")
+ 
+-prefix=/usr
++prefix=$(EPREFIX)/usr
+ includedir=$(prefix)/include
+-libdir=$(prefix)/lib
++libdir=$(EPREFIX)/$(LIBDIR)
+ 
+ pkgname := libaio
+ ver := $(shell cat .version)
+diff -ru ../libaio-0.3.109/src/Makefile ./src/Makefile
+--- ../libaio-0.3.109/src/Makefile	2009-10-09 20:17:02.000000000 +0200
++++ ./src/Makefile	2010-08-25 23:05:01.047919131 +0200
+@@ -1,6 +1,4 @@
+-prefix=/usr
+-includedir=$(prefix)/include
+-libdir=$(prefix)/lib
++usrlibdir=$(prefix)/$(LIBDIR)
+ 
+ ARCH := $(shell uname -m | sed -e s/i.86/i386/)
+ CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
+@@ -51,11 +49,11 @@
+ 	$(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
+ 
+ install: $(all_targets)
+-	install -D -m 644 libaio.h $(includedir)/libaio.h
+-	install -D -m 644 libaio.a $(libdir)/libaio.a
+-	install -D -m 755 $(libname) $(libdir)/$(libname)
+-	ln -sf $(libname) $(libdir)/$(soname)
+-	ln -sf $(libname) $(libdir)/libaio.so
++	install -D -m 644 libaio.h $(DESTDIR)$(includedir)/libaio.h
++	install -D -m 644 libaio.a $(DESTDIR)$(usrlibdir)/libaio.a
++	install -D -m 755 $(libname) $(DESTDIR)$(libdir)/$(libname)
++	ln -sf $(libname) $(DESTDIR)$(libdir)/$(soname)
++	ln -sf $(libname) $(DESTDIR)$(libdir)/libaio.so
+ 
+ $(libaio_objs): libaio.h
+ 
diff --git a/dev-libs/libaio/libaio-0.3.109.ebuild b/dev-libs/libaio/libaio-0.3.109.ebuild
new file mode 100644
index 000000000000..b375162a9e47
--- /dev/null
+++ b/dev-libs/libaio/libaio-0.3.109.ebuild
@@ -0,0 +1,53 @@
+# 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.109.ebuild,v 1.1 2010/08/25 21:41:02 reavertm Exp $
+
+EAPI="3"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
+HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/andrea/libaio/ http://lse.sourceforge.net/io/aio.html"
+# Rip out of src rpm that Redhat uses:
+# http://download.fedora.redhat.com/pub/fedora/linux/core/development/source/SRPMS/
+SRC_URI="mirror://kernel/linux/libs/aio/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs"
+
+RESTRICT="test"
+
+src_prepare() {
+	# FIXME epatch "${FILESDIR}"/${PN}-0.3.107-sparc.patch        # not applicable anymore, may need porting
+	# FIXME epatch "${FILESDIR}"/${PN}-0.3.107-generic-arch.patch # not applicable anymore but arm support now upstream
+	epatch "${FILESDIR}"/${PN}-0.3.106-build.patch
+	epatch "${FILESDIR}"/${PN}-0.3.107-ar-ranlib.patch
+	epatch "${FILESDIR}"/${P}-install.patch
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+}
+
+src_test() {
+	cd "${S}"/harness
+	mkdir testdir
+	emake check prefix="${S}/src" libdir="${S}/src"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" LIBDIR=$(get_libdir) || die
+	doman man/*
+	dodoc ChangeLog TODO
+
+	if ! use static-libs; then
+		rm "${ED}"usr/lib*/*.a || die
+	else
+		gen_usr_ldscript libaio.so
+	fi
+
+	# remove stuff provided by man-pages now
+	rm "${ED}"usr/share/man/man3/aio_{cancel,error,fsync,read,return,suspend,write}.*
+}