Introduce USE=libav to control the preferred implementation. Add subslot op to force rebuilds on ABI change.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 155 insertions, 2 deletions

diff --git a/net-misc/mediatomb/ChangeLog b/net-misc/mediatomb/ChangeLog
index cb4dd3b0a334..d1eb6e97d49c 100644
--- a/net-misc/mediatomb/ChangeLog
+++ b/net-misc/mediatomb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/mediatomb
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.62 2015/01/18 18:54:09 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.63 2015/02/01 23:27:52 mgorny Exp $
+
+*mediatomb-0.12.2_pre20150118-r1 (01 Feb 2015)
+
+  01 Feb 2015; Michał Górny <mgorny@gentoo.org>
+  +mediatomb-0.12.2_pre20150118-r1.ebuild:
+  Introduce USE=libav to control the preferred implementation. Add subslot op to
+  force rebuilds on ABI change.
 
 *mediatomb-0.12.2_pre20150118 (18 Jan 2015)
 
diff --git a/net-misc/mediatomb/Manifest b/net-misc/mediatomb/Manifest
index 37532bf2eede..f4fc87d3228f 100644
--- a/net-misc/mediatomb/Manifest
+++ b/net-misc/mediatomb/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX mediatomb-0.12.0.confd 805 SHA256 21b1b9d31a6db76c5c1ccfbf00e5cd553eecfeb0e2bb161ccc024eab2243293c SHA512 74d2866c749272fe71e97e73ddf349070c51879967e7fd55716bb2dfc49f89d80d0655ac05e01fdb107fb057a62540116dcebdda87840b16c7bd11962c12065c WHIRLPOOL 3b545b860f61c5a91db2d9ba0ee8a30b572bb073ae7a82456488a2d8bacfa03e89218722d6e072ed7ab32f995bc5465f8da53c5bdaa4a049eb5d7caa8a71c5d8
 AUX mediatomb-0.12.0.config 6180 SHA256 cb43e92639e5e53908567c050c9a2fc0e5c349fd11a149414590c2c6a402b4d2 SHA512 310f408d6925ac7c2a4b5cbb0a8a854ba41c8aaa678b1e1805649e73be86d9e438da2fce7731df0e244b78271da98751e66624af15328633833603f7645be081 WHIRLPOOL abc2ad05aa92fa540ea4c69db24e205fa84babd308ff769eda68a7e4d68c004b96191c63566db71a308a2c309b10999ab9925af8e00cbf9caa90e16d90467871
 AUX mediatomb-0.12.0.initd 541 SHA256 8dfe99d619a3384b2fb9105051daae1fc6c88402364d4203b21344f766a6b696 SHA512 5aab06ea989986350f6002f67946a9abd0e3c4ec538f4b143454ed92fc5384344db862cf190b632f6b343b4e5fa268b55922ec1eafa3859705185c14af066e47 WHIRLPOOL c07afad49c46c633e32ac33a82de8316fc0ccf2dbdb65662f79bcf40b4a5e991ca710648537278f4e6eb82afd34b47df22c713b86ca6bececf79183126cfdac8
@@ -20,6 +23,26 @@ DIST mediatomb_0.12.1-4.debian.tar.gz 34161 SHA256 b1e48d01f4f99362ef554c9220df2
 DIST mediatomb_0.12.1-5.debian.tar.gz 36001 SHA256 bfbc971eeaeb09791d4cf1b1102a19ca9ce69d67c97608bba7b8ce3b519a8625 SHA512 420cf0d4fc0aa82337f2893ef18f04f9d079d833f2540d6bee504d423e8acee5e5ae528d97f5cd4228d6648777c62d6186532f7a74d3d0cb04f9226a2de1dd95 WHIRLPOOL 3d826181f97873fc9acb67fa5a3171b9e0c60862066cc0dd29e05a4f793828fbcfb438dd1375d56144933d101824a4f498b5dbf1e269e3bb12e4ee53d9b13d59
 EBUILD mediatomb-0.12.1-r7.ebuild 4426 SHA256 7d6fbb18ea1492ac81408fbcb9d7e62c0be0c35cc8420c75461d773da70968c6 SHA512 08fe49f1e201a4a334866f3a407b0f8de88fd22abb3554ce862b590dd553d9810513387c681e9e0a7355adbbe8905e5f8e1c970c802eaa0af8a8c5367e5e4773 WHIRLPOOL 90744b925113751c1db203ecabebdbac1bc5300fe46b254085fc2f4466d9436a420e3347f5323e07e3e36f532f7c9af36df1fc30e56847e29358a9d46d6d3183
 EBUILD mediatomb-0.12.1-r8.ebuild 4402 SHA256 197e6200e897d62274db820c30d88c5bf787283989a93f985835656502d61ff3 SHA512 c40157f60d910047951f2f70db16e5f148e28f530837ffb7cb6abe7370b40c82c4c54c43360663c1092377d288b27726fd45baea8d082a432dfe7ef3a6f9a1fe WHIRLPOOL 928556fba674097b2a64d893455260ce78f1c12e96dd9583a74a0f98b2af6f03c3bc8affac5ad92a47e738a40c6ab601cdc0551a5d3108f024f3e46bd4c1b669
