Clean up ebuild by restoring patches and drop aio_init man page #341953 by Alec M.

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

6 files changed, 245 insertions, 32 deletions

diff --git a/dev-libs/libaio/ChangeLog b/dev-libs/libaio/ChangeLog
index 5cdfe70347f9..573e9458981a 100644
--- a/dev-libs/libaio/ChangeLog
+++ b/dev-libs/libaio/ChangeLog
@@ -1,6 +1,15 @@
 # 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.51 2010/08/25 21:41:02 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.52 2010/10/21 23:56:38 vapier Exp $
+
+*libaio-0.3.109-r1 (21 Oct 2010)
+
+  21 Oct 2010; Mike Frysinger <vapier@gentoo.org> +libaio-0.3.109-r1.ebuild,
+  +files/libaio-0.3.109-generic-arch.patch,
+  files/libaio-0.3.109-install.patch,
+  +files/libaio-0.3.109-unify-bits-endian.patch:
+  Clean up ebuild by restoring patches and drop aio_init man page #341953 by
+  Alec M.
 
 *libaio-0.3.109 (25 Aug 2010)
 
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index 5d6c12125201..8d3210917e5f 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -1,12 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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
+AUX libaio-0.3.109-generic-arch.patch 2047 RMD160 5a89b6864672a1cefecd4ba2408dccf6f394ac19 SHA1 4329c5276b416f1575080117e913d4e7eb27af49 SHA256 f1bd745d3e6fe42f8a0ab811a4925b9bbdb827d338cf1cf1cf44583951f5abda
+AUX libaio-0.3.109-install.patch 1506 RMD160 0cc96314ee891d24161ea604239c202723ea61d8 SHA1 e3ad797525ce251e2b8dcec8fba1aa6fa1b39e9a SHA256 6d4b429bd3f29bf3748256943ee1a7cbb4cb6d9b3af63b2a9ee0be913783e34e
+AUX libaio-0.3.109-unify-bits-endian.patch 2610 RMD160 d22a312b8bec3faf39077e3145f6a89647188be7 SHA1 a275af96cfaaab2723ed0a187cc39a21db696ca3 SHA256 53c10fda429b47fc2fbbbf3751285a39523b8f8bdae9366294569055bd088f92
 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
-EBUILD libaio-0.3.109.ebuild 1541 RMD160 a909abad827e5ff1381f69adcb6535e4e1a0d025 SHA1 cee163da1290b91b7117b787cb4a77f10122f797 SHA256 1e0def29ce6932792cab3bd4af75c19255189c3c3338ad198dd33e92928d1efb
-MISC ChangeLog 6818 RMD160 52ae6ce20aa7c8fc2f3dcebff533c85cd6aa788a SHA1 a054722c3c6f7f9e492250d142f7c6e4babef59d SHA256 1d9ab20375472300c6ca38aa516d29fdbfc8d9cec62ffb03ea112fe1129269e8
+EBUILD libaio-0.3.109-r1.ebuild 1596 RMD160 f524720377ead44e1bfcf6481fc83bcb88de05fd SHA1 da6a03dc53e74815cd1c7f963d08f9fbfc762cc9 SHA256 dc8b6582152eee085c575cb7d4a8c69a680be9cf1c59c0ebef70bc94273af027
+MISC ChangeLog 7146 RMD160 85d0397a3afa4a4a890cb05b5254e428e9ebf85c SHA1 9c1eff92e944af487871d4fe839cac1cdc0eecc4 SHA256 811f31153f24473cab4b5e42a797dab5f56ac9af8adfc94ce4a548beafd794f3
 MISC metadata.xml 435 RMD160 902bc4ecb946fdd64e3d1cc1ff3b70cfe14ca50c SHA1 5e182a069552e7d74bb2e7aa4fe7b024b1325c88 SHA256 10b3565f0a219e28194ec8ad33b306203310b9a05e56f4e5e20db547ac5a257d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAkzA0x4ACgkQTwhj9JtAlp4GJAEArlSSijFlnSCovZ9Ktp4gf8sq
