gentoo resync : 01.12.2017

3 files changed, 123 insertions, 17 deletions

diff --git a/net-dialup/mgetty/Manifest b/net-dialup/mgetty/Manifest
index baa7f223ac1c..bb8ccf87bd1d 100644
--- a/net-dialup/mgetty/Manifest
+++ b/net-dialup/mgetty/Manifest
@@ -1,9 +1,10 @@
 AUX Lucent.c.patch 814 BLAKE2B 376cc24cd214c4e7c5c0c0b3cf81c8e5c950c147489d620a3d5026ebcd1f65bfe6da3a6f99157db936273386c311adb292600d5aa071a1d2550dcc90d5bc1b0b SHA512 68f5792c2fb3b13330cd78f74f9dc03b5c66665896af01ff6f0df8aa1615985cfe64b332e945508de5cafa9287d00904d32d164ca4d0f7785e5aa8f147e7f882
 AUX mgetty-1.1.36-callback.patch 991 BLAKE2B 11991e04ed2fc49790f512e94e8a1500e9d68197cbb742bc2b62db07a6f86f6204412cade9332e81e80046dc696b91cc250d5fce755d0316835e195205759563 SHA512 8cb246feddb91683f9438af6975ff6119d8229156a54bd2fac7aed25111079730d65ae1cb94d57fa311d26d420129eb65a8f1250b53f016d5bfeab59202b244b
 AUX mgetty-1.1.36-tmpfile.patch 796 BLAKE2B 0d492c8ae68b02d78746b441e5f37dfb25c306c5423c6b35da3b6440953d5218e3f8a9d4cc6c0630ecf740e80e73361e5516d73fd434d882d2f1520bd6139a53 SHA512 be58895174a8eae047952a7fee76a7989175ec8169321d1deaa7d8719eeb71d08111cb3677e855a676e16ef58eda6901090ffcd5a5989176be1184adb7f3d2d9
+AUX mgetty-1.1.37-gcc7.patch 2548 BLAKE2B 76f155627ea48a131ca71ea50abea2468eb58f753d0d7270606105a2b145241cc8a5f68cf56a8158387223505372f4fb4a5dbfba17a36837c4fd466fbe8df53b SHA512 f315ca759f51a5cc351349c3df31eed7ead4f56958df00bb5f6cf7b261d3de4af0ba3d1ebba624f1c4ec74e4d3cf981be4756e7ee32ff3c5591e8451cc93aa92
 AUX mgetty-1.1.37-gentoo.patch 5835 BLAKE2B 8443e06812eddec61b5b9f01e0cb23c15a8f7eaf1f8fb715eab54d852cb2e9f95a5b57a6dfd8a36cc8e14432ffede36077dce34298d5501ca7cb1d9ee40a49fd SHA512 1975c8f4d96e5c136bf2f2cef236ffc3da27c146ff57bc3703f1de61764b28d7da94680291ee3c54bab6a083ff24315d81fac6ea4c73f815377555f19fac2c2e
 AUX mgetty-1.1.37-nofax.patch 3613 BLAKE2B 52167631f57aa773af9c17aef5857d5fc09a5b19d553917d9f3959b0170c8a75bfcddd718abe1793585ada958b1ed661b2cc125ee6823d0a8a03fde5bc20a12a SHA512 be64802b24f4fa5b21c97782b8c2f74c8311878ebb48a05d0b0101e8fb3a24f1629780452acd710dade02660b186d494b3363a90e36550dcff9bf0b257bc5c71
 AUX mgetty-1.1.37-qa-fixes.patch 6029 BLAKE2B d8ceb364913f1d133d77b29711ff31d24c40a75c67743d9adbcbbafde3696a62969783eede9362f1243e535a58b1430c2745c162c5a5671aa6bded0ba865c880 SHA512 8286d5d11dbf900a28918cc2471ef0170483afc5ae537f8f05b885213fb62b2fa5969a1448229afefe2f6b736148c7e5818ed997ef710360de6f3e2a450b8918
