Fix a problem with missing empty line in the udev rule.

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

4 files changed, 81 insertions, 10 deletions

diff --git a/app-misc/media-player-info/ChangeLog b/app-misc/media-player-info/ChangeLog
index 41358c4be383..5f0680dbee38 100644
--- a/app-misc/media-player-info/ChangeLog
+++ b/app-misc/media-player-info/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/media-player-info
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/media-player-info/ChangeLog,v 1.31 2013/08/11 19:00:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/media-player-info/ChangeLog,v 1.32 2013/10/02 07:00:16 ssuominen Exp $
+
+*media-player-info-21-r1 (02 Oct 2013)
+
+  02 Oct 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +files/media-player-info-21-udev.patch, +media-player-info-21-r1.ebuild:
+  Fix a problem with missing empty line in the udev rule.
 
   11 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>
   media-player-info-21.ebuild:
diff --git a/app-misc/media-player-info/Manifest b/app-misc/media-player-info/Manifest
index 0d501cd139c6..048eeaff68f8 100644
--- a/app-misc/media-player-info/Manifest
+++ b/app-misc/media-player-info/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX media-player-info-21-udev.patch 669 SHA256 2f374c71a194d0de637df78007153c245e80d304fd76006f856e87ded22a8563 SHA512 bfcc949406695e8518d3f8b24529b4bb45cfc298ba8129fff3296f7a6d2f6465b20c21bf62d90cdd67c21eb29bbaa1a61bc1f29ca79ad4e03fe6036e6f3d5846 WHIRLPOOL 3de39ea08444122ab05927cab4cf492f9465012ef17a157c73cfb78dfecbf4c2264058e79e736a43f087a3b45037444e688742f09a748b2594800c46f6ec838f
 DIST media-player-info-17.tar.gz 107176 SHA256 ceab4699e27b683dec4f985be5667b684e1502728243a1bb711590a58ee31e46 SHA512 7e9092b8f3f5a661f8e858647eea471851327fc0ef84ecbf45753f2a3fd564229754c866ed9e1eefba193739d38a2c6d04257c93b9525431d49034fbed6e38c5 WHIRLPOOL 00fa9c2b4cb6b990c60a77b2a3ef513cf8a3698104821dd9ad35f7872817cb171f793cae2ecb9f0bc680c32a6e609d4115de046a9b265a9ba1f87dce007a1067
 DIST media-player-info-21.tar.gz 103224 SHA256 eae5a41d27715c9280128ff770a491dae2e73e2ebeef41630b069ad0d4795127 SHA512 d281984cd746984a4b618478d9fdc3249ad4f84c38d4c6486cbf9f50d44d1ca089d8950989e34157139560b97b0093befb34a7dc465121af37dc3cbf26f04bb5 WHIRLPOOL 18b32b6dabafbdc3697af7285b373bd87bd7f3f087d7344170e99428374d57e25efbaafdc703d4b587dd2addc29701afbf352282fe2f10ffb7b8fbe5589edf5a
 EBUILD media-player-info-17.ebuild 715 SHA256 59e5f900a80fc7bd7afa6b63f820add50577c378b20ab00b3dcb563ef7c4969f SHA512 ff91adfe54674c6d807f342e3b0c59a8543b2f6a2895a650ed9145b89ee1c1d80bc5baa3095346296a0b03f56baacb42b3d9ae7ea245ea9be6d6a86b16351aea WHIRLPOOL 6709e221ad1d92b0dbd70f92c4951a6a868c0867450c990e57291b9c42adba4b56b2af3e7ca80af00176991321840f5cf5728c4141f120977a0477c9efe66748
+EBUILD media-player-info-21-r1.ebuild 1285 SHA256 63dcedde86ab7a51fb1d1756858ad5a15b992e28386b19621e0124ef7a616af6 SHA512 b14c98649d50c166ef92c009032aec190ae838f3a4bdb1d8af2919f89bb0e1fd88214e3b3d47958ff5074d3a0c5c62935284e7ecd8e9d8fd4897e7e1cc97f227 WHIRLPOOL b42d0840d01af79188b9d5900fd7d0349d68d5d551cc59fe1b05e6fbf9d0b8f92298db5b9cd7dca49de32dab1af70a4dd259b591e6221832d839ce738f983488
 EBUILD media-player-info-21.ebuild 1218 SHA256 12cc26b186b68836340a1ea1653b5e6fc994e63d8b83c0ff937065b3a790cd48 SHA512 d3f6b7e805c53c545f1340b083310b3fb685850ea149d5d0811dca46eb4afd297136000ab06ab54eeb90e8e18b43d49136567c76dc399b94f307daffd53f1f80 WHIRLPOOL cb00c91288bd08459cb4bb8497002a4dba3661d86038b430b224a8ae81c512ce70f59bf49e27b6b03ee606fd6eaf68e2c74409861152994ddfa5cf72db74f94e
