diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-07-01 17:57:12 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-07-01 17:57:12 +0000 |
| commit | 62797b046eebd14510e583c191d3e4402be245bb (patch) | |
| tree | efe265e5f03b1a7f5ea688e67912952d95d842ce /dev-libs | |
| parent | Drop alpha keywords (diff) | |
| download | historical-62797b046eebd14510e583c191d3e4402be245bb.tar.gz historical-62797b046eebd14510e583c191d3e4402be245bb.tar.bz2 historical-62797b046eebd14510e583c191d3e4402be245bb.zip | |
Don't redefine usbi_log_level because libusbx is now defining it wrt #423135 by Jeroen Dekien
Package-Manager: portage-2.2.0_alpha113/cvs/Linux x86_64
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/libusb-compat/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/libusb-compat/Manifest | 17 | ||||
| -rw-r--r-- | dev-libs/libusb-compat/files/libusb-0.1-libusbx.patch | 17 | ||||
| -rw-r--r-- | dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild | 5 |
4 files changed, 38 insertions, 8 deletions
diff --git a/dev-libs/libusb-compat/ChangeLog b/dev-libs/libusb-compat/ChangeLog index ba25e51157ba..9ecfb770c89c 100644 --- a/dev-libs/libusb-compat/ChangeLog +++ b/dev-libs/libusb-compat/ChangeLog @@ -1,6 +1,11 @@ # 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.16 2012/06/17 18:23:10 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/ChangeLog,v 1.17 2012/07/01 17:57:12 ssuominen Exp $ + + 01 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> + libusb-compat-0.1.4.ebuild, +files/libusb-0.1-libusbx.patch: + Don't redefine usbi_log_level because libusbx is now defining it wrt #423135 + by Jeroen Dekien 17 Jun 2012; Raúl Porcel <armin76@gentoo.org> libusb-compat-0.1.4.ebuild: alpha/ia64/m68k/s390/sh/sparc stable wrt #417135 diff --git a/dev-libs/libusb-compat/Manifest b/dev-libs/libusb-compat/Manifest index cbc680dffb50..5f7eee740968 100644 --- a/dev-libs/libusb-compat/Manifest +++ b/dev-libs/libusb-compat/Manifest @@ -2,14 +2,19 @@ Hash: SHA1 AUX libusb-0.1-ansi.patch 4461 RMD160 27caf4d2ce5e4ef7c3268434b6c5ba35d18e2a20 SHA1 96bec47b1299ee62f488a62d2c4020bcba6e90ea SHA256 c54c0d3866ac9842d6a04618267d97186268305966441a3e104af507db0f9a51 +AUX libusb-0.1-libusbx.patch 349 RMD160 cf43bbf2457adbd12625065ae593969f8689ee90 SHA1 a6e57e65eef884846db02d657dfc0b140d51f2ae SHA256 32634196e5649fd81987efea257ca9a24700477bfedc3ea8948b6e5d80470c65 DIST libusb-compat-0.1.4.tar.bz2 242379 RMD160 84a7aa3a294a6065838fcb464935926b659e4fee SHA1 fdc1df6f5cf7b71de7a74292aeea1aa2a39552ae SHA256 ed5bdd160c7b01ef767fb931a81b454f46226d1e2cf58502ced758d3e5a9fdc4 -EBUILD libusb-compat-0.1.4.ebuild 993 RMD160 0f3f1c51bfec7bf279bd52a44dcef24a452639f1 SHA1 598c14ff0a1aaded1c54bbd515461d11552320b6 SHA256 1b9ae4c49bee39000018b0f774f461c10b72dc2fb8f2d76dc363e3068a649053 -MISC ChangeLog 2527 RMD160 b1b5c5432405d8e6462d883af1f803e7a0991162 SHA1 66b1b143d4a209f395e47dabf6de90ac1430cc80 SHA256 f3c3a1bf7094baf42dd89b0732af2cc3aa9b3922210c5bbda833cb96e0eacce7 +EBUILD libusb-compat-0.1.4.ebuild 1086 RMD160 f3ef84297e08df71edc5702019b7dd550bc1855b SHA1 4c28e6b453f4914543edce4e217d65ddae50d7c5 SHA256 90e42a3e11d5881b97f87da3643f7ad1fb60ac8d3cd46e3a11d29d082a7890c9 +MISC ChangeLog 2745 RMD160 035b0d85082703e8581aa2b9a79afd5f23df1e59 SHA1 6f5185243c731324f627c30ea08736c86bdbad1f SHA256 959d9edb14abde6d3764092ce572f4401c19197bd7c89981c392d45469a620ac MISC metadata.xml 204 RMD160 c8357c2cfd2ae4415ccd01ab839a3a4260fd8367 SHA1 7e046a19d6d3ac8caa658059c5c268630d1e99df SHA256 f3aeb60df346d19b4d43cea2b2916d51674d99dabfce252723548687909cbd6b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iEYEARECAAYFAk/eIJUACgkQuQc30/atMkCGDwCeO0NgIhxgxUTkGXzOF9I0I9Kl -Y14An079UNGpCSkMeq6vX2k3R/iokf1U -=7y6r +iQEcBAEBAgAGBQJP8I4sAAoJEEdUh39IaPFNwXAH/j9ps8HPYUeQedxR2So9MH1j +DyGW2pQjT4IR3FnghcQPgwaXebE6Ko7L220ewSdh3K2Xotej7vf13fPZLn54Xw6S +qt/1rhHVosf3f/AtrYoppLPJDc17Lh40DFK+lqG91g7v+K2y5ukgJvwVp7DuTcM1 +mxgAR00xQ6BWfqJHLaPSo4gOk95jUmNdcJzgBrTDIOaZgSPVbILZtOrY1+C6fj0T ++iNU8iZskXcLr2ArrYVwrpBZgyHlk7ITsIl54VqZ8oQPVaxtxcTdqHBexOZSvMrL +OFwRRsxmQAp97Hg6Ne2oWkoz8Din8FvEhIvJdsGJZOT4S0oANagI3ZlDmdeIsdw= +=paab -----END PGP SIGNATURE----- diff --git a/dev-libs/libusb-compat/files/libusb-0.1-libusbx.patch b/dev-libs/libusb-compat/files/libusb-0.1-libusbx.patch new file mode 100644 index 000000000000..61563651b25a --- /dev/null +++ b/dev-libs/libusb-compat/files/libusb-0.1-libusbx.patch @@ -0,0 +1,17 @@ +http://bugs.gentoo.org/423135 + +--- 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 ab135ef752c1..3aba7dc20ca3 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.8 2012/06/17 18:23:10 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/libusb-compat-0.1.4.ebuild,v 1.9 2012/07/01 17:57:12 ssuominen Exp $ EAPI=4 inherit eutils @@ -23,6 +23,9 @@ DOCS="AUTHORS ChangeLog NEWS README" src_prepare() { epatch "${FILESDIR}"/${PN/-compat}-0.1-ansi.patch + + has_version dev-libs/libusbx && \ + epatch "${FILESDIR}"/${PN/-compat}-0.1-libusbx.patch } src_configure() { |