summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-03-21 18:03:38 +0000
committerMike Frysinger <vapier@gentoo.org>2010-03-21 18:03:38 +0000
commit9b7d42afce80a7ae0013a5d6555fdb936cfb762c (patch)
tree2f12f6ed854737a3f0299358303916688f900be7 /sys-apps
parentFix build with glibc-2.11, thanks to Mike Frysinger, bug #310569 (diff)
downloadgentoo-2-9b7d42afce80a7ae0013a5d6555fdb936cfb762c.tar.gz
gentoo-2-9b7d42afce80a7ae0013a5d6555fdb936cfb762c.tar.bz2
gentoo-2-9b7d42afce80a7ae0013a5d6555fdb936cfb762c.zip
old
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/usbutils/files/usbutils-0.72-update-usbids.patch34
-rw-r--r--sys-apps/usbutils/files/usbutils-0.73-byteorder.patch40
-rw-r--r--sys-apps/usbutils/usbutils-0.73.ebuild58
-rw-r--r--sys-apps/usbutils/usbutils-0.80.ebuild55
-rw-r--r--sys-apps/usbutils/usbutils-0.82.ebuild39
5 files changed, 0 insertions, 226 deletions
diff --git a/sys-apps/usbutils/files/usbutils-0.72-update-usbids.patch b/sys-apps/usbutils/files/usbutils-0.72-update-usbids.patch
deleted file mode 100644
index fc90773cc9bc..000000000000
--- a/sys-apps/usbutils/files/usbutils-0.72-update-usbids.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- update-usbids.sh
-+++ update-usbids.sh
-@@ -2,13 +2,23 @@
-
- # see also update-pciids.sh (fancier)
-
-+[ "$1" = "-q" ] && quiet="true" || quiet="false"
-+
- set -e
- SRC="http://www.linux-usb.org/usb.ids"
- DEST=usb.ids
-
-+# if usb.ids is read-only (because the filesystem is read-only),
-+# then just skip this whole process.
-+if ! touch ${DEST} >&2 >/dev/null ; then
-+ ${quiet} || echo "${DEST} is read-only, exiting."
-+ exit 0
-+fi
-+
--if which wget >/dev/null ; then
-+if which wget >/dev/null 2>&1 ; then
- DL="wget -O $DEST.new $SRC"
--elif which lynx >/dev/null ; then
-+ ${quiet} && DL="$DL -q"
-+elif which lynx >/dev/null 2>&1 ; then
- DL="eval lynx -source $SRC >$DEST.new"
- else
- echo >&2 "update-usbids: cannot find wget nor lynx"
-@@ -33,4 +43,4 @@
- fi
- mv $DEST.new $DEST
-
--echo "Done."
-+${quiet} || echo "Done."
diff --git a/sys-apps/usbutils/files/usbutils-0.73-byteorder.patch b/sys-apps/usbutils/files/usbutils-0.73-byteorder.patch
deleted file mode 100644
index 76cd9505e7f9..000000000000
--- a/sys-apps/usbutils/files/usbutils-0.73-byteorder.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ur usbutils-0.73.old/configure.in usbutils-0.73.new/configure.in
---- usbutils-0.73.old/configure.in 2007-11-13 10:19:41 -0500
-+++ usbutils-0.73.new/configure.in 2007-11-13 10:23:12 -0500
-@@ -20,10 +20,11 @@
- AC_FUNC_ALLOCA
- AC_HEADER_DIRENT
- AC_HEADER_STDC
--AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h getopt.h errno.h ])
-+AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h getopt.h errno.h asm/byteorder.h machine/endian.h])
-
--# Checks for typedefs, structures, and compiler characteristics.
-+# Checks for typedefs, structures, byte order, and compiler characteristics.
- AC_C_CONST
-+AC_C_BIGENDIAN
- AC_TYPE_OFF_T
- AC_TYPE_SIZE_T
-
-diff -ur usbutils-0.73.old/lsusb.c usbutils-0.73.new/lsusb.c
---- usbutils-0.73.old/lsusb.c 2007-11-13 10:19:41 -0500
-+++ usbutils-0.73.new/lsusb.c 2007-11-13 10:23:12 -0500
-@@ -35,8 +35,17 @@
- #include <errno.h>
- #include <stdio.h>
- #include <stdarg.h>
--#include <asm/byteorder.h>
--#define le16_to_cpu __le16_to_cpu
-+#if defined(HAVE_ASM_BYTEORDER_H)
-+# include <asm/byteorder.h>
-+# define le16_to_cpu __le16_to_cpu
-+#elif defined(HAVE_MACHINE_ENDIAN_H)
-+# include <machine/endian.h>
-+# ifdef WORDS_BIGENDIAN
-+# define le16_to_cpu __bswap16
-+# else
-+# define le16_to_cpu(x) (x)
-+# endif
-+#endif
- #include <usb.h>
-
- /* NOTE: that should be <libusb.h> and it should include
diff --git a/sys-apps/usbutils/usbutils-0.73.ebuild b/sys-apps/usbutils/usbutils-0.73.ebuild
deleted file mode 100644
index 6a1aec740177..000000000000
--- a/sys-apps/usbutils/usbutils-0.73.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.73.ebuild,v 1.15 2009/05/15 10:10:04 robbat2 Exp $
-
-EAPI=1
-inherit eutils autotools
-
-DESCRIPTION="USB enumeration utilities"
-HOMEPAGE="http://linux-usb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/linux-usb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="network-cron zlib"
-
-DEPEND="virtual/libusb:0"
- # zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- cp update-usbids.sh update-usbids.sh.orig
- epatch "${FILESDIR}"/${PN}-0.72-update-usbids.patch
- epatch "${FILESDIR}"/${P}-byteorder.patch
-
- # put usb.ids in same place as pci.ids (/usr/share/misc)
- sed -i \
- -e 's:/usr/share/usb.ids:/usr/share/misc/usb.ids:' \
- lsusb.8 || die "sed lsusb.8"
- sed -e '/^DEST=/s:=usb.ids:=/usr/share/misc/usb.ids:' \
- update-usbids.sh > update-usbids
-
- eautoreconf
-}
-
-src_compile() {
- # robbat2 - 2007/10/29
- # zlib disabled pending a revision of update-usbids from upstream.
- # $(use_enable zlib) \
- econf \
- --datadir=/usr/share/misc \
- --disable-zlib \
- || die "./configure failed"
- emake || die "make failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- newbin "${FILESDIR}"/usbmodules.sh usbmodules || die
- dosbin update-usbids || die "update-usbids failed"
- dodoc AUTHORS ChangeLog NEWS README
-
- use network-cron || return 0
- exeinto /etc/cron.monthly
- newexe "${FILESDIR}"/usbutils.cron update-usbids || die
-}
diff --git a/sys-apps/usbutils/usbutils-0.80.ebuild b/sys-apps/usbutils/usbutils-0.80.ebuild
deleted file mode 100644
index e3baebb83a43..000000000000
--- a/sys-apps/usbutils/usbutils-0.80.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.80.ebuild,v 1.2 2009/05/15 10:10:04 robbat2 Exp $
-
-EAPI=1
-inherit eutils autotools
-
-DESCRIPTION="USB enumeration utilities"
-HOMEPAGE="http://linux-usb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/linux-usb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="network-cron zlib"
-
-DEPEND="virtual/libusb:0"
- # zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # put usb.ids in same place as pci.ids (/usr/share/misc)
- sed -i \
- -e 's:/usr/share/usb.ids:/usr/share/misc/usb.ids:' \
- lsusb.8 || die "sed lsusb.8"
- sed -e '/^DEST=/s:=usb.ids:=/usr/share/misc/usb.ids:' \
- update-usbids.sh > update-usbids
-
- eautoreconf
-}
-
-src_compile() {
- # robbat2 - 2007/10/29
- # zlib disabled pending a revision of update-usbids from upstream.
- # $(use_enable zlib) \
- econf \
- --datadir=/usr/share/misc \
- --disable-zlib \
- || die "./configure failed"
- emake || die "make failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- newbin "${FILESDIR}"/usbmodules.sh usbmodules || die
- dosbin update-usbids || die "update-usbids failed"
- dodoc AUTHORS ChangeLog NEWS README
-
- use network-cron || return 0
- exeinto /etc/cron.monthly
- newexe "${FILESDIR}"/usbutils.cron update-usbids || die
-}
diff --git a/sys-apps/usbutils/usbutils-0.82.ebuild b/sys-apps/usbutils/usbutils-0.82.ebuild
deleted file mode 100644
index 53e848562791..000000000000
--- a/sys-apps/usbutils/usbutils-0.82.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.82.ebuild,v 1.10 2009/12/11 16:03:52 armin76 Exp $
-
-EAPI=1
-DESCRIPTION="USB enumeration utilities"
-HOMEPAGE="http://linux-usb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/linux-usb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="network-cron zlib"
-
-DEPEND="virtual/libusb:0"
- # zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_compile() {
- # robbat2 - 2007/10/29
- # zlib disabled pending a revision of update-usbids from upstream.
- # $(use_enable zlib) \
- econf \
- --datadir=/usr/share/misc \
- --disable-zlib \
- || die "./configure failed"
- emake || die "make failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- newbin "${FILESDIR}"/usbmodules.sh usbmodules || die
- newsbin update-usbids.sh update-usbids || die "update-usbids failed"
- dodoc AUTHORS ChangeLog NEWS README
-
- use network-cron || return 0
- exeinto /etc/cron.monthly
- newexe "${FILESDIR}"/usbutils.cron update-usbids || die
-}