Add helper comment to confd file for bug 274627, comment #4 by Andrew Frink. Old cruft cleanup

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

7 files changed, 10 insertions, 312 deletions

diff --git a/net-misc/mediatomb/ChangeLog b/net-misc/mediatomb/ChangeLog
index bd1341cfa539..dd7a7da6581a 100644
--- a/net-misc/mediatomb/ChangeLog
+++ b/net-misc/mediatomb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/mediatomb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.17 2010/04/18 12:29:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.18 2010/08/19 01:59:51 darkside Exp $
+
+  19 Aug 2010; Jeremy Olexa <darkside@gentoo.org> -mediatomb-0.11.0.ebuild,
+  -mediatomb-0.12.0-r1.ebuild, files/mediatomb-0.12.0.confd,
+  -files/mediatomb.confd, -files/mediatomb.initd:
+  Add helper comment to confd file for bug 274627, comment #4 by Andrew
+  Frink. Old cruft cleanup
 
   18 Apr 2010; Markus Meier <maekke@gentoo.org> mediatomb-0.12.1.ebuild:
   amd64 stable, bug #284886
diff --git a/net-misc/mediatomb/Manifest b/net-misc/mediatomb/Manifest
index 84a18dcb9a32..6e76b32bff0a 100644
--- a/net-misc/mediatomb/Manifest
+++ b/net-misc/mediatomb/Manifest
@@ -1,27 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mediatomb-0.11.0+curl-7.18.patch 524 RMD160 beb5dd3f23437af630182ef1b4228622e0d3594c SHA1 c256310f7785b7f26298dba9284a1c72885fc0f5 SHA256 6015e2fac0409322e917a1b5426333581167cc2b30677883c221e4726f0553be
 AUX mediatomb-0.11.0+glibc-2.10.patch 733 RMD160 277863d375f03b5aed4e7479594daf6e221b9f91 SHA1 fa8f13b3cc5181efacac58dfcc6d097e287f6b82 SHA256 be29e7344db08bd07a449c0bb2a30e9aa4c59bc97275e7534aaf7a4a3d218211
 AUX mediatomb-0.11.0-newffmpeg.patch 2410 RMD160 112b1683bc86325e5584b9e7089f46d4a218d8fc SHA1 4af90200a3cf0a07ce47ea42b6b398002f3d99c1 SHA256 7566cd01d9af848bdfd75949bb586b9a83bb6b9501fe9dba921e93960e2f2fdb
 AUX mediatomb-0.11.0.config 2739 RMD160 0f6d8108052d19940e7f5d2288c9027aa2976dc6 SHA1 2c8bfdf7d370ca7782a930d8ef70a242a2942d37 SHA256 0c02298dd2078fed683dad661d933c1f7e43086c77999bf651065ec40ea762c4
-AUX mediatomb-0.12.0.confd 732 RMD160 b426cecb920cda23401e7551fd66adc4a468a728 SHA1 6a3cfaeb4a6f0cd3270965e6273ed00bfd38d487 SHA256 3aea898aed5f3f0d7dce14fbdeec115d6e5c76447590132692fd8d4db39bb421
+AUX mediatomb-0.12.0.confd 805 RMD160 80b99ac5eb0a3cfdbe658084b6ba8a48c2b97dea SHA1 c3908aa800c4d6f3078760b5c32fbdf745f28239 SHA256 21b1b9d31a6db76c5c1ccfbf00e5cd553eecfeb0e2bb161ccc024eab2243293c
 AUX mediatomb-0.12.0.config 6180 RMD160 ee51ad90cd9c4107376b80af19dfe076f06df8e7 SHA1 41376b8a161d8523846c5adb5375af5bc0c1a0d1 SHA256 cb43e92639e5e53908567c050c9a2fc0e5c349fd11a149414590c2c6a402b4d2
 AUX mediatomb-0.12.0.initd 541 RMD160 cb4ccfebbe98d38a9e4fdedc6f0fa9aa7ab18453 SHA1 e3c8ed51e118cc72a164b908fe4d629a1ebbf14b SHA256 8dfe99d619a3384b2fb9105051daae1fc6c88402364d4203b21344f766a6b696
