1 |
commit: a168666a5aedea196140923ecdce1e3a00a736de |
2 |
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 24 11:04:36 2016 +0000 |
4 |
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 24 11:05:55 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a168666a |
7 |
|
8 |
net-im/pyicq-t: Move fixed -r6 to stable and remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
net-im/pyicq-t/pyicq-t-0.8.1.5-r4.ebuild | 54 ------------------------------- |
13 |
net-im/pyicq-t/pyicq-t-0.8.1.5-r5.ebuild | 55 -------------------------------- |
14 |
net-im/pyicq-t/pyicq-t-0.8.1.5-r6.ebuild | 2 +- |
15 |
3 files changed, 1 insertion(+), 110 deletions(-) |
16 |
|
17 |
diff --git a/net-im/pyicq-t/pyicq-t-0.8.1.5-r4.ebuild b/net-im/pyicq-t/pyicq-t-0.8.1.5-r4.ebuild |
18 |
deleted file mode 100644 |
19 |
index d5fd407..00000000 |
20 |
--- a/net-im/pyicq-t/pyicq-t-0.8.1.5-r4.ebuild |
21 |
+++ /dev/null |
22 |
@@ -1,54 +0,0 @@ |
23 |
-# Copyright 1999-2015 Gentoo Foundation |
24 |
-# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Id$ |
26 |
- |
27 |
-EAPI="5" |
28 |
-PYTHON_COMPAT=( python2_7 ) |
29 |
-inherit eutils python-single-r1 systemd |
30 |
- |
31 |
-MY_P="${P/pyicq-t/pyicqt}" |
32 |
-DESCRIPTION="Python based jabber transport for ICQ" |
33 |
-HOMEPAGE="https://code.google.com/p/pyicqt/" |
34 |
-SRC_URI="https://pyicqt.googlecode.com/files/${MY_P}.tar.gz" |
35 |
-S="${WORKDIR}/${MY_P}" |
36 |
- |
37 |
-LICENSE="GPL-2" |
38 |
-SLOT="0" |
39 |
-KEYWORDS="amd64 x86" |
40 |
-IUSE="webinterface" |
41 |
- |
42 |
-DEPEND="net-im/jabber-base" |
43 |
-RDEPEND="${DEPEND} |
44 |
- dev-python/twisted-core[${PYTHON_USEDEP}] |
45 |
- dev-python/twisted-words[${PYTHON_USEDEP}] |
46 |
- dev-python/twisted-web[${PYTHON_USEDEP}] |
47 |
- webinterface? ( >=dev-python/nevow-0.4.1[${PYTHON_USEDEP}] ) |
48 |
- dev-python/pillow[${PYTHON_USEDEP}]" |
49 |
- |
50 |
-src_prepare() { |
51 |
- epatch "${FILESDIR}/${P}-python26-warnings.diff" |
52 |
- epatch "${FILESDIR}/${P}-pillow-imaging.patch" |
53 |
-} |
54 |
- |
55 |
-src_install() { |
56 |
- python_moduleinto ${PN} |
57 |
- cp PyICQt.py ${PN}.py || die |
58 |
- python_domodule ${PN}.py data tools src |
59 |
- |
60 |
- insinto /etc/jabber |
61 |
- newins config_example.xml ${PN}.xml |
62 |
- fperms 600 /etc/jabber/${PN}.xml |
63 |
- fowners jabber:jabber /etc/jabber/${PN}.xml |
64 |
- fperms 755 "$(python_get_sitedir)/${PN}/${PN}.py" |
65 |
- sed -i \ |
66 |
- -e "s:<spooldir>[^\<]*</spooldir>:<spooldir>/var/spool/jabber</spooldir>:" \ |
67 |
- -e "s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \ |
68 |
- "${ED}/etc/jabber/${PN}.xml" || die |
69 |
- |
70 |
- newinitd "${FILESDIR}/${PN}-0.8-initd-r1" ${PN} |
71 |
- systemd_dounit "${FILESDIR}/${PN}.service" |
72 |
- sed -i -e "s:INSPATH:$(python_get_sitedir)/${PN}:" \ |
73 |
- "${ED}/etc/init.d/${PN}" "${ED}/usr/lib/systemd/system/${PN}.service" || die |
74 |
- |
75 |
- python_fix_shebang "${D}$(python_get_sitedir)/${PN}" |
76 |
-} |
77 |
|
78 |
diff --git a/net-im/pyicq-t/pyicq-t-0.8.1.5-r5.ebuild b/net-im/pyicq-t/pyicq-t-0.8.1.5-r5.ebuild |
79 |
deleted file mode 100644 |
80 |
index a4d1d38..00000000 |
81 |
--- a/net-im/pyicq-t/pyicq-t-0.8.1.5-r5.ebuild |
82 |
+++ /dev/null |
83 |
@@ -1,55 +0,0 @@ |
84 |
-# Copyright 1999-2016 Gentoo Foundation |
85 |
-# Distributed under the terms of the GNU General Public License v2 |
86 |
-# $Id$ |
87 |
- |
88 |
-EAPI="6" |
89 |
-PYTHON_COMPAT=( python2_7 ) |
90 |
-inherit eutils python-single-r1 systemd |
91 |
- |
92 |
-MY_P="${P/pyicq-t/pyicqt}" |
93 |
-DESCRIPTION="Python based jabber transport for ICQ" |
94 |
-HOMEPAGE="https://code.google.com/p/pyicqt/" |
95 |
-SRC_URI="https://pyicqt.googlecode.com/files/${MY_P}.tar.gz" |
96 |
-S="${WORKDIR}/${MY_P}" |
97 |
- |
98 |
-LICENSE="GPL-2" |
99 |
-SLOT="0" |
100 |
-KEYWORDS="~amd64 ~x86" |
101 |
-IUSE="webinterface" |
102 |
- |
103 |
-DEPEND="net-im/jabber-base" |
104 |
-RDEPEND="${DEPEND} |
105 |
- dev-python/twisted-core[${PYTHON_USEDEP}] |
106 |
- dev-python/twisted-words[${PYTHON_USEDEP}] |
107 |
- dev-python/twisted-web[${PYTHON_USEDEP}] |
108 |
- webinterface? ( >=dev-python/nevow-0.4.1[${PYTHON_USEDEP}] ) |
109 |
- dev-python/pillow[${PYTHON_USEDEP}]" |
110 |
- |
111 |
-src_prepare() { |
112 |
- eapply "${FILESDIR}/${P}-python26-warnings.diff" |
113 |
- eapply "${FILESDIR}/${P}-pillow-imaging.patch" |
114 |
- eapply_user |
115 |
-} |
116 |
- |
117 |
-src_install() { |
118 |
- python_moduleinto ${PN} |
119 |
- cp PyICQt.py ${PN}.py || die |
120 |
- python_domodule ${PN}.py data tools src |
121 |
- |
122 |
- insinto /etc/jabber |
123 |
- newins config_example.xml ${PN}.xml |
124 |
- fperms 600 /etc/jabber/${PN}.xml |
125 |
- fowners jabber:jabber /etc/jabber/${PN}.xml |
126 |
- fperms 755 "$(python_get_sitedir)/${PN}/${PN}.py" |
127 |
- sed -i \ |
128 |
- -e "s:<spooldir>[^\<]*</spooldir>:<spooldir>/var/spool/jabber</spooldir>:" \ |
129 |
- -e "s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \ |
130 |
- "${ED}/etc/jabber/${PN}.xml" || die |
131 |
- |
132 |
- newinitd "${FILESDIR}/${PN}-0.8-initd-r1" ${PN} |
133 |
- systemd_dounit "${FILESDIR}/${PN}.service" |
134 |
- sed -i -e "s:INSPATH:$(python_get_sitedir)/${PN}:" \ |
135 |
- "${ED}/etc/init.d/${PN}" "${ED}/usr/lib/systemd/system/${PN}.service" || die |
136 |
- |
137 |
- python_fix_shebang "${D}$(python_get_sitedir)/${PN}" |
138 |
-} |
139 |
|
140 |
diff --git a/net-im/pyicq-t/pyicq-t-0.8.1.5-r6.ebuild b/net-im/pyicq-t/pyicq-t-0.8.1.5-r6.ebuild |
141 |
index 889ff1c..58c536a 100644 |
142 |
--- a/net-im/pyicq-t/pyicq-t-0.8.1.5-r6.ebuild |
143 |
+++ b/net-im/pyicq-t/pyicq-t-0.8.1.5-r6.ebuild |
144 |
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}" |
145 |
|
146 |
LICENSE="GPL-2" |
147 |
SLOT="0" |
148 |
-KEYWORDS="~amd64 ~x86" |
149 |
+KEYWORDS="amd64 x86" |
150 |
IUSE="webinterface" |
151 |
|
152 |
DEPEND="net-im/jabber-base" |