Version bump with gentoo logo (bug 522112, thanks BT, Steve Dibb, Perfect Gentleman and baru reddy).

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

5 files changed, 26 insertions, 267 deletions

diff --git a/net-misc/minidlna/ChangeLog b/net-misc/minidlna/ChangeLog
index 5fbeb265539f..992e0c58f945 100644
--- a/net-misc/minidlna/ChangeLog
+++ b/net-misc/minidlna/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/minidlna
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.43 2014/10/30 10:01:45 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.44 2015/02/27 11:50:34 xmw Exp $
+
+*minidlna-1.1.4 (27 Feb 2015)
+
+  27 Feb 2015; Michael Weber <xmw@gentoo.org> +minidlna-1.1.4.ebuild,
+  -minidlna-1.1.0-r2.ebuild, -minidlna-1.1.0-r3.ebuild, -minidlna-1.1.1.ebuild,
+  -minidlna-1.1.2.ebuild:
+  Version bump with gentoo logo (bug 522112, thanks BT, Steve Dibb, Perfect
+  Gentleman and baru reddy).
 
   30 Oct 2014; Agostino Sarubbo <ago@gentoo.org> minidlna-1.1.3.ebuild:
   Stable for x86, wrt bug #524644
diff --git a/net-misc/minidlna/minidlna-1.1.0-r2.ebuild b/net-misc/minidlna/minidlna-1.1.0-r2.ebuild
deleted file mode 100644
index 856ead7e3452..000000000000
--- a/net-misc/minidlna/minidlna-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/minidlna-1.1.0-r2.ebuild,v 1.4 2013/06/25 18:43:50 ago Exp $
-
-EAPI=4
-
-inherit eutils systemd toolchain-funcs user
-
-DESCRIPTION="DLNA/UPnP-AV compliant media server"
-HOMEPAGE="http://minidlna.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="netgear readynas"
-
-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"
-
-pkg_setup() {
-	local my_is_new="yes"
-	[ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	if [ -d "${EPREFIX}"/var/lib/${PN} ] && [ "${my_is_new}" == "yes" ] ; then
-		# created by above enewuser command w/ wrong group and permissions
-		chown ${PN}:${PN} "${EPREFIX}"/var/lib/${PN} || die
-		chmod 0750 "${EPREFIX}"/var/lib/${PN} || die
-		# if user already exists, but /var/lib/minidlna is missing
-		# rely on ${D}/var/lib/minidlna created in src_install
-	fi
-}
-
-src_prepare() {
-	sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
-		-e "/db_dir/s:/var/cache/:/var/lib/:" \
-		-i ${PN}.conf || die
-
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		--with-db-path=/var/lib/${PN} \
-		--with-log-path=/var/log/${PN} \
-		--enable-tivo \
-		$(use_enable netgear) \
-		$(use_enable readynas)
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins ${PN}.conf
-
-	newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}-1.1.0.initd ${PN}
-	systemd_newunit "${FILESDIR}"/${PN}-1.1.0.service ${PN}.service
-
-	dodir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-
-	dodoc AUTHORS NEWS README TODO
-	doman ${PN}d.8 ${PN}.conf.5
-}
-
-pkg_postinst() {
-	elog "minidlna now runs as minidlna:minidlna (bug 426726),"
-	elog "logfile is moved to /var/log/minidlna/minidlna.log,"
-	elog "cache is moved to /var/lib/minidlna."
-	elog "Please edit /etc/conf.d/${PN} and file ownerships to suit your needs."
-}
diff --git a/net-misc/minidlna/minidlna-1.1.1.ebuild b/net-misc/minidlna/minidlna-1.1.1.ebuild
deleted file mode 100644
index 3a5bc8e49a60..000000000000
--- a/net-misc/minidlna/minidlna-1.1.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/minidlna-1.1.1.ebuild,v 1.1 2014/03/14 21:34:55 beandog Exp $
-
-EAPI=4
-
-inherit eutils systemd toolchain-funcs user
-
-DESCRIPTION="DLNA/UPnP-AV compliant media server"
-HOMEPAGE="http://minidlna.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="netgear readynas"
-
-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"
-
-pkg_setup() {
-	local my_is_new="yes"
-	[ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	if [ -d "${EPREFIX}"/var/lib/${PN} ] && [ "${my_is_new}" == "yes" ] ; then
-		# created by above enewuser command w/ wrong group and permissions
-		chown ${PN}:${PN} "${EPREFIX}"/var/lib/${PN} || die
-		chmod 0750 "${EPREFIX}"/var/lib/${PN} || die
-		# if user already exists, but /var/lib/minidlna is missing
-		# rely on ${D}/var/lib/minidlna created in src_install
-	fi
-}
-
-src_prepare() {
-	sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
-		-e "/db_dir/s:/var/cache/:/var/lib/:" \
-		-i ${PN}.conf || die
-
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		--with-db-path=/var/lib/${PN} \
-		--with-log-path=/var/log/${PN} \
-		--enable-tivo \
-		$(use_enable netgear) \
-		$(use_enable readynas)
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins ${PN}.conf
-
-	newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
-	newinitd "${FILESDIR}"/${PF}.initd ${PN}
-	systemd_newunit "${FILESDIR}"/${PF}.service ${PN}.service
-	echo "d /run/${PN} 0755 ${PN} ${PN} -" > "${T}"/${PN}.conf
-	systemd_dotmpfilesd "${T}"/${PN}.conf
-
-	dodir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-
-	dodoc AUTHORS NEWS README TODO
-	doman ${PN}d.8 ${PN}.conf.5
-}
-
-pkg_postinst() {
-	elog "minidlna now runs as minidlna:minidlna (bug 426726),"
-	elog "logfile is moved to /var/log/minidlna/minidlna.log,"
-	elog "cache is moved to /var/lib/minidlna."
-	elog "Please edit /etc/conf.d/${PN} and file ownerships to suit your needs."
-}
diff --git a/net-misc/minidlna/minidlna-1.1.2.ebuild b/net-misc/minidlna/minidlna-1.1.2.ebuild
deleted file mode 100644
index 4334244daa0b..000000000000
--- a/net-misc/minidlna/minidlna-1.1.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/minidlna-1.1.2.ebuild,v 1.1 2014/03/14 21:34:55 beandog Exp $
-
-EAPI=4
-
-inherit eutils systemd toolchain-funcs user
-
-DESCRIPTION="DLNA/UPnP-AV compliant media server"
-HOMEPAGE="http://minidlna.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="netgear readynas"
-
-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"
-
-pkg_setup() {
-	local my_is_new="yes"
-	[ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	if [ -d "${EPREFIX}"/var/lib/${PN} ] && [ "${my_is_new}" == "yes" ] ; then
-		# created by above enewuser command w/ wrong group and permissions
-		chown ${PN}:${PN} "${EPREFIX}"/var/lib/${PN} || die
-		chmod 0750 "${EPREFIX}"/var/lib/${PN} || die
-		# if user already exists, but /var/lib/minidlna is missing
-		# rely on ${D}/var/lib/minidlna created in src_install
-	fi
-}
-
-src_prepare() {
-	sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
-		-e "/db_dir/s:/var/cache/:/var/lib/:" \
-		-i ${PN}.conf || die
-
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		--with-db-path=/var/lib/${PN} \
-		--with-log-path=/var/log/${PN} \
-		--enable-tivo \
-		$(use_enable netgear) \
-		$(use_enable readynas)
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins ${PN}.conf
-
-	newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
-	newinitd "${FILESDIR}"/${PF}.initd ${PN}
-	systemd_newunit "${FILESDIR}"/${PF}.service ${PN}.service
-	echo "d /run/${PN} 0755 ${PN} ${PN} -" > "${T}"/${PN}.conf
-	systemd_dotmpfilesd "${T}"/${PN}.conf
-
-	dodir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-
-	dodoc AUTHORS NEWS README TODO
-	doman ${PN}d.8 ${PN}.conf.5
-}
-
-pkg_postinst() {
-	elog "minidlna now runs as minidlna:minidlna (bug 426726),"
-	elog "logfile is moved to /var/log/minidlna/minidlna.log,"
-	elog "cache is moved to /var/lib/minidlna."
-	elog "Please edit /etc/conf.d/${PN} and file ownerships to suit your needs."
-}
diff --git a/net-misc/minidlna/minidlna-1.1.0-r3.ebuild b/net-misc/minidlna/minidlna-1.1.4.ebuild
index 11d28a759458..3fedd2dcecbd 100644
--- a/net-misc/minidlna/minidlna-1.1.0-r3.ebuild
+++ b/net-misc/minidlna/minidlna-1.1.4.ebuild
@@ -1,31 +1,34 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/minidlna-1.1.0-r3.ebuild,v 1.1 2013/09/05 20:25:35 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/minidlna-1.1.4.ebuild,v 1.1 2015/02/27 11:50:34 xmw Exp $
 
-EAPI=4
+EAPI=5
 
-inherit eutils systemd toolchain-funcs user
+inherit eutils linux-info systemd toolchain-funcs user
 
 DESCRIPTION="DLNA/UPnP-AV compliant media server"
 HOMEPAGE="http://minidlna.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz
+	http://dev.gentoo.org/~xmw/${PN}-gentoo-artwork.patch.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="netgear readynas"
 
-RDEPEND="dev-db/sqlite
+RDEPEND="dev-db/sqlite:3
 	media-libs/flac
 	media-libs/libexif
 	media-libs/libid3tag
 	media-libs/libogg
 	media-libs/libvorbis
 	virtual/ffmpeg
-	virtual/jpeg"
+	virtual/jpeg:0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+CONFIG_CHECK="~INOTIFY_USER"
+
 pkg_setup() {
 	local my_is_new="yes"
 	[ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
@@ -38,6 +41,8 @@ pkg_setup() {
 		# if user already exists, but /var/lib/minidlna is missing
 		# rely on ${D}/var/lib/minidlna created in src_install
 	fi
+
+	linux-info_pkg_setup
 }
 
 src_prepare() {
@@ -45,6 +50,8 @@ src_prepare() {
 		-e "/db_dir/s:/var/cache/:/var/lib/:" \
 		-i ${PN}.conf || die
 
+	epatch "${WORKDIR}"/${PN}-gentoo-artwork.patch
+
 	epatch_user
 }
 
@@ -65,8 +72,8 @@ src_install() {
 	doins ${PN}.conf
 
 	newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
-	newinitd "${FILESDIR}"/${PF}.initd ${PN}
-	systemd_newunit "${FILESDIR}"/${PF}.service ${PN}.service
+	newinitd "${FILESDIR}"/${PN}-1.1.2.initd ${PN}
+	systemd_newunit "${FILESDIR}"/${PN}-1.1.2.service ${PN}.service
 	echo "d /run/${PN} 0755 ${PN} ${PN} -" > "${T}"/${PN}.conf
 	systemd_dotmpfilesd "${T}"/${PN}.conf