-MISC ChangeLog 5035 SHA256 4660c75ac7a6c7660e6868aebb2cff5246069f1a28612582cc1696a57701ed01 SHA512 07b175f6636b8f9014aa5e670017369ccfcc209c0836fccb57d86d61bde761d7c8f984d2df00da70f50f9dfd9c8c6ad07808e55e07c8b21b4f56e1751080b534 WHIRLPOOL 6ebaf37f8935b0b22add836300b2d052211ac05753e0e7d90e61cdfeda3e10e9d79161cf881f2dc0c93cc216d5f620429ec4640ce876eeb5ca657c6978c9f41d
+MISC ChangeLog 5263 SHA256 f830db19904a755da30e0f2b5cf5249d00216d21d8b47057add1385b2252ece9 SHA512 d2e66619de5e725c6ed7ce6ddd7bfc4f2d6f877ad8aebeb2c1e21c95d0310848819d6ba9dfe45ab0c3bb92f72ba0d4920534891604f3199990f0d572e8e4ac47 WHIRLPOOL aaede29b03f363fec8036bddf7ff04f10b1def1fc575c0df7d45b1580cd71cf36a51d81fe6ff07262b8d5af45883396606fac50ea2d47f502dfe3e4834d86c18
 MISC metadata.xml 164 SHA256 66cdaff449660e99dfaee8d19b47413fc8ced6d5a1eccd3c842a48e9d9668d48 SHA512 87c2ce9c93ff1fdd7fb4768b89912acfceeeee0bbdb88d0cebdeb3e5f3b93e53bfbfbe2c1c3618629044a01af390d8fe9ec795472df58893df65503150dcf2e9 WHIRLPOOL d4c178d01829841a4f2e694280036c74f68c215c4ab64869f5a8ce2ee5005a30a204ab0e9189fd752563f392480c3c5e7fdd59cbecb40f7e51fe2ff8d1e4cd7a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSB97BAAoJEEdUh39IaPFNhPAIAJkaG0Es4LUk4qaV9bmeeXT7
-djBQPzAlOtOpSMgJVJ1ja4X0s1Pp6Br6OQ04gAYwL3OZlFpXNquihOsHKZP5u8Bu
-IFO1zlP17Is02MUb9zLd2b3CL8ZpyG95BPPXD8iTLOjhLd6AKZMXJ6HKXfqkqNP1
-h1WUXu1khKM09ExRXxXzjG5Xe9qYoPBJHuWqOQdRQwV++moO8xxtZ0b62HgRK2AY
-nYUJNUQ9hPkLyDHNVEYzxDE+BiVbFljSW5r3vhfn4pN0AmyyRq1SOvMxQgf5rVIV
-EJ1ioa7M8RnFmWzgTj5j05lVD0UiD98n412M6MUzxEVnhjvJw/Kn4F2TxqplYD8=
-=zy0Q
+iQEcBAEBCAAGBQJSS8QTAAoJEEdUh39IaPFNEAUH/1kOi8j5JEkTZnFSkyjH7xMF
+hcHY//6i7K/It5U+3857DXCgkhuqm7PMc0aNI3+/LE9BIwWYzkIy/PUWubCPa+q2
+iE/Vhg/DlL2O+I09+x76NcrDIJ4c5ggbzCvzWF4ZJ0LPGkEJZif9gSE4+LOJ77ut
+icbnPJOgirD8r7to2qWkMpNcUzB5tDRLkQh0TF4SYbZnXT34uu9xmeiNorEanfBn
+iCBSoZKNFITOggbM+0Mk2Q5X+w/S1HDLrluux6DaNaTfevnBjZXPLfaSJIq+FzCS
+1Us8JZtLbcWE1ydEz8MCBHM8pE5VdkPDZ9tt6hfWwoX0gKlIQOkYu3itg+NCwZc=
+=hZzy
 -----END PGP SIGNATURE-----
diff --git a/app-misc/media-player-info/files/media-player-info-21-udev.patch b/app-misc/media-player-info/files/media-player-info-21-udev.patch
new file mode 100644
index 000000000000..fd2fe4b28af3
--- /dev/null
+++ b/app-misc/media-player-info/files/media-player-info-21-udev.patch
@@ -0,0 +1,20 @@
+From 952a7e728356681f019f3a5076169daa24b946b9 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martinpitt@gnome.org>
+Date: Mon, 30 Sep 2013 12:07:49 +0000
+Subject: Terminate udev rules with an empty line
+
+Apparently newer udev versions now complain about the lack of it. Reported by
+Frederic Crozat.
+---
+diff --git a/tools/mpi2udev.py b/tools/mpi2udev.py
+index d33055b..33fdfa2 100755
+--- a/tools/mpi2udev.py
++++ b/tools/mpi2udev.py
+@@ -126,4 +126,4 @@ for f in sys.argv[2:]:
+     parse_mpi(f, hwdb)
+ 
+ # udev rules footer
+-os.write(sys.stdout.fileno(), b'\nLABEL="media_player_end"')
++os.write(sys.stdout.fileno(), b'\nLABEL="media_player_end"\n')
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/app-misc/media-player-info/media-player-info-21-r1.ebuild b/app-misc/media-player-info/media-player-info-21-r1.ebuild
new file mode 100644
index 000000000000..d954457f8f4f
--- /dev/null
+++ b/app-misc/media-player-info/media-player-info-21-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/media-player-info/media-player-info-21-r1.ebuild,v 1.1 2013/10/02 07:00:16 ssuominen Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_2,3_3} )
+
+inherit eutils python-any-r1
+
+DESCRIPTION="A repository of data files describing media player capabilities"
+HOMEPAGE="http://cgit.freedesktop.org/media-player-info/"
+SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+# http://cgit.freedesktop.org/media-player-info/commit/?id=d83dd01a0a1df6198ee08954da1c033b88a1004b
+RDEPEND=">=virtual/udev-196[hwdb(+)]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS NEWS README"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-udev.patch
+}
+
+pkg_postinst() {
+	# Run for /lib/udev/hwdb.d/20-usb-media-players.hwdb
+	udevadm hwdb --update --root="${ROOT%/}"
+	# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+	if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
+		return 0
+	fi
+	udevadm control --reload
+}