-DIST mgetty1.1.37-Jun05.tar.gz 1057939 SHA256 6ff8cbc4f8aacd3dd7f247ff96715141bc6173745ea916dd98b8381a85ecdf0e SHA512 577d740c7d209b830bf8e783bf71edb666cb8bbfe8e7dceaa51dda6095d88724715394bcbd24eacfb1c377999f5779b547a7ec79cd9cdc13de6de18c4d857188 WHIRLPOOL f00d22ab213cd00f392ead46804ad1c3b192ae816b7518f1a73b4d65c180ba78fb2f193ceacf1f5aa88aeca4431eecb87e0960f0b6196a7e00247690083e937e
-EBUILD mgetty-1.1.37-r1.ebuild 4879 BLAKE2B ace9bd8e5799ea19b21baa41245af735acd87d51130234d925211a651a9fb0d48f1d141dd6925f31e21520851c77a5099c2bd361f040cd696de9c5a376f651d9 SHA512 49e8baa2ca76c2751413af6c2a37070f7f7fad458cedd057bcbbd7a3d936df8033089ccd1412e2ba867890cf84277000fde1aa7e981e29e4ed699c4e1db66fb1
+DIST mgetty1.1.37-Jun05.tar.gz 1057939 BLAKE2B de22751e72d72d19293794739c29ed115a6810cd7d57c07228526817120898ca597ba35afad36c324562c220ab67dd44655247ac46a2d6612c704557f3ec149d SHA512 577d740c7d209b830bf8e783bf71edb666cb8bbfe8e7dceaa51dda6095d88724715394bcbd24eacfb1c377999f5779b547a7ec79cd9cdc13de6de18c4d857188
+EBUILD mgetty-1.1.37-r1.ebuild 4795 BLAKE2B 6c8c512b8462cbc26f02e1e24e59379e117ddef9beec6e7a612068a68458f6c5652cee9dfb1004853c15f420f6bc68c6de83d2a20ec453b68b9ebd99dfd6590f SHA512 a950b93a806dd7f47d0f190fc20b46b7e9e4699280bc59ff34f35219698fdfa88e5174b5ce32b8bfe9e040fbc034af3caaacbcc976fface3c9e44e39bdcb3723
 MISC metadata.xml 491 BLAKE2B 41dd8488152f14cb26c4db838c6a7267d0cc8063263aa7879971b2afc24e6df481cc76452ff58d07d1c86dab5d27e6d551a1d4c9b721214a71e14af4f33020ba SHA512 e975c8e98834b587752c566c0f52fd16fbbcd1b6b930407d5bf027b5717eb898af0c7c7aff94a31a18a8033d561e934e151f17b1ebbfe406c2cff22f88adba36
