Version bump

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

5 files changed, 135 insertions, 5 deletions

diff --git a/net-misc/minidlna/ChangeLog b/net-misc/minidlna/ChangeLog
index da7bf245620b..17ca94deda9b 100644
--- a/net-misc/minidlna/ChangeLog
+++ b/net-misc/minidlna/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/minidlna
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.29 2013/05/08 07:29:49 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.30 2013/05/08 20:56:01 xmw Exp $
+
+*minidlna-1.0.26 (08 May 2013)
+
+  08 May 2013; Michael Weber <xmw@gentoo.org>
+  +files/minidlna-1.0.26-Makefile.patch, +files/minidlna-1.0.26-locale.patch,
+  +minidlna-1.0.26.ebuild, minidlna-1.0.25-r1.ebuild:
+  Version bump
 
 *minidlna-1.0.25-r2 (08 May 2013)
 
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index c1d6bab71a2c..ede56a49bb79 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -9,18 +9,22 @@ AUX minidlna-1.0.25-r2.initd 1340 SHA256 428c939763d53316ae7c8e4fac38c56c8cd5263
 AUX minidlna-1.0.25.confd 313 SHA256 67603d65c6bd3918255f050cb5cfd6fc1373b024bca1ce728f03491a90d79e19 SHA512 e209848af0d79069ac989ad61d3be610b4c0c2783a207a50463a25ec3811b04d1da3a2acde54749878bec44e1567874ede827b978d5472c00f6a855663e5cbf8 WHIRLPOOL f749a75ee70cc63eb5221770a17b5df6deadc87f4258b8cb418478f09e92084fce0c3d815be83ec2205a88ac4c43e9a88df28f92fd7e9b093f42f2a858e2812e
 AUX minidlna-1.0.25.initd 1229 SHA256 3d888eb894c63a4c072503c63d8b7fcee5783ca5715037ea83feb8b0af6906d7 SHA512 a6b67db78307fdd90ce19c49983e09eaf07efb5bc05ebcd38b5885cfa1e9dbd4ad6ca63ecbb6b48813e0e584ab0c54222dac53d6e96a12b30b865284212fa2a7 WHIRLPOOL 0f4924c08e9388db0621238ed94033456127cbf028697422129a346ec54bc9a6b582bb992df274be3183ad156d7a76236c8df5e1eaa6bab0173676cc778185f1
 AUX minidlna-1.0.25.service 341 SHA256 d7bd56f6b8c492c53249bbd2b7f0151d9bb7d393863d57a7b59adab60dac9126 SHA512 227f3753ac856bb9b0e05c61f2e083e60d1e317539d8a28d7ddeba1e8c212bda289717116c09ec50490e7a7f196728cb07cf455dc54597e5a3bd8ec1372d1a83 WHIRLPOOL 063c68bb70532c0cda62796afbddb773dc2af8ff7280b0fbde12b55df6d900df68da0f0120780b2eef661089b5d30f440b9505780c0315923b0c0581b14e1de6
