Cleaned up ebuilds.

2 files changed, 15 insertions, 21 deletions

diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 8b17a88..55c1b0a 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -2,6 +2,6 @@ AUX sabnzbd.conf 723 RMD160 704a24d899970fb3051285a8f8dd650bb1584f48 SHA1 62c9b9
 AUX sabnzbd.ini 2415 RMD160 eec1fbb240c3e1b904d3757da7a2f6e60acad157 SHA1 82ccfd2689042a33ed2d26c587489e98ffeddd3c SHA256 e05345c728bb2285caaf8feec264aaef3adaf903c4fd1879d3222fd5a7ae304a
 AUX sabnzbd.init 509 RMD160 84fe7ab74e15eca5e630f05b60f9650a1faeaacc SHA1 b2568a3fea569017428c3e3a9852e1151db9f550 SHA256 92024dc4a466c6ef10e6ccec2c98f5d038d496ebd4d07222d1492d640d1c6113
 DIST SABnzbd-0.6.1-src.tar.gz 1888233 RMD160 0ac6823c2b850d4184b94f6a206241bcab04af1e SHA1 6e009f210235bb6b8278c59634bf2db1b5fb32f4 SHA256 b9b7e15c3e774aae42e248f19bc97bdbc17afe6bf27e236a7d565ddf5e11ae58
-EBUILD sabnzbd-0.6.1.ebuild 3728 RMD160 d25105def832e4943c3e320e4afca72d47158a8a SHA1 0e6e3286fd2c0de2c76dd4563df14b1253d8a23a SHA256 b04e67585229e1ab1ded9612bceb4f79d30716c4018ade6c7aeec72bc818cdd6
+EBUILD sabnzbd-0.6.1.ebuild 3207 RMD160 8efc813c510ae7bf8256d17c1af2165e2b670789 SHA1 0c124840a315c548c43f3fe6539eea9e4e0a6ac7 SHA256 30e7cdd766f601923566dfdd14c04cb6e92f11def0299fea99ca81f2e9b2e398
 MISC ChangeLog 252 RMD160 37a18861a1739a133fa07f2cf89be3bf067c88d3 SHA1 1d39f9e535afcdc498cfe06da872bf37d67a134b SHA256 ee66b4dfcec39dc60c0ac5f155b2d2be1b5f268209c5f78407488f8c798e52ec
 MISC metadata.xml 252 RMD160 0d6b4d4e9e2fc0a9fc73289b6f3234195a3a1405 SHA1 6d719654a220ceff01851fa059936c79ca6bf9be SHA256 50fba57de1e11a48fbf58020c096095ebf9ec5defa2b5bcda9ed44e5be159d3f
diff --git a/net-nntp/sabnzbd/sabnzbd-0.6.1.ebuild b/net-nntp/sabnzbd/sabnzbd-0.6.1.ebuild
index 98c3a43..90e7410 100644
--- a/net-nntp/sabnzbd/sabnzbd-0.6.1.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-0.6.1.ebuild
@@ -48,16 +48,16 @@ pkg_setup() {
 
 src_install() {
 
-	cp "${FILESDIR}/${PN}.ini" "${S}" || die "copying sample ${PN}.ini"
+	cp "${FILESDIR}/${PN}.ini" "${S}" \
+		|| die "copying sample ${PN}.ini"
 
-	dodoc CHANGELOG.txt ISSUES.txt INSTALL.txt README.txt Sample-PostProc.sh \
-		Sample-PostProc.cmd || die
+	dodoc CHANGELOG.txt ISSUES.txt INSTALL.txt README.txt \
+		Sample-PostProc.sh Sample-PostProc.cmd || die
 
 	insopts -m0660 -o root -g ${PN}
 	newconfd "${FILESDIR}/${PN}.conf" "${PN}" || die
 	newinitd "${FILESDIR}/${PN}.init" "${PN}" || die
 
-	#SABnzbd >=0.6.0 write temp files when editing config from the web GUI, so directory needs to be writable by the SABnzbd process
 	diropts -m0770 -o root -g ${PN}
 	dodir /etc/${PN} || die
 
@@ -65,27 +65,23 @@ src_install() {
 	insopts -m0660 -o root -g ${PN}
 	doins "${PN}.ini" || die "newins ${PN}.ini"
 
-	#Create all default dirs & mark with .keep so portage will not remove them
 	keepdir ${DHOMEDIR}
-	for i in admin cache complete download dirscan incomplete nzb_backup scripts; do
+	for i in admin cache complete download dirscan incomplete \
+		nzb_backup scripts; do
 		keepdir ${DHOMEDIR}/${i} || die
 	done
 
-	#Create & assign ownership of SABnzbd default directories
-	fowners -R root:${PN} ${DHOMEDIR}
-	fperms -R 770 ${DHOMEDIR}
+	fowners -R root:${PN} ${DHOMEDIR} || die
+	fperms -R 770 ${DHOMEDIR} || die
 
-	#Create & assign ownership of SABnzbd log directory
 	keepdir /var/log/${PN} || die
-	fowners -R root:${PN} /var/log/${PN}
-	fperms -R 770 /var/log/${PN}
+	fowners -R root:${PN} /var/log/${PN} || die
+	fperms -R 770 /var/log/${PN} || die
 
-	#Create & assign ownership of SABnzbd PID directory
 	keepdir /var/run/${PN} || die
-	fowners -R root:${PN} /var/run/${PN}
-	fperms -R 770 /var/run/${PN}
+	fowners -R root:${PN} /var/run/${PN} || die
+	fperms -R 770 /var/run/${PN} || die
 
-	#Add themes & code into /usr/share
 	dodir /usr/share/${P} || die
 	insinto /usr/share/${P}
 	for i in interfaces sabnzbd email locale po tools util;do
@@ -94,12 +90,10 @@ src_install() {
 
 	doins SABnzbd.py || die
 
-	#create symlink to /usr/share/sabnzbd (minus version #)
 	dosym /usr/share/${P} /usr/share/${PN} || die
 
-	#Adjust permissions in python source directory for root:sabnzbd
-	fowners -R root:${PN} /usr/share/${P}
-	fperms -R 770 /usr/share/${P}
+	fowners -R root:${PN} /usr/share/${P} || die
+	fperms -R 770 /usr/share/${P} || die
 }
 
 pkg_postinst() {