+EBUILD mediatomb-0.12.2_pre20150118-r1.ebuild 3379 SHA256 4b5f63050e4dfa78f382c03d3e6927692c9020c91abf2f6d53a5a5e197af1cff SHA512 1c8cdc322e15401a548435c7276638304f59ad0681443bc97196f449be3b5d0f06bacd282e42567f1d62ce1afda4d62cedb1c4149a8fde4609435e842dac4575 WHIRLPOOL dcaabf33ee5d55fbad0907627c33e0332ec8dd417057b45e5a021127e62fd8a37d038b10bf03c3b36244c9fa84a66ee8f9ce02d1d00c351546cacf29c00f06be
 EBUILD mediatomb-0.12.2_pre20150118.ebuild 3347 SHA256 a3058008ae2e9c4f48e57e67b449e193f545a3037c2bc2e3ad74f330c84d3e39 SHA512 039f3174af022cc892ed5735f52780bfe404b3291a7cf43d9513ca8db07451f0e0137cd55a77283b46bb409ef77beda68bb18085b849021a7f034435ba9a2636 WHIRLPOOL 341362f1011836280dd4efd2de9ebe10abacc8ede49e70b84bffac073fdb0d9f5e19a1a1cfd612fb79e41aa5868bb925099580a3c171e96614baa9bbc9bf3944
-MISC ChangeLog 11527 SHA256 86f49205faccd75bc1b9bc18fd0f07a6740c90b75a9aa50ce1ed65a12427257b SHA512 fff854db3fb467646f1d10f0a5ee43458c350821e284d34a6c9fe7e508e44796632ff2899bb55bc8c7193b8b68523b4a38daaf9874ff6944f992aedbf72f4108 WHIRLPOOL e269d4eab720a9a036076f6d7ffd17074dcab9d6a4a8ee2ffe67f8b97191c6767d195fe2931bc7e58f00e55be0b1335a7dce0095d063b410daea759ac33d2348
+MISC ChangeLog 11779 SHA256 540c4932f91dfc02cc15169cca1d0850b7a34c32334a3cb6eb6feea8dc74a7fd SHA512 3ad48e5ee61f984263320f8b7f42dcb6878953d97ef21e4d789bea4fd63597a6edf37227be94e442db89158ca93bc17c7eb07d78fa5ae44f2d5e2b7c259cbbc7 WHIRLPOOL 9f053d26641438c1c909da2ea8001192eef1a03f0b0f474bab59bc19b01b6ec873e98d5704b850421504c2f00ab19cfdfd74bd51f47ea4d0f572282533eeb944
 MISC metadata.xml 1118 SHA256 5fef1234288fa61e9617f7c3fc857607cd4fe962e65d6957b983f21bfaf6746a SHA512 81afc84f7f54de6565a2c3faabc7795516f47282eaf47151186929cc3e699e04537c3825d1972bef48dd897c3eef84d46f30c880a8e98ab95c86f79b640d1297 WHIRLPOOL 9ca2bf1662c76fc878a4a1c4d638de5bd01d80e22b5aed0667cf2c59a6eae685c420bda12373d3d6cc7c390447efb169d239f10d95fb9375181057ec169735d4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJUzrZ5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOmGYP/0afFmCmixFTzeomu/BuABEZ