+AUX minidlna-1.0.26-Makefile.patch 627 SHA256 bcb53001004fd5d844de2c6fda4cdf385d464d53aa95672921ad78e29b99d509 SHA512 84d41345a9fa0b16ac39aa97305ea8fcd3fa2adc79c0085923005940ae4c0fa67d506a0c0499bb4c244aa0abff3270d407c924adefc6fb8df8eb9faddfee1c46 WHIRLPOOL b65d69f319b4eb9ba701a422a96951042d590a5f8e3167688a9538cd4e90f1f8c8c8142ae1cd1625ff86af6d5173a775f2b4c2726f3c9fab441cd0138de5271c
+AUX minidlna-1.0.26-locale.patch 290 SHA256 9e69903e0b4e4afe634c6c07d89d2d5f7873932d745313dffe1463f72d2e5fde SHA512 97825f5636d121cd486afaec22f418fb2ac8f6be029a1b00febe8d73d2a0248f4de20695743f7d98d598e9ab139a112d5586b33779d22acdebe631436a241d67 WHIRLPOOL e679bcedbe1b9a4edd0334729114ccda0464210067f761310056a98d7a0758c89d25b7a7b4e858b53c38c54eaad0dbf35518279ed723195b31c62318c301e183
+DIST minidlna-1.0.26.tar.gz 212353 SHA256 8c94dc8bef5602f0dac8d6c9068cf0484200bc1909e62b7e7551eae5af5eee4c SHA512 9e681592cfc637d32244f81d493143a5548f6e607a7c38a909a104492ad39be14831629997095efbc9154e0e087a6181058d4cdeb04b3f6548b99531c65e0631 WHIRLPOOL 29f7571c9e9fba949810c5162f546a6d47f72e7f810a44b56204ee4dd52a9c482da327089ddbaf516c6b718cbb569ff4c2fb0f76add477ff8057d7882d6e30f3
 DIST minidlna_1.0.24_src.tar.gz 210775 SHA256 840ac2303c23d63066912750391d1ebef7761b5b23493e590624a17670ceb942 SHA512 bf1c2e7465ad24ae7c57f4270d40875227e0fb0e3db6c20fee7e286d7f93cfa17935475a8e9dda2da539d88f33fc4ec123a55e8cdf8e6656ae0e37306bb9625e WHIRLPOOL 1f12058862d37d9502680a75a4ff6f18ddc6b47638fece54ae24239e683489f346b09e5715a69ef132162fa8c8860830df8b52c9c748ca04a3c20d98392b014d
 DIST minidlna_1.0.25_src.tar.gz 211756 SHA256 170560fbe042c2bbcba78c5f15b54f4fac321ff770490b23b55789be463f2851 SHA512 91945d787c06d0f6d6fded206b95d678b223e52dab8506c8b4f3ece10909ad5f304be17c9504b509a0c7fe175c8f55c711f38694adebd6ae302266bcb32196ed WHIRLPOOL c6e321d1fcc1a54e5dc528bafc92e87b3e5a7be9392f90bda247456dd4a2e0d9e487c1fa4b360f63443dd55888ce5825e0b3dc53c73ecaf1a0fc76f53a829369
 EBUILD minidlna-1.0.24.ebuild 1204 SHA256 2dabe3dc16701ac34490387f54ed49162af981f2a67d1141303578572a843c9c SHA512 93b432c8992ea2a485222221161bbfcd1fe3daa6f1fb49755151a7060a6d20b194062e081e8220539c0c6ad4d622288cf7d155c5270719fb5e14c438348acb99 WHIRLPOOL bdcaf64f26781dbbf7a851e49b91e246dd5b3c5667b1d7b1f7a13c61d8209bd20daff0368328ced1d13ab674a1355ad07c4cbf72770c2c07f62a4e5cd7a6f94b
 EBUILD minidlna-1.0.25-r1.ebuild 2208 SHA256 2fc3c8596c2d4a809ce5d6e7554b23c473b9afe06e5ddb23253f21faa4309610 SHA512 ec37fc1f92b58943f3f0c4520d72ecbd32c958901a128b7d4c378a40d8babb003b4d850754629759831b1539a49e12f907491dfdc307ee611cf4771ff21e4755 WHIRLPOOL ee0521874902eb367213ce0efe6b62b04d5cf027b7098e704daa58289bb9cf98d6651603f196ebd3c95e773adfbb40b723587ac5f4a625592b11ace6e0a4a0ac
 EBUILD minidlna-1.0.25-r2.ebuild 2298 SHA256 b23213b0dd101b3b667aeda00199fc9c04181481fd80bb4edbf4835b2485f43f SHA512 9e27af1d58a14884c239796d066e01fb16202da39714cfa5a1e6e3b222ca53965dd3742adbfc3c7558f2a08a63abc9d5bf924f25a65a6ef077b3d82bf910f1a1 WHIRLPOOL 3eb950b5fb2bfa5887077849877672a54df3d20d49ec36970f3aa1262723231b595dcc0c7bf577d0d08540365e846573371a5ac96164f56d669e8cec951bb165
 EBUILD minidlna-1.0.25.ebuild 1200 SHA256 600287b1ca050c23dabad302312a6b44ae70b691380eb82cc40cf7f3d2fc3661 SHA512 f12f5ccb902226e618d08fb15474d951b62f49bfc36b6ee8f3d4c69a201c802ebc0b2d76a80ab2455a40f57d7601ef2f9afe7a565b030f2d83ad93aabe61f6d3 WHIRLPOOL 98364b07d6e674b68d5cb9718e50f6d84555e9a47c186d8da5fa659dfb7663f2d93557f0b0e3fbd192a591fd77a467343def394fe801ecb494885c9b8e18aea6
