Remove old versions, add upstream.

(Portage version: 2.1.10.63/cvs/Linux x86_64)

5 files changed, 11 insertions, 158 deletions

diff --git a/net-misc/minidlna/ChangeLog b/net-misc/minidlna/ChangeLog
index 37dd3990eb3b..f02c2d1cda81 100644
--- a/net-misc/minidlna/ChangeLog
+++ b/net-misc/minidlna/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/minidlna
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.15 2012/05/05 03:20:42 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.16 2012/05/28 15:50:31 xmw Exp $
+
+  28 May 2012; Michael Weber <xmw@gentoo.org> -minidlna-1.0.23.ebuild,
+  -minidlna-1.0.23-r1.ebuild, -files/minidlna-1.0.23.initd, metadata.xml:
+  Remove old versions, add upstream.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> minidlna-1.0.23.ebuild,
   minidlna-1.0.23-r1.ebuild, minidlna-1.0.24.ebuild:
diff --git a/net-misc/minidlna/files/minidlna-1.0.23.initd b/net-misc/minidlna/files/minidlna-1.0.23.initd
deleted file mode 100644
index 1f08cde3cdb7..000000000000
--- a/net-misc/minidlna/files/minidlna-1.0.23.initd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/files/minidlna-1.0.23.initd,v 1.1 2012/01/29 00:33:27 xmw Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting MiniDLNA"
-	local params=""
-	local stop=0
-
-	if [[ "${RESCAN}" = "true" || "{$RESCAN}" = yes ]]; then
-		params="$params -R"
-	fi
-
-	#set the config file and check if it exists
-	if [ -z "${CONFIG}" ]; then
-		if [ ! -f "/etc/minidlna.conf" ]; then
-			ewarn "You did not set the config file correctly"
-			stop=1
-		fi
-		params="$params -f /etc/minidlna.conf"
-	else
-		if [ ! -f "${CONFIG}" ]; then
-			ewarn "The specified config file does not exist"
-			stop=1
-		fi
-		params="$params -f ${CONFIG}"
-	fi
-
-
-	if [ $stop -eq 1 ]; then
-		eend 1
-	else
-		start-stop-daemon --start \
-			--user ${M_USER:-nobody} --group ${M_GROUP:-nogroup} \
-			--exec /usr/sbin/minidlna -- ${params}
-		eend $?
-	fi
-}
-
-stop() {
-	ebegin "Stopping MiniDLNA"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/minidlna
-	eend $?
-}
diff --git a/net-misc/minidlna/metadata.xml b/net-misc/minidlna/metadata.xml
index 59acc2cc580e..f3b5594ac392 100644
--- a/net-misc/minidlna/metadata.xml
+++ b/net-misc/minidlna/metadata.xml
@@ -2,8 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
+	<email>xmw@gentoo.org</email>
+	<name>Michael Weber</name>
 </maintainer>
+<upstream>
+	<bugs-to>http://sourceforge.net/tracker/?group_id=243163</bugs-to>
+	<remote-id type="sourceforge">minidlna</remote-id>
+</upstream>
 </pkgmetadata>
 
diff --git a/net-misc/minidlna/minidlna-1.0.23-r1.ebuild b/net-misc/minidlna/minidlna-1.0.23-r1.ebuild
deleted file mode 100644
index 76ac7840e9a0..000000000000
--- a/net-misc/minidlna/minidlna-1.0.23-r1.ebuild
+++ /dev/null
@@ -1,53 +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/minidlna/minidlna-1.0.23-r1.ebuild,v 1.3 2012/05/05 03:20:42 jdhore Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="server software with the aim of being fully compliant with DLNA/UPnP-AV clients"
-HOMEPAGE="http://minidlna.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="dev-db/sqlite
-	media-libs/flac
-	media-libs/libexif
-	media-libs/libid3tag
-	media-libs/libogg
-	media-libs/libvorbis
-	virtual/ffmpeg
-	virtual/jpeg"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.18-Makefile.patch
-}
-
-src_configure() {
-	./genconfig.sh || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-conf
-
-	newconfd "${FILESDIR}"/${P}.confd ${PN}
-	newinitd "${FILESDIR}"/${P}-r1.initd ${PN}
-
-	dodoc README TODO
-}
-
-pkg_postinst() {
-	ewarn "minidlna no longer runs as root:root, per bug 394373."
-	ewarn "Please edit /etc/conf.d/${PN} to suit your needs."
-}
diff --git a/net-misc/minidlna/minidlna-1.0.23.ebuild b/net-misc/minidlna/minidlna-1.0.23.ebuild
deleted file mode 100644
index 22343fa304a0..000000000000
--- a/net-misc/minidlna/minidlna-1.0.23.ebuild
+++ /dev/null
@@ -1,53 +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/minidlna/minidlna-1.0.23.ebuild,v 1.2 2012/05/05 03:20:42 jdhore Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="server software with the aim of being fully compliant with DLNA/UPnP-AV clients"
-HOMEPAGE="http://minidlna.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="dev-db/sqlite
-	media-libs/flac
-	media-libs/libexif
-	media-libs/libid3tag
-	media-libs/libogg
-	media-libs/libvorbis
-	virtual/ffmpeg
-	virtual/jpeg"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.18-Makefile.patch
-}
-
-src_configure() {
-	./genconfig.sh || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newconfd "${FILESDIR}"/${P}.confd ${PN}
-	newinitd "${FILESDIR}"/${P}.initd ${PN}
-
-	dodoc README TODO
-}
-
-pkg_postinst() {
-	ewarn "minidlna no longer runs as root:root, per bug 394373."
-	ewarn "Please edit /etc/conf.d/${PN} to suit your needs."
-}