Gentoo Archives: gentoo-commits

From: Dane Smith <c1pher@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/c1pher:master commit in: dev-python/yenc/, net-nntp/sabnzbd/
Date: Fri, 01 Jul 2011 15:46:54
Message-Id: a35f81f62a8b87ace41267c52a812944bac4ef6d.c1pher@gentoo
1 commit: a35f81f62a8b87ace41267c52a812944bac4ef6d
2 Author: Dane Smith <c1pher <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 25 17:54:23 2011 +0000
4 Commit: Dane Smith <c1pher <AT> gentoo <DOT> org>
5 CommitDate: Wed May 25 17:54:23 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=a35f81f6
7
8 Cleaned up ebuilds.
9
10 ---
11 dev-python/yenc/Manifest | 2 +-
12 dev-python/yenc/yenc-0.3.ebuild | 2 -
13 net-nntp/sabnzbd/Manifest | 2 +-
14 net-nntp/sabnzbd/sabnzbd-0.6.1.ebuild | 34 +++++++++++++-------------------
15 4 files changed, 16 insertions(+), 24 deletions(-)
16
17 diff --git a/dev-python/yenc/Manifest b/dev-python/yenc/Manifest
18 index 156f276..8d170bf 100644
19 --- a/dev-python/yenc/Manifest
20 +++ b/dev-python/yenc/Manifest
21 @@ -1,4 +1,4 @@
22 DIST yenc-0.3.tar.gz 42740 RMD160 c71c776088ebb4ccc50276957a2d58b821ab52f0 SHA1 0ce392753e825f965dfc91cd0c106e434984496e SHA256 fb04fea7c5821345608fa01728ce5356b6dfb2d3e469e59e3fd31b88f45fb313
23 -EBUILD yenc-0.3.ebuild 493 RMD160 79bd045e51ad591c28fd74a8b877d323e881503a SHA1 b9f899b3b7e7f65df4db82a2c8b0b42122beb487 SHA256 81665f2596d17118c16751a0c3364110109229e14c48fc6ecefad68f851438ec
24 +EBUILD yenc-0.3.ebuild 468 RMD160 b4faa5226dc036f84ea51916887be85f2dc9ad88 SHA1 617773aa058623d611bf9c890355abcb4ed0efad SHA256 99e3791dd9e75343e67b287793590d1e6d88c78c8d989235330572798dd3b7bc
25 MISC ChangeLog 240 RMD160 3b22844d96a3f029566300777a25b9bd2788f8d4 SHA1 2a73ee36eda99b9dd5e2e81e5f3e908f314c6d6f SHA256 28824937c085bf04360fd3e3076ae0b459472578d6671e67eb3a43b51de6abf0
26 MISC metadata.xml 252 RMD160 0d6b4d4e9e2fc0a9fc73289b6f3234195a3a1405 SHA1 6d719654a220ceff01851fa059936c79ca6bf9be SHA256 50fba57de1e11a48fbf58020c096095ebf9ec5defa2b5bcda9ed44e5be159d3f
27
28 diff --git a/dev-python/yenc/yenc-0.3.ebuild b/dev-python/yenc/yenc-0.3.ebuild
29 index 48279c1..dd6ea93 100644
30 --- a/dev-python/yenc/yenc-0.3.ebuild
31 +++ b/dev-python/yenc/yenc-0.3.ebuild
32 @@ -17,5 +17,3 @@ LICENSE="GPL-2"
33 SLOT="0"
34 KEYWORDS=""
35 IUSE=""
36 -
37 -S=${WORKDIR}/yenc-${PV}
38
39 diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
40 index 8b17a88..55c1b0a 100644
41 --- a/net-nntp/sabnzbd/Manifest
42 +++ b/net-nntp/sabnzbd/Manifest
43 @@ -2,6 +2,6 @@ AUX sabnzbd.conf 723 RMD160 704a24d899970fb3051285a8f8dd650bb1584f48 SHA1 62c9b9
44 AUX sabnzbd.ini 2415 RMD160 eec1fbb240c3e1b904d3757da7a2f6e60acad157 SHA1 82ccfd2689042a33ed2d26c587489e98ffeddd3c SHA256 e05345c728bb2285caaf8feec264aaef3adaf903c4fd1879d3222fd5a7ae304a
45 AUX sabnzbd.init 509 RMD160 84fe7ab74e15eca5e630f05b60f9650a1faeaacc SHA1 b2568a3fea569017428c3e3a9852e1151db9f550 SHA256 92024dc4a466c6ef10e6ccec2c98f5d038d496ebd4d07222d1492d640d1c6113
46 DIST SABnzbd-0.6.1-src.tar.gz 1888233 RMD160 0ac6823c2b850d4184b94f6a206241bcab04af1e SHA1 6e009f210235bb6b8278c59634bf2db1b5fb32f4 SHA256 b9b7e15c3e774aae42e248f19bc97bdbc17afe6bf27e236a7d565ddf5e11ae58
47 -EBUILD sabnzbd-0.6.1.ebuild 3728 RMD160 d25105def832e4943c3e320e4afca72d47158a8a SHA1 0e6e3286fd2c0de2c76dd4563df14b1253d8a23a SHA256 b04e67585229e1ab1ded9612bceb4f79d30716c4018ade6c7aeec72bc818cdd6
48 +EBUILD sabnzbd-0.6.1.ebuild 3207 RMD160 8efc813c510ae7bf8256d17c1af2165e2b670789 SHA1 0c124840a315c548c43f3fe6539eea9e4e0a6ac7 SHA256 30e7cdd766f601923566dfdd14c04cb6e92f11def0299fea99ca81f2e9b2e398
49 MISC ChangeLog 252 RMD160 37a18861a1739a133fa07f2cf89be3bf067c88d3 SHA1 1d39f9e535afcdc498cfe06da872bf37d67a134b SHA256 ee66b4dfcec39dc60c0ac5f155b2d2be1b5f268209c5f78407488f8c798e52ec
50 MISC metadata.xml 252 RMD160 0d6b4d4e9e2fc0a9fc73289b6f3234195a3a1405 SHA1 6d719654a220ceff01851fa059936c79ca6bf9be SHA256 50fba57de1e11a48fbf58020c096095ebf9ec5defa2b5bcda9ed44e5be159d3f
51
52 diff --git a/net-nntp/sabnzbd/sabnzbd-0.6.1.ebuild b/net-nntp/sabnzbd/sabnzbd-0.6.1.ebuild
53 index 98c3a43..90e7410 100644
54 --- a/net-nntp/sabnzbd/sabnzbd-0.6.1.ebuild
55 +++ b/net-nntp/sabnzbd/sabnzbd-0.6.1.ebuild
56 @@ -48,16 +48,16 @@ pkg_setup() {
57
58 src_install() {
59
60 - cp "${FILESDIR}/${PN}.ini" "${S}" || die "copying sample ${PN}.ini"
61 + cp "${FILESDIR}/${PN}.ini" "${S}" \
62 + || die "copying sample ${PN}.ini"
63
64 - dodoc CHANGELOG.txt ISSUES.txt INSTALL.txt README.txt Sample-PostProc.sh \
65 - Sample-PostProc.cmd || die
66 + dodoc CHANGELOG.txt ISSUES.txt INSTALL.txt README.txt \
67 + Sample-PostProc.sh Sample-PostProc.cmd || die
68
69 insopts -m0660 -o root -g ${PN}
70 newconfd "${FILESDIR}/${PN}.conf" "${PN}" || die
71 newinitd "${FILESDIR}/${PN}.init" "${PN}" || die
72
73 - #SABnzbd >=0.6.0 write temp files when editing config from the web GUI, so directory needs to be writable by the SABnzbd process
74 diropts -m0770 -o root -g ${PN}
75 dodir /etc/${PN} || die
76
77 @@ -65,27 +65,23 @@ src_install() {
78 insopts -m0660 -o root -g ${PN}
79 doins "${PN}.ini" || die "newins ${PN}.ini"
80
81 - #Create all default dirs & mark with .keep so portage will not remove them
82 keepdir ${DHOMEDIR}
83 - for i in admin cache complete download dirscan incomplete nzb_backup scripts; do
84 + for i in admin cache complete download dirscan incomplete \
85 + nzb_backup scripts; do
86 keepdir ${DHOMEDIR}/${i} || die
87 done
88
89 - #Create & assign ownership of SABnzbd default directories
90 - fowners -R root:${PN} ${DHOMEDIR}
91 - fperms -R 770 ${DHOMEDIR}
92 + fowners -R root:${PN} ${DHOMEDIR} || die
93 + fperms -R 770 ${DHOMEDIR} || die
94
95 - #Create & assign ownership of SABnzbd log directory
96 keepdir /var/log/${PN} || die
97 - fowners -R root:${PN} /var/log/${PN}
98 - fperms -R 770 /var/log/${PN}
99 + fowners -R root:${PN} /var/log/${PN} || die
100 + fperms -R 770 /var/log/${PN} || die
101
102 - #Create & assign ownership of SABnzbd PID directory
103 keepdir /var/run/${PN} || die
104 - fowners -R root:${PN} /var/run/${PN}
105 - fperms -R 770 /var/run/${PN}
106 + fowners -R root:${PN} /var/run/${PN} || die
107 + fperms -R 770 /var/run/${PN} || die
108
109 - #Add themes & code into /usr/share
110 dodir /usr/share/${P} || die
111 insinto /usr/share/${P}
112 for i in interfaces sabnzbd email locale po tools util;do
113 @@ -94,12 +90,10 @@ src_install() {
114
115 doins SABnzbd.py || die
116
117 - #create symlink to /usr/share/sabnzbd (minus version #)
118 dosym /usr/share/${P} /usr/share/${PN} || die
119
120 - #Adjust permissions in python source directory for root:sabnzbd
121 - fowners -R root:${PN} /usr/share/${P}
122 - fperms -R 770 /usr/share/${P}
123 + fowners -R root:${PN} /usr/share/${P} || die
124 + fperms -R 770 /usr/share/${P} || die
125 }
126
127 pkg_postinst() {