+EwyAqK0kV5hxzHp/ll8BALypGun5BXZozQ0vRVAcGXihsA0Tp/sKhEMtcjbqWAQE
+=3CYp
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libaio/files/libaio-0.3.109-generic-arch.patch b/dev-libs/libaio/files/libaio-0.3.109-generic-arch.patch
new file mode 100644
index 000000000000..fea3aeeee420
--- /dev/null
+++ b/dev-libs/libaio/files/libaio-0.3.109-generic-arch.patch
@@ -0,0 +1,62 @@
+From 5e96c73d5dfbdea8d0be82b7f3fc8d6735e5dfa7 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 17 Jan 2010 17:07:48 -0500
+Subject: [PATCH] add a generic syscall() fallback
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ src/syscall-generic.h |   29 +++++++++++++++++++++++++++++
+ src/syscall.h         |    3 ++-
+ 2 files changed, 31 insertions(+), 1 deletions(-)
+ create mode 100644 src/syscall-generic.h
+
+diff --git a/src/syscall-generic.h b/src/syscall-generic.h
+new file mode 100644
+index 0000000..24d7c7c
+--- /dev/null
++++ b/src/syscall-generic.h
+@@ -0,0 +1,29 @@
++#include <errno.h>
++#include <unistd.h>
++#include <sys/syscall.h>
++
++#define _body_io_syscall(sname, args...) \
++{ \
++	int ret = syscall(__NR_##sname, ## args); \
++	return ret < 0 ? -errno : ret; \
++}
++
++#define io_syscall1(type,fname,sname,type1,arg1) \
++type fname(type1 arg1) \
++_body_io_syscall(sname, (long)arg1)
++
++#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \
++type fname(type1 arg1,type2 arg2) \
++_body_io_syscall(sname, (long)arg1, (long)arg2)
++
++#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \
++type fname(type1 arg1,type2 arg2,type3 arg3) \
++_body_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3)
++
++#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
++type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
++_body_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3, (long)arg4)
++
++#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, type5,arg5) \
++type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
++_body_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3, (long)arg4, (long)arg5)
+diff --git a/src/syscall.h b/src/syscall.h
+index 78becfe..d954af0 100644
+--- a/src/syscall.h
++++ b/src/syscall.h
+@@ -25,5 +25,6 @@
+ #elif defined(__arm__)
+ #include "syscall-arm.h"
+ #else
+-#error "add syscall-arch.h"
++#warning "using generic syscall method"
++#include "syscall-generic.h"
+ #endif
+-- 
+1.7.3.1
+
diff --git a/dev-libs/libaio/files/libaio-0.3.109-install.patch b/dev-libs/libaio/files/libaio-0.3.109-install.patch
index 3498fee95280..9c049fcbf5cd 100644
--- a/dev-libs/libaio/files/libaio-0.3.109-install.patch
+++ b/dev-libs/libaio/files/libaio-0.3.109-install.patch
@@ -1,31 +1,30 @@
-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
+From 2e34caef82a2367a85de4f06daf5e5a92f61e845 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 17 Jan 2010 17:10:14 -0500
+Subject: [PATCH] fix up install paths
+
+This is similar to the Fedora patch, but this uses more common conventions
+like "DESTDIR" instead of "destdir".
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ src/Makefile |   11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 687c7be..ee431a1 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,6 +1,7 @@
+ prefix=/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)
+ libdir=$(prefix)/lib
++usrlibdir=$(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)
+ CFLAGS ?= -g -fomit-frame-pointer -O2
+ CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC
+@@ -53,11 +54,11 @@ $(libname): $(libaio_sobjs) libaio.map
+ 	$(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
@@ -36,8 +35,11 @@ diff -ru ../libaio-0.3.109/src/Makefile ./src/Makefile
 +	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
++	ln -sf $(libname) $(DESTDIR)$(usrlibdir)/$(soname)
++	ln -sf $(libname) $(DESTDIR)$(usrlibdir)/libaio.so
  
  $(libaio_objs): libaio.h
  
+-- 
+1.7.3.1
+
diff --git a/dev-libs/libaio/files/libaio-0.3.109-unify-bits-endian.patch b/dev-libs/libaio/files/libaio-0.3.109-unify-bits-endian.patch
new file mode 100644
index 000000000000..1a4e6ef12303
--- /dev/null
+++ b/dev-libs/libaio/files/libaio-0.3.109-unify-bits-endian.patch
@@ -0,0 +1,73 @@
+From be673c7afd7a86b89fbe2e09c758f2de3482d19b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 17 Jan 2010 17:07:24 -0500
+Subject: [PATCH] unify LE/BE 32/64bit logic and add more arches
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ src/libaio.h |   36 +++++++++++++++---------------------
+ 1 files changed, 15 insertions(+), 21 deletions(-)
+
+diff --git a/src/libaio.h b/src/libaio.h
+index ffe8259..4a6c9fb 100644
+--- a/src/libaio.h
++++ b/src/libaio.h
+@@ -49,40 +49,34 @@ typedef enum io_iocb_cmd {
+ 	IO_CMD_PWRITEV = 8,
+ } io_iocb_cmd_t;
+ 
+-#if defined(__i386__) /* little endian, 32 bits */
++/* little endian, 32 bits */
++#if defined(__i386__) || defined(__sh__) || defined(__bfin__) || \
++    defined(__ARMEL__) || defined(__MIPSEL__) || defined(__cris__)
+ #define PADDED(x, y)	x; unsigned y
+ #define PADDEDptr(x, y)	x; unsigned y
+ #define PADDEDul(x, y)	unsigned long x; unsigned y
++
++/* little endian, 64 bits */
+ #elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__)
+ #define PADDED(x, y)	x, y
+ #define PADDEDptr(x, y)	x
+ #define PADDEDul(x, y)	unsigned long x
+-#elif defined(__powerpc64__) /* big endian, 64 bits */
+-#define PADDED(x, y)	unsigned y; x
+-#define PADDEDptr(x,y)	x
+-#define PADDEDul(x, y)	unsigned long x
+-#elif defined(__PPC__)  /* big endian, 32 bits */
+-#define PADDED(x, y)	unsigned y; x
+-#define PADDEDptr(x, y)	unsigned y; x
+-#define PADDEDul(x, y)	unsigned y; unsigned long x
+-#elif defined(__s390x__) /* big endian, 64 bits */
++
++/* big endian, 64 bits */
++#elif defined(__powerpc64__) || defined(__s390x__) || \
++      (defined(__sparc__) && defined(__arch64__))
+ #define PADDED(x, y)	unsigned y; x
+ #define PADDEDptr(x,y)	x
+ #define PADDEDul(x, y)	unsigned long x
+-#elif defined(__s390__) /* big endian, 32 bits */
+-#define PADDED(x, y)	unsigned y; x
+-#define PADDEDptr(x, y) unsigned y; x
+-#define PADDEDul(x, y)	unsigned y; unsigned long x
+-#elif defined(__arm__)
+-#  if defined (__ARMEB__) /* big endian, 32 bits */
++
++/* big endian, 32 bits */
++#elif defined(__PPC__) || defined(__s390__) || defined(__ARMEB__) || \
++      defined(__MIPSEB__) || defined(__sparc__) || defined(__m68k__) || \
++      defined(__hppa__) || defined(__frv__) || defined(__avr32__)
+ #define PADDED(x, y)	unsigned y; x
+ #define PADDEDptr(x, y)	unsigned y; x
+ #define PADDEDul(x, y)	unsigned y; unsigned long x
+-#  else                   /* little endian, 32 bits */
+-#define PADDED(x, y)	x; unsigned y
+-#define PADDEDptr(x, y)	x; unsigned y
+-#define PADDEDul(x, y)	unsigned long x; unsigned y
+-#  endif
++
+ #else
+ #error	endian?
+ #endif
+-- 
+1.7.3.1
+
diff --git a/dev-libs/libaio/libaio-0.3.109-r1.ebuild b/dev-libs/libaio/libaio-0.3.109-r1.ebuild
new file mode 100644
index 000000000000..78a9c0da5345
--- /dev/null
+++ b/dev-libs/libaio/libaio-0.3.109-r1.ebuild
@@ -0,0 +1,55 @@
+# 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-r1.ebuild,v 1.1 2010/10/21 23:56:38 vapier 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"
+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() {
+	epatch "${FILESDIR}"/${PN}-0.3.109-unify-bits-endian.patch
+	epatch "${FILESDIR}"/${PN}-0.3.109-generic-arch.patch
+	epatch "${FILESDIR}"/${PN}-0.3.106-build.patch
+	epatch "${FILESDIR}"/${PN}-0.3.107-ar-ranlib.patch
+	epatch "${FILESDIR}"/${PN}-0.3.109-install.patch
+	sed -i \
+		-e "/^libdir=/s:lib$:$(get_libdir):" \
+		-e "/^prefix=/s:/usr:${EPREFIX}/usr:" \
+		src/Makefile Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+}
+
+src_test() {
+	cd "${S}"/harness
+	mkdir testdir
+	emake check prefix="${S}/src" libdir="${S}/src" || die
+}
+
+src_install() {
+	emake install DESTDIR="${ED}" || die
+	doman man/*
+	dodoc ChangeLog TODO
+
+	# move crap to / for multipath-tools #325355
+	gen_usr_ldscript -a aio
+	if ! use static-libs ; then
+		rm "${ED}"usr/lib*/*.a || die
+	fi
+
+	# remove stuff provided by man-pages now
+	rm "${ED}"usr/share/man/man3/aio_{cancel,error,fsync,init,read,return,suspend,write}.*
+}