New revision, add SG_IO patches for 2.6 kernel mentioned in bug #118189

(Portage version: 2.1_pre3-r1)

4 files changed, 79 insertions, 18 deletions

diff --git a/media-sound/cdparanoia/ChangeLog b/media-sound/cdparanoia/ChangeLog
index 9d2e17004242..ba7c6cd8f9df 100644
--- a/media-sound/cdparanoia/ChangeLog
+++ b/media-sound/cdparanoia/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/cdparanoia
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.25 2005/07/02 00:26:57 hardave Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.26 2006/01/27 18:30:33 chutzpah Exp $
+
+*cdparanoia-3.9.8-r3 (27 Jan 2006)
+
+  27 Jan 2006; Patrick McLean <chutzpah@gentoo.org>
+  +cdparanoia-3.9.8-r3.ebuild:
+  New revision. When running a 2.6 kernel, add patches written by Red Hat to
+  use the new SG_IO system rather than the old IO system. See bug #118189
+  for more info.
 
   02 Jul 2005; Hardave Riar <hardave@gentoo.org> cdparanoia-3.9.8-r2.ebuild:
   Stable on mips
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index a2b5c2b604a5..bed0ffea993d 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 ccbb18ce1d57ee869b43835da80ec9bf ChangeLog 3750
 MD5 d8b949816db2ef3bd2884e73e2f40fa4 cdparanoia-3.9.8-r1.ebuild 1325
 MD5 a22ca8ded5dc7838500b2d40b4518787 cdparanoia-3.9.8-r2.ebuild 1554
-MD5 69b600cdc9725153164a57014aed249c ChangeLog 3462
-MD5 532963b39bb2da5b1961bcf17fb11e68 files/cdparanoia-3.9.8-include-cdda_interface_h.patch 452
+MD5 45a6962511a8691765a1671cf20f79b8 cdparanoia-3.9.8-r3.ebuild 1652
+MD5 8dfcb53296c1e66ba13fb02d81eef39b files/3.9.8-gcc34.patch 772
 MD5 0c381b5b41380f5a4a92f3e018fe16fe files/cdparanoia-3.9.8-identify_crash.patch 536
+MD5 532963b39bb2da5b1961bcf17fb11e68 files/cdparanoia-3.9.8-include-cdda_interface_h.patch 452
+MD5 ab34ae9f60b4a00e3a9e6b7310b84746 files/cdparanoia-3.9.8-toc.patch 778
+MD5 22fcfd4883bc0ce781d42429655a4a3d files/cdparanoia-3.9.8-use-destdir.patch 2468
 MD5 9d2dfbe5871d672111900f8d3fd09880 files/digest-cdparanoia-3.9.8-r1 76
 MD5 9d2dfbe5871d672111900f8d3fd09880 files/digest-cdparanoia-3.9.8-r2 76
-MD5 22fcfd4883bc0ce781d42429655a4a3d files/cdparanoia-3.9.8-use-destdir.patch 2468
-MD5 8dfcb53296c1e66ba13fb02d81eef39b files/3.9.8-gcc34.patch 772
-MD5 ab34ae9f60b4a00e3a9e6b7310b84746 files/cdparanoia-3.9.8-toc.patch 778
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzyhigIKl8Uu19MoRAgkeAJ0UUdj4incn87SgtR81ME4kJeK5eQCfcSQa
-f37jcIhStbf53jsFU92Z8Lk=
-=1djB
------END PGP SIGNATURE-----
+MD5 63c43a2585dbf441f9360bac92e0e36e files/digest-cdparanoia-3.9.8-r3 157
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
diff --git a/media-sound/cdparanoia/cdparanoia-3.9.8-r3.ebuild b/media-sound/cdparanoia/cdparanoia-3.9.8-r3.ebuild
new file mode 100644
index 000000000000..919f4644cd26
--- /dev/null
+++ b/media-sound/cdparanoia/cdparanoia-3.9.8-r3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.9.8-r3.ebuild,v 1.1 2006/01/27 18:30:33 chutzpah Exp $
+
+inherit eutils flag-o-matic gnuconfig linux-info
+
+MY_P=${PN}-III-alpha9.8
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="an advanced CDDA reader with error correction"
+HOMEPAGE="http://www.xiph.org/paranoia/"
+SRC_URI="http://www.xiph.org/paranoia/download/${MY_P}.src.tgz
+	mirror://gentoo/${P}-SG_IO-patches.tar.gz"
+
+IUSE=""
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# cdda_paranoia.h should include cdda_interface_h, else most configure
+	# scripts testing for support fails (gnome-vfs, etc).
+	epatch ${FILESDIR}/${P}-include-cdda_interface_h.patch
+	epatch ${FILESDIR}/${P}-toc.patch
+	epatch ${FILESDIR}/${P}-identify_crash.patch
+	epatch ${FILESDIR}/${PV}-gcc34.patch
+
+	# if libdir is specified, cdparanoia causes sandbox violations, and using
+	# einstall doesnt work around it. so lets patch in DESTDIR support
+	epatch ${FILESDIR}/${P}-use-destdir.patch
+
+	# Apply Red Hat's SG_IO patches see bug #118189 for more info
+	kernel_is 2 6 && EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" epatch
+
+	# Let portage handle the stripping of binaries
+	sed -i -e "/strip cdparanoia/d" Makefile.in
+
+	ln -s configure.guess config.guess
+	ln -s configure.sub config.sub
+	gnuconfig_update
+	rm config.{guess,sub}
+}
+
+src_compile() {
+	append-flags -I${S}/interface
+	econf || die
+	make OPT="${CFLAGS}" || die
+}
+
+src_install() {
+	dodir /usr/{bin,lib,include} /usr/share/man/man1
+	make DESTDIR=${D} install || die
+	dodoc FAQ.txt README
+}
diff --git a/media-sound/cdparanoia/files/digest-cdparanoia-3.9.8-r3 b/media-sound/cdparanoia/files/digest-cdparanoia-3.9.8-r3
new file mode 100644
index 000000000000..9d085bfb81a5
--- /dev/null
+++ b/media-sound/cdparanoia/files/digest-cdparanoia-3.9.8-r3
@@ -0,0 +1,2 @@
+MD5 c0beceb4bd049ff89f0359b57bc25872 cdparanoia-3.9.8-SG_IO-patches.tar.gz 18149
+MD5 7218e778b5970a86c958e597f952f193 cdparanoia-III-alpha9.8.src.tgz 116591