diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-05-22 16:04:30 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-05-22 16:04:30 +0000 |
| commit | bc39572edf7cc41ad0621b4cccdc9b329a82a8ca (patch) | |
| tree | d2bb57dd70cf50001f2caf76ba23b908bb311511 /sys-freebsd | |
| parent | Restrict tests, since they require dev-python/manuel which is not in tree yet (diff) | |
| download | gentoo-2-bc39572edf7cc41ad0621b4cccdc9b329a82a8ca.tar.gz gentoo-2-bc39572edf7cc41ad0621b4cccdc9b329a82a8ca.tar.bz2 gentoo-2-bc39572edf7cc41ad0621b4cccdc9b329a82a8ca.zip | |
Block dev-libs/libusbx because dev-libs/libusb is blocked as well.
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'sys-freebsd')
| -rw-r--r-- | sys-freebsd/freebsd-lib/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-8.0.ebuild | 4 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild | 4 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-9.0-r1.ebuild | 4 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild | 4 |
5 files changed, 14 insertions, 9 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog index 913eca1bcb9c..8fb1e2e5d9c4 100644 --- a/sys-freebsd/freebsd-lib/ChangeLog +++ b/sys-freebsd/freebsd-lib/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-freebsd/freebsd-lib # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.136 2012/05/21 23:20:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.137 2012/05/22 16:04:30 ssuominen Exp $ + + 22 May 2012; Samuli Suominen <ssuominen@gentoo.org> freebsd-lib-8.0.ebuild, + freebsd-lib-8.2-r1.ebuild, freebsd-lib-9.0-r1.ebuild, + freebsd-lib-9.0-r2.ebuild: + Block dev-libs/libusbx because dev-libs/libusb is blocked as well. 21 May 2012; Mike Frysinger <vapier@gentoo.org> freebsd-lib-7.2-r1.ebuild, freebsd-lib-8.0.ebuild, freebsd-lib-8.2-r1.ebuild, freebsd-lib-9.0-r1.ebuild, diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-8.0.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-8.0.ebuild index 39e65712da3f..1f861fa17738 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-8.0.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-8.0.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/sys-freebsd/freebsd-lib/freebsd-lib-8.0.ebuild,v 1.10 2012/05/21 23:20:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-8.0.ebuild,v 1.11 2012/05/22 16:04:30 ssuominen Exp $ EAPI=2 @@ -28,7 +28,7 @@ if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then RDEPEND="ssl? ( dev-libs/openssl ) hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) - usb? ( !dev-libs/libusb ) + usb? ( !dev-libs/libusb !dev-libs/libusbx ) !sys-freebsd/freebsd-headers" DEPEND="${RDEPEND} >=sys-devel/flex-2.5.31-r2 diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild index 1ba00525be46..f0321e4dfb97 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.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/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild,v 1.7 2012/05/21 23:20:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild,v 1.8 2012/05/22 16:04:30 ssuominen Exp $ EAPI=2 @@ -28,7 +28,7 @@ if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then RDEPEND="ssl? ( dev-libs/openssl ) hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) - usb? ( !dev-libs/libusb ) + usb? ( !dev-libs/libusb !dev-libs/libusbx ) >=dev-libs/expat-2.0.1 !sys-freebsd/freebsd-headers" DEPEND="${RDEPEND} diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r1.ebuild index 8f30abbfb1a2..359ee78f3204 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r1.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r1.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/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r1.ebuild,v 1.5 2012/05/21 23:20:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r1.ebuild,v 1.6 2012/05/22 16:04:30 ssuominen Exp $ EAPI=2 @@ -30,7 +30,7 @@ if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then RDEPEND="ssl? ( dev-libs/openssl ) hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) - usb? ( !dev-libs/libusb ) + usb? ( !dev-libs/libusb !dev-libs/libusbx ) zfs? ( =sys-freebsd/freebsd-cddl-${RV}* ) >=dev-libs/expat-2.0.1 !sys-libs/libutempter diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild index 35f7fed18fdb..633e91afc55b 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.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/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.22 2012/05/21 23:20:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.23 2012/05/22 16:04:30 ssuominen Exp $ EAPI=2 @@ -30,7 +30,7 @@ if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then RDEPEND="ssl? ( dev-libs/openssl ) hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) - usb? ( !dev-libs/libusb ) + usb? ( !dev-libs/libusb !dev-libs/libusbx ) zfs? ( =sys-freebsd/freebsd-cddl-${RV}* ) >=dev-libs/expat-2.0.1 !sys-libs/libutempter |