diff --git a/net-dialup/mgetty/files/mgetty-1.1.37-gcc7.patch b/net-dialup/mgetty/files/mgetty-1.1.37-gcc7.patch
new file mode 100644
index 000000000000..6a4fa87a90a6
--- /dev/null
+++ b/net-dialup/mgetty/files/mgetty-1.1.37-gcc7.patch
@@ -0,0 +1,102 @@
+From 09227cacda77d7785e864c0fec3854c22b3273f7 Mon Sep 17 00:00:00 2001
+From: Michal Sekletar <msekleta@redhat.com>
+Date: Thu, 2 Mar 2017 09:25:45 +0100
+Subject: [PATCH] Fix build failure with gcc-7
+
+When function is declared inline but it is not static then compiler
+assumes it could be potentially called from other translation
+units. Hence it will inline the function within the translation unit and
+at the same time it will generate object code for function with external
+linkage. However both extern and inline variant *must* be the same and
+therefore such function can not use any variables with static storage
+duration. In our case functions in g3cat.c and pbm2g3.c are not called
+from other translation units hence it is fine to mark then explicitly as
+static and compiler won't generate other (problematic) extern variant.
+---
+ g3/g3cat.c  | 8 ++++----
+ g3/pbm2g3.c | 8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/g3/g3cat.c b/g3/g3cat.c
+index 8a4b708..1951210 100644
+--- a/g3/g3cat.c
++++ b/g3/g3cat.c
+@@ -44,7 +44,7 @@ static int b_written = 0;		/* bytes of a line already */
+ 					/* written */
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void putcode _P2( (code, len), int code, int len )
+ {
+@@ -67,7 +67,7 @@ void putcode _P2( (code, len), int code, int len )
+ }
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void putwhitespan _P1( (l), int l )
+ {
+@@ -98,7 +98,7 @@ void putwhitespan _P1( (l), int l )
+ }
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void putblackspan _P1( (l), int l )
+ {
+@@ -129,7 +129,7 @@ void putblackspan _P1( (l), int l )
+ }
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void puteol _P0( void )			/* write byte-aligned EOL */
+ {
+diff --git a/g3/pbm2g3.c b/g3/pbm2g3.c
+index 283a728..57cb69a 100644
+--- a/g3/pbm2g3.c
++++ b/g3/pbm2g3.c
+@@ -40,7 +40,7 @@ static unsigned int out_hibit = 0;
+ static int out_byte_tab[ 256 ];			/* for g3 byte reversal */
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void putcode _P2( (code, len), int code, int len )
+ {
+@@ -60,7 +60,7 @@ void putcode _P2( (code, len), int code, int len )
+ }
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void puteol _P0( void )			/* write byte-aligned EOL */
+ {
+@@ -69,7 +69,7 @@ void puteol _P0( void )			/* write byte-aligned EOL */
+ }
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void putwhitespan _P1( (l), int l )
+ {
+@@ -100,7 +100,7 @@ void putwhitespan _P1( (l), int l )
+ }
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void putblackspan _P1( (l), int l )
+ {
+-- 
+2.9.3
+
diff --git a/net-dialup/mgetty/mgetty-1.1.37-r1.ebuild b/net-dialup/mgetty/mgetty-1.1.37-r1.ebuild
index f071ac4d388e..a6305c0271c8 100644
--- a/net-dialup/mgetty/mgetty-1.1.37-r1.ebuild
+++ b/net-dialup/mgetty/mgetty-1.1.37-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs user
+EAPI=6
+inherit flag-o-matic toolchain-funcs user
 
 DESCRIPTION="fax and voice modem programs"
 SRC_URI="ftp://mgetty.greenie.net/pub/mgetty/source/1.1/${PN}${PV}-Jun05.tar.gz"
 HOMEPAGE="http://mgetty.greenie.net/"
 
-DEPEND="doc? ( virtual/latex-base virtual/texi2dvi )
+DEPEND="
+	doc? ( virtual/latex-base virtual/texi2dvi )
 	>=sys-apps/sed-4
 	sys-apps/groff
 	dev-lang/perl
@@ -17,9 +18,11 @@ DEPEND="doc? ( virtual/latex-base virtual/texi2dvi )
 	fax? (
 		!net-misc/efax
 		!net-misc/hylafax
-	)"
+	)
+"
 RDEPEND="${DEPEND}
-	fax? ( media-libs/netpbm app-text/ghostscript-gpl )"
+	fax? ( media-libs/netpbm app-text/ghostscript-gpl )
+"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -32,12 +35,13 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-qa-fixes.patch"
-	epatch "${FILESDIR}/${PN}-1.1.36-callback.patch" # add callback install to Makefile
-	epatch "${FILESDIR}/Lucent.c.patch" # Lucent modem CallerID patch - bug #80366
-	use fax || epatch "${FILESDIR}/${P}-nofax.patch" # don't install fax related files - bug #195467
-	epatch "${FILESDIR}/${PN}-1.1.36-tmpfile.patch" # fix security bug 235806
+	eapply "${FILESDIR}/${P}-gentoo.patch"
+	eapply "${FILESDIR}/${P}-qa-fixes.patch"
+	eapply "${FILESDIR}/${PN}-1.1.36-callback.patch" # add callback install to Makefile
+	eapply "${FILESDIR}/Lucent.c.patch" # Lucent modem CallerID patch - bug #80366
+	use fax || eapply "${FILESDIR}/${P}-nofax.patch" # don't install fax related files - bug #195467
+	eapply "${FILESDIR}/${PN}-1.1.36-tmpfile.patch" # fix security bug 235806
+	eapply "${FILESDIR}/${P}-gcc7.patch"
 
 	sed -e 's:var/log/mgetty:var/log/mgetty/mgetty:' \
 		-e 's:var/log/sendfax:var/log/mgetty/sendfax:' \
@@ -60,6 +64,8 @@ src_prepare() {
 	# Support user's CFLAGS and LDFLAGS.
 	sed -e "s/\$(CFLAGS) -o newslock/${CFLAGS} ${LDFLAGS} -Wall -o newslock/" \
 		-e "s/\$(LDLAGS)/${LDFLAGS}/" -i {,fax/}Makefile || die
+
+	default
 }
 
 src_compile() {
@@ -157,7 +163,4 @@ pkg_postinst() {
 	elog
 	elog "If you want to grab voice messages from a remote location, you must save"
 	elog "the password in /var/spool/voice/.code file"
-	echo
-	ewarn "/var/spool/voice/.code and /var/spool/voice/messages/Index"
-	ewarn "are not longer created by this automatically!"
 }