bring back sysconf option. Add systemd unit file

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

5 files changed, 98 insertions, 17 deletions

diff --git a/media-video/ushare/ChangeLog b/media-video/ushare/ChangeLog
index 7bf9be7f730f..f3406c54c531 100644
--- a/media-video/ushare/ChangeLog
+++ b/media-video/ushare/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/ushare
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ChangeLog,v 1.24 2013/02/16 08:36:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ChangeLog,v 1.25 2013/08/18 16:41:09 hwoarang Exp $
+
+*ushare-1.1a-r6 (18 Aug 2013)
+
+  18 Aug 2013; Markos Chandras <hwoarang@gentoo.org> -ushare-1.1a-r4.ebuild,
+  +ushare-1.1a-r6.ebuild, +files/ushare.init.d.ng, +files/ushare.service:
+  Revbump to bring back the sysconf support and migrate away from the
+  /etc/conf.d/ushare file. This also allows easier intergration with systemd.
 
   16 Feb 2013; Pacho Ramos <pacho@gentoo.org> ushare-1.1a-r5.ebuild:
   Don't show elog messages always (#457596)
diff --git a/media-video/ushare/Manifest b/media-video/ushare/Manifest
index a1942a6321d8..6df87489cf02 100644
--- a/media-video/ushare/Manifest
+++ b/media-video/ushare/Manifest
@@ -10,15 +10,29 @@ AUX 06_all_ushare_disable_sysconf.patch 656 SHA256 16226297ea6148608c7bc12ae6106
 AUX 07_all_drop_optimizations.patch 516 SHA256 a3871598281fdcd6a4e597d668b81ae1eee5dcc4a2b4a95415379a7a5b075bd4 SHA512 0b2fd04608fe74949d7a18d172c66596570c042a204f7665ceac09202d504138813ed700d1f327e1cb5b0601931f34bdb00efbac61979ff9f88735c54ae89770 WHIRLPOOL 9696145f5dea7bb2d33833a671a8274863bc0bc537ccf2bacc9fb158c1aff462600fbe33048adee1b0bb4dbd3ab85a05f1500302ec5304b2d52523abac3d1f9b
 AUX ushare.conf.d 896 SHA256 cf333cc495177828c8a5bf3fde9462190435843ffd51d95ef676c3c6df1c5563 SHA512 60256fdc900c93948120f172722f19e52fc3869952d60fefc25d2728ed14f5e57a0e93eb71613cbc48b83d38cd2c5b4c476fa3e1cd2eeff17204b50c4b6a3b83 WHIRLPOOL f4af8734f15bdb1edb92d0d4eb2793a4a5b9e4c65285bfdef1132b58306f8dcadef48e6e27bfc76ff5be1415fcc0e68d4802dfd776f9af1c5eed0c7915ee018e
 AUX ushare.init.d 2164 SHA256 10de994599a9d21fcb0b9d039a5ba7f1714c990819a41db745eb536fdb6c0d92 SHA512 aa9faeb0a78229dbdf425c25e7eb94b19537c705760323f66ef86811e77b94a62a37a072ac5e8895dbc06e7a42c56d9e263b7f5ea718f7493db9855c7d34a0bf WHIRLPOOL e14e155c628d9f7cba4d8af429700c503866a1a95503367d3bb18dc5760b6afd3ea13d3ae340a3a91f5b2cc53d03bcba5c56472f157cb6ce63320aa0dc8ba76b
