amd64 stable wrt #204358, fix multilib issues, use die message, remove old versions.

(Portage version: 2.1.4_rc14)

8 files changed, 14 insertions, 130 deletions

diff --git a/app-misc/rioutil/ChangeLog b/app-misc/rioutil/ChangeLog
index 0e9e0273f750..020c787403ea 100644
--- a/app-misc/rioutil/ChangeLog
+++ b/app-misc/rioutil/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/rioutil
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rioutil/ChangeLog,v 1.25 2008/01/05 13:55:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rioutil/ChangeLog,v 1.26 2008/01/05 14:19:04 drac Exp $
+
+  05 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  -files/rioutil-gcc4.1.1.patch, -files/rioutil-1.4.4-26headers.patch,
+  -rioutil-1.4.4.ebuild, -rioutil-1.5.0.ebuild, rioutil-1.5.0-r1.ebuild:
+  amd64 stable wrt #204358, fix multilib issues, use die message, remove old
+  versions.
 
   05 Jan 2008; Markus Meier <maekke@gentoo.org> rioutil-1.5.0-r1.ebuild:
   x86 stable, bug #204358
diff --git a/app-misc/rioutil/files/digest-rioutil-1.4.4 b/app-misc/rioutil/files/digest-rioutil-1.4.4
deleted file mode 100644
index 360ab1ed20d4..000000000000
--- a/app-misc/rioutil/files/digest-rioutil-1.4.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 926eda6ef95a4b2a9a9b4ba1dc52c3d9 rioutil-1.4.4.tar.bz2 278386
-RMD160 bd78dce4009983b2d9845321f705c2d42fa2236e rioutil-1.4.4.tar.bz2 278386
-SHA256 16241d018370fa188cf8e3d4c949d65af5f73d22ffc1137e1add6335039a8b3f rioutil-1.4.4.tar.bz2 278386
diff --git a/app-misc/rioutil/files/digest-rioutil-1.5.0 b/app-misc/rioutil/files/digest-rioutil-1.5.0
deleted file mode 100644
index 5c564a6794d0..000000000000
--- a/app-misc/rioutil/files/digest-rioutil-1.5.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0663d52c97fb20dfc93185ac805e5048 rioutil-1.5.0.tar.gz 401244
-RMD160 2f1db9eb36501aecdb388278d5f7c1876bfebf19 rioutil-1.5.0.tar.gz 401244
-SHA256 4991cda30bcd0cd01097c4d220c5facf67e988d4bbfc2f272a359ac89d52e9a7 rioutil-1.5.0.tar.gz 401244
diff --git a/app-misc/rioutil/files/rioutil-1.4.4-26headers.patch b/app-misc/rioutil/files/rioutil-1.4.4-26headers.patch
deleted file mode 100644
index d76de6c5b4ae..000000000000
--- a/app-misc/rioutil/files/rioutil-1.4.4-26headers.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -ur rioutil-1.4.2b/include/usbdrv.h rioutil-1.4.2b.plasmaroo/include/usbdrv.h
---- rioutil-1.4.2b/include/usbdrv.h	2003-08-06 16:56:25.000000000 +0100
-+++ rioutil-1.4.2b.plasmaroo/include/usbdrv.h	2004-04-02 22:22:51.802629528 +0100
-@@ -63,6 +63,7 @@
- 
- /* --------------------------------------------------------------------- */
- 
-+#ifndef __LINUX_USB_CH9_H
- struct usb_device_descriptor {
-         u_int8_t  bLength;
-         u_int8_t  bDescriptorType;
-@@ -79,8 +80,7 @@
-         u_int8_t  iSerialNumber;
-         u_int8_t  bNumConfigurations;
- };
--
--//#define USB_DT_DEVICE_SIZE sizeof(struct usb_device_descriptor)
-+#endif /* __LINUX_USB_CH9_H */
- 
- /* --------------------------------------------------------------------- */
- 
-diff -ur rioutil-1.4.2b/librioutil/usbdrvlinux.c rioutil-1.4.2b.plasmaroo/librioutil/usbdrvlinux.c
---- rioutil-1.4.2b/librioutil/usbdrvlinux.c	2003-08-06 16:56:25.000000000 +0100
-+++ rioutil-1.4.2b.plasmaroo/librioutil/usbdrvlinux.c	2004-04-02 22:25:26.820063296 +0100
-@@ -84,14 +84,26 @@
-         fprintf(f, "  Length              = %2d%s\n", desc->bLength,
- 		desc->bLength == USB_DT_DEVICE_SIZE ? "" : " (!!!)");
-         fprintf(f, "  DescriptorType      = %02x\n", desc->bDescriptorType);
-+	#ifdef __LINUX_USB_CH9_H
-+        fprintf(f, "  USB version         = %x\n",
-+	       desc->bcdUSB);
-+        fprintf(f, "  Vendor:Product      = %04x:%04x\n",
-+	       desc->idVendor, desc->idProduct);
-+	#else
-         fprintf(f, "  USB version         = %x.%02x\n",
- 	       desc->bcdUSB[1], desc->bcdUSB[0]);
-         fprintf(f, "  Vendor:Product      = %02x%02x:%02x%02x\n",
- 	       desc->idVendor[1], desc->idVendor[0], desc->idProduct[1], desc->idProduct[0]);
-+	#endif
-         fprintf(f, "  MaxPacketSize0      = %d\n", desc->bMaxPacketSize0);
-         fprintf(f, "  NumConfigurations   = %d\n", desc->bNumConfigurations);
-+	#ifdef __LINUX_USB_CH9_H
-+        fprintf(f, "  Device version      = %x\n",
-+		desc->bcdDevice);	
-+	#else
-         fprintf(f, "  Device version      = %x.%02x\n",
- 		desc->bcdDevice[1], desc->bcdDevice[0]);
-+	#endif
-         fprintf(f, "  Device Class:SubClass:Protocol = %02x:%02x:%02x\n",
- 		desc->bDeviceClass, desc->bDeviceSubClass, desc->bDeviceProtocol);
-         switch (desc->bDeviceClass) {
diff --git a/app-misc/rioutil/files/rioutil-gcc4.1.1.patch b/app-misc/rioutil/files/rioutil-gcc4.1.1.patch
deleted file mode 100644
index d940bdb690f2..000000000000
--- a/app-misc/rioutil/files/rioutil-gcc4.1.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rioutil-1.4.4.orig/librioutil/rio.c
-+++ rioutil-1.4.4/librioutil/rio.c
-@@ -373,7 +373,7 @@
-     return ret;
-   }
-
--  iptr = (u_int32_t *)read_buffer = (u_int8_t *) malloc (RIO_FTS);
-+  iptr = (u_int32_t *)(read_buffer = (u_int8_t *) malloc (RIO_FTS));
-   if (read_buffer == NULL) {
-     rio_log (rio, errno, "Could not allocate read buffer\n");
-     return errno;
diff --git a/app-misc/rioutil/rioutil-1.4.4.ebuild b/app-misc/rioutil/rioutil-1.4.4.ebuild
deleted file mode 100644
index 43b6e5bc9b0c..000000000000
--- a/app-misc/rioutil/rioutil-1.4.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rioutil/rioutil-1.4.4.ebuild,v 1.12 2006/10/08 11:15:11 jokey Exp $
-
-inherit eutils
-
-DESCRIPTION="Command line tool for transfering mp3s to and from a Rio 600, 800, Rio Riot, and Nike PSA/Play"
-HOMEPAGE="http://rioutil.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rioutil/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE=""
-
-DEPEND="sys-libs/zlib
-	virtual/libc
-	dev-libs/libusb"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-26headers.patch"
-	epatch "${FILESDIR}/${PN}-gcc4.1.1.patch"
-}
-
-src_compile() {
-	econf --with-usbdevfs || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/app-misc/rioutil/rioutil-1.5.0-r1.ebuild b/app-misc/rioutil/rioutil-1.5.0-r1.ebuild
index e4493859fd87..c7951d3c2ede 100644
--- a/app-misc/rioutil/rioutil-1.5.0-r1.ebuild
+++ b/app-misc/rioutil/rioutil-1.5.0-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rioutil/rioutil-1.5.0-r1.ebuild,v 1.2 2008/01/05 13:55:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rioutil/rioutil-1.5.0-r1.ebuild,v 1.3 2008/01/05 14:19:04 drac Exp $
+
+inherit multilib
 
 DESCRIPTION="Command line tool for transfering mp3s to and from a Rio 600, 800, Rio Riot, and Nike PSA/Play"
 HOMEPAGE="http://rioutil.sourceforge.net/"
@@ -8,13 +10,15 @@ SRC_URI="mirror://sourceforge/rioutil/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="dev-libs/libusb"
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" libdir="/usr/$(get_libdir)" \
+		install || die "emake install failed."
+
 	dodoc AUTHORS ChangeLog NEWS README TODO
 	insinto /etc/udev/rules.d
 	doins "${FILESDIR}"/75-rio.rules
diff --git a/app-misc/rioutil/rioutil-1.5.0.ebuild b/app-misc/rioutil/rioutil-1.5.0.ebuild
deleted file mode 100644
index 8ee4610de35f..000000000000
--- a/app-misc/rioutil/rioutil-1.5.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rioutil/rioutil-1.5.0.ebuild,v 1.1 2006/10/08 11:15:11 jokey Exp $
-
-inherit eutils
-
-DESCRIPTION="Command line tool for transfering mp3s to and from a Rio 600, 800, Rio Riot, and Nike PSA/Play"
-HOMEPAGE="http://rioutil.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rioutil/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="sys-libs/zlib
-	virtual/libc
-	dev-libs/libusb"
-
-src_install() {
-	emake DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}