commit: d623e504f214ce34add64880dafde8bad725ec05
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 15:55:45 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 17:01:47 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d623e504
app-admin/qpage: Port to EAPI 6
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../qpage/files/qpage-3.3-fix-build-system.patch | 21 ++++++++++++++
app-admin/qpage/files/qpage-3.3-gentoo.patch | 16 +++++------
app-admin/qpage/metadata.xml | 22 +++++++--------
app-admin/qpage/qpage-3.3.ebuild | 32 ++++++++++------------
4 files changed, 55 insertions(+), 36 deletions(-)
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
new file mode 100644
index 00000000000..0fd091df8e0
--- /dev/null
+++ b/app-admin/qpage/files/qpage-3.3-fix-build-system.patch
@@ -0,0 +1,21 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -65,12 +65,12 @@
+ @exit 1
+
+ install: all
+- $(RM) $(bindir)/$(PROG)
+- $(MKDIR) -p $(bindir)
+- $(CP) $(PROG) $(bindir)
+- $(RM) $(mandir)/man1/$(PROG).1
+- $(MKDIR) -p $(mandir)/man1
+- $(CP) $(PROG).man $(mandir)/man1/$(PROG).1
++ $(RM) $(DESTDIR)$(bindir)/$(PROG)
++ $(MKDIR) -p $(DESTDIR)$(bindir)
++ $(CP) $(PROG) $(DESTDIR)$(bindir)
++ $(RM) $(DESTDIR)$(mandir)/man1/$(PROG).1
++ $(MKDIR) -p $(DESTDIR)$(mandir)/man1
++ $(CP) $(PROG).man $(DESTDIR)$(mandir)/man1/$(PROG).1
+
+ # $(INSTALL) S99qpage /etc/rc3.d
+ # ln /etc/rc3.d/S99qpage /etc/init.d/qpage
diff --git a/app-admin/qpage/files/qpage-3.3-gentoo.patch
b/app-admin/qpage/files/qpage-3.3-gentoo.patch
index 577fb8a4ff3..72baf899764 100644
--- a/app-admin/qpage/files/qpage-3.3-gentoo.patch
+++ b/app-admin/qpage/files/qpage-3.3-gentoo.patch
@@ -1,5 +1,5 @@
---- config.input.dist 2003-04-11 14:03:36.000000000 -0700
-+++ config.input 2003-04-11 14:05:47.000000000 -0700
+--- a/config.input
++++ b/config.input
@@ -20,7 +20,7 @@
# See the QuickPage documentation for complete details about
# the syntax of the configuration file.
@@ -18,8 +18,8 @@
#
---- qpage.man.dist 2003-04-18 14:43:45.000000000 -0700
-+++ qpage.man 2003-04-18 14:43:55.000000000 -0700
+--- a/qpage.man
++++ b/qpage.man
@@ -867,7 +867,7 @@
must be able to detect when it's safe to send dial commands to the modem.
.LP
@@ -29,8 +29,8 @@
.SH SEE ALSO
.B RFC-1861
.SH KNOWN BUGS
---- example.cf.dist 2003-04-25 09:55:47.000000000 -0700
-+++ example.cf 2003-04-25 10:55:11.000000000 -0700
+--- a/example.cf
++++ b/example.cf
@@ -21,7 +21,7 @@
#
# modem=<modem name>
@@ -59,8 +59,8 @@
baudrate=1200
parity=even
allowpid=yes
---- ixo.c.dist 2003-04-25 11:36:30.000000000 -0700
-+++ ixo.c 2003-04-25 11:37:37.000000000 -0700
+--- a/ixo.c
++++ b/ixo.c
@@ -192,7 +192,7 @@
if ((i = read_modem(fd, seconds)) < 0)
return(NULL);
diff --git a/app-admin/qpage/metadata.xml b/app-admin/qpage/metadata.xml
index f61b7216e28..6ab99be9402 100644
--- a/app-admin/qpage/metadata.xml
+++ b/app-admin/qpage/metadata.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
-<maintainer type="person">
- <email>[email protected]</email>
- <name>Patrick McLean</name>
-</maintainer>
-<longdescription lang="en">
-QuickPage is a client/server software package that enables you to send messages
-to an alphanumeric pager. The client accepts a message from the user and
-forwards it to a server using SNPP. The server uses a modem to transmit the
-message to the recipient's paging service using the TAP protocol (also known as
-the IXO protocol).
-</longdescription>
+ <maintainer type="person">
+ <email>[email protected]</email>
+ <name>Patrick McLean</name>
+ </maintainer>
+ <longdescription lang="en">
+ QuickPage is a client/server software package that enables you
to send messages
+ to an alphanumeric pager. The client accepts a message from the
user and
+ forwards it to a server using SNPP. The server uses a modem to
transmit the
+ message to the recipient's paging service using the TAP
protocol (also known as
+ the IXO protocol).
+ </longdescription>
</pkgmetadata>
diff --git a/app-admin/qpage/qpage-3.3.ebuild b/app-admin/qpage/qpage-3.3.ebuild
index 01cddbc8732..9231daae0ad 100644
--- a/app-admin/qpage/qpage-3.3.ebuild
+++ b/app-admin/qpage/qpage-3.3.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-inherit eutils toolchain-funcs
+EAPI=6
+
+inherit toolchain-funcs
DESCRIPTION="Sends messages to an alphanumeric pager via TAP protocol"
HOMEPAGE="http://www.qpage.org/";
@@ -16,30 +18,26 @@ DEPEND="tcpd? ( sys-apps/tcp-wrappers )"
RDEPEND="${DEPEND}
virtual/mta"
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}"/${P}-gentoo.patch
- epatch "${FILESDIR}"/${P}-fix-warning.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-fix-warning.patch
+ "${FILESDIR}"/${P}-fix-build-system.patch
+)
-src_compile() {
+src_configure() {
tc-export CC
- econf || die "econf failed"
+ default
# There doesn't seem to be a clean way to disable tcp wrappers in
# this package if you have it installed, but don't want to use it.
if ! use tcpd ; then
- sed -i 's/-lwrap//g; s/-DTCP_WRAPPERS//g' Makefile
- echo '#undef TCP_WRAPPERS' >> config.h
+ sed -i 's/-lwrap//g; s/-DTCP_WRAPPERS//g' Makefile || die
+ echo '#undef TCP_WRAPPERS' >> config.h || die
fi
-
- emake || die "emake failed"
}
src_install() {
- einstall || die "einstall failed"
+ default
dodir /var/spool/qpage
fowners daemon:daemon /var/spool/qpage
@@ -50,7 +48,7 @@ src_install() {
fperms 770 /var/lock/subsys/qpage
insinto /etc/qpage
- doins example.cf || die "doins example.cf failed"
+ doins example.cf
doinitd "${FILESDIR}"/qpage
}
