Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/emech/, net-irc/emech/files/
Date: Wed, 21 Mar 2018 22:10:21
Message-Id: 1521670195.5ef4f0b03df1ef0fbc7bf0c4976cfdc1faa559c2.monsieurp@gentoo
1 commit: 5ef4f0b03df1ef0fbc7bf0c4976cfdc1faa559c2
2 Author: Dawid Węgliński <dawid.weglinski <AT> gmail <DOT> com>
3 AuthorDate: Tue Mar 20 22:04:00 2018 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 21 22:09:55 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ef4f0b0
7
8 net-irc/emech: version bump to 3.0.99_p3.
9
10 * Bump EAPI.
11 * Fix buidling issue.
12 * Add maintainer to metadata.xml.
13
14 Closes: https://bugs.gentoo.org/651034
15
16 net-irc/emech/Manifest | 1 +
17 net-irc/emech/emech-3.0.99_p3.ebuild | 89 ++++++++++++++++++++++
18 net-irc/emech/files/emech-3.0.99_p3-buildfix.patch | 70 +++++++++++++++++
19 net-irc/emech/metadata.xml | 9 ++-
20 4 files changed, 168 insertions(+), 1 deletion(-)
21
22 diff --git a/net-irc/emech/Manifest b/net-irc/emech/Manifest
23 index 6392da6ae1e..30a0181692f 100644
24 --- a/net-irc/emech/Manifest
25 +++ b/net-irc/emech/Manifest
26 @@ -1 +1,2 @@
27 DIST emech-3.0.3.tar.gz 228709 BLAKE2B 596c2d757438e1ed08ecb96927258cbd1afcc6105831c336b5df4b22716fdeb2a3215678589c6d9898ad39979d6039cccb12f0af88183ac5fa1c9c1ce86c5102 SHA512 ffe478c0c1800c8afb7afca62dbe08fce6af25a5878ca5fb44bb1271a302d11b96263c51a3848996db8f33f1cdab60d86c26d571d6342fe1505d4dcff83803a3
28 +DIST emech-3.0.99p3.tar.gz 249209 BLAKE2B 8ff0806275f7b1c9e49bb2eeda2afa0ac94b894426a2f56508492f970070e4141f14f88ffb3c1c46855817c405d29454cf85ebba53c85b4038d7d9d079f4dff6 SHA512 8ce6f8889e060791ab3af6fa63623469a457c436b4e23c51dcd1833fd09e7692270a324ad1d15beb4ad390e9d481267a8ea60eb17c9fd3195b5ad0daf7341165
29
30 diff --git a/net-irc/emech/emech-3.0.99_p3.ebuild b/net-irc/emech/emech-3.0.99_p3.ebuild
31 new file mode 100644
32 index 00000000000..f083ab026f8
33 --- /dev/null
34 +++ b/net-irc/emech/emech-3.0.99_p3.ebuild
35 @@ -0,0 +1,89 @@
36 +# Copyright 1999-2018 Gentoo Foundation
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI=6
40 +
41 +inherit readme.gentoo-r1 toolchain-funcs
42 +
43 +DESCRIPTION="UNIX compatible IRC bot programmed in the C language"
44 +HOMEPAGE="http://www.energymech.net/"
45 +SRC_URI="http://www.energymech.net/files/${P/_/}.tar.gz"
46 +
47 +LICENSE="GPL-2"
48 +SLOT="0"
49 +KEYWORDS="~amd64 ~ppc ~x86"
50 +
51 +IUSE="debug session tcl"
52 +S="${WORKDIR}/${P/_/}"
53 +
54 +DOC_CONTENTS="You can find a compressed sample config file at /usr/share/doc/${PF}"
55 +
56 +src_prepare() {
57 + eapply "${FILESDIR}/${P}-buildfix.patch"
58 +
59 + sed -i \
60 + -e 's: "help/":"/usr/share/energymech/help/":' \
61 + -e 's: "messages/":"/usr/share/energymech/messages/":' \
62 + src/config.h.in || die
63 + # Respect CFLAGS and LDFLAGS
64 + sed -i \
65 + -e '/^LFLAGS/s/\$(PIPEFLAG)/\0 \$(OPTIMIZE) \$(LDFLAGS)/' \
66 + -e '/^GDBFLAG/d' \
67 + -e '/^PIPEFLAG/d' \
68 + src/Makefile.in || die
69 +
70 + eapply_user
71 +}
72 +
73 +myconf() {
74 + echo ./configure $*
75 + ./configure $* || die "./configure failed"
76 +}
77 +
78 +src_configure() {
79 + myconf \
80 + --with-alias \
81 + --with-botnet \
82 + --with-bounce \
83 + --with-ctcp \
84 + --with-dccfile \
85 + --with-dynamode \
86 + --with-dyncmd \
87 + --with-greet \
88 + --with-ircd_ext \
89 + --with-md5 \
90 + --with-newbie \
91 + --with-note \
92 + --with-notify \
93 + --with-rawdns \
94 + --with-redirect \
95 + --with-seen \
96 + --with-stats \
97 + --with-telnet \
98 + --with-toybox \
99 + --with-trivia \
100 + --without-uptime \
101 + --with-web \
102 + --with-wingate \
103 + --without-profiling \
104 + $(use_with tcl) \
105 + $(use_with session) \
106 + $(use_with debug)
107 +}
108 +
109 +src_compile() {
110 + emake -C src CC="$(tc-getCC)" OPTIMIZE="${CFLAGS}"
111 +}
112 +
113 +src_install() {
114 + dobin src/energymech
115 +
116 + insinto /usr/share/energymech
117 + doins -r help
118 +
119 + insinto /usr/share/energymech/messages
120 + doins messages/*.txt
121 +
122 + dodoc sample.* README* TODO VERSIONS CREDITS checkmech
123 + readme.gentoo_create_doc
124 +}
125
126 diff --git a/net-irc/emech/files/emech-3.0.99_p3-buildfix.patch b/net-irc/emech/files/emech-3.0.99_p3-buildfix.patch
127 new file mode 100644
128 index 00000000000..de1dee6ed67
129 --- /dev/null
130 +++ b/net-irc/emech/files/emech-3.0.99_p3-buildfix.patch
131 @@ -0,0 +1,70 @@
132 +diff -Naur emech-3.0.99p3.org/src/gencmd.c emech-3.0.99p3/src/gencmd.c
133 +--- emech-3.0.99p3.org/src/gencmd.c 2009-05-13 08:51:09.000000000 -0000
134 ++++ emech-3.0.99p3/src/gencmd.c 2018-03-16 22:52:42.591033854 -0000
135 +@@ -316,7 +316,7 @@
136 + }
137 + if (pass == __struct_acces)
138 + {
139 +- printf("\t%i,\t/""* %s *""/\n",
140 ++ printf("\t%li,\t/""* %s *""/\n",
141 + pre_mcmd[wh].flags & CLEVEL,
142 + pt);
143 + }
144 +@@ -390,7 +390,7 @@
145 + }
146 + pass--;
147 + }
148 +- printf("#define LOCALHOST_ULONG %lu\n",inet_addr("127.1"));
149 ++ printf("#define LOCALHOST_ULONG %u\n",inet_addr("127.1"));
150 + printf("#else /""* MAIN_C *""/\n\n");
151 + printf("extern OnMsg mcmd[];\n");
152 + printf("extern OnMsg_access acmd[];\n\n");
153 +@@ -404,29 +404,29 @@
154 +
155 + #ifdef BOTNET
156 + combo.comboflags = 0; combo.x.noshare = 1;
157 +- fprintf(of,"#define COMBO_NOSHARE\t0x%x\n",combo.comboflags);
158 ++ fprintf(of,"#define COMBO_NOSHARE\t0x%lx\n",combo.comboflags);
159 + combo.comboflags = 0; combo.x.readonly = 1;
160 +- fprintf(of,"#define COMBO_READONLY\t0x%x\n",combo.comboflags);
161 ++ fprintf(of,"#define COMBO_READONLY\t0x%lx\n",combo.comboflags);
162 + #endif /* BOTNET */
163 +
164 + #ifdef GREET
165 + combo.comboflags = 0; combo.x.greetfile = 1;
166 +- fprintf(of,"#define COMBO_GREETFILE\t0x%x\n",combo.comboflags);
167 ++ fprintf(of,"#define COMBO_GREETFILE\t0x%lx\n",combo.comboflags);
168 + combo.comboflags = 0; combo.x.randline = 1;
169 +- fprintf(of,"#define COMBO_RANDLINE\t0x%x\n",combo.comboflags);
170 ++ fprintf(of,"#define COMBO_RANDLINE\t0x%lx\n",combo.comboflags);
171 + #endif /* GREET */
172 +
173 + #ifdef BOUNCE
174 + combo.comboflags = 0; combo.x.bounce = 1;
175 +- fprintf(of,"#define COMBO_BOUNCE\t0x%x\n",combo.comboflags);
176 ++ fprintf(of,"#define COMBO_BOUNCE\t0x%lx\n",combo.comboflags);
177 + #endif /* BOUNCE */
178 +
179 + combo.comboflags = 0; combo.x.echo = 1;
180 +- fprintf(of,"#define COMBO_ECHO\t0x%x\n",combo.comboflags);
181 ++ fprintf(of,"#define COMBO_ECHO\t0x%lx\n",combo.comboflags);
182 + combo.comboflags = 0; combo.x.aop = 1;
183 +- fprintf(of,"#define COMBO_AOP\t0x%x\n",combo.comboflags);
184 ++ fprintf(of,"#define COMBO_AOP\t0x%lx\n",combo.comboflags);
185 + combo.comboflags = 0; combo.x.avoice = 1;
186 +- fprintf(of,"#define COMBO_AVOICE\t0x%x\n",combo.comboflags);
187 ++ fprintf(of,"#define COMBO_AVOICE\t0x%lx\n",combo.comboflags);
188 +
189 + fclose(of);
190 + return(0);
191 +diff -Naur emech-3.0.99p3.org/src/function.c emech-3.0.99p3/src/function.c
192 +--- emech-3.0.99p3.org/src/function.c 2009-05-17 20:25:29.000000000 -0000
193 ++++ emech-3.0.99p3/src/function.c 2018-03-17 11:41:15.224075216 -0000
194 +@@ -26,6 +26,7 @@
195 + #include "global.h"
196 + #include "h.h"
197 + #include "text.h"
198 ++#include "linux/limits.h"
199 +
200 + LS char timebuf[24]; /* max format lentgh == 20+1, round up to nearest longword -> 24 */
201 + LS char idlestr[36]; /* max format lentgh == 24+1, round up to nearest longword -> 28 */
202
203 diff --git a/net-irc/emech/metadata.xml b/net-irc/emech/metadata.xml
204 index 6f49eba8f49..d376f2bcd4b 100644
205 --- a/net-irc/emech/metadata.xml
206 +++ b/net-irc/emech/metadata.xml
207 @@ -1,5 +1,12 @@
208 <?xml version="1.0" encoding="UTF-8"?>
209 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
210 <pkgmetadata>
211 -<!-- maintainer-needed -->
212 + <maintainer type="person">
213 + <email>dawid.weglinski@×××××.com</email>
214 + <name>Dawid Węgliński</name>
215 + </maintainer>
216 + <maintainer type="project">
217 + <email>proxy-maint@g.o</email>
218 + <name>Proxy Maintainers</name>
219 + </maintainer>
220 </pkgmetadata>