Fix from upstream for newer libata versions #210391 by Slava Gorbunov.

Package-Manager: portage-2.2_pre2

4 files changed, 80 insertions, 6 deletions

diff --git a/app-cdr/qpxtool/ChangeLog b/app-cdr/qpxtool/ChangeLog
index d7552b85dad4..23153d0588af 100644
--- a/app-cdr/qpxtool/ChangeLog
+++ b/app-cdr/qpxtool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/qpxtool
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/qpxtool/ChangeLog,v 1.12 2007/10/08 20:22:39 coldwind Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/qpxtool/ChangeLog,v 1.13 2008/02/19 02:59:54 vapier Exp $
+
+*qpxtool-0.6.1-r1 (19 Feb 2008)
+
+  19 Feb 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/qpxtool-0.6.1-libata.patch, +qpxtool-0.6.1-r1.ebuild:
+  Fix from upstream for newer libata versions #210391 by Slava Gorbunov.
 
   08 Oct 2007; Santiago M. Mola <coldwind@gentoo.org> qpxtool-0.6.1.ebuild:
   Add menu entry (#188584).
diff --git a/app-cdr/qpxtool/Manifest b/app-cdr/qpxtool/Manifest
index 874d4847f957..5449a4c63f45 100644
--- a/app-cdr/qpxtool/Manifest
+++ b/app-cdr/qpxtool/Manifest
@@ -1,7 +1,16 @@
-DIST qpxtool-0.6.0.9-gentoo-buildsystem.tar.bz2 1517 RMD160 82f4f8016849020026ba8eb45a702c106abe9c22 SHA1 3460fa26994e4cdcec14b5325762cb99831ae5bb SHA256 89f4a0063f0ea314a941e2e17d38dae6eb7e307d662bdda74bffd6c03f871161
-DIST qpxtool-0.6.0.9.tar.bz2 192385 RMD160 ef9a2355cb4f29ba2cc08b9ae27797755c5e8ec7 SHA1 d619f536a6d3aabd370ab191c19737cd241565e8 SHA256 cdd5ecd71524522d2d3edf86c03e1a0e58289ed3d70b991e2555663b254204e4
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX qpxtool-0.6.1-libata.patch 669 RMD160 0d6f73db19f69396566ac8090c4ecc9624eca161 SHA1 8a815450017b11533aafd1448ba1a01920cf5a35 SHA256 ae0955fa161171d1348652cf901d085c52eb85615a4ae7f43f691337562e4dae
 DIST qpxtool-0.6.1.tar.bz2 156636 RMD160 6030fcca6453b94356ca969a0594289a1832a175 SHA1 d9666b12c8602f2231ffbf734c1f5e0cd2fafd56 SHA256 ee0c1d0be57a4efd6e458867863fcf460ae7e155e3b674bd525ad4dcd13dcb59
-EBUILD qpxtool-0.6.0.9.ebuild 775 RMD160 a3395e916c145024a6492ea4c1472b3641db0f14 SHA1 cad9487db94c4a2d187f4adbb61cf167b79b0990 SHA256 75b63314788abec183ce1ed8a64cb95a7f6ca1e4f8a46a595a59834e7f640009
+EBUILD qpxtool-0.6.1-r1.ebuild 903 RMD160 9b3f49000ad5f7471dad36a90e68d84b1b8dfce8 SHA1 c92e53f6812714ead217981b11f8976ec3863c13 SHA256 66fa75deab9a9770267a4409b88a95a21d44f201240184b9f4144422aec0d3d6
 EBUILD qpxtool-0.6.1.ebuild 854 RMD160 cfdb2441adc5e00e971e9ca6c9b20baf3a9893e2 SHA1 9e4482485f23a31bcae1162a722ce3f8330c4ac4 SHA256 95961a827310727c1df3fb65a39beb024bcc25877eac9d1d6994d348a2c58ba4
-MISC ChangeLog 1686 RMD160 a25fe9c997c7f3b40ea4a0e84765042feccee2a6 SHA1 a572c59d4913c325f7a133087997f3021fae0962 SHA256 1048e5cbf67b8c7f80132419d0744468f2934b035acd0815c6b71855307a30d7
+MISC ChangeLog 1904 RMD160 564162be16feff66c24af07319e6359fc63a7531 SHA1 67183b4eb5522e4feb9605310245e0f19d547821 SHA256 93ec7181bf70af3e748a1a71d41dd2c9e0b73804f73ecc76cad74eea6d18788e
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHukYwj9hvisErhMIRAmeGAKCYk8K1GwdoRtpSyYfPItOYK1febQCeMxEh
+zLWRUemD6QL0Ln3e1ofDpf4=
+=R5tg
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/qpxtool/files/qpxtool-0.6.1-libata.patch b/app-cdr/qpxtool/files/qpxtool-0.6.1-libata.patch
new file mode 100644
index 000000000000..145e486308d7
--- /dev/null
+++ b/app-cdr/qpxtool/files/qpxtool-0.6.1-libata.patch
@@ -0,0 +1,26 @@
+http://bugs.gentoo.org/210392
+
+--- lib/qpxtransport/qpx_transport.cpp
++++ lib/qpxtransport/qpx_transport.cpp
+@@ -215,6 +215,21 @@
+ #define KERNEL_BROKEN 0
+ 	if (use_sg_io)
+ 	{
++		/* see linux-2.6.23/block/scsi_ioctl.c:36 */
++		static const unsigned char scsi_command_size[8] =
++		{
++				6, 10, 10, 12,
++				16, 12, 10, 10
++		};
++		char cmdsize, opcode;
++
++		opcode = cgc.cmd[0];
++		/* see linux-2.6.23/include/scsi/scsi.h:25 */
++		cmdsize = scsi_command_size[((opcode) >> 5) & 7];
++		if ((sg_io.cmd_len > 0) && (sg_io.cmd_len < cmdsize)) {
++			sg_io.cmd_len = cmdsize;
++		}
++
+ 		sg_io.dxferp		= buf;
+ 		sg_io.dxfer_len		= sz;
+ 		sg_io.dxfer_direction	= use_sg_io[dir];
diff --git a/app-cdr/qpxtool/qpxtool-0.6.1-r1.ebuild b/app-cdr/qpxtool/qpxtool-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..94e022642b41
--- /dev/null
+++ b/app-cdr/qpxtool/qpxtool-0.6.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/qpxtool/qpxtool-0.6.1-r1.ebuild,v 1.1 2008/02/19 02:59:54 vapier Exp $
+
+inherit kde-functions qt3 multilib eutils
+
+DESCRIPTION="cd/dvd quality checker for a variety of drives"
+HOMEPAGE="http://qpxtool.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpxtool/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="=x11-libs/qt-3*"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-libata.patch #210392
+	sed -i \
+		-e '/^PREFIX/s:/usr/local:/usr:' \
+		-e "/^LIBDIR/s:/lib:/$(get_libdir):" \
+		Makefile || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	newicon qpxtool-gui/img/q.xpm ${PN}.xpm
+	make_desktop_entry ${PN} Qpxtool ${PN}.xpm "Utility;Qt;DiscBurning"
+	dodoc AUTHORS ChangeLog README TODO
+}