Remove garbage from top of the udev rule wrt #481666 by Maxim Kammerer

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 19 insertions, 10 deletions

diff --git a/media-libs/libmtp/ChangeLog b/media-libs/libmtp/ChangeLog
index 466a5bcc7a8e..93e8698cd723 100644
--- a/media-libs/libmtp/ChangeLog
+++ b/media-libs/libmtp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libmtp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.136 2013/08/29 19:53:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.137 2013/11/23 13:40:55 ssuominen Exp $
+
+  23 Nov 2013; Samuli Suominen <ssuominen@gentoo.org> libmtp-1.1.6.ebuild,
+  libmtp-9999.ebuild:
+  Remove garbage from top of the udev rule wrt #481666 by Maxim Kammerer
 
   29 Aug 2013; Agostino Sarubbo <ago@gentoo.org> libmtp-1.1.6.ebuild:
   Stable for ia64, wrt bug #470512
diff --git a/media-libs/libmtp/libmtp-1.1.6.ebuild b/media-libs/libmtp/libmtp-1.1.6.ebuild
index 919b36c84529..1be1208a2a17 100644
--- a/media-libs/libmtp/libmtp-1.1.6.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.6.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-1.1.6.ebuild,v 1.9 2013/08/29 19:53:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-1.1.6.ebuild,v 1.10 2013/11/23 13:40:55 ssuominen Exp $
 
-EAPI=4
+EAPI=5
 
 inherit autotools eutils udev user toolchain-funcs
 
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
+	EGIT_REPO_URI="git://git.code.sf.net/p/libmtp/code"
+	EGIT_PROJECT="libmtp"
 	inherit git-2
 else
 	KEYWORDS="amd64 hppa ia64 ppc ppc64 x86 ~amd64-fbsd"
@@ -34,7 +35,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-fbsdlibusb.patch"
+	epatch "${FILESDIR}"/${P}-fbsdlibusb.patch
 	if [[ ${PV} == *9999* ]]; then
 		touch config.rpath # This is from upstream autogen.sh
 		eautoreconf
@@ -46,7 +47,7 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_enable doc doxygen) \
 		$(use_enable crypt mtpz) \
-		--with-udev="$(udev_get_udevdir)" \
+		--with-udev="$(get_udevdir)" \
 		--with-udev-group=plugdev \
 		--with-udev-mode=0660
 }
@@ -59,4 +60,6 @@ src_install() {
 		docinto examples
 		dodoc examples/*.{c,h,sh}
 	fi
+
+	sed -i -e '/^Unable to open/d' "${ED}/$(get_udevdir)"/rules.d/*-libmtp.rules || die #481666
 }
diff --git a/media-libs/libmtp/libmtp-9999.ebuild b/media-libs/libmtp/libmtp-9999.ebuild
index 1f40b36cb9aa..5d9478369e56 100644
--- a/media-libs/libmtp/libmtp-9999.ebuild
+++ b/media-libs/libmtp/libmtp-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-9999.ebuild,v 1.8 2013/08/27 21:40:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-9999.ebuild,v 1.9 2013/11/23 13:40:55 ssuominen Exp $
 
-EAPI=4
+EAPI=5
 
 inherit autotools eutils udev user toolchain-funcs
 
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_PROJECT="libmtp"
 	inherit git-2
 else
-	KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 fi
 
@@ -46,7 +46,7 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_enable doc doxygen) \
 		$(use_enable crypt mtpz) \
-		--with-udev="$(udev_get_udevdir)" \
+		--with-udev="$(get_udevdir)" \
 		--with-udev-group=plugdev \
 		--with-udev-mode=0660
 }
@@ -59,4 +59,6 @@ src_install() {
 		docinto examples
 		dodoc examples/*.{c,h,sh}
 	fi
+
+	sed -i -e '/^Unable to open/d' "${ED}/$(get_udevdir)"/rules.d/*-libmtp.rules || die #481666
 }