1 |
commit: d623e504f214ce34add64880dafde8bad725ec05 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 29 15:55:45 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 29 17:01:47 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d623e504 |
7 |
|
8 |
app-admin/qpage: Port to EAPI 6 |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
.../qpage/files/qpage-3.3-fix-build-system.patch | 21 ++++++++++++++ |
13 |
app-admin/qpage/files/qpage-3.3-gentoo.patch | 16 +++++------ |
14 |
app-admin/qpage/metadata.xml | 22 +++++++-------- |
15 |
app-admin/qpage/qpage-3.3.ebuild | 32 ++++++++++------------ |
16 |
4 files changed, 55 insertions(+), 36 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/qpage/files/qpage-3.3-fix-build-system.patch b/app-admin/qpage/files/qpage-3.3-fix-build-system.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..0fd091df8e0 |
21 |
--- /dev/null |
22 |
+++ b/app-admin/qpage/files/qpage-3.3-fix-build-system.patch |
23 |
@@ -0,0 +1,21 @@ |
24 |
+--- a/Makefile.in |
25 |
++++ b/Makefile.in |
26 |
+@@ -65,12 +65,12 @@ |
27 |
+ @exit 1 |
28 |
+ |
29 |
+ install: all |
30 |
+- $(RM) $(bindir)/$(PROG) |
31 |
+- $(MKDIR) -p $(bindir) |
32 |
+- $(CP) $(PROG) $(bindir) |
33 |
+- $(RM) $(mandir)/man1/$(PROG).1 |
34 |
+- $(MKDIR) -p $(mandir)/man1 |
35 |
+- $(CP) $(PROG).man $(mandir)/man1/$(PROG).1 |
36 |
++ $(RM) $(DESTDIR)$(bindir)/$(PROG) |
37 |
++ $(MKDIR) -p $(DESTDIR)$(bindir) |
38 |
++ $(CP) $(PROG) $(DESTDIR)$(bindir) |
39 |
++ $(RM) $(DESTDIR)$(mandir)/man1/$(PROG).1 |
40 |
++ $(MKDIR) -p $(DESTDIR)$(mandir)/man1 |
41 |
++ $(CP) $(PROG).man $(DESTDIR)$(mandir)/man1/$(PROG).1 |
42 |
+ |
43 |
+ # $(INSTALL) S99qpage /etc/rc3.d |
44 |
+ # ln /etc/rc3.d/S99qpage /etc/init.d/qpage |
45 |
|
46 |
diff --git a/app-admin/qpage/files/qpage-3.3-gentoo.patch b/app-admin/qpage/files/qpage-3.3-gentoo.patch |
47 |
index 577fb8a4ff3..72baf899764 100644 |
48 |
--- a/app-admin/qpage/files/qpage-3.3-gentoo.patch |
49 |
+++ b/app-admin/qpage/files/qpage-3.3-gentoo.patch |
50 |
@@ -1,5 +1,5 @@ |
51 |
---- config.input.dist 2003-04-11 14:03:36.000000000 -0700 |
52 |
-+++ config.input 2003-04-11 14:05:47.000000000 -0700 |
53 |
+--- a/config.input |
54 |
++++ b/config.input |
55 |
@@ -20,7 +20,7 @@ |
56 |
# See the QuickPage documentation for complete details about |
57 |
# the syntax of the configuration file. |
58 |
@@ -18,8 +18,8 @@ |
59 |
|
60 |
|
61 |
# |
62 |
---- qpage.man.dist 2003-04-18 14:43:45.000000000 -0700 |
63 |
-+++ qpage.man 2003-04-18 14:43:55.000000000 -0700 |
64 |
+--- a/qpage.man |
65 |
++++ b/qpage.man |
66 |
@@ -867,7 +867,7 @@ |
67 |
must be able to detect when it's safe to send dial commands to the modem. |
68 |
.LP |
69 |
@@ -29,8 +29,8 @@ |
70 |
.SH SEE ALSO |
71 |
.B RFC-1861 |
72 |
.SH KNOWN BUGS |
73 |
---- example.cf.dist 2003-04-25 09:55:47.000000000 -0700 |
74 |
-+++ example.cf 2003-04-25 10:55:11.000000000 -0700 |
75 |
+--- a/example.cf |
76 |
++++ b/example.cf |
77 |
@@ -21,7 +21,7 @@ |
78 |
# |
79 |
# modem=<modem name> |
80 |
@@ -59,8 +59,8 @@ |
81 |
baudrate=1200 |
82 |
parity=even |
83 |
allowpid=yes |
84 |
---- ixo.c.dist 2003-04-25 11:36:30.000000000 -0700 |
85 |
-+++ ixo.c 2003-04-25 11:37:37.000000000 -0700 |
86 |
+--- a/ixo.c |
87 |
++++ b/ixo.c |
88 |
@@ -192,7 +192,7 @@ |
89 |
if ((i = read_modem(fd, seconds)) < 0) |
90 |
return(NULL); |
91 |
|
92 |
diff --git a/app-admin/qpage/metadata.xml b/app-admin/qpage/metadata.xml |
93 |
index f61b7216e28..6ab99be9402 100644 |
94 |
--- a/app-admin/qpage/metadata.xml |
95 |
+++ b/app-admin/qpage/metadata.xml |
96 |
@@ -1,15 +1,15 @@ |
97 |
<?xml version="1.0" encoding="UTF-8"?> |
98 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
99 |
<pkgmetadata> |
100 |
-<maintainer type="person"> |
101 |
- <email>chutzpah@g.o</email> |
102 |
- <name>Patrick McLean</name> |
103 |
-</maintainer> |
104 |
-<longdescription lang="en"> |
105 |
-QuickPage is a client/server software package that enables you to send messages |
106 |
-to an alphanumeric pager. The client accepts a message from the user and |
107 |
-forwards it to a server using SNPP. The server uses a modem to transmit the |
108 |
-message to the recipient's paging service using the TAP protocol (also known as |
109 |
-the IXO protocol). |
110 |
-</longdescription> |
111 |
+ <maintainer type="person"> |
112 |
+ <email>chutzpah@g.o</email> |
113 |
+ <name>Patrick McLean</name> |
114 |
+ </maintainer> |
115 |
+ <longdescription lang="en"> |
116 |
+ QuickPage is a client/server software package that enables you to send messages |
117 |
+ to an alphanumeric pager. The client accepts a message from the user and |
118 |
+ forwards it to a server using SNPP. The server uses a modem to transmit the |
119 |
+ message to the recipient's paging service using the TAP protocol (also known as |
120 |
+ the IXO protocol). |
121 |
+ </longdescription> |
122 |
</pkgmetadata> |
123 |
|
124 |
diff --git a/app-admin/qpage/qpage-3.3.ebuild b/app-admin/qpage/qpage-3.3.ebuild |
125 |
index 01cddbc8732..9231daae0ad 100644 |
126 |
--- a/app-admin/qpage/qpage-3.3.ebuild |
127 |
+++ b/app-admin/qpage/qpage-3.3.ebuild |
128 |
@@ -1,7 +1,9 @@ |
129 |
-# Copyright 1999-2014 Gentoo Foundation |
130 |
+# Copyright 1999-2017 Gentoo Foundation |
131 |
# Distributed under the terms of the GNU General Public License v2 |
132 |
|
133 |
-inherit eutils toolchain-funcs |
134 |
+EAPI=6 |
135 |
+ |
136 |
+inherit toolchain-funcs |
137 |
|
138 |
DESCRIPTION="Sends messages to an alphanumeric pager via TAP protocol" |
139 |
HOMEPAGE="http://www.qpage.org/" |
140 |
@@ -16,30 +18,26 @@ DEPEND="tcpd? ( sys-apps/tcp-wrappers )" |
141 |
RDEPEND="${DEPEND} |
142 |
virtual/mta" |
143 |
|
144 |
-src_unpack() { |
145 |
- unpack ${A} |
146 |
- cd "${S}" |
147 |
- |
148 |
- epatch "${FILESDIR}"/${P}-gentoo.patch |
149 |
- epatch "${FILESDIR}"/${P}-fix-warning.patch |
150 |
-} |
151 |
+PATCHES=( |
152 |
+ "${FILESDIR}"/${P}-gentoo.patch |
153 |
+ "${FILESDIR}"/${P}-fix-warning.patch |
154 |
+ "${FILESDIR}"/${P}-fix-build-system.patch |
155 |
+) |
156 |
|
157 |
-src_compile() { |
158 |
+src_configure() { |
159 |
tc-export CC |
160 |
- econf || die "econf failed" |
161 |
+ default |
162 |
|
163 |
# There doesn't seem to be a clean way to disable tcp wrappers in |
164 |
# this package if you have it installed, but don't want to use it. |
165 |
if ! use tcpd ; then |
166 |
- sed -i 's/-lwrap//g; s/-DTCP_WRAPPERS//g' Makefile |
167 |
- echo '#undef TCP_WRAPPERS' >> config.h |
168 |
+ sed -i 's/-lwrap//g; s/-DTCP_WRAPPERS//g' Makefile || die |
169 |
+ echo '#undef TCP_WRAPPERS' >> config.h || die |
170 |
fi |
171 |
- |
172 |
- emake || die "emake failed" |
173 |
} |
174 |
|
175 |
src_install() { |
176 |
- einstall || die "einstall failed" |
177 |
+ default |
178 |
|
179 |
dodir /var/spool/qpage |
180 |
fowners daemon:daemon /var/spool/qpage |
181 |
@@ -50,7 +48,7 @@ src_install() { |
182 |
fperms 770 /var/lock/subsys/qpage |
183 |
|
184 |
insinto /etc/qpage |
185 |
- doins example.cf || die "doins example.cf failed" |
186 |
+ doins example.cf |
187 |
|
188 |
doinitd "${FILESDIR}"/qpage |
189 |
} |