fixed build patch, soname, and QA issues, works now on amd64

(Portage version: 2.1.1_pre2-r6)

4 files changed, 69 insertions, 7 deletions

diff --git a/dev-libs/libaio/ChangeLog b/dev-libs/libaio/ChangeLog
index 6170f652eb71..52b9e5bc0043 100644
--- a/dev-libs/libaio/ChangeLog
+++ b/dev-libs/libaio/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libaio
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.25 2006/07/09 02:10:52 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.26 2006/07/10 06:51:25 nerdboy Exp $
+
+  10 Jul 2006; Steve Arnold <nerdboy@gentoo.org>
+  +files/libaio-0.3.106-build.patch, libaio-0.3.106-r1.ebuild:
+  Fixed build patch, soname, and QA issues, works now on amd64.  Note the
+  tests still need a Maekfile patch to work correctly, and I'm not sure
+  about the status of the kernel support (upstream kernel patches stop about
+  a year ago at 2.6.12).  This is used by the ROMIO support in mpich2.
 
   09 Jul 2006; Joshua Kinard <kumba@gentoo.org> libaio-0.3.15-r1.ebuild:
   Marked stable on mips.
diff --git a/dev-libs/libaio/files/libaio-0.3.106-build.patch b/dev-libs/libaio/files/libaio-0.3.106-build.patch
new file mode 100644
index 000000000000..4a8434bb7e70
--- /dev/null
+++ b/dev-libs/libaio/files/libaio-0.3.106-build.patch
@@ -0,0 +1,26 @@
+--- src/Makefile.orig	2006-07-09 19:46:41.000000000 -0700
++++ src/Makefile	2006-07-09 19:51:00.000000000 -0700
+@@ -2,11 +2,10 @@
+ includedir=$(prefix)/include
+ libdir=$(prefix)/lib
+ 
+-ARCH := $(shell uname -m | sed -e s/i.86/i386/)
+-CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
+-SO_CFLAGS=-shared $(CFLAGS)
++CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC
++SO_CFLAGS=-shared $(CFLAGS)
+ L_CFLAGS=$(CFLAGS)
+-LINK_FLAGS=
++LINK_FLAGS=-lgcc -lrt $(LDFLAGS)
+ 
+ soname=libaio.so.1
+ minor=0
+@@ -48,7 +47,7 @@
+ 	ranlib libaio.a
+ 
+ $(libname): $(libaio_sobjs) libaio.map
+-	$(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
++	$(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
diff --git a/dev-libs/libaio/libaio-0.3.106-r1.ebuild b/dev-libs/libaio/libaio-0.3.106-r1.ebuild
index 218979d92b32..6c474eaf9471 100644
--- a/dev-libs/libaio/libaio-0.3.106-r1.ebuild
+++ b/dev-libs/libaio/libaio-0.3.106-r1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.106-r1.ebuild,v 1.5 2006/07/03 01:46:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.106-r1.ebuild,v 1.6 2006/07/10 06:51:25 nerdboy Exp $
 
 inherit eutils multilib
 
 DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/andrea/libaio/"
+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/SRPMS/
 SRC_URI="mirror://gentoo/${P}.tar.gz"
@@ -17,17 +18,34 @@ IUSE=""
 
 DEPEND=""
 
+RESTRICT="test"
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.3.104-build.patch
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_compile() {
+	EBUILD_ARCH=${ARCH}
+	export ARCH=$HOSTTYPE
+	einfo "Using ${ARCH}"
+	make || die "make failed"
+	export ARCH=${EBUILD_ARCH}
+}
+
+src_test() {
+	cd ${S}/harness
+	mkdir testdir
+	make check prefix="${S}/src" libdir="${S}/src"
 }
 
 src_install() {
-	make prefix="${D}/usr" libdir="${D}/usr/$(get_libdir)" install || die
+	make install prefix="${D}usr" libdir="${D}usr/$(get_libdir)" \
+	    root=${D} || die "make install failed"
 	doman man/*
-	dodoc ChangeLog TODO
+	dodoc ChangeLog TODO COPYING
 
 	# remove stuff provided by man-pages now
-	rm "${D}"/usr/share/man/man3/aio_{cancel,error,fsync,read,return,suspend,write}.*
+	rm "${D}"usr/share/man/man3/aio_{cancel,error,fsync,read,return,suspend,write}.*
 }
diff --git a/dev-libs/libaio/metadata.xml b/dev-libs/libaio/metadata.xml
new file mode 100644
index 000000000000..2ef981f35059
--- /dev/null
+++ b/dev-libs/libaio/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>maintainer-wanted@gentoo.org</email>
+  <description>feel free to take over</description>
+</maintainer>
+<longdescription>Library to provide user-level kernel Asynchronous I/O (AIO)
+ support for Linux (needs kernel patches as of 2.6.12)</longdescription>
+</pkgmetadata>