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

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 31 insertions, 28 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/Manifest b/media-libs/libmtp/Manifest
index 9a2aa626a83a..daf7841d49c2 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,26 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX libmtp-1.1.6-fbsdlibusb.patch 590 SHA256 536752f2c171a8e4ab3dd2ea92a16e793f5f46dc8ba7d95450f8c1348879b02f SHA512 79f8cd0a52119e7d4e9d12d11dac24c4ed83397cbf93f94e666bfce5dc7a082edc35a6a01863fe761ff567fa084e13515e45037ed90a4f7f745a3a4dd08281f2 WHIRLPOOL bfe3b025619bf58b81a34ec1716e80edb700402564a5adcb43b90a5905c78a4c312e815a74a34e55fb9a770f01e7c74a6a322dc9005bb0c059a58e68bfd8b556
 DIST libmtp-1.1.6.tar.gz 733519 SHA256 3a1c1c83af91de4052eb54feb795c141b4c04a252e0031954ebbf6175970cb0a SHA512 fe6d9bc0621d6ad2325164585ec5f3e20824add5ee763d6d14ba7dbea6d2aacd75afa450627f3a03691c33ffb92675abebce64c3f8e32e8c2db511e814207ab3 WHIRLPOOL 176f2d64241735f2de33da4d84142debb2343aeb3abbd27a2af8e2a1815aa239c5f4ed9f38316bd2a8deb9d8faad4e293a5abae46e54d9137bfe8fcba279b371