+AUX ushare.init.d.ng 1074 SHA256 ac261f2953253db939cbc2413c843d83e49942e1ed953ad65c4affaec033ba97 SHA512 4972f3d20f5c6ed965a2285912c47d779c159e153a289510f295c1f3e908cc0e0348d1d18aab9b2706fca894561d4fdfa846f618aca97321d5291d79424f2d4d WHIRLPOOL 5abf235f9cc77a421dea49ce483544e1ba77e0c65023bd2bec43e96d7693ede7b2f58cbe1334e682b8aa8a20dd82a9aae1d6b7a48707c07534e3978ff13c655f
+AUX ushare.service 189 SHA256 1967fd7ce1a8ce0018258dc743d951e2ff991d26597578f64f2d732c4d4606c9 SHA512 141b1f592220d3785af821f085f9c03811a2370e1a8c6bb5d2739b4ae74421323df437d2a6672d943ab8371b6d5ccfb395a4943a10eb5c1e8bc0ff16a3177b15 WHIRLPOOL 8c40cad1cf41605548852202946adf70bc5bd8937555dd0b427c57c5a5e80f0921e5e7d7b5f92b3ddeb7523a6001f84af8a1e56554e7438a86c0b9a575c797f4
 DIST ushare-1.1a.tar.bz2 65864 SHA256 7b9b85c79968d4f4560f02a99e33c6a33ff58f9d41d8faea79e31cce2ee78665 SHA512 2144ef96e58960d4d11bcefcd857c7eb7adab8df4ff815772d3b9d668f9f9daa1312707eb00a770c461b2a316e094e6697a004723ea02e86ee872fbe60b4797c WHIRLPOOL de9043c34edfd9ff3a1220968496e2ce42fae43cf1b190c40a14f11a6e4297689d2d800878e698a9f57edbe35dbb5c7ca82d81a67029df648a0d6e6c75966471
-EBUILD ushare-1.1a-r4.ebuild 1410 SHA256 e0dff783cde3fe68a0bc52ac1c96b7b9adf9ee5ef8dddef672c349138243e621 SHA512 ab86a1fbfe7b68f804c2c4e6fb817caab7ce61786cbcb907fc9cf372ac92b7094ba9fa0dca334100671bf4f11a54b6201eefeea98b5d40bab4458ee55aa29922 WHIRLPOOL af8328db1b23e4464c474c6588ef6305d9104f101a67b9db0d2c80abccb7ea37979bfc04c6c398f7931b1487dbdf188f1d67ff8433563adbf4a6cdb3a487ebb7
 EBUILD ushare-1.1a-r5.ebuild 1505 SHA256 92f3d29207f0334b0d82c3ebcea20472e36c820a580063d23c1f1976edc59816 SHA512 9a5588bcb1ed944817dac6ccc12f1633facadde5097b50a4bab8827f19b683fe45acd491454fa7411e486f41190533caa4a58cedb8cecca24c89a30c18e2979c WHIRLPOOL 8f108e960c390ebaf5f87583d5c95594767a3058530cc6c86e6b045f3e243902013ca8e814b7cdc27607895671c3f93ef55e66040e2445329e112f8d40284309
