Add snapshot build, remove old

Package-Manager: portage-2.2.11-r1/cvs/Linux x86_64

3 files changed, 38 insertions, 64 deletions

diff --git a/net-misc/mediatomb/ChangeLog b/net-misc/mediatomb/ChangeLog
index 2c9394d047c2..f0274c6e72c8 100644
--- a/net-misc/mediatomb/ChangeLog
+++ b/net-misc/mediatomb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/mediatomb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.53 2014/05/03 19:51:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.54 2014/08/09 17:07:12 thev00d00 Exp $
+
+*mediatomb-0.12.2_pre20140809 (09 Aug 2014)
+
+  09 Aug 2014; Ian Whyman <thev00d00@gentoo.org>
+  +mediatomb-0.12.2_pre20140809.ebuild, -mediatomb-0.12.1-r5.ebuild:
+  Add snapshot build, remove old
 
 *mediatomb-0.12.1-r8 (03 May 2014)
 
diff --git a/net-misc/mediatomb/Manifest b/net-misc/mediatomb/Manifest
index 2e1cc303123f..dccd51e0df8a 100644
--- a/net-misc/mediatomb/Manifest
+++ b/net-misc/mediatomb/Manifest
@@ -1,6 +1,3 @@
------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
@@ -18,27 +15,11 @@ AUX mediatomb-0.12.1-thumbnail-locking.patch 4992 SHA256 7c760d4f74dceda8298b44a
 AUX mediatomb-0.12.1-youtube-dl.patch 4704 SHA256 76342683dea21e8566f599723658d4e90fb97c8d4d6dcc5c988115a308642667 SHA512 658e580499c17fb5a8f78c41095c38a94043c4e472b1996507b97229ab1fadd3c8044f9c3d27c8f210052e1c96b5ad88cf9e70daef9e98d2e740b9376eb7f102 WHIRLPOOL 3c9055ce23dd87651fe41e354ffc78bb0d3215456f8c0d8268fa968e7bf0d923971615820101fcf60b527305a1a8f9d4413ce0a9d5367fd3dc195f4579dfa020
 AUX mediatomb-0.12.1.initd 954 SHA256 7a12a5e4aac11e1e3abae9522ecea10527c813b12b51258f47518868c23c94c4 SHA512 6d8e3f95a8342e5a8097f17f1b44a52afad6c89cff59b8cbe8ccc947bdc41e4c20ecfc0f40fee3b64617b240b7f5d3d8e9c1c129eeb9cf5a7686982cdfddafe9 WHIRLPOOL 7d019d5f13278b3bf8755b79bb191beeaed7daf5843a24aa0bbe67dda6aa029b71171a0276322836c0ffaa5f43f0c39b0af1f0cb8f242667748b01e097ba4de0
 DIST mediatomb-0.12.1.tar.gz 1240612 SHA256 31163c34a7b9d1c9735181737cb31306f29f1f2a0335fb4f53ecccf8f62f11cd SHA512 36e7269a532a79c91b4ea7be36f92cbefa913a1f856e422e46fe2b97ee7a569dd20c38b0cbe651a8e7faacde892ea18f3cac66c3c0737480c44f9b9bc3a45438 WHIRLPOOL 6a9e294aa9f8f40850863a86bae4fd6a81d198d7f4cf34d67a6a0cd568c387ef0f0bd5a3524c7bc05cb304f4e86dd0c12dc773bd1034c1924af6919cc740177b