-AUX mediatomb.confd 857 RMD160 66c19ff63accb09048250daa94b7fdea208616fa SHA1 3ab51654efbb89aa9a8beb5ca47170ba86fd1320 SHA256 9d8b7e044f9ac684b33ea2ac97ddcfb2c038cb5038d4149e11441d5e24d7d92d
-AUX mediatomb.initd 576 RMD160 e92a6f915eb6d1a0fff1e82a74004ed8a430d503 SHA1 d2c7f0e7e86d8e7add10566d1928b45a953ce39b SHA256 f9f53683b6a6ad11ee1aab2cb8c604cd6639872c1abe36bf5d7006ffbbd7ca14
-DIST mediatomb-0.11.0.tar.gz 1059429 RMD160 11c53d5757da3a689c025107331526c0486befc4 SHA1 1d7c86924686f9999a359ba96092aa36d30832a6 SHA256 25e0b3d761e41fc6793c780eb7f638719867cdc6d3429ec24f72d1e9556ac1d2
-DIST mediatomb-0.12.0.tar.gz 1149071 RMD160 5d46fa16d8614f853ec52212cd5df00a204c6e47 SHA1 50333464ce42e14488f9c63243ab0ab34e36c762 SHA256 3fc4d4aef09952e8a1814f2dbf6eefa66b4a01a6cc1c41dee9e0edd60faf51f7
 DIST mediatomb-0.12.1.tar.gz 1240612 RMD160 ecb61ca2483f76421beef1036ac442b8f805fa96 SHA1 86e880584cc9c8aaf3926d56048510d1d06e76b4 SHA256 31163c34a7b9d1c9735181737cb31306f29f1f2a0335fb4f53ecccf8f62f11cd
-EBUILD mediatomb-0.11.0.ebuild 3457 RMD160 5dfc8ae48da2c9ceca5e8f4addc2704905d7d28b SHA1 5ea193a2843dbea38f465865ac767d1217ede322 SHA256 14954d9a5eace85755c4dfe857bb8484ecba9f31dc46e9aa73415739f6c480c0
-EBUILD mediatomb-0.12.0-r1.ebuild 3260 RMD160 e0ad9ddc7d1a0c9a86d3ef52e402fa8dd937ae21 SHA1 508096b4e540c9d5f4346acce9eae30e578a5adb SHA256 3f5a5550d28e5043ecb5070c69aab247df8971512cda5b732b19cce90347f095
 EBUILD mediatomb-0.12.1.ebuild 3540 RMD160 d38b9534f557bf1a10d9cd7f76c52d335be98099 SHA1 c265a06301f63e747c5b0e7c6c18cc8ea18176d0 SHA256 d96bae43c87cedc494d117d313d8ff6bdc3f478029bde9081a3a956793429568
-MISC ChangeLog 3075 RMD160 0c35706d5edbc06f52ef0575ea155c97a980fe2b SHA1 6807546429964a89e101d7c65597818d5de36af7 SHA256 3091246f96d60e22b67243104ca780341fc4e7b1e236bfe8922a3d241df83fcc
+MISC ChangeLog 3364 RMD160 6aa9b8a816053a106156683d3dfdfb51aefde5f6 SHA1 9d1262f752df681343cf781b02e5cb40b1d8b444 SHA256 fc29f32d1cac808ed21c59b49899fddcc80a7697c2f86f561f6f9cd93863c6e2
 MISC metadata.xml 917 RMD160 2c817f4ed63ff24ff4262df5897733098ab753f9 SHA1 1eb716452e1ead4a6fb2cf4931f76d2dc9df6cd9 SHA256 a8f81f44d0efc27bd22ebefe96864f84c94c1cadb1908ff1ed52fd3d91b99e23
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvK+skACgkQkKaRLQcq0GKcwgCeNV5qLvD1BoX9PTqpAtAI8hxG
-wP8An2Pg7IA3ImcEWaXRSVPdCLyyIjcb
-=pX//
------END PGP SIGNATURE-----
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.0.confd b/net-misc/mediatomb/files/mediatomb-0.12.0.confd
index f531ec70dc82..7f5c00830251 100644
--- a/net-misc/mediatomb/files/mediatomb-0.12.0.confd
+++ b/net-misc/mediatomb/files/mediatomb-0.12.0.confd
@@ -24,4 +24,5 @@ MEDIATOMB_LOGFILE="/var/log/mediatomb.log"
 MEDIATOMB_PIDFILE="/var/run/mediatomb.pid"
 
 # Other options you want to pass to MediaTomb.
+# Add "--interface ${MEDIATOMB_INTERFACE}" to bind to a named interface.
 MEDIATOMB_OPTIONS=""