-EBUILD libmtp-1.1.6.ebuild 1402 SHA256 2ec81cb5355b70a8bc5a555b5fe31aaa4041095c8adcc9adea17d80902f4a7ce SHA512 68a3537b7f5a5fd6efac7d39bd7277e36e8a5274198824f62b329e09afe3b13b68ff8da9d7ff1a1f371c7f3da0e85f6b139b4f0652ed8bb5779bf8c39af30352 WHIRLPOOL a62212e297615010f63851677ce0e036ac75d21bd8d5567866c0647c35b8ef9bdb163c0b9e4429732aa1d1e13a73af0497bbbc744387dbb2089f0279523446cb
-EBUILD libmtp-9999.ebuild 1369 SHA256 47d29a6bf524e28ca0f01ae7e668c495374ce106f61f87394ce92bbd2ec1da12 SHA512 b17fb428f2b46c7c63c5972a2b2fdadf58e4d132f2b0983e44a3784ba7074681c745c80f3d02b925a828f3d76e4b7bd34ced5569b175d8a0c49de6ee6b940b81 WHIRLPOOL ef728c8c061c4115b408a99895bb992f69046744dca698677059febf2218ddb5997b5717eabade14b8bd8d29345ebc6dd69c62d051577fb0d29799c8726d7b0e
-MISC ChangeLog 16961 SHA256 4c9b4a14d099a05b7513b5530155c91e0969d1fbfd610c0a04b349c95404bd86 SHA512 30c60b6189dd26e6e7b77fb22954d489a9a92bcf35d246b492f2642a7e5eb171311c01a40fdfc9e97e142bf8f56f67ac565a7b652a16914b613d59167012c018 WHIRLPOOL c6f46dd9b156348751b317179f17a7152030dddd59f48ec690fb5f21848d107563ac51bdc204ae9fc80f4ba409c5fbc5514dd77cb20aeb38ed723d38290bd408
+EBUILD libmtp-1.1.6.ebuild 1505 SHA256 8feea6c3b577f963a7f473ae7d3793048593dd11d43b019f04f4822463b8a700 SHA512 0bc43f7055bba7b070fd80d69b582c3c291dae64648802f9a69785d4ae8ac4ba2293b42018bf7502f2f086ebd418e32d06528b2ab6f7d5949e3c54a88125140d WHIRLPOOL 95a02fb2e7007e9884072eb937f49aa02a9f0a47a8c13fdd3c8293d77e64c791f600894be1abb3acd21f673384e5c4425cfd7e45636e40f2b067665886024fd9
+EBUILD libmtp-9999.ebuild 1465 SHA256 47fd0efee556259763ba10d5b92f9cdd19e88c5de954e3e5b7f6ef76d7c886e5 SHA512 92c751888a66ee197951ddb72765c5cffdfcd4947363b4b5aea67de258810466ad2da1b14276073d0c9a71009e32765481455345bbc7e94d21c3485904869483 WHIRLPOOL d71f410b705c3cd7d754dc6c252bc7bd5cefd299969fc5a2c1f2a32b0ffb84330fd0fc732c6dd8cf708d3912fc29c8d98761c66a356a1df0242f5bb163f89f39
+MISC ChangeLog 17138 SHA256 b207eab75815630997f56c3472104b72483306b31475ba2f5a076a665d0f2738 SHA512 ce055431ef174855833f16f7e941dd375d5458dfeb3af54198d99b1e735efdd3cddcb0f7121b3630ef32e13a140a854951fa4b76c9b5953f73f67dee393c9589 WHIRLPOOL 6dc71475f3ccbec44a9b97a89436ea3ce1e55c0bc8636ed834be479451ffd495d3e5a136da12da3dd01855cc044ff737fe18e122ba34bcc16e3d20f51e6232ec
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSH6X0AAoJELp701BxlEWf5ckP/R8OmJJVVptrYwQBmptaZO0b
-tofRBB8dS7Z/GzATbdRO2aofykC311LGreOsSgGJpYx05teaWlTVWuB/Zsl4dPWr
-atdUtLgOq4o1+d8Tr2NH0FSaL7Ez95G/nGtERlGzE1IWitahWR//PRZX5tgy2JbN
-f0JJEhAaYRCI6yxej9j54nUhqDaCuVhpWJpvmZwmT/Jy3Y3oxH4CLVJbDbKImPtZ
-zZjTxHhkXqV4ujCqudK00kxHCVjiOX+Hp1fPnasAr2nSqFxtmXcQpL0kGAtTaEW0
-bEYkjHFHkkm8rbBX/U1fTXx4tsFP0uFxQMuzFFGp3quwBGzgVy4yS7TuML4dMSIy
-QKmZsEdAJ2V9/EaXpgge6wS+tOZG7ZPaRw8K7XG8xMdPhzJG+65OC00mzI3hson1
-49MMB/tWF6V56W+8lCjT96NKHel6aI9E68mE1LMSkCs+zv1o/IKLvSOWU3UVIAsk
-3jxyC048cszvExCUGepTMOFJ0FfwNLCHHjYUdmraY4LgCO7F93X6i9Skk1oylXSa
-Xz6ynMRqsnCas2lmtybNwksl1M2TEy7O209CEROCgQV6kcDEnf/hHLBIXzilcTdW
-6v90pi9PFpj6O4o3znsd67F19BfTGJjxjPw8X6kwdbMwnf3PZu6C/vgG9bPQfz0c
-l6ZWdVM/O1NnkFHeYoiD
-=cctD
+iQEcBAEBCAAGBQJSkLASAAoJEEdUh39IaPFNrEAIAJgJBydzkXBKaxoO8ozoG8Wd
+30tKK7idPk4c9QPRB9I7WcNdOv3cw5EUOoI3BWSHX5J/1IvB40Q9RokPEYTNlVfz
+PMdNhqKge/GWdxNVwLlwnqmFIsm3jZbeMLJ1d50s8TK81uUW9EUc40uAfWcnI9rZ
+382HhJzzuGdWlwacUeaYNNPvjtvNYke6O0cZClaZvmmaedY/H1dt6m0zwiydHemO
+5haLrvRkt6IobDt3fgCSf5IRaGxfPQqDhz12qcCKNVmXYnU+EGOg/3kr1LfEtivG
+X8GJUZCLNgb1pODXG0yJygg2pHoYnA6TOGWuLFsCYN77RJ5Ri7XcMKnl6x8oxy0=
+=jWJP
 -----END PGP SIGNATURE-----
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
 }