-MISC ChangeLog 3963 SHA256 9b0850e4ec224616e26bd49f012c0629ec43b3a246a2b9aa933498e5e46aad90 SHA512 32d56583e7c306daac551b366308da6b639981b121749d5c2b1b3eab1af26643ee8f39de52e231c1cf5b7204ddb9b880bbed1a3b7005d62500676129a8e79330 WHIRLPOOL 423d46b28ed23ba458efb4d86af40c29f505d2ecc5862bde5d546aaedbadb0c2f7bd770990e3efdac9073a58ae53626021b44e474911d2418838c327017bd418
+EBUILD ushare-1.1a-r6.ebuild 1846 SHA256 e6737899e1c8652f0f1628eda829ec20178081f9ca1cb105378ec27a7760b463 SHA512 46de04551d1683d016155570106e383383e0e3b9294eddd4993ebb1adce777dfc6f3bd69b4446511e2f3ea57ee09cd9114b23ab708fcc395bbe0b1a92c1633ca WHIRLPOOL befb7c879113a731c37f033608ed9f78722201db5c3f3cdfa938eccb99808dc58d3ac593896770a9f2d43dda3d972c3d3e82b4d7ad175e696fb9772df2ccd348
+MISC ChangeLog 4297 SHA256 69e93d7b5f4a593d88f3db33cfa9e6717575501426000204f59bbc72e004277e SHA512 4a73fc70a54e71d0008016e34b77c018a050863194142a0018cab3c314492a9fcc8e752b6d2cc519de21639b0df7d71ff8366cc9847888010ff892a19a4c50c2 WHIRLPOOL f12a4190ba2a24eb848c1f3687049b605f54f59d186085c94c6d2812958db0f70d3271a9858a271b7563d5d26a0ebd72e7abe6b380f4ac3e962c437321e0bc6e
 MISC metadata.xml 320 SHA256 9320abca2a1edcc7d3df6db97cec570bdf5eaf4eaf54c9f72e7ac6cf078a01f5 SHA512 0b356d64373c1001dba167a393ee0708782cb815b71d665265155011656f033eb46b7f045006f1f7aa962bd081bb9a599570f048a2f591a6fad2e73d77a3bdc0 WHIRLPOOL a2901557f76cc39476558417f4587e4d3287fa2dc21a975f6fc409b520d893f872ab6ab515acddb68f2040c8cb6bfd2e6e7287695f859cf204dcd29aae843e04
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlEfRQEACgkQCaWpQKGI+9Q4JQCdFXAkGvLfiJRdcyUiEh+/RJLz
-66oAnAuabha+EhB0LtLAYf6xlVgaGgkX
-=s9Jj
+iQJ8BAEBCABmBQJSEPjaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88JdQP/A+q3F9dZ5MuMJ2wUNec+Fuy
+ZTySu8+IUrI2k5jrVKEkhtk/PL0hKFe+YGLWTFeSvWMSK53kqXtAt7mG4Nq4eZDH
+jUyQ60NKqcpVqHD8IFJHfgs+LXjk/avuD+zjVuBCeMwKu76Pf98aLVWcc5aBUezV
+l8ZVlOffMiBWywsrQoPNV4n+7bUQ++4aWBA6ZRpihn01OfWVk9I+wyRKhzsOgkZJ
+0AjS/8hTxFZqi/UQOagwRT8PxaALXX9hBhJ9AmrtLRQtmea8ktTqSbjBy05zHTU/
+3h02hSodbsBrSjjIVF6tk0SWAZSPIRS3703Hi8NdbOmKId5L6MhkiKYPC5vX2ANX
+1SbVoUeD/4/YUuvSges9IJ8tU0Mj/vS/lS5+ArH9Cev20XpnRuueRWKfTl9507Sp
+s92HpWouNx6QeelaTLDhbwQPpHyFPouok8DmCPKGkai4gWM0NXMCkRYjJK/9lGQV
+brjqS+KHgOtn2vJW0AsZMxpKE+PWClpITFn6LsTEQsthVcWobowuV/SJ2+IN70PB
+rVzF2/F70n+BOLe4mqlO47sJqL5cRCBJNxjd+5rl7dGkop5WwUqvASJDGOD+joCn
+8R8n11GuziN6z7Tmg+Hx7SI0ssfV/NC+heImvtVCuunDdxQtII+jJ2hEsUR2jCH9
+PinuSZZOQgeUpk2j0Psk
+=dB9J
 -----END PGP SIGNATURE-----