+PqjVkWSgXfK4M7CUTcHchm6IJsofCMjWlTHh5jLHQ/Du2Ikfqv64AYEMUG1yEcPe
+ZIHJ8/yMi51+Vw8AKR5X47+tJ9X3VhacOJBOYkE8BFprEcQgzqH/UwqKqY2rBhO9
+mxd7yygwfNqn9yYNUihyoG33z3nIryaK6edEi4rEa9j1QhDjGGKoH9GVbPHC+t3s
+2nA8+66Q0ZUGNT0HZvFhi69PW2j3MXWyRpwfyKvl5ciD6XNxLwjk1Bgsr/L83Rpg
+bYiyO/2OD9EceIJNoNpkXAk+220MHhQaja5qJRf3FOQl2dCCPlhErKD/C6hQwSSr
+KWfOcfK47B2R8R9holVXwF4SAx3eIZfNNNByGSCW9mod78YZiFrajZCBqmydI7VH
+Rd829NSUdFbr/Vti372WAYFqJoJH8AYr/ux2Jo9RZIr+sNsUREgJTE2ponCJ9HVd
+3+mbd3X35c8excElFSCjrEmsqsfBvoX74aN/r3Nd9nLQkIA+Gk547CY5hA4XezqI
+dvTM/LQynaYqVCTvdxknHgYnpT13CZ726/ihtPcyQAp0NzWJCOXykuNw6qmszPB7
+cATR/WWsWrAl55FA+T6pB8Ox+z+dd12TjFXKzQ/MisZz2oTqFUwRykrxkU9xXsjF
+ry/zeaGyVWrtHzLNmZdc
+=wiRT
+-----END PGP SIGNATURE-----
diff --git a/net-misc/mediatomb/mediatomb-0.12.2_pre20150118-r1.ebuild b/net-misc/mediatomb/mediatomb-0.12.2_pre20150118-r1.ebuild
new file mode 100644
index 000000000000..0969e4873730
--- /dev/null
+++ b/net-misc/mediatomb/mediatomb-0.12.2_pre20150118-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.2_pre20150118-r1.ebuild,v 1.1 2015/02/01 23:27:52 mgorny Exp $
+
+EAPI=5
+inherit autotools eutils linux-info systemd user vcs-snapshot
+
+DESCRIPTION="MediaTomb is an open source UPnP MediaServer"
+HOMEPAGE="http://www.mediatomb.cc/"
+SRC_URI="https://github.com/v00d00/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="curl debug +exif +ffmpeg flac id3tag +inotify +javascript lastfm
+	libav +magic +mp4 mysql +sqlite +taglib thumbnail +zlib"
+REQUIRED_USE="
+	|| ( mysql sqlite )
+	taglib? ( !id3tag )
+	id3tag? ( !taglib )
+	thumbnail? ( ffmpeg )
+"
+
+DEPEND="mysql? ( virtual/mysql )
+	dev-libs/expat
+	id3tag? ( media-libs/id3lib )
+	javascript? ( >=dev-lang/spidermonkey-1.8.5:0 )
+	taglib? ( media-libs/taglib )
+	sqlite? ( >=dev-db/sqlite-3 )
+	lastfm? ( >=media-libs/lastfmlib-0.4 )
+	exif? ( media-libs/libexif )
+	mp4? ( >=media-libs/libmp4v2-1.9.1_p479:0 )
+	ffmpeg? (
+		libav? ( >=media-video/libav-10:0= )
+		!libav? ( >=media-video/ffmpeg-2.2:0= )
+	)
+	flac? ( media-libs/flac )
+	thumbnail? ( media-video/ffmpegthumbnailer[jpeg] )
+	curl? ( net-misc/curl net-misc/youtube-dl )
+	magic? ( sys-apps/file )
+	sys-apps/util-linux
+	zlib? ( sys-libs/zlib )
+	virtual/libiconv
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup() {
+	use inotify && linux-info_pkg_setup
+
+	enewgroup mediatomb
+	enewuser mediatomb -1 -1 /dev/null mediatomb
+}
+
+src_prepare() {
+	# Support spidermonkey-187 #423991 #482392
+	if has_version "~dev-lang/spidermonkey-1.8.7" ; then
+		epatch "${FILESDIR}"/${PN}-0.12.1-mozjs187.patch
+	fi
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable curl) \
+		$(use_enable curl youtube) \
+		$(use_enable debug tombdebug) \
+		$(use_enable exif libexif) \
+		$(use_enable ffmpeg) \
+		$(use_enable flac) \
+		$(use_enable id3tag id3lib) \
+		$(use_enable inotify) \
+		$(use_enable javascript libjs) \
+		$(use_enable lastfm lastfm) \
+		$(use_enable magic libmagic) \
+		$(use_enable mp4 libmp4v2) \
+		$(use_enable mysql) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable taglib) \
+		$(use_enable thumbnail ffmpegthumbnailer) \
+		--enable-external-transcoding \
+		--enable-protocolinfo-extension
+}
+
+src_install() {
+	default
+
+	systemd_dounit "${S}"/scripts/systemd/"${PN}".service
+	use mysql && systemd_dounit "${S}"/scripts/systemd/"${PN}"-mysql.service
+
+	newinitd "${FILESDIR}"/${PN}-0.12.1.initd ${PN}
+	use mysql || sed -i -e "/use mysql/d" "${ED}"/etc/init.d/${PN}
+	newconfd "${FILESDIR}"/${PN}-0.12.0.confd ${PN}
+
+	insinto /etc/mediatomb
+	newins "${FILESDIR}/${PN}-0.12.0.config" config.xml
+	fperms 0600 /etc/mediatomb/config.xml
+	fowners mediatomb:mediatomb /etc/mediatomb/config.xml
+
+	keepdir /var/lib/mediatomb
+	fowners mediatomb:mediatomb /var/lib/mediatomb
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog "MediaTomb has been built with MySQL support and needs"
+		elog "to be configured before being started."
+		elog "For more information, please consult the MediaTomb"
+		elog "documentation: http://mediatomb.cc/pages/documentation"
+		elog
+	fi
+
+	elog "To configure MediaTomb edit:"
+	elog "/etc/mediatomb/config.xml"
+	elog
+	elog "The MediaTomb web interface can be reached at (after the service is started):"
+	elog "http://localhost:49152/"
+}