diff --git a/net-misc/mediatomb/files/mediatomb.confd b/net-misc/mediatomb/files/mediatomb.confd
deleted file mode 100644
index 22fc21bd55cb..000000000000
--- a/net-misc/mediatomb/files/mediatomb.confd
+++ /dev/null
@@ -1,32 +0,0 @@
-# /etc/conf.d/mediatomb: config file for /etc/init.d/mediatomb
-
-# See the mediatomb(1) manpage for more info.
-
-# MediaTomb Web UI port.
-# NOTE: The minimum value allowed is 49152
-MEDIATOMB_PORT=49152
-
-# Bind MediaTomb to this interface
-MEDIATOMB_INTERFACE="eth0"
-
-# Run MediaTomb as this user.
-# NOTE: It is not recommended to run MediaTomb as root for
-#       security reasons.
-MEDIATOMB_USER="mediatomb"
-
-# Run MediaTomb as this group.
-# NOTE: It is not recommended to run MediaTomb as root for
-#       security reasons.
-MEDIATOMB_GROUP="mediatomb"
-
-# Path to MediaTomb config file.
-MEDIATOMB_CONFIG="/etc/mediatomb/config.xml"
-
-# Path to MediaTomb log file.
-MEDIATOMB_LOGFILE="/var/log/mediatomb.log"
-
-# Path to MediaTomb pid file.
-MEDIATOMB_PIDFILE="/var/run/mediatomb/mediatomb.pid"
-
-# Other options you want to pass to MediaTomb.
-MEDIATOMB_OPTIONS=""
diff --git a/net-misc/mediatomb/files/mediatomb.initd b/net-misc/mediatomb/files/mediatomb.initd
deleted file mode 100644
index 12f96a4a5669..000000000000
--- a/net-misc/mediatomb/files/mediatomb.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need net #MYSQL#
-}
-
-start() {
-	ebegin "Starting MediaTomb"
-	start-stop-daemon --start --quiet --exec /usr/bin/mediatomb \
-		--pidfile ${MEDIATOMB_PIDFILE} -- --daemon \
-		--pidfile ${MEDIATOMB_PIDFILE} --user ${MEDIATOMB_USER} \
-		--group ${MEDIATOMB_GROUP} --logfile ${MEDIATOMB_LOGFILE} \
-		--config ${MEDIATOMB_CONFIG} --port ${MEDIATOMB_PORT} \
-		--interface ${MEDIATOMB_INTERFACE} ${MEDIATOMB_OPTIONS}
-	eend $?
-}
-
-stop () {
-	ebegin "Stopping MediaTomb"
-	start-stop-daemon --stop --retry 10 --quiet --pidfile ${MEDIATOMB_PIDFILE}
-	eend $?
-}
diff --git a/net-misc/mediatomb/mediatomb-0.11.0.ebuild b/net-misc/mediatomb/mediatomb-0.11.0.ebuild
deleted file mode 100644
index 8fce2ea0874c..000000000000
--- a/net-misc/mediatomb/mediatomb-0.11.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.11.0.ebuild,v 1.9 2009/12/29 17:46:14 armin76 Exp $
-
-inherit eutils autotools
-
-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="curl debug exif ffmpeg javascript libextractor mysql taglib"
-RDEPEND="
-	mysql? ( virtual/mysql )
-	!mysql? ( >=dev-db/sqlite-3 )
-	javascript? ( dev-lang/spidermonkey )
-	dev-libs/expat
-	taglib? ( media-libs/taglib )
-	!taglib? ( media-libs/id3lib )
-	exif? ( media-libs/libexif )
-	libextractor? ( media-libs/libextractor )
-	ffmpeg? ( media-video/ffmpeg )
-	curl? ( net-misc/curl )
-	sys-apps/file
-	sys-libs/zlib
-	virtual/libiconv"
-DEPEND="${RDEPEND}"
-
-MEDIATOMB_HOMEDIR="/var/lib/mediatomb"
-MEDIATOMB_CONFDIR="/etc/mediatomb"
-MEDIATOMB_PIDDIR="/var/run/mediatomb"
-
-pkg_setup() {
-	# disable libextractor support if ffmpeg and libextractor use are enabled
-	if use ffmpeg && use libextractor; then
-		ewarn "ffmpeg and libextractor USE flags are enabled. libextractor support will be disabled."
-	fi
-
-	# create the mediatomb group and user
-	enewgroup mediatomb
-	enewuser mediatomb -1 -1 /dev/null mediatomb
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-newffmpeg.patch"
-	epatch "${FILESDIR}/${P}+curl-7.18.patch"
-	epatch "${FILESDIR}/${P}+glibc-2.10.patch"
-	eautoreconf
-}
-
-src_compile() {
-	local myconf
-
-	# disable libextractor support if ffmpeg and libextractor use are enabled
-	if use ffmpeg && use libextractor; then
-		myconf="${myconf} --enable-ffmpeg --disable-libextractor"
-	else
-		myconf="${myconf} $(use_enable ffmpeg) $(use_enable libextractor)"
-	fi
-
-	econf \
-		--prefix=/usr \
-		$(use_enable curl) \
-		$(use_enable debug tombdebug) \
-		$(use_enable exif libexif) \
-		$(use_enable javascript libjs) \
-		$(use_enable mysql) $(use_enable !mysql sqlite3) \
-		$(use_enable taglib) $(use_enable !taglib id3lib) \
-		--enable-external-transcoding \
-		--enable-libmagic \
-		--enable-protocolinfo-extension \
-		${myconf} \
-		|| die "Configure failed!"
-
-	emake || die "Make failed!"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed!"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	sed -e "s:#MYSQL#:$(use mysql && echo "mysql"):" \
-		"${FILESDIR}/${PN}.initd" \
-		> "${T}/mediatomb.initd"
-	newinitd "${T}/mediatomb.initd" mediatomb
-	newconfd "${FILESDIR}/${PN}.confd" mediatomb
-
-	insinto "${MEDIATOMB_CONFDIR}"
-	newins "${FILESDIR}/${P}.config" config.xml
-	fperms 0600 "${MEDIATOMB_CONFDIR}/config.xml"
-	fowners mediatomb:mediatomb "${MEDIATOMB_CONFDIR}/config.xml"
-
-	keepdir "${MEDIATOMB_HOMEDIR}"
-	fowners mediatomb:mediatomb "${MEDIATOMB_HOMEDIR}"
-
-	keepdir "${MEDIATOMB_PIDDIR}"
-	fowners mediatomb:mediatomb "${MEDIATOMB_PIDDIR}"
-}
-
-pkg_postinst() {
-	if use mysql; then
-		elog "MediaTomb has been built with MySQL support. Please"
-		elog "consult sections 4.2.2 and 6.1 of the MediaTomb"
-		elog "documentation for information on configuring MediaTomb"
-		elog "with MySQL. http://mediatomb.cc/pages/documentation"
-		elog
-	fi
-
-	elog "The MediaTomb Web UI can be reached at:"
-	elog "http://localhost:49152/"
-	elog
-	elog "To start MediaTomb:"
-	elog "/etc/init.d/mediatomb start"
-	elog
-	elog "To start MediaTomb at boot:"
-	elog "rc-update add mediatomb default"
-}
diff --git a/net-misc/mediatomb/mediatomb-0.12.0-r1.ebuild b/net-misc/mediatomb/mediatomb-0.12.0-r1.ebuild
deleted file mode 100644
index d9f5d044806c..000000000000
--- a/net-misc/mediatomb/mediatomb-0.12.0-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.0-r1.ebuild,v 1.2 2010/04/04 04:44:20 darkside Exp $
-
-EAPI=2
-
-inherit 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 ~x86"
-IUSE="debug +exif +ffmpeg inotify +javascript lastfm +mp4 mysql +taglib thumbnail"
-
-DEPEND="
-	mysql? ( virtual/mysql )
-	!mysql? ( >=dev-db/sqlite-3 )
-	javascript? ( dev-lang/spidermonkey )
-	dev-libs/expat
-	taglib? ( media-libs/taglib )
-	!taglib? ( media-libs/id3lib )
-	lastfm? ( >=media-libs/lastfmlib-0.4 )
-	exif? ( media-libs/libexif )
-	mp4? ( media-libs/libmp4v2 )
-	ffmpeg? ( media-video/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; then
-			if ! 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
-	fi
-	enewgroup mediatomb
-	enewuser mediatomb -1 -1 /dev/null mediatomb
-}
-
-src_configure() {
-	if use thumbnail; then
-		myconf="${myconf} --enable-ffmpegthumbnailer --enable-ffmpeg"
-	else
-		myconf="${myconf} $(use_enable thumbnail ffmpegthumbnailer) $(use_enable ffmpeg)"
-	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}/${P}.initd" > "${T}/mediatomb.initd" || die
-	newinitd "${T}/mediatomb.initd" mediatomb || die
-	newconfd "${FILESDIR}/${P}.confd" mediatomb || die
-
-	insinto /etc/mediatomb
-	newins "${FILESDIR}/${P}.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 "To start MediaTomb:"
-	elog "/etc/init.d/mediatomb start"
-	elog
-	elog "To start MediaTomb at boot:"
-	elog "rc-update add mediatomb default"
-	elog
-	elog "The MediaTomb web interface can be reached at:"
-	elog "http://localhost:49152/"
-}