+DIST mediatomb-0.12.2_pre20140809.tar.gz 2477223 SHA256 e550d7c2f64311775a682065e2361c1600288950b6399e78c281274ce8f70f93 SHA512 2855074a136602185e6cee79581c013d3096e233a7fdd682dc296c220788a5e6d0ee5036c682e4699854d92e59862b972e81ea048d1b97abb8e622bcb6a40f97 WHIRLPOOL f4819cee698a4a976410a453164858548a9045ed97758ab021e43e445080c99ac5fa1c88b897c5597d4e379a8fb28ffe747ac4bf6db8abad67f394549d3b6ea7
 DIST mediatomb_0.12.1-4.debian.tar.gz 34161 SHA256 b1e48d01f4f99362ef554c9220df21c48f6b76ad716e29427948a524e5c84d90 SHA512 21f876de3ec0b24bfcb37d387b5337d574f2e62e12944547f0a2e69e34532e296097fd04cce9941e994c3823a7bb863172db4fc3024d490f2a2359b7f0adb079 WHIRLPOOL ad38bc64411f1aac25672c522b862401897f0e4225ea21bab317a1c3311ef87a3e688f6ea1abb5a30eeb4cb3165dabbbff158eb5d4267dba901a54f15017078d
 DIST mediatomb_0.12.1-5.debian.tar.gz 36001 SHA256 bfbc971eeaeb09791d4cf1b1102a19ca9ce69d67c97608bba7b8ce3b519a8625 SHA512 420cf0d4fc0aa82337f2893ef18f04f9d079d833f2540d6bee504d423e8acee5e5ae528d97f5cd4228d6648777c62d6186532f7a74d3d0cb04f9226a2de1dd95 WHIRLPOOL 3d826181f97873fc9acb67fa5a3171b9e0c60862066cc0dd29e05a4f793828fbcfb438dd1375d56144933d101824a4f498b5dbf1e269e3bb12e4ee53d9b13d59
-EBUILD mediatomb-0.12.1-r5.ebuild 3961 SHA256 f8eab7ae715342ae5b40ca11912c1a35ba539f0660311d60baa0adc466080ac6 SHA512 083f55e2e1212ccb9cb44caf69f3b8ba461232eafbe635f2f06f774e76cd8118c8e41a6094fde6b87a56c2438b579adc745f1783e6d27595514f56788ba92b84 WHIRLPOOL 30f12fb8c52cb81c9bcb8a39fc809b4dfcd1f65a8092495151b409a486ed7219759062c3e737ba76e241720cc46145e2f683117c6a6465a98a7326a698e12ca2
 EBUILD mediatomb-0.12.1-r7.ebuild 4426 SHA256 7d6fbb18ea1492ac81408fbcb9d7e62c0be0c35cc8420c75461d773da70968c6 SHA512 08fe49f1e201a4a334866f3a407b0f8de88fd22abb3554ce862b590dd553d9810513387c681e9e0a7355adbbe8905e5f8e1c970c802eaa0af8a8c5367e5e4773 WHIRLPOOL 90744b925113751c1db203ecabebdbac1bc5300fe46b254085fc2f4466d9436a420e3347f5323e07e3e36f532f7c9af36df1fc30e56847e29358a9d46d6d3183
 EBUILD mediatomb-0.12.1-r8.ebuild 4404 SHA256 a655d5b2a5ce0e3e4785746195bc0ca1bdb3afb567719c32e84fa62ee97eb540 SHA512 572cc306054279374d14fe3b84b1e40afccdfae4d2854b7ffe90816944e74fa65b33aee3e253db063a1cd6efd68a213bc2b1f96b16d4738711ef51059012320a WHIRLPOOL d744e35af9e359a825bb640abbe9fcb5af63bc9c16f41c606b7a93a42895563ae749e0a6bf193a07af116f8e295b6f37b0d4638a1acd6597b596ad3dcbdf2954