diff --git a/media-video/ushare/files/ushare.init.d.ng b/media-video/ushare/files/ushare.init.d.ng
new file mode 100644
index 000000000000..7f9920ab1b38
--- /dev/null
+++ b/media-video/ushare/files/ushare.init.d.ng
@@ -0,0 +1,36 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/files/ushare.init.d.ng,v 1.1 2013/08/18 16:41:08 hwoarang Exp $
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting uShare"
+
+	if [[ ! -f /etc/ushare.conf && -f /etc/conf.d/ushare ]]; then
+		ewarn "Please migrate your settings from"
+		ewarn "/etc/conf.d/ushare to the new /etc/ushare.conf file"
+		ewarn "and then delete the /etc/conf.d/ushare file."
+		eerror "User migration steps are needed!"
+	fi
+
+	if [[ -f /etc/ushare.conf && -f /etc/conf.d/ushare ]]; then
+		ewarn "Old configuration file /etc/conf.d/ushare detected!"
+		ewarn "Please migrate your settings to the new /etc/ushare.conf file"
+		ewarn "and then delete the old one."
+		eerror "Use migration steps are needed!"
+	fi
+
+	start-stop-daemon --start --quiet -u ushare \
+	--exec /usr/bin/ushare -- -D --cfg=/etc/ushare.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping uShare"
+	start-stop-daemon --stop --quiet --exec /usr/bin/ushare
+	eend $?
+}
diff --git a/media-video/ushare/files/ushare.service b/media-video/ushare/files/ushare.service
new file mode 100644
index 000000000000..a1ea1080fce6
--- /dev/null
+++ b/media-video/ushare/files/ushare.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Ushare Media Server
+Requires=network.target
+
+[Service]
+Type=forking
+User=ushare
+ExecStart=/usr/bin/ushare -D --cfg=/etc/ushare.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/media-video/ushare/ushare-1.1a-r4.ebuild b/media-video/ushare/ushare-1.1a-r6.ebuild
index 3b740456a4b6..46d3758d5b26 100644
--- a/media-video/ushare/ushare-1.1a-r4.ebuild
+++ b/media-video/ushare/ushare-1.1a-r6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ushare-1.1a-r4.ebuild,v 1.1 2012/08/18 15:06:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ushare-1.1a-r6.ebuild,v 1.1 2013/08/18 16:41:09 hwoarang Exp $
 
 EAPI=4
-inherit eutils multilib user
+inherit eutils multilib readme.gentoo toolchain-funcs user systemd
 
 DESCRIPTION="uShare is a UPnP (TM) A/V & DLNA Media Server"
 HOMEPAGE="http://ushare.geexbox.org/"
@@ -11,7 +11,7 @@ SRC_URI="http://ushare.geexbox.org/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dlna nls"
 
 RDEPEND=">=net-libs/libupnp-1.6.14
@@ -20,32 +20,45 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
+	EPATCH_EXCLUDE="06_all_ushare_disable_sysconf.patch"
 	EPATCH_SOURCE="${FILESDIR}" EPATCH_SUFFIX="patch" \
 		EPATCH_OPTS="-p1" epatch
+
+	DOC_CONTENTS="Please edit /etc/ushare.conf to set the shared directories
+		and other important settings. Check system log if ushare is
+		not booting."
 }
 
 src_configure() {
 	local myconf
-	myconf="--prefix=/usr --disable-sysconf --disable-strip $(use_enable dlna)"
+	myconf="--prefix=/usr --sysconfdir=/etc --disable-strip $(use_enable dlna)"
 	# nls can only be disabled, on by default.
 	use nls || myconf="${myconf} --disable-nls"
 
 	# I can't use econf
 	# --host is not implemented in ./configure file
+	tc-export CC CXX
+
 	./configure ${myconf} || die "./configure failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
 	doman src/ushare.1
-	newconfd "${FILESDIR}"/ushare.conf.d ushare
-	newinitd "${FILESDIR}"/ushare.init.d ushare
+	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
+	newinitd "${FILESDIR}"/${PN}.init.d.ng ${PN}
 	dodoc NEWS README TODO THANKS AUTHORS
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
 	enewuser ushare
-	elog "Please edit /etc/conf.d/ushare to set the shared directories"
-	elog "and other important settings. Check system log if ushare is"
-	elog "not booting."
+	readme.gentoo_print_elog
+	elog
+	elog "The config file has been moved to /etc/ushare.conf"
+	elog "Please migrate your settings from /etc/conf.d/ushare"
+	elog "to /etc/ushare.conf in order to use the ushare init script"
+	elog "and systemd unit service."
+	elog
 }