summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-09-25 10:44:10 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-09-25 10:44:10 +0000
commit46c5bef8b3a235978462803154fc7be06662fd1c (patch)
tree62b29f7b91d82cb5a19173e654a63fbbf774dbf1
parentVersion bump. #431936 (diff)
downloadgentoo-2-46c5bef8b3a235978462803154fc7be06662fd1c.tar.gz
gentoo-2-46c5bef8b3a235978462803154fc7be06662fd1c.tar.bz2
gentoo-2-46c5bef8b3a235978462803154fc7be06662fd1c.zip
Remove now unnecessary patch that was used only for <dev-libs/libusbx-1.0.13.
(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)
-rw-r--r--dev-libs/libusb-compat/ChangeLog6
-rw-r--r--dev-libs/libusb-compat/files/libusb-0.1-libusbx.patch19
-rw-r--r--dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild5
3 files changed, 6 insertions, 24 deletions
diff --git a/dev-libs/libusb-compat/ChangeLog b/dev-libs/libusb-compat/ChangeLog
index 3938265ebf73..606d14db0f27 100644
--- a/dev-libs/libusb-compat/ChangeLog
+++ b/dev-libs/libusb-compat/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/libusb-compat
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/ChangeLog,v 1.19 2012/07/21 06:47:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/ChangeLog,v 1.20 2012/09/25 10:44:09 ssuominen Exp $
+
+ 25 Sep 2012; Samuli Suominen <ssuominen@gentoo.org>
+ libusb-compat-0.1.4.ebuild, -files/libusb-0.1-libusbx.patch:
+ Remove now unnecessary patch that was used only for <dev-libs/libusbx-1.0.13.
21 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
libusb-compat-0.1.4.ebuild, files/libusb-0.1-libusbx.patch:
diff --git a/dev-libs/libusb-compat/files/libusb-0.1-libusbx.patch b/dev-libs/libusb-compat/files/libusb-0.1-libusbx.patch
deleted file mode 100644
index 870fc6093e36..000000000000
--- a/dev-libs/libusb-compat/files/libusb-0.1-libusbx.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://bugs.gentoo.org/423135
-http://sourceforge.net/apps/trac/libusbx/ticket/31
-http://github.com/libusbx/libusbx/commit/7ec94a45ed8155e7a1d4d5d75575099b09c78834
-
---- libusb/core.c
-+++ libusb/core.c
-@@ -32,12 +32,6 @@
- static libusb_context *ctx = NULL;
- static int usb_debug = 0;
-
--enum usbi_log_level {
-- LOG_LEVEL_DEBUG,
-- LOG_LEVEL_INFO,
-- LOG_LEVEL_WARNING,
-- LOG_LEVEL_ERROR,
--};
-
- #ifdef ENABLE_LOGGING
- #define _usbi_log(level, fmt...) usbi_log(level, __FUNCTION__, fmt)
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild
index 651f1b4aa479..90db5aa45e91 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild,v 1.11 2012/07/21 06:47:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild,v 1.12 2012/09/25 10:44:09 ssuominen Exp $
EAPI=4
inherit eutils
@@ -23,9 +23,6 @@ DOCS="AUTHORS ChangeLog NEWS README"
src_prepare() {
epatch "${FILESDIR}"/${PN/-compat}-0.1-ansi.patch
-
- has_version '<dev-libs/libusbx-1.0.13' && \
- epatch "${FILESDIR}"/${PN/-compat}-0.1-libusbx.patch
}
src_configure() {