-MISC ChangeLog 10046 SHA256 c26200c4fa7df933bc696d2f4d2d6db67610c79b791f46507c8d26009322502c SHA512 e488129eeb3a68c0218a69525baa354a59d22d99979a1390f3de67d153642bff884cbac3e22902c9926bb7c6a590257534c39e741771b12a7816ed5555ddf19e WHIRLPOOL 07c49a62455fadf65fae2638337bc8380313065672be67259980c0a728a0e529cb03c899dc3aa291936a084281693c1804ad4dc41b8a9f85e4e3de96a0cf69d4
+EBUILD mediatomb-0.12.2_pre20140809.ebuild 3136 SHA256 4c515a6979618bfa7d6257ebf387cbaede7064ae24ce747970adfe3dcbfb25c7 SHA512 64c7310f144d40e5ea6a3bd2f364fe5773ad7dcd8dabc852985ddd03e623baeeb16b60e5216b4a495ed2539a4e896b146d2f7454dca8072e42aa884515b834d8 WHIRLPOOL 806a753159cdf1aa5fdd43e56074f5730a3944be2fd16041a21115f2420269962cea79c33082d5f52ceffd865ceaa8f72948a9d42fefefd33125260684dcb157
+MISC ChangeLog 10246 SHA256 948e407be871d319ffbc7d1c3abc0286c9398cb4c0f9616589e8486910aa2548 SHA512 767f70697e04e71f506646f70e73143c557461c1e3f9563a04fe6723db6aff443765f83893f504e8697d0346f09aca7181d339578d1141f1dd56306ae13ecd16 WHIRLPOOL d196c393cef4a30275554e5c1c9bd3fabdac3c95ce40e57d5e2cda7f73004ff4a2ae858992e08d2cf27e101fcef95984cfedb737e4f4ed93f1705da08bf3eedd
 MISC metadata.xml 1053 SHA256 80d12510f8130f063da5b1255f0e0ce668c11b1cb689392e93eb926be1fb9c0f SHA512 fbb8841367c92c0deb0a2248d4c3691d46e3f29e1270a41e78c1c11c7bb327393709e14e9ba6124c6ad7e3f953ecf1d3ced1e75784161c272f28b3fcafedc529 WHIRLPOOL 3eeb9bd0aaa01e7b2343c795daf175e4accacef6e7bfdc296e1df6c5e4b93fdc60e62585a80c605e4a86a3dc47d9f26202bf7a63fc97eb3dadf2953604e45f2c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJTZUjMAAoJEPGu1DbS6WIAkMQP/R7VTeiwFlHvj34R7Ob6BzrS
-u9DfxADUV6b5/FttGeUaN/zl7uGr1rtNUzjuMDAlftIt0hNF+mZqQXiS68e1P32E
-w0Oo3KgHSapSg2pZ8NSC+/zctsIOw/qmXHDch2iC+BWiouKQ0RX3bPHmmMqgqD4i
-4QlAIzTtjVQAzZvUp391+g4VuzSwmpT0M0uWBd4lRT9kquVfsHRj1aNka2EpLnX4
-6mHPZ+qVWfDSh+6Un+QO5XRA2Fkzy5ZpprQKH8dxEamCx2PfJ6qXg68qUUhjPcx2
-U6rFUzOuBK2b+wr49E3bLbb9GpKtn6pnwBmIXy8ESDK0HggCqfi1TVSolB21tW89
-qFPy9lHMuy3Geebnok2TRP54cAfKZwbdgpUWbR3WEdy1JGzan4S51VvTWHYPDwhN
-D3y+PQQsOTb5ZvNB9PhYZlbAfvadI2STBBxlCECHKhp4uxlnYFqp0O7Hc74j+BZL
-99vkWJhAXFCA/OWqIq9BxoKNjiKAXCckI7MA4+FKyHzEAz2BDzsuhRNBdiRtjnQW
-o11LN747vUITPkUlvNO3gd7oxFx64bsaJ/qxo9dpXGBTinj9LCENVToJM4K4mHcX
-Vd8ofttW3Cm/FpWFUInF74exKrCtywsIcqbQPPJuXBV4WYLuAckgne4IiBr4qo2t
-a14Xsx+NMw7pM5ct84oL
-=nrpz
------END PGP SIGNATURE-----
diff --git a/net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild b/net-misc/mediatomb/mediatomb-0.12.2_pre20140809.ebuild
index 0a6e66b07c5d..b3d1b6ef8de9 100644
--- a/net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild
+++ b/net-misc/mediatomb/mediatomb-0.12.2_pre20140809.ebuild
@@ -1,96 +1,83 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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-r5.ebuild,v 1.7 2013/08/26 15:31:14 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.2_pre20140809.ebuild,v 1.1 2014/08/09 17:07:12 thev00d00 Exp $
 