-MISC ChangeLog 5292 SHA256 aa5676328cb5de038a0fbc6c026e5e893b9e93d5cdf90882c84a0da1a67b97af SHA512 d90abd7538460889bea9779be74237ee56635fae9dd2e35b3f81cea200b0f59115a064be5af255ac6d9cbcc44bd091185d15d052003dfc31ade7ae964c8d0efb WHIRLPOOL 2164c07731d896f37d796a366a60c37862e6fa99cafa9345701df545865b8bc98a1b5ce933ef46f15c56ffdebef0938d1a9889b9903a92566217b933185c2d8d
+EBUILD minidlna-1.0.26.ebuild 2271 SHA256 cbb05c6337f230b2d3e165dd9fb4f1f1eeb447909b98a7a125bc45fcf1ac6b03 SHA512 ab710bfa98e84123d5457a945ace0872348ef90d1b35fc8ce3871096b60461aeb7f048bd0ab93dba3fe1fb0f11b6f98f7a8d474c2f1a667c69c2baa6ec98b64a WHIRLPOOL 1659774f849ac64e79a6588f6af94a6add225f6580b906cef534767840c6f6d864fb7028151e641938c060fc9c26f0d85979c8e370f13e2680db775c2c5d02ff
+MISC ChangeLog 5518 SHA256 363c881c85dabc9eb868753ede483fe01c6cb3d652fd07a056ed41445bd222a8 SHA512 8dcc212783fc6d41a3d072600aba3c776486155339f14be6ac1bb4267f4cafb063306556bf1980415eed9a983a2f07a7a703192a02a9afa0ee83836879d90efe WHIRLPOOL 56357b510d2a6da92fdd4d7d6c81c11fb58f5aa8badf23cc4f2297646766d9b2a23562a3562ba3ef44010e1f34742760016c73990b4816c1d3048988010fa15c
 MISC metadata.xml 369 SHA256 9842820667d8f6d13c4d3a340ede5b99c0092c5358f2d67cf08f07c669ea98f4 SHA512 6b331b75443101cc8182e11ab0779e55d96ca7b81dd904449f7acfa835a608d65b8503521f5b0f42465d149ed55420de6f16881f3348bcef07cabc147116549e WHIRLPOOL 6a3b290333f7d7d89156a3a0618b11ecc677a6c325948d966a044d070304185f9b38ac13c44829116f5d4ef6e035911e86139d60a8a4d41a5ee4d646c8bd9248
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlGJ/xwACgkQknrdDGLu8JCuBAD+MJFYGaBo6112T2y1/xvBMjHM
-xQ/vknQoMOaM//lCgRMA/0g47PXQWpmi+gb6v2/T71kuFvsHpN4zDVRzkFKgC6qQ
-=Wbh2
+iF4EAREIAAYFAlGKvCQACgkQknrdDGLu8JDs2gD/WyPaVgU8Hw6//nxfeV3TmH4Y
+rtyVNeUNj+bqrpdPgikA/jNuC6gOvtjqDTQ6VQAinpXE830vR3MfXV5fD5KhEU81
+=5FuC
 -----END PGP SIGNATURE-----
diff --git a/net-misc/minidlna/files/minidlna-1.0.26-Makefile.patch b/net-misc/minidlna/files/minidlna-1.0.26-Makefile.patch
new file mode 100644
index 000000000000..52a5ee3c08c5
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.0.26-Makefile.patch
@@ -0,0 +1,23 @@
+--- minidlna-1.0.26/Makefile
++++ minidlna-1.0.26/Makefile
+@@ -12,10 +12,10 @@
+ #
+ #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG
+ #CFLAGS = -Wall -g -Os -D_GNU_SOURCE
+-CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
++CFLAGS += -Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+ #STATIC_LINKING: CFLAGS += -DSTATIC
+ #STATIC_LINKING: LDFLAGS = -static
+-CC = gcc
++CC ?= gcc
+ RM = rm -f
+ INSTALL = install
+ 
+@@ -125,6 +125,4 @@
+ .SUFFIXES: .c .o
+ 
+ .c.o:
+-	@echo Compiling $*.c
+-	@$(CC) $(CFLAGS) -o $@ -c $< && exit 0; \
+-		echo "The following command failed:  $(CC) $(CFLAGS) -o $@ -c $<" && false
++	$(CC) $(CFLAGS) -o $@ -c $<
diff --git a/net-misc/minidlna/files/minidlna-1.0.26-locale.patch b/net-misc/minidlna/files/minidlna-1.0.26-locale.patch
new file mode 100644
index 000000000000..40d07c3626d1
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.0.26-locale.patch
@@ -0,0 +1,12 @@
+Index: minidlna-1.0.25/minidlna.c
+===================================================================
+--- minidlna-1.0.25.orig/minidlna.c
++++ minidlna-1.0.25/minidlna.c
+@@ -69,6 +69,7 @@
+ 
+ #ifdef ENABLE_NLS
+ #include <libintl.h>
++#include <locale.h>
+ #endif
+ 
+ #include "upnpglobalvars.h"
diff --git a/net-misc/minidlna/minidlna-1.0.26.ebuild b/net-misc/minidlna/minidlna-1.0.26.ebuild
new file mode 100644
index 000000000000..8e5e424c716b
--- /dev/null
+++ b/net-misc/minidlna/minidlna-1.0.26.ebuild
@@ -0,0 +1,84 @@
+# 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.0.26.ebuild,v 1.1 2013/05/08 20:56:01 xmw 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=""
+
+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() {
+	epatch \
+		"${FILESDIR}"/${P}-Makefile.patch \
+		"${FILESDIR}"/${P}-locale.patch
+
+	sed -e "/^DB_PATH=/s:\".*\":\"${EPREFIX}/var/lib/${PN}\":" \
+		-e "/^LOG_PATH=/s:\".*\":\"${EPREFIX}/var/log/${PN}\":" \
+		-i ./genconfig.sh || die
+	sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
+		-i ${PN}.conf || die
+
+	sed -e 's:@$(CC):$(CC):' \
+		-i Makefile || die
+
+	epatch_user
+}
+
+src_configure() {
+	./genconfig.sh || die
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-conf
+
+	newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}-1.0.25-r2.initd ${PN}
+	systemd_newunit "${FILESDIR}"/${PN}-1.0.25.service ${PN}.service
+
+	dodir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+
+	dodoc NEWS README TODO
+}
+
+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."
+}