summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Whyman <thev00d00@gentoo.org>2013-01-20 20:35:20 +0000
committerIan Whyman <thev00d00@gentoo.org>2013-01-20 20:35:20 +0000
commitdf68c22f70f7dc6da3dbfaa1d92274ebbb85b1b4 (patch)
treeb04eec140646aebe60aec89a83dc64b679934e5a /net-misc
parentAdd PYTHON_USEDEP to setuptools dep. (diff)
downloadhistorical-df68c22f70f7dc6da3dbfaa1d92274ebbb85b1b4.tar.gz
historical-df68c22f70f7dc6da3dbfaa1d92274ebbb85b1b4.tar.bz2
historical-df68c22f70f7dc6da3dbfaa1d92274ebbb85b1b4.zip
Update to use REQUIRED_USE, Thanks to BT in #448484, Drop old
Package-Manager: portage-2.2.0_alpha157/cvs/Linux x86_64
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/mediatomb/ChangeLog6
-rw-r--r--net-misc/mediatomb/Manifest6
-rw-r--r--net-misc/mediatomb/mediatomb-0.12.1-r1.ebuild122
-rw-r--r--net-misc/mediatomb/mediatomb-0.12.1-r3.ebuild134
-rw-r--r--net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild26
5 files changed, 15 insertions, 279 deletions
diff --git a/net-misc/mediatomb/ChangeLog b/net-misc/mediatomb/ChangeLog
index 454108933498..63e904539237 100644
--- a/net-misc/mediatomb/ChangeLog
+++ b/net-misc/mediatomb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/mediatomb
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.41 2013/01/20 16:28:11 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.42 2013/01/20 20:35:16 thev00d00 Exp $
+
+ 20 Jan 2013; Ian Whyman <thev00d00@gentoo.org> -mediatomb-0.12.1-r1.ebuild,
+ -mediatomb-0.12.1-r3.ebuild, mediatomb-0.12.1-r5.ebuild:
+ Update to use REQUIRED_USE, Thanks to BT in #448484, Drop old
*mediatomb-0.12.1-r5 (20 Jan 2013)
diff --git a/net-misc/mediatomb/Manifest b/net-misc/mediatomb/Manifest
index c832942d0330..23a8adc660ab 100644
--- a/net-misc/mediatomb/Manifest
+++ b/net-misc/mediatomb/Manifest
@@ -17,9 +17,7 @@ AUX mediatomb-0.12.1-thumb-cache.patch 8315 SHA256 425a78297827ab2f5a2cdfbe03ad5
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.1-4.debian.tar.gz 34161 SHA256 b1e48d01f4f99362ef554c9220df21c48f6b76ad716e29427948a524e5c84d90 SHA512 21f876de3ec0b24bfcb37d387b5337d574f2e62e12944547f0a2e69e34532e296097fd04cce9941e994c3823a7bb863172db4fc3024d490f2a2359b7f0adb079 WHIRLPOOL ad38bc64411f1aac25672c522b862401897f0e4225ea21bab317a1c3311ef87a3e688f6ea1abb5a30eeb4cb3165dabbbff158eb5d4267dba901a54f15017078d
-EBUILD mediatomb-0.12.1-r1.ebuild 3792 SHA256 f2e6e0aca325d095d92f6f6bba51b398461151ebbb6495fff5da1719bd0a3c48 SHA512 07fd3cf9d22e5f28525dceae5889b60e5846e14bfd4abd0b5ea893b7c6e99caad7f67285bab147f3dc9b7b0e6ce48c2185dd99dc134c8b7016bdebd27164441d WHIRLPOOL aad1ca88de7d922d25dbc7dd1278c337dd7e4e90ac1e891cf7d60986f110b524400835c03bdd10493d99b216680c3be3a78bc527baad994ba591f1276ef74866
EBUILD mediatomb-0.12.1-r2.ebuild 3889 SHA256 923070cbdadb4f1b04e604371734a28f3a6db7ae3270e27c880dddd432e5cb06 SHA512 33217cf659c746244293bbcfdcec90e6499cba612cbbfe8d12f425be383cd28ee24a928ebfafb239bb47eebade6fc75821295ac0bc3972c8f720f12b0cf00d95 WHIRLPOOL 6ba2c8038eb3213ed552a6772d9782b45f5cfa69a46912d55dd273fcb2df8927edcb94523077d1aa45d8fbe14dc07686aec45f76de648df181d5691702c62488
-EBUILD mediatomb-0.12.1-r3.ebuild 4113 SHA256 5c16826cfedc24d7428f47e19295c533f2706cc8c66597f16073b867214429bc SHA512 910146f4c7c768d0f2d7d766ada937b332f509984ec9c4a69f7e1493292d5f433dfc5a428afca97081b49b09af93e361199b145b5e6f88a7ff96a56f20d962f1 WHIRLPOOL 29689bc441ff1d0550ee3ca76cdf6fd7e0225c5aef680bd20ab763b31f4bbbee10595b74879356167359f9d06d42e008df6595168b948d61c6695e430e4e3fd8
-EBUILD mediatomb-0.12.1-r5.ebuild 4364 SHA256 66b8165247012e2a459708956c01a0db59ee463f535f2359b85916d67f3f5278 SHA512 787203930a22ab223358f4a437c306387608113430eca32bb93fc7e0f5e8c61427f0edeff5cdcc0ad803ca7f68b3fbe9df4a25fc453bf3210c5898fbf9355018 WHIRLPOOL 1bf4e655168925c35a91defc5141df5e997d2e1957cdb0519e3cfae5585e1477963c5308e71ced63db7bd6c0f65d20cc5d6fc2726e1cab4c114a334ee4547717
-MISC ChangeLog 7692 SHA256 0f8acfb3e4fb4cf0c84183c5bd539d5f385b2e64c66c7441d8849a1c7c53f201 SHA512 bb829992212c6e049850f32cbbb7053d8bf6439f06323f1c5da24879d267c68db1f5ab8122b60f194e4d1a75c934b9e0404911b9c654e2ec89edaa0bda6cb2ad WHIRLPOOL eeaf7008271df632ccbf2db67c464580c4c1979133bd2d2ad9beadfd9bdcafd847ceec07a0140f48ebef2541c75706e8184c272de19a555329e775c331171f35
+EBUILD mediatomb-0.12.1-r5.ebuild 4014 SHA256 beee0ddb049df342508cbb66b8550368b2c985bad90c6614f06489536a178f7b SHA512 25b51c97b8562ec8776eae222fa9454a5ed6fa696b88c86ebf562a7fedc55494df5068a047fd0031b0f83c26421660ec8321d0a266f5e94a8cd072f547ad5256 WHIRLPOOL 4496143a8572245a2b2c2ff1df9c568cb603d8f91ffd54f587a605fbfa746fc999fffc9faf78e83638dc8ecb6f861a93e2a7c7f457c295ee55491f1dc543b973
+MISC ChangeLog 7894 SHA256 822ebd8d3415be10456e51f90f52c54e1195a09715e151e2b36a9e2111c24bb3 SHA512 52138275baa2f49781e56f53953c9f3dd98ba8f10d086c22672ea129f80a014b4d24ea86e3e6a1e54c8298e1dbd35632a38012d34dc70b1e6ded5100922af2ba WHIRLPOOL 94706e84351a2700f20e38b800597179ad388040707770242aacaf46e0af313f4eb12fec14d76d5e9bc7810ee9b4b3ca9fe4e700887be9f114ae1cb1ddbd3bd9
MISC metadata.xml 868 SHA256 1d1c5d3778c67556255786a5082e7c45b598a2edf20159b6e337ed04ebe15bd4 SHA512 a20d44b05d6a4ebf31deed0289a4d7f0d96a8a1ff370a4bbec1d1f8b5b12823a047e846a95e24fd0e47c0020478d3ff0402642309a8fb8554db841db2fa89e05 WHIRLPOOL c68c00fe9cf9902c4c3a4edef9d223b6a68627c1c26aede016aaed4b7d8f7bcae6e280a9ddf8dea435e53c017a56eec303b3aab0d72bae0ca2c59e063d8f1720
diff --git a/net-misc/mediatomb/mediatomb-0.12.1-r1.ebuild b/net-misc/mediatomb/mediatomb-0.12.1-r1.ebuild
deleted file mode 100644
index ddd795294125..000000000000
--- a/net-misc/mediatomb/mediatomb-0.12.1-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# 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.4 2012/06/28 17:23:51 axs Exp $
-
-EAPI=2
-inherit autotools eutils linux-info
-
-DESCRIPTION="MediaTomb is an open source UPnP MediaServer"
-HOMEPAGE="http://www.mediatomb.cc/"
-SRC_URI="mirror://sourceforge/mediatomb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="debug +exif +ffmpeg inotify +javascript lastfm libextractor +mp4 mysql +taglib thumbnail"
-
-DEPEND="
- mysql? ( virtual/mysql )
- !mysql? ( >=dev-db/sqlite-3 )
- javascript? ( <dev-lang/spidermonkey-1.8.6 )
- dev-libs/expat
- taglib? ( media-libs/taglib )
- !taglib? ( media-libs/id3lib )
- lastfm? ( >=media-libs/lastfmlib-0.4 )
- exif? ( media-libs/libexif )
- libextractor? ( media-libs/libextractor )
- mp4? ( media-libs/libmp4v2:0 )
- ffmpeg? ( virtual/ffmpeg )
- thumbnail? ( media-video/ffmpegthumbnailer[jpeg] )
- net-misc/curl
- sys-apps/file
- sys-libs/zlib
- virtual/libiconv"
-RDEPEND="${DEPEND}"
-
-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
- ewarn " File systems --->"
- ewarn " [*] Inotify support for userspace"
- ewarn
- fi
- fi
- enewgroup mediatomb
- enewuser mediatomb -1 -1 /dev/null mediatomb
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-gcc46.patch"
- epatch "${FILESDIR}/${P}-libav7.patch"
- if use javascript && has_version ">=dev-lang/spidermonkey-1.8.5" ; then
- epatch "${FILESDIR}"/${P}-mozjs185.patch
- eautoreconf
- fi
-}
-
-src_configure() {
- if use thumbnail; then
- elog "libextrator does not work with thumbnail, disabling libextrator"
- myconf="${myconf} --enable-ffmpegthumbnailer --enable-ffmpeg --disable-libextractor"
- elif ! use thumbnail && use ffmpeg && use libextractor; then
- elog "libextrator does not work with ffmpeg, disabling libextrator"
- myconf="${myconf} --disable-ffmpegthumbnailer --enable-ffmpeg --disable-libextractor"
- else
- myconf="${myconf} $(use_enable thumbnail ffmpegthumbnailer) $(use_enable ffmpeg) $(use_enable libextractor)"
- fi
-
- econf \
- $(use_enable debug tombdebug) \
- $(use_enable exif libexif) \
- $(use_enable inotify) \
- $(use_enable javascript libjs) \
- $(use_enable lastfm lastfmlib) \
- $(use_enable mp4 libmp4v2) \
- $(use_enable mysql) $(use_enable !mysql sqlite3) \
- $(use_enable taglib) $(use_enable !taglib id3lib) \
- --enable-curl \
- --enable-external-transcoding \
- --enable-libmagic \
- --enable-protocolinfo-extension \
- --enable-youtube \
- --enable-zlib \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "Install failed!"
-
- dodoc AUTHORS ChangeLog NEWS README TODO
-
- sed -e "s:#MYSQL#:$(use mysql && has_version dev-db/mysql[-minimal] && echo "mysql"):" \
- "${FILESDIR}/${PN}-0.12.0.initd" > "${T}/mediatomb.initd" || die
- newinitd "${T}/mediatomb.initd" mediatomb || die
- newconfd "${FILESDIR}/${PN}-0.12.0.confd" mediatomb || die
-
- insinto /etc/mediatomb
- newins "${FILESDIR}/${PN}-0.12.0.config" config.xml || die
- 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.1-r3.ebuild b/net-misc/mediatomb/mediatomb-0.12.1-r3.ebuild
deleted file mode 100644
index 5bb4d76b15c9..000000000000
--- a/net-misc/mediatomb/mediatomb-0.12.1-r3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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-r3.ebuild,v 1.4 2012/10/04 03:52:25 vapier Exp $
-
-EAPI="4"
-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 id3tag inotify +javascript lastfm libextractor +magic +mp4 mysql +sqlite +taglib thumbnail +zlib"
-REQUIRED_USE="
- || ( mysql sqlite )
- taglib? ( !id3tag ) id3tag? ( !taglib )
-"
-
-DEPEND="mysql? ( virtual/mysql )
- id3tag? ( media-libs/id3lib )
- javascript? ( >=dev-lang/spidermonkey-1.8.5 )
- 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 )
- thumbnail? ( media-video/ffmpegthumbnailer[jpeg] )
- curl? ( net-misc/curl )
- magic? ( sys-apps/file )
- sys-apps/util-linux
- zlib? ( sys-libs/zlib )
- virtual/libiconv"
-RDEPEND="${DEPEND}"
-
-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
- if has_version ">=dev-lang/spidermonkey-1.8.7" ; then
- epatch "${FILESDIR}"/${P}-mozjs187.patch #435394
- fi
- epatch "${FILESDIR}"/${P}-libextractor.patch #435394
- eautoreconf
-}
-
-src_configure() {
- local myconf=()
- if use thumbnail ; then
- elog "libextrator does not work with thumbnail, disabling libextrator"
- myconf+=( --enable-ffmpegthumbnailer --enable-ffmpeg --disable-libextractor )
- elif ! use thumbnail && use ffmpeg && use libextractor ; then
- elog "libextrator does not work with ffmpeg, disabling libextrator"
- myconf+=( --disable-ffmpegthumbnailer --enable-ffmpeg --disable-libextractor )
- else
- myconf+=(
- $(use_enable thumbnail ffmpegthumbnailer)
- $(use_enable ffmpeg)
- $(use_enable libextractor)
- )
- fi
-
- econf \
- $(use_enable curl) $(use_enable curl youtube) \
- $(use_enable debug tombdebug) \
- $(use_enable exif libexif) \
- $(use_enable id3tag id3lib) \
- $(use_enable inotify) \
- $(use_enable javascript libjs) \
- $(use_enable lastfm lastfmlib) \
- $(use_enable magic libmagic) \
- $(use_enable mp4 libmp4v2) \
- $(use_enable mysql) \
- $(use_enable sqlite sqlite3) \
- $(use_enable taglib) \
- $(use_enable zlib) \
- --enable-external-transcoding \
- --enable-protocolinfo-extension \
- "${myconf[@]}"
-}
-
-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.1-r5.ebuild b/net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild
index 33c8b3ee41fd..1aebdb9520e0 100644
--- a/net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild
+++ b/net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.1 2013/01/20 16:28:11 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.1-r5.ebuild,v 1.2 2013/01/20 20:35:16 thev00d00 Exp $
EAPI="4"
inherit autotools eutils linux-info user
@@ -18,6 +18,9 @@ IUSE="+curl debug +exif +ffmpeg id3tag inotify +javascript lastfm libextractor +
REQUIRED_USE="
|| ( mysql sqlite )
taglib? ( !id3tag ) id3tag? ( !taglib )
+ thumbnail? ( ffmpeg !libextractor )
+ ffmpeg? ( !libextractor )
+ libextractor? ( !ffmpeg !thumbnail )
"
DEPEND="mysql? ( virtual/mysql )
@@ -72,38 +75,25 @@ src_prepare() {
}
src_configure() {
- local myconf=()
- if use thumbnail ; then
- elog "libextrator does not work with thumbnail, disabling libextrator"
- myconf+=( --enable-ffmpegthumbnailer --enable-ffmpeg --disable-libextractor )
- elif ! use thumbnail && use ffmpeg && use libextractor ; then
- elog "libextrator does not work with ffmpeg, disabling libextrator"
- myconf+=( --disable-ffmpegthumbnailer --enable-ffmpeg --disable-libextractor )
- else
- myconf+=(
- $(use_enable thumbnail ffmpegthumbnailer)
- $(use_enable ffmpeg)
- $(use_enable libextractor)
- )
- fi
-
econf \
$(use_enable curl) $(use_enable curl youtube) \
$(use_enable debug tombdebug) \
$(use_enable exif libexif) \
+ $(use_enable ffmpeg) \
$(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 \
- "${myconf[@]}"
+ --enable-protocolinfo-extension
}
src_install() {