Remove old versions, add upstream.

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

6 files changed, 23 insertions, 164 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/Manifest b/net-misc/minidlna/Manifest
index 906ba9ee645e..77cb5761b08f 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -1,11 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX minidlna-1.0.18-Makefile.patch 452 RMD160 81fad7433ccf2cdbccac8735772705a6a9ebca60 SHA1 431c0d0a49d231f70059d4fd2713b6a8613aa115 SHA256 036047d07f5fa9395104ca16c79d332ee17e2b3b83292ba3de019e97d5cafced
 AUX minidlna-1.0.23-r1.initd 1226 RMD160 cf43515323011d00bde02fe56cf850ef5426a23c SHA1 88745d823146ab9f3ee415f7d7c404b53e977815 SHA256 26ef5686db85f14c0f7b493c693f7da134a95f58553643581d6e186f68c9c05e
 AUX minidlna-1.0.23.confd 310 RMD160 5a3e150d34c59126b45c7f64d84d39e211eeab27 SHA1 be093a5ea697b7292c1f0c312560e93cb1b1e530 SHA256 6c11dee4e893d24900cbe8efcd5f2b0eaf5476d0f3c16b809f48607efe7154a8
-AUX minidlna-1.0.23.initd 1085 RMD160 f46f29417dc47b9b73f67ec92a85c70685939838 SHA1 8a11a512e96d79908b404ff22688f4e76ba810a8 SHA256 7a557a91f0c2944b69b1d659d66cd10913c1bdcf3eca3fd396575c0b1a1dcbe0
-DIST minidlna_1.0.23_src.tar.gz 210175 RMD160 b95b44b112f8531c9028f70c1bccfb91272a5f9a SHA1 354d35ffd43249a7cea6a6ce316ceb2623bf8cde SHA256 efc3a5de564c42782714eb89186254910e343f309b9b78635865a4592cd0c28a
 DIST minidlna_1.0.24_src.tar.gz 210775 RMD160 dad61a48059678c202b8ef009470f72622d7a38a SHA1 5e7fe50dbac5b5784e3d7a4eb9251fa9b37e97f2 SHA256 840ac2303c23d63066912750391d1ebef7761b5b23493e590624a17670ceb942
-EBUILD minidlna-1.0.23-r1.ebuild 1190 RMD160 cb34949833b91518752ff0e75f39ae625275e71c SHA1 62b174a9f857438435e35ace4f6d8485fbfa9fce SHA256 2d8db131dad0cc8643afdeef523c003a2714e71adab4680f7e1b3107b78b45d8
-EBUILD minidlna-1.0.23.ebuild 1171 RMD160 78465e74e88208b1650aa7516c9bd2b967504dd8 SHA1 aae0a54609f5019888f4fda32c4aa134206e3ed0 SHA256 794c950e6c0cb39661db856fb2fd8fc110ae42effd5d3f632531a93be80f4e1e
 EBUILD minidlna-1.0.24.ebuild 1203 RMD160 7321ef31fb36ec5a9c6bb28315cdf96eadb5732e SHA1 07d0c1f5cf8cb646f2a6b2e763f87c02ec00b342 SHA256 d8e4602861cbdca158d583587e165cd036194054414ee8510f466d294c0a56f9
-MISC ChangeLog 2962 RMD160 1dd8acc45e217639b94c8fe12054a297b8fe5eb4 SHA1 9fac3b138cfc5cf73fae1dd6440031d31794bbdf SHA256 9dd993d3e7d64a9e426e9ff8a7391e9ae248b349dddc80f369eea18164840586
-MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7
+MISC ChangeLog 3142 RMD160 3b5e3b115c9fbfd7306508ba5e37e87dc9be5729 SHA1 e2c4c1c774a79bd2b8476d0f0371767e380e3307 SHA256 b460b87971a4092481af7a4098ea0f7bf3000cb07c2c7118ffe9ba38d06ba821
+MISC metadata.xml 369 RMD160 55f94e989114f41cf416141ab924d822f1a121ca SHA1 825264206e7d406ea0cb0806a8a4e836359c3537 SHA256 9842820667d8f6d13c4d3a340ede5b99c0092c5358f2d67cf08f07c669ea98f4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk/DnrgACgkQknrdDGLu8JDUJwD8DuX1OP2NUpA0QvTGgSSvMUL4
+FQyPQOBymsdp2vyPqzgA+wX3QwNFic1EaWIzu42FuMSSyfHicczom0YRyFrP0tra
+=/YuV
+-----END PGP SIGNATURE-----
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."
-}