diff options
| -rw-r--r-- | app-pda/usbmuxd/ChangeLog | 6 | ||||
| -rw-r--r-- | app-pda/usbmuxd/usbmuxd-1.0.8-r1.ebuild | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/app-pda/usbmuxd/ChangeLog b/app-pda/usbmuxd/ChangeLog index e5fbc1be53e8..6891b99735c0 100644 --- a/app-pda/usbmuxd/ChangeLog +++ b/app-pda/usbmuxd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-pda/usbmuxd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/usbmuxd/ChangeLog,v 1.34 2014/05/30 11:44:29 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/usbmuxd/ChangeLog,v 1.35 2014/05/30 11:52:33 ssuominen Exp $ + + 30 May 2014; Samuli Suominen <ssuominen@gentoo.org> usbmuxd-1.0.8-r1.ebuild: + Block libusbmuxd because this release contains it. Use get_udevdir instead of + the deprecated udev_get_udevdir. *usbmuxd-1.0.8_p20140530 (30 May 2014) diff --git a/app-pda/usbmuxd/usbmuxd-1.0.8-r1.ebuild b/app-pda/usbmuxd/usbmuxd-1.0.8-r1.ebuild index 862205150937..9e12c0de6873 100644 --- a/app-pda/usbmuxd/usbmuxd-1.0.8-r1.ebuild +++ b/app-pda/usbmuxd/usbmuxd-1.0.8-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/usbmuxd/usbmuxd-1.0.8-r1.ebuild,v 1.7 2013/02/02 22:23:47 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/usbmuxd/usbmuxd-1.0.8-r1.ebuild,v 1.8 2014/05/30 11:52:33 ssuominen Exp $ EAPI=4 inherit cmake-utils user udev @@ -15,7 +15,8 @@ KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" IUSE="" RDEPEND=">=app-pda/libplist-1.8-r1 - virtual/libusb:1" + virtual/libusb:1 + !app-pda/libusbmuxd" DEPEND="${RDEPEND} virtual/os-headers virtual/pkgconfig" @@ -26,8 +27,8 @@ pkg_setup() { } src_configure() { - if [[ $(udev_get_udevdir) != "/lib/udev" ]]; then - sed -i -e "/rules/s:/lib/udev:$(udev_get_udevdir):" udev/CMakeLists.txt || die + if [[ $(get_udevdir) != "/lib/udev" ]]; then + sed -i -e "/rules/s:/lib/udev:$(get_udevdir):" udev/CMakeLists.txt || die fi cmake-utils_src_configure |