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

Package-Manager: portage-2.2_rc69/cvs/Linux x86_64

4 files changed, 107 insertions, 12 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/Manifest b/dev-libs/libaio/Manifest
index 3581ce3904a8..21b176ddba46 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libaio-0.3.106-build.patch 897 RMD160 59f63ebec2b753b114dd0a2e600faa55346b53f4 SHA1 b43f7c37de4918f14ea944aaee415fb710a443b9 SHA256 bea61cfeff24fb2fd37dd4dffc3dbe4ce98f32ddccb20f6462cf62ba16eaeee3
 AUX libaio-0.3.107-ar-ranlib.patch 398 RMD160 f947850b92889f03c97bfc1d6704bf145be47ad5 SHA1 e7ef3531f21cef45a0d44aab936d8b3da97e8f37 SHA256 08f00e00cef21df01ec7327b1789083ea0d93b86b211a7164f1f1926ecde301f
 AUX libaio-0.3.107-generic-arch.patch 3638 RMD160 a38bd582d9970f120075d37d5014561f0c278639 SHA1 d753d7c344a82467f4e97fe9f54dd22037edbe89 SHA256 90e51ca04c7c6e4a8773efa05f91bf372a010a55b670d6353b849709905f18f8
 AUX libaio-0.3.107-install-to-slash.patch 1072 RMD160 2dc3e0b19a2a3e925ed02c6ff70cc5a4544a8dbd SHA1 f194309d2e25bc2254cbc6a4e1f5a7ce1b42876a SHA256 9405774a83dec8862002b185837495e96fa1c6753de18a8c0ea732cef525588c
 AUX libaio-0.3.107-sparc.patch 5331 RMD160 f265fe93f6c1fee7201a168b21cd3dfb00a33e1d SHA1 5af283341c55f7907b91266703417a1cfa3db296 SHA256 38cc2e213054332ba888cf5e3844e762374dd63f1537fd86ceebccfd516c1c45
+AUX libaio-0.3.109-install.patch 1626 RMD160 63b505cb3c17ee18750ef20d8fd6ec5a98f6725f SHA1 b1f52f68d802c5b4bc5f2cc902782f9664c9ed9a SHA256 e676d320201bf5d42b22b9388ad6c38bc57078205a50b92b54dbfe629801d090
 DIST libaio-0.3.107.tar.gz 51540 RMD160 b1b09ec4c277a4322917493cfe6a7e532eb66032 SHA1 769a541744448a6dfc3fd3a3e335afe7aa77ca8e SHA256 e6ad9246d7cd615d90fb3d231eec94111a36a85e9ffc759ac6bdab1a03995f27
+DIST libaio-0.3.109.tar.bz2 43579 RMD160 fed1f4ddb9cb9d66c40f5909a6d7c2400dcebda0 SHA1 b772e567e7089bb3ca405b16370f8b1a4997c0b3 SHA256 b5cefce0a3cb49f8dca4d00e9480c0d9b45b75863bd44764156e322ee214e794
 EBUILD libaio-0.3.107.ebuild 1511 RMD160 54bffb7552c3d806075acbbebc0481816b232cd7 SHA1 27ce5a8c02185860744cc3e7cd35af85c87fac57 SHA256 6b2df4e5454e04f71a630cb24c948031a01914a13eefa4ae6b476d3251a6efdb
-MISC ChangeLog 6616 RMD160 025f7fbb59a32699e6a578755db1b242c9777f8a SHA1 c64ebd7c509d1aac1c4d7609d46ed20d0fb9b6b5 SHA256 e4d6c07abb4b5ff8358c7f2ad9e4f784fe65499a42451d5a14fc22b2341d4a19
+EBUILD libaio-0.3.109.ebuild 1664 RMD160 b49c550c44eada4bd93c73c0578493a3d2c38dda SHA1 52a3b99dd0eaaaeba8f9fef236fbbe8c08cf2f48 SHA256 709ad4fa6b62696f02fe76223628c3f280167cb115e661d73acaf656f242d427
+MISC ChangeLog 6818 RMD160 52ae6ce20aa7c8fc2f3dcebff533c85cd6aa788a SHA1 a054722c3c6f7f9e492250d142f7c6e4babef59d SHA256 1d9ab20375472300c6ca38aa516d29fdbfc8d9cec62ffb03ea112fe1129269e8
 MISC metadata.xml 435 RMD160 902bc4ecb946fdd64e3d1cc1ff3b70cfe14ca50c SHA1 5e182a069552e7d74bb2e7aa4fe7b024b1325c88 SHA256 10b3565f0a219e28194ec8ad33b306203310b9a05e56f4e5e20db547ac5a257d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAku6/KQACgkQOypDUo0oQOr9swCfU2QvzCNj3iY9+0CJBC2WHAAV
-wUkAn1viAjqDBvZRssIbhPMvKerYxqJu
-=i9KP
------END PGP SIGNATURE-----
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}.*
+}