-EAPI="4"
-inherit autotools eutils linux-info user
+EAPI=5
+inherit autotools eutils linux-info user vcs-snapshot
 
-DEB_VER="4"
 DESCRIPTION="MediaTomb is an open source UPnP MediaServer"
 HOMEPAGE="http://www.mediatomb.cc/"
-SRC_URI="mirror://sourceforge/mediatomb/${P}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_VER}.debian.tar.gz"
+SRC_URI="https://github.com/v00d00/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="+curl debug +exif +ffmpeg id3tag inotify +javascript lastfm libextractor +magic +mp4 mysql +sqlite +taglib thumbnail +zlib"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+IUSE="curl debug +exif +ffmpeg flac id3tag +inotify +javascript lastfm
+		+magic +mp4 mysql +sqlite +taglib thumbnail +zlib"
 REQUIRED_USE="
 	|| ( mysql sqlite )
-	taglib? ( !id3tag ) id3tag? ( !taglib )
-	thumbnail? ( ffmpeg !libextractor )
-	ffmpeg? ( !libextractor )
-	libextractor? ( !ffmpeg !thumbnail )
+	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 )
-	dev-libs/expat
 	taglib? ( media-libs/taglib )
 	sqlite? ( >=dev-db/sqlite-3 )
 	lastfm? ( >=media-libs/lastfmlib-0.4 )
 	exif? ( media-libs/libexif )
-	libextractor? ( media-libs/libextractor )
 	mp4? ( >=media-libs/libmp4v2-1.9.1_p479:0 )
 	ffmpeg? ( virtual/ffmpeg )
+	flac? ( media-libs/flac )
 	thumbnail? ( media-video/ffmpegthumbnailer[jpeg] )
-	curl? ( net-misc/curl )
+	curl? ( net-misc/curl net-misc/youtube-dl )
 	magic? ( sys-apps/file )
 	sys-apps/util-linux
 	zlib? ( sys-libs/zlib )
-	virtual/libiconv"
+	virtual/libiconv
+"
 RDEPEND="${DEPEND}"
 
+CONFIG_CHECK="~INOTIFY_USER"
+
 pkg_setup() {
-	if use inotify ; then
-		if ! linux_config_exists || ! linux_chkconfig_present INOTIFY_USER ; then
-			ewarn "Please enable Inotify support in your kernel:"
-			ewarn "  File systems --->"
-			ewarn "    [*] Inotify support for userspace"
-		fi
-	fi
 	enewgroup mediatomb
 	enewuser mediatomb -1 -1 /dev/null mediatomb
 }
 
 src_prepare() {
-	local p dd="${WORKDIR}"/debian/patches
-	sed -i -r '/^[-+]{3} /s:[.][.]/::' "${dd}"/* || die
-	for p in $(<"${dd}"/series) ; do
-		epatch "${dd}"/${p}
-	done
-	epatch "${FILESDIR}"/${P}-libmp4v2.patch
-	epatch "${FILESDIR}"/${P}-system-uuid.patch #270830
+	# Support spidermonkey-187 #423991 #482392
 	if has_version "~dev-lang/spidermonkey-1.8.7" ; then
-		epatch "${FILESDIR}"/${P}-mozjs187.patch #435394
+		epatch "${FILESDIR}"/${PN}-0.12.1-mozjs187.patch
 	fi
-	epatch "${FILESDIR}"/${P}-libextractor.patch #435394
-	epatch "${FILESDIR}"/${P}-inotify-hard-links.patch
-	epatch "${FILESDIR}"/${P}-thumb-cache.patch
-	epatch "${FILESDIR}"/${P}-libav9.patch
-	epatch "${FILESDIR}"/${P}-avformatcontext-pointer.patch #446922
+
+	epatch_user
+
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		$(use_enable curl) $(use_enable curl youtube) \
+		$(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 lastfmlib) \
-		$(use_enable libextractor) \
+		$(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) \
-		$(use_enable zlib) \
 		--enable-external-transcoding \
 		--enable-protocolinfo-extension
 }