Version bump, tidy old

Package-Manager: portage-2.2.28

4 files changed, 2 insertions, 284 deletions

diff --git a/net-misc/mediatomb/Manifest b/net-misc/mediatomb/Manifest
index f8cf86b6d40d..5ab8360bf424 100644
--- a/net-misc/mediatomb/Manifest
+++ b/net-misc/mediatomb/Manifest
@@ -1,4 +1,3 @@
 DIST mediatomb-0.12.1.tar.gz 1240612 SHA256 31163c34a7b9d1c9735181737cb31306f29f1f2a0335fb4f53ecccf8f62f11cd SHA512 36e7269a532a79c91b4ea7be36f92cbefa913a1f856e422e46fe2b97ee7a569dd20c38b0cbe651a8e7faacde892ea18f3cac66c3c0737480c44f9b9bc3a45438 WHIRLPOOL 6a9e294aa9f8f40850863a86bae4fd6a81d198d7f4cf34d67a6a0cd568c387ef0f0bd5a3524c7bc05cb304f4e86dd0c12dc773bd1034c1924af6919cc740177b
-DIST mediatomb-0.12.2_pre20150118.tar.gz 2413534 SHA256 a892fe02151978433f3604d10f6dca35a935c61ea0988bd10312cdbdb1055a8b SHA512 968b9a91de48396e05ed1c65e77e576fc5b959bce7b2b77cde14f4aa88fbc57ac2b0e6d34f7365a071a01a6c7285f36866097c9e7608eef7e33c3d4d215e0675 WHIRLPOOL c9be68ece751811e9796a5dc43e1852daebbbc7c58fda7867afd23e070e84f8c48d32ca3b2ae2dfc1a422c4443d5d5e74b30841c1dabf35bb00d68336f0287df
-DIST mediatomb_0.12.1-4.debian.tar.gz 34161 SHA256 b1e48d01f4f99362ef554c9220df21c48f6b76ad716e29427948a524e5c84d90 SHA512 21f876de3ec0b24bfcb37d387b5337d574f2e62e12944547f0a2e69e34532e296097fd04cce9941e994c3823a7bb863172db4fc3024d490f2a2359b7f0adb079 WHIRLPOOL ad38bc64411f1aac25672c522b862401897f0e4225ea21bab317a1c3311ef87a3e688f6ea1abb5a30eeb4cb3165dabbbff158eb5d4267dba901a54f15017078d
+DIST mediatomb-0.12.2_pre20160522.tar.gz 2415058 SHA256 30df1c8c57dcc2e90d5f0f9ed3c4613cc798aeae21e8541c6668be0066d7c4b9 SHA512 b45c81f548013b8fc0de84e02e47c8acbf21c359a6c41a5f13addfdd9d084ee58b23b776da4dce4da1f924a80a02835c622245165da09107c0b89786e5a69804 WHIRLPOOL cbdbccbe5a0e09a1fd8948382f96e696ab752a66a355eeb3a0eb49d0e75641567870e2979b375724d795362ad265786509a5bd53f6d74d27914ceaa714ec4dc8
 DIST mediatomb_0.12.1-5.debian.tar.gz 36001 SHA256 bfbc971eeaeb09791d4cf1b1102a19ca9ce69d67c97608bba7b8ce3b519a8625 SHA512 420cf0d4fc0aa82337f2893ef18f04f9d079d833f2540d6bee504d423e8acee5e5ae528d97f5cd4228d6648777c62d6186532f7a74d3d0cb04f9226a2de1dd95 WHIRLPOOL 3d826181f97873fc9acb67fa5a3171b9e0c60862066cc0dd29e05a4f793828fbcfb438dd1375d56144933d101824a4f498b5dbf1e269e3bb12e4ee53d9b13d59
