Avoid re-generating the ioctlent.h header at build-time; instead patch in a new series of ioctl() (including the alsa ones).

(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)

3 files changed, 16 insertions, 32 deletions

diff --git a/dev-util/strace/ChangeLog b/dev-util/strace/ChangeLog
index a8f577b1d046..1da5b379076a 100644
--- a/dev-util/strace/ChangeLog
+++ b/dev-util/strace/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/strace
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.155 2010/11/04 20:43:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.156 2010/11/17 23:53:15 flameeyes Exp $
+
+*strace-4.5.20-r2 (17 Nov 2010)
+
+  17 Nov 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -strace-4.5.20-r1.ebuild, +strace-4.5.20-r2.ebuild,
+  -files/strace-4.5.20-ioctlent.patch:
+  Avoid re-generating the ioctlent.h header at build-time; instead patch in a
+  new series of ioctl() (including the alsa ones).
 
   04 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> strace-4.5.20.ebuild:
   ppc64 stable wrt #343255
diff --git a/dev-util/strace/files/strace-4.5.20-ioctlent.patch b/dev-util/strace/files/strace-4.5.20-ioctlent.patch
deleted file mode 100644
index 941f83962a20..000000000000
--- a/dev-util/strace/files/strace-4.5.20-ioctlent.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: strace-4.5.20/Makefile.am
-===================================================================
---- strace-4.5.20.orig/Makefile.am
-+++ strace-4.5.20/Makefile.am
-@@ -109,11 +109,7 @@ if LINUX
- IOCTLDIR = /usr/include
- IOCTLASM = asm
- 
--if I386
- ioctlent_h = linux/ioctlent.h
--else
--ioctlent_h = linux/$(ARCH)/ioctlent.h
--endif
- 
- BUILT_SOURCES = $(ioctlent_h)
- 
diff --git a/dev-util/strace/strace-4.5.20-r1.ebuild b/dev-util/strace/strace-4.5.20-r2.ebuild
index d2d185225d43..f9b9afaae63e 100644
--- a/dev-util/strace/strace-4.5.20-r1.ebuild
+++ b/dev-util/strace/strace-4.5.20-r2.ebuild
@@ -1,34 +1,29 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.20-r1.ebuild,v 1.1 2010/10/12 12:34:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.20-r2.ebuild,v 1.1 2010/11/17 23:53:15 flameeyes Exp $
 
 EAPI="2"
 
-inherit flag-o-matic autotools
+inherit flag-o-matic
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
 HOMEPAGE="http://sourceforge.net/projects/strace/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	http://dev.gentoo.org/~flameeyes/patches/${PN}/${P}-ioctls.patch.bz2"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="static aio alsa"
+IUSE="static aio"
 
 # strace only uses the header from libaio
 DEPEND="aio? ( >=dev-libs/libaio-0.3.106 )
-	alsa? ( media-sound/alsa-headers )
 	sys-kernel/linux-headers"
 RDEPEND=""
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-sparc.patch #336939
-	epatch "${FILESDIR}"/${P}-ioctlent.patch
-
-	# Force rebuild of the list
-	rm linux/ioctlent.h || die
-
-	eautoreconf
+	epatch "${WORKDIR}"/${P}-ioctls.patch
 }
 
 src_configure() {
@@ -37,10 +32,7 @@ src_configure() {
 
 	use aio || export ac_cv_header_libaio_h=no
 
-	# Without maintainer mode the list won't be rebuilt
-	econf \
-		--enable-maintainer-mode \
-		|| die
+	econf
 }
 
 src_install() {