From 98251413eb66c302a01ab12a8fb51443744c409f Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 26 Jan 2014 16:56:45 +0100
Subject: [PATCH] Remove libusbx, it has been merged into libusb-1.0.18.

---
 srcpkgs/libusb-compat/template |  2 +-
 srcpkgs/libusbx-devel          |  1 -
 srcpkgs/libusbx/template       | 27 ---------------------------
 srcpkgs/qemu/template          |  2 +-
 srcpkgs/sunxi-tools/template   |  2 +-
 5 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 120000 srcpkgs/libusbx-devel
 delete mode 100644 srcpkgs/libusbx/template

diff --git a/srcpkgs/libusb-compat/template b/srcpkgs/libusb-compat/template
index dcba833609f..06afd6335d8 100644
--- a/srcpkgs/libusb-compat/template
+++ b/srcpkgs/libusb-compat/template
@@ -4,7 +4,7 @@ version=0.1.5
 revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libusbx-devel"
+makedepends="libusb-devel"
 short_desc="A libusb-0.1 compatibility library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
diff --git a/srcpkgs/libusbx-devel b/srcpkgs/libusbx-devel
deleted file mode 120000
index 59e741ddfd4..00000000000
--- a/srcpkgs/libusbx-devel
+++ /dev/null
@@ -1 +0,0 @@
-libusbx
\ No newline at end of file
diff --git a/srcpkgs/libusbx/template b/srcpkgs/libusbx/template
deleted file mode 100644
index f781bea7bb8..00000000000
--- a/srcpkgs/libusbx/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'libusbx'
-pkgname=libusbx
-version=1.0.17
-revision=1
-build_style=gnu-configure
-makedepends="libudev-devel"
-provides="libusb-${version}_${revision}"
-replaces="libusb>=0"
-short_desc="Library that provides generic access to USB devices"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="LGPL-2.1"
-homepage="http://libusbx.org"
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=876f8d2c3fee73840a89cb78f3e384c0ab73a67f9155a010b1a5a73ece5145b8
-
-libusbx-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	provides="libusb-devel-${version}_${revision}"
-	replaces="libusb-devel>=0"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-	}
-}
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b93d529d63a..d00dc8ede3d 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -21,7 +21,7 @@ makedepends="attr-devel libpng-devel>=1.6 libjpeg-turbo-devel pixman-devel
  libuuid-devel libX11-devel alsa-lib-devel gnutls-devel>=3.1.5 SDL-devel
  libsasl-devel libglib-devel ncurses-devel libseccomp-devel>=2.1.0 nss-devel
  libcurl-devel xfsprogs-devel libcap-ng-devel libcap-devel vde2-devel
- libbluetooth-devel libssh2-devel libusbx-devel pulseaudio-devel"
+ libbluetooth-devel libssh2-devel libusb-devel pulseaudio-devel"
 depends="libusb>=1.0.15"
 conf_files="/etc/qemu/target-x86_64.conf"
 replaces="qemu-kvm>=0"
diff --git a/srcpkgs/sunxi-tools/template b/srcpkgs/sunxi-tools/template
index 0947fb14fd0..b2c8d2c9dc5 100644
--- a/srcpkgs/sunxi-tools/template
+++ b/srcpkgs/sunxi-tools/template
@@ -4,7 +4,7 @@ version=20140125
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
-makedepends="libusbx-devel"
+makedepends="libusb-devel"
 short_desc="Tools to help hacking Allwinner AXX (aka sunxi) based devices"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"