Ensure libmp4v2 headers are present by forcing correct SLOT

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

4 files changed, 19 insertions, 15 deletions

diff --git a/net-misc/mediatomb/ChangeLog b/net-misc/mediatomb/ChangeLog
index 73a87c726577..9bbb73a89afd 100644
--- a/net-misc/mediatomb/ChangeLog
+++ b/net-misc/mediatomb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/mediatomb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.29 2012/05/19 09:09:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.30 2012/05/19 09:13:42 ssuominen Exp $
+
+  19 May 2012; Samuli Suominen <ssuominen@gentoo.org>
+  mediatomb-0.12.1-r1.ebuild, mediatomb-0.12.1-r2.ebuild:
+  Ensure libmp4v2 headers are present by forcing correct SLOT
 
   19 May 2012; Samuli Suominen <ssuominen@gentoo.org> -mediatomb-0.12.1.ebuild:
   old
diff --git a/net-misc/mediatomb/Manifest b/net-misc/mediatomb/Manifest
index a60a8e0619a2..8ea52b98bbb9 100644
--- a/net-misc/mediatomb/Manifest
+++ b/net-misc/mediatomb/Manifest
@@ -10,18 +10,18 @@ AUX mediatomb-0.12.1-libav7.patch 1983 RMD160 1ff1421bef0ec2cc4a56b5f649a4888a6a
 AUX mediatomb-0.12.1-libmp4v2.patch 5893 RMD160 712dab501782c241655a5290b784eef5444bcca0 SHA1 b570ab83c6f17bc6eae3288d7c66cced0933208a SHA256 d39c2f9aab051c5447461718fd0ec72cf5982f6c920a4a985a50831f34babe84
 AUX mediatomb-0.12.1-mozjs185.patch 22839 RMD160 6e47aff3a3d97d7d8a5359161b549699368a6bb8 SHA1 95d47ffd95b217100387844cbbbd854d0587f8dd SHA256 3960961f1fbe46baff3956ea2fa94b4dc193c0d278b8646cda1f4cee26812f59
 DIST mediatomb-0.12.1.tar.gz 1240612 RMD160 ecb61ca2483f76421beef1036ac442b8f805fa96 SHA1 86e880584cc9c8aaf3926d56048510d1d06e76b4 SHA256 31163c34a7b9d1c9735181737cb31306f29f1f2a0335fb4f53ecccf8f62f11cd
