gentoo resync : 30.12.2017

5 files changed, 59 insertions, 39 deletions

diff --git a/app-admin/qpage/Manifest b/app-admin/qpage/Manifest
index 052f26ef723f..3472383cfa14 100644
--- a/app-admin/qpage/Manifest
+++ b/app-admin/qpage/Manifest
@@ -1,6 +1,7 @@
 AUX qpage 568 BLAKE2B a1e0e53332af86dd63339e3c8353f8e4c454ebe38ad9df0d3a9c141bca7db8fbfbb8773f58e8ae97efdbd9d6a56a1fda896d64f8d633de4fe9a81e3ff1f6cbfd SHA512 3153cab39730cf1173a1cdb3fa61dead6f767650427b03e7f69173969272eda683fb9aee79b69b1bb879f3c6a30266d6842ceb7f438c09806e35886d923832b4
+AUX qpage-3.3-fix-build-system.patch 603 BLAKE2B e6bde35536561397c6aba4cc7e5f2523beb74e59732ddbe6f8c5672bcefaf4781494d37b7aaecbbe3a81239093c0b0f58034577378313e1ccaaeb21da092b4c4 SHA512 efd9ef6ea9c9df9ce52c53cd962b55170a49a0e8cdeb82aca05e8cb70c79b8afc930b9678f718305fe28e4ef9b359c1d6bffb09f3a23758b1328d0a393a6516a
 AUX qpage-3.3-fix-warning.patch 450 BLAKE2B 4947c7b7aa7bcb05f63f371a1a06211fd63582af4d492b8541828bd124ac71a458266e49fad21da34efc854d34ca5a3395d4b76bbac6a17f1678f43f9afd3b00 SHA512 c2b0ad552ff60471171693eca90e51470072c73961bf30406e59c7929f02f093d754d5f1e278a43e0aac8d1031dafcbd085b0b59a1d9634f6f631c2a84e7a7c1
-AUX qpage-3.3-gentoo.patch 1764 BLAKE2B ef43620f0e8172ca6bb967732f8d8ce0cb73d48ea6c4a2741a18527c4a2f6ca78f4fe51a470474a6138e1fddc8b136e6b9f806f8f43c2d30cf27c6e15d34a3a8 SHA512 5bdcab57907871dabd1b4beca928fe30bad1729a5185c5885f6c3252b0e3a5394fe0bf5d4f206438d9d83a608669d0a73bb9dea7c9b94c48dbef77e4331e60a8
+AUX qpage-3.3-gentoo.patch 1472 BLAKE2B 804be08ec654aab34d338cf1d3d1f69d7d2984b8b931e06d5117e449e19a6ee80cb1bedc71dffe070e2e44326881702b0aea2fd4fc2f67130c315a2fe3101294 SHA512 a9e0a1793a8af41340c5593420eecf54fdc405600f71704efd3cdb9f70d9bdfacdff636cea5839c5ca024be27f90c84a7a2c1c95e078af2fffdd7cbc6ae7e5f4
 DIST qpage-3.3.tar.Z 225689 BLAKE2B 25ac50bbe1e5a623a95f0ca8ad53255693647ca49763d80bb571ce36cf941618b6cbecc1681035d5d56d559a30e2da2a8d3621588925b00b9cac7ad278ec4a44 SHA512 d6062fb9e9cd6cfd60cadb923d29d36fd649c27adff2a36fd4e768798b90780153b78e7d0d1a13dcad94971ac98b32c1c5a3b415d5a1b4aa1cfbac564514a3e9
-EBUILD qpage-3.3.ebuild 1674 BLAKE2B 9070962506a93a0326697effafa869d6cfcb56609e1b3fb3e74f2d097d092061f6f5ece46788cff8402a4bc639eb4fed1411ef6ce89c83c16d0806aba26c4f8f SHA512 b83c8a54ec808a662a52d530ce9e64a81196ace477476f689591eacaff7a4dcbf5eed98081d05045b0b796fca32d2bc06f5cb7c53aff6c32d48344b75ed1e598
-MISC metadata.xml 620 BLAKE2B 86d1b4ba97f1456d38b9e755efd17a9fd22d20331de1780c8425430f0a908b3c75d617e59d4a2a0e8812e91ab06c57f3c232d0fdc810229d017faa7bc9d4a16b SHA512 4310087f97f28aa193b9bb365612f32f6c3bd995446ce077bd099d662d1c0deda1b17418e4e2c0d89f3d53e9badd7c5aef946218fad43db1a273c7f67f444ca1
+EBUILD qpage-3.3.ebuild 1581 BLAKE2B ec7511f5b27714f621f308872514bff98f014bc9eda7d2244b88efa223a73a0ac25a60d5e15182aa51ca8cfdce9f61522be7ae5bcea1baf0b7f1edbd4b8652f7 SHA512 3733207dbaa4e98861bffe500ac69dc366c76f3662a59ee7ef78090d08533a311ba268605a32b882e0013093bf8540933abf89732a51f2cf40333cf97ed8615e
+MISC metadata.xml 636 BLAKE2B 35f51043f98eb59d371ec414588cc51f056522bcf8fd02a516c7f523cff009f55fb162a964516a35e7cccd8c942ea3545b42d623764d467d5465913a8b047859 SHA512 9d45fd5a3361b6ffc1548df05595df91726d0037043c0443601b7bd1588218adccfecb38de8ae961a6e1ff5e618b14dc1e249f94657ec98fab914f1a70f13dad
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 000000000000..0fd091df8e0e
--- /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 577fb8a4ff3b..72baf899764e 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 f61b7216e28c..6ab99be94028 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>chutzpah@gentoo.org</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>chutzpah@gentoo.org</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 01cddbc87320..9231daae0add 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
 }