diff --git a/net-misc/mediatomb/mediatomb-0.12.1-r7.ebuild b/net-misc/mediatomb/mediatomb-0.12.1-r7.ebuild
deleted file mode 100644
index 7ab5e96d1c24..000000000000
--- a/net-misc/mediatomb/mediatomb-0.12.1-r7.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils linux-info user
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-
-IUSE="curl debug +exif +ffmpeg flac id3tag +inotify +javascript lastfm
-		libextractor +magic +mp4 mysql +sqlite +taglib thumbnail +zlib"
-REQUIRED_USE="
-	|| ( mysql sqlite )
-	taglib? ( !id3tag )
-	id3tag? ( !taglib )
-	thumbnail? ( ffmpeg !libextractor )
-	ffmpeg? ( !libextractor )
-	libextractor? ( !ffmpeg !thumbnail )
-"
-
-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 )
-	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 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() {
-	enewgroup mediatomb
-	enewuser mediatomb -1 -1 /dev/null mediatomb
-}
-
-src_prepare() {
-
-	# Apply Debians patchset
-	local p dd="${WORKDIR}"/debian/patches
-	sed -i -r '/^[-+]{3} /s:[.][.]/::' "${dd}"/* || die
-	for p in $(<"${dd}"/series) ; do
-		epatch "${dd}"/${p}
-	done
-
-	# libmp4v2 API breakage #410235
-	epatch "${FILESDIR}"/${P}-libmp4v2.patch
-
-	# Use system libuuid #270830
-	epatch "${FILESDIR}"/${P}-system-uuid.patch
-
-	# Support spidermonkey-187 #423991 #482392
-	if has_version "~dev-lang/spidermonkey-1.8.7" ; then
-		epatch "${FILESDIR}"/${P}-mozjs187.patch
-	fi
-
-	# Support libextractor-0.6.0 #435394
-	epatch "${FILESDIR}"/${P}-libextractor.patch
-
-	# Fix inotify and hard links
-	epatch "${FILESDIR}"/${P}-inotify-hard-links.patch
-
-	# Add support for caching thumbnails
-	epatch "${FILESDIR}"/${P}-thumb-cache.patch
-
-	# Support libav-9 #443178
-	epatch "${FILESDIR}"/${P}-libav9.patch
-
-	# Fix Crash due to Uninitalized AVFormatContext pointer #446922
-	epatch "${FILESDIR}"/${P}-avformatcontext-pointer.patch
-
-	# Respect AR #464710
-	epatch "${FILESDIR}"/${P}-system-ar.patch
-
-	# Add flac metadata support #494398
-	epatch "${FILESDIR}"/${P}-flac-metadata.patch
-
-	# Work around broken youtube support by using youtube-dl #467110
-	epatch "${FILESDIR}"/${P}-youtube-dl.patch
-
-	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 FLAC) \
-		$(use_enable id3tag id3lib) \
-		$(use_enable inotify) \
-		$(use_enable javascript libjs) \
-		$(use_enable lastfm lastfmlib) \
-		$(use_enable libextractor) \
-		$(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
-}
-
-src_install() {
-	default
-
-	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/"
-}
diff --git a/net-misc/mediatomb/mediatomb-0.12.2_pre20150118.ebuild b/net-misc/mediatomb/mediatomb-0.12.2_pre20150118.ebuild
deleted file mode 100644
index c835557f0cb4..000000000000
--- a/net-misc/mediatomb/mediatomb-0.12.2_pre20150118.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
-		+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? ( || ( >=media-video/libav-10 >=media-video/ffmpeg-2.2 ) )
-	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/"
-}
diff --git a/net-misc/mediatomb/mediatomb-0.12.2_pre20150118-r1.ebuild b/net-misc/mediatomb/mediatomb-0.12.2_pre20160522.ebuild
index a2081aaa5108..395371600372 100644
--- a/net-misc/mediatomb/mediatomb-0.12.2_pre20150118-r1.ebuild
+++ b/net-misc/mediatomb/mediatomb-0.12.2_pre20160522.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$