-EBUILD mediatomb-0.12.1-r1.ebuild 3788 RMD160 370e344b4b1c9099c51d33616868fbd7710866f2 SHA1 4066cc52c291c5e5780bb13e1eed206b163ae9c6 SHA256 fa581b3b41515476bd71b57433b8731f680d5e7a22fde49ef6713d5d77a80d62
-EBUILD mediatomb-0.12.1-r2.ebuild 3885 RMD160 53f12f3615b08088407b0543e74cfe361b74efd0 SHA1 edd1fbb8869e86426be26537072400ac1dd3eea4 SHA256 350d19d6a28aef4e84f5d92d5234b85eab75ea8793134005934e3b46ad2eac9d
-MISC ChangeLog 5252 RMD160 8a216679a32ba8963f71c29416a38df3c7089ebe SHA1 a7695f006b77e9295e6a00c3529ffb2c2423b518 SHA256 53a9999c3aff8521877e6a08ad0711e4c83b8f53e37e2ca97c6d860e31dc5751
+EBUILD mediatomb-0.12.1-r1.ebuild 3791 RMD160 c0407450a348f295d06939dec91a1b087aa96f50 SHA1 1dcce2caac2e011d51cf802fc611fae48e550f65 SHA256 496889f126b0d4d89b8b7d0fc4211fa504e75f276d65459dcba4e8589800673a
+EBUILD mediatomb-0.12.1-r2.ebuild 3887 RMD160 be85f98f485a8ebd880f0db1bf388172c303ad74 SHA1 b5ccba997a86e3eb5ebd33daf51879124f240c94 SHA256 de5282fb9e2c1755bd0a8f9227466fd11193b4800de41fa09e16f3f3fb78cbb6
+MISC ChangeLog 5427 RMD160 f7597d6ff40e5a81322502a86a5c56a5c9f4bbf6 SHA1 42eafd34886a0ca036d4500928ada8efd3db827b SHA256 ec9fea746cb83b7696c871f97a583982db86540ba30b570c3a13345a9e9ebf0e
 MISC metadata.xml 917 RMD160 2c817f4ed63ff24ff4262df5897733098ab753f9 SHA1 1eb716452e1ead4a6fb2cf4931f76d2dc9df6cd9 SHA256 a8f81f44d0efc27bd22ebefe96864f84c94c1cadb1908ff1ed52fd3d91b99e23
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPt2MuAAoJEEdUh39IaPFNPQ4H/i5zmZHgDN6Z2YGh2rpngjln
-ryibcGX2zwFinnhLjS1sk5mDdLgOxyc3I3pI0QA0SZXO1Lia8GSpm3or/7nOV0nx
-MjsLdBZu6V59+WOA/owqStQKV80fQ/Vx4Nqx2V5X41VtWWpZMbldwlybvCOhNfz+
-mHbx5Hdiir8KBrWlDxDDv5mpI5dQ9oAM34BHhD5r1YuzJtkOA85+XA3FGr7/LuXx
-mLSqyt4TYytjj1LJHwiAhqsXWRwYQyObY7UvMKgKRwALqxxmGz4MPK1dkyDBagUw
-ddHZyDeZWnbSYQEUdAZahWuZqZLJ1l3rqC9vHutwz6VsNQth6KNAlzXnVjfnObs=
-=FgPA
+iQEcBAEBAgAGBQJPt2Q8AAoJEEdUh39IaPFNSRQIAKCJQgFw01IuG20yFjtMrjqh
+0H13Pp48QpQ8lYoH3MyEaPgGVToOBAsdTTK7ehGtYIYVxIl1AdMnEY1V/xGOdnJc
+FhTDoUM1GQnqUWXEc8K8SWNQmi6uzM/zoZ/WJben0jGbKdgg2GN3mczhRX3T7G1D
+WpcF3WfMiG0v4uCjpMTIsG4MZEppdKtM3zTdUG+SFJorCnHMCVfLEPVZzcMlFS9U
+/ENv34EhmFjxMl5Eow77romu+x8M3GMl+YECJPXlIepVFVA+PRMF8gE4LTHgveUQ
+b6NLllBEzKjJ7MmeqYuTMzOv7BMAfXZDVKWI5mn05fkqSVPR1oqjFdfWlQ3NCIc=
+=t5Lp
 -----END PGP SIGNATURE-----
diff --git a/net-misc/mediatomb/mediatomb-0.12.1-r1.ebuild b/net-misc/mediatomb/mediatomb-0.12.1-r1.ebuild
index de1d9efde69d..5f60c5ba2541 100644
--- a/net-misc/mediatomb/mediatomb-0.12.1-r1.ebuild
+++ b/net-misc/mediatomb/mediatomb-0.12.1-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/net-misc/mediatomb/mediatomb-0.12.1-r1.ebuild,v 1.2 2012/03/11 04:36:12 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.1-r1.ebuild,v 1.3 2012/05/19 09:13:42 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils linux-info
@@ -24,7 +24,7 @@ DEPEND="
 	lastfm? ( >=media-libs/lastfmlib-0.4 )
 	exif? ( media-libs/libexif )
 	libextractor? ( media-libs/libextractor )
-	mp4? ( media-libs/libmp4v2 )
+	mp4? ( media-libs/libmp4v2:0 )
 	ffmpeg? ( virtual/ffmpeg )
 	thumbnail? ( media-video/ffmpegthumbnailer[jpeg] )
 	net-misc/curl
diff --git a/net-misc/mediatomb/mediatomb-0.12.1-r2.ebuild b/net-misc/mediatomb/mediatomb-0.12.1-r2.ebuild
index ffe39bba4fe5..3d5a70c6c312 100644
--- a/net-misc/mediatomb/mediatomb-0.12.1-r2.ebuild
+++ b/net-misc/mediatomb/mediatomb-0.12.1-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/net-misc/mediatomb/mediatomb-0.12.1-r2.ebuild,v 1.1 2012/04/11 04:54:08 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.1-r2.ebuild,v 1.2 2012/05/19 09:13:42 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils linux-info
@@ -24,7 +24,7 @@ DEPEND="
 	lastfm? ( >=media-libs/lastfmlib-0.4 )
 	exif? ( media-libs/libexif )
 	libextractor? ( media-libs/libextractor )
-	mp4? ( >=media-libs/libmp4v2-1.9.1_p479 )
+	mp4? ( >=media-libs/libmp4v2-1.9.1_p479:0 )
 	ffmpeg? ( virtual/ffmpeg )
 	thumbnail? ( media-video/ffmpegthumbnailer[jpeg] )
 	net-misc/curl