1 |
arfrever 10/11/07 14:46:36 |
2 |
|
3 |
Modified: tmda-1.1.12.ebuild ChangeLog |
4 |
Log: |
5 |
Update EAPI. Use Python 2, call python_mod_optimize() and python_mod_cleanup() (bug #313481). Don't install nonexistent documentation files (bug #300511). |
6 |
|
7 |
(Portage version: 2.2.0_alpha4_p11/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 mail-filter/tmda/tmda-1.1.12.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/tmda/tmda-1.1.12.ebuild?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/tmda/tmda-1.1.12.ebuild?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/tmda/tmda-1.1.12.ebuild?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: tmda-1.1.12.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/mail-filter/tmda/tmda-1.1.12.ebuild,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- tmda-1.1.12.ebuild 7 Jan 2010 14:37:24 -0000 1.1 |
23 |
+++ tmda-1.1.12.ebuild 7 Nov 2010 14:46:36 -0000 1.2 |
24 |
@@ -1,67 +1,73 @@ |
25 |
# Copyright 1999-2010 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/tmda-1.1.12.ebuild,v 1.1 2010/01/07 14:37:24 patrick Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/tmda-1.1.12.ebuild,v 1.2 2010/11/07 14:46:36 arfrever Exp $ |
29 |
|
30 |
-inherit eutils |
31 |
+EAPI="3" |
32 |
+PYTHON_DEPEND="2" |
33 |
+ |
34 |
+inherit eutils multilib python |
35 |
|
36 |
DESCRIPTION="Python-based SPAM reduction system" |
37 |
HOMEPAGE="http://www.tmda.net/" |
38 |
-LICENSE="GPL-2" |
39 |
- |
40 |
-DEPEND=">=dev-lang/python-2.2 |
41 |
- virtual/mta" |
42 |
- |
43 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" |
44 |
+ |
45 |
+LICENSE="GPL-2" |
46 |
SLOT="0" |
47 |
KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
48 |
IUSE="" |
49 |
|
50 |
-src_compile () { |
51 |
- # Do not open /dev/tty when in batch mode. (bug #67150) -ticho |
52 |
- epatch ${FILESDIR}/tmda-1.0-non-interactive-tty.patch |
53 |
+DEPEND="virtual/mta" |
54 |
+RDEPEND="${DEPEND}" |
55 |
|
56 |
- ./compileall || die "tmda compilation failed" |
57 |
+pkg_setup() { |
58 |
+ python_set_active_version 2 |
59 |
+ python_pkg_setup |
60 |
} |
61 |
|
62 |
-src_install () { |
63 |
- # Figure out python version |
64 |
- # below hack should be replaced w/ pkg-config, when we get it working |
65 |
- local pv=`python -V 2>&1 | sed -e 's:Python \([0-9].[0-9]\).*:\1:'` |
66 |
+src_prepare() { |
67 |
+ # Do not open /dev/tty when in batch mode. (bug #67150) -ticho |
68 |
+ epatch "${FILESDIR}/tmda-1.0-non-interactive-tty.patch" |
69 |
+ |
70 |
+ python_convert_shebangs -r $(python_get_version) bin |
71 |
+} |
72 |
|
73 |
+src_install() { |
74 |
# Executables |
75 |
- dobin bin/tmda-* |
76 |
+ dobin bin/tmda-* || die "dobin failed" |
77 |
|
78 |
# The Python TMDA module |
79 |
- insinto "/usr/lib/python${pv}/site-packages/TMDA" |
80 |
- doins TMDA/*.py* |
81 |
- insinto "/usr/lib/python${pv}/site-packages/TMDA/Queue" |
82 |
- doins TMDA/Queue/*.py* |
83 |
- insinto "/usr/lib/python${pv}/site-packages/TMDA/pythonlib/email" |
84 |
- doins TMDA/pythonlib/email/*.py* |
85 |
- insinto "/usr/lib/python${pv}/site-packages/TMDA/pythonlib/email/mime" |
86 |
- doins TMDA/pythonlib/email/mime/*.py* |
87 |
+ insinto $(python_get_sitedir) |
88 |
+ doins -r TMDA || die "doins failed" |
89 |
|
90 |
# The templates |
91 |
insinto /etc/tmda |
92 |
- doins templates/*.txt |
93 |
+ doins templates/*.txt || die "doins failed" |
94 |
|
95 |
# Documentation |
96 |
- dodoc COPYING ChangeLog README THANKS UPGRADE CRYPTO CODENAMES INSTALL |
97 |
- dohtml -r htdocs/*.html |
98 |
- dohtml -r htdocs/img |
99 |
+ dodoc ChangeLog CODENAMES CRYPTO NEWS README THANKS UPGRADE || die "dodoc failed" |
100 |
+ dohtml -r doc/html/* || die "dohtml failed" |
101 |
|
102 |
# Contributed binaries and stuff |
103 |
- cd ${S}/contrib |
104 |
+ pushd contrib > /dev/null |
105 |
|
106 |
- exeinto /usr/lib/tmda/contrib |
107 |
+ exeinto /usr/$(get_libdir)/tmda/contrib |
108 |
doexe collectaddys def2html printcdb printdbm \ |
109 |
sendit.sh smtp-check-sender update-internaldomains vadduser-tmda \ |
110 |
- vmailmgr-vdir.sh vpopmail-vdir.sh wrapfd3.sh |
111 |
+ vmailmgr-vdir.sh vpopmail-vdir.sh wrapfd3.sh || die "doexe failed" |
112 |
|
113 |
- insinto /usr/lib/tmda/contrib |
114 |
+ insinto /usr/$(get_libdir)/tmda/contrib |
115 |
doins ChangeLog tmda.el tmda.spec \ |
116 |
- tofmipd.init tofmipd.sysconfig vtmdarc |
117 |
+ tofmipd.init tofmipd.sysconfig vtmdarc || die "doins failed" |
118 |
+ |
119 |
+ insinto /usr/$(get_libdir)/tmda/contrib/dot-tmda |
120 |
+ doins dot-tmda/* || die "doins failed" |
121 |
+ popd > /dev/null |
122 |
+} |
123 |
+ |
124 |
+pkg_postinst() { |
125 |
+ python_mod_optimize TMDA |
126 |
+} |
127 |
|
128 |
- insinto /usr/lib/tmda/contrib/dot-tmda |
129 |
- doins dot-tmda/* |
130 |
+pkg_postrm() { |
131 |
+ python_mod_cleanup TMDA |
132 |
} |
133 |
|
134 |
|
135 |
|
136 |
1.18 mail-filter/tmda/ChangeLog |
137 |
|
138 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/tmda/ChangeLog?rev=1.18&view=markup |
139 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/tmda/ChangeLog?rev=1.18&content-type=text/plain |
140 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/tmda/ChangeLog?r1=1.17&r2=1.18 |
141 |
|
142 |
Index: ChangeLog |
143 |
=================================================================== |
144 |
RCS file: /var/cvsroot/gentoo-x86/mail-filter/tmda/ChangeLog,v |
145 |
retrieving revision 1.17 |
146 |
retrieving revision 1.18 |
147 |
diff -u -r1.17 -r1.18 |
148 |
--- ChangeLog 7 Jan 2010 14:37:24 -0000 1.17 |
149 |
+++ ChangeLog 7 Nov 2010 14:46:36 -0000 1.18 |
150 |
@@ -1,6 +1,12 @@ |
151 |
# ChangeLog for mail-filter/tmda |
152 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
153 |
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/ChangeLog,v 1.17 2010/01/07 14:37:24 patrick Exp $ |
154 |
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/ChangeLog,v 1.18 2010/11/07 14:46:36 arfrever Exp $ |
155 |
+ |
156 |
+ 07 Nov 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
157 |
+ tmda-1.1.12.ebuild: |
158 |
+ Update EAPI. Use Python 2, call python_mod_optimize() and |
159 |
+ python_mod_cleanup() (bug #313481). Don't install nonexistent |
160 |
+ documentation files (bug #300511). |
161 |
|
162 |
*tmda-1.1.12 (07 Jan 2010) |