gentoo resync : 01.12.2017

4 files changed, 25 insertions, 5 deletions

diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index ad6a39b25e37..9ceb459543ea 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/gnokii/Manifest b/app-mobilephone/gnokii/Manifest
index f39150980b8a..9718ae68ab12 100644
--- a/app-mobilephone/gnokii/Manifest
+++ b/app-mobilephone/gnokii/Manifest
@@ -1,8 +1,9 @@
 AUX gnokii-0.6.31-fix_xgnokii_inclusion.patch 260 BLAKE2B 7f681ed48bcf8f8cb5b07e9d1208f3a98fc0006f8a436aa160387f3de6b6a49f488028cf0d818e9d29dc1ffbe9c28368641965685a18ddb6743ed61611dab0b7 SHA512 e23b72af4d51c7691b56beab15b36e275e6ea1fb8599d1cee4be98570caf0c9434b2cd61fd3879c41adb219c7ab9b41bd794df27d9be97bb38b3799427039393
 AUX gnokii-0.6.31-gcc5.patch 863 BLAKE2B 4d018cbdc5e071e05811f41db3b0ae936268192978f0588b9e0d6dad4aebdb086d23d1f42bc4c6f878eabef7451e3a5b1d687cd5d989b4c5f9581497b2a0396f SHA512 548a32f93b059e45c8616dedf49a0ce3b0e63463f8ddc3384b473d91bd12c3fab2c6e21de0b09d2b330c189454a2bf3e486aa25122ea58392d9cb11994592086
+AUX gnokii-0.6.31-gcc7.patch 830 BLAKE2B 308123e9f4a341a9ec1b2dd90e6c88b9ba9f2d8bc1114057ed8b0675152ca340cedd4ecc4e6859f84b537ff86c04a193dd24816ce33ed08a1cb3649a7358b138 SHA512 6c6a106d9a0bfd20d35d5ae73537aa3409a721989fc450a315720a11f79c771de077af86434003284c9a187cfd17e9cc6766d8f4db4ccf496a30596ac59b7d8d
 AUX gnokii-9999-icon.patch 239 BLAKE2B 17253cc10ccb2b7520c0967821e4a57f56e2292d2d8692cf5879f3b3b0f5304dba257a56dc3c45b920c29b5fbda120daa7bbd3135f9a53880e09447580fd320b SHA512 11ecd345c1bd93a8c0f316b411106bc22c5fecff2a848d075e9feb1bd1581a255dbf5a7eaa7fc525325af9b1c7d90736a7b58104f870f3d7ec329ea0b43c2dc3
 AUX gnokii-9999-translations.patch 196 BLAKE2B e703e57517f370852858bbe945be12697a249dc9743bce5f05b0f3ac1a04bc5c48d16217b7f2f0ef89ed0930cbadff2d758b6407a16bb1d785d329d1a47afc13 SHA512 ac167f1d93abf9ed00cd4761ae3b86fdfda33ec5690bf1c0c62a136fe09d0f57dd0d3abe172a3adafb499cc01655995111bc84343932bc6054d45a8e70097af6
-DIST gnokii-0.6.31.tar.bz2 1237865 SHA256 8f5a083b05c1a66a3402ca5cd80084e14c2c0632c991bb53b03c78e9adb02501 SHA512 529f6d0d29873f48ac00cf7151ba35dcbd93405ab27d69848ed17dea73f4fba71721d1811d921441b4214777b9b33f760b372631627cc108eb94c39684da343d WHIRLPOOL a14927d205748647187336f408fc7449808e48ff2b6de0df8cc14562d25a67643d1bb4cb97f50c27a5c2acad2bdb503bcec049a4fdac534ce48c763b9715cae7
-EBUILD gnokii-0.6.31-r1.ebuild 3426 BLAKE2B 726b4eeaf64984fbfa326516687340612f23900f0ef96806e18e4fe4c8a18e796c0dbfa52f4dab528286982593773cfd7780265fc1bb4c06a712c842a1384466 SHA512 8f48893eba869c49641a78a64546e8ed6b614a90d7dcf7e354208750c332de3d471ef3888425bf60fd78be54039411b80e14c6aced6e1f3c45dfdfccb9f9c155
+DIST gnokii-0.6.31.tar.bz2 1237865 BLAKE2B d94c5d44e7075b875037c55448b63c76a27116ad09eeb3c450597d6d65d0cabae65aefc904dcdd868b30fbd17989ce50aecfb2d08dce8ac55e36d1976f0b61da SHA512 529f6d0d29873f48ac00cf7151ba35dcbd93405ab27d69848ed17dea73f4fba71721d1811d921441b4214777b9b33f760b372631627cc108eb94c39684da343d
+EBUILD gnokii-0.6.31-r1.ebuild 3458 BLAKE2B 6e610a9c478f8170cf30028ce403a458e69fb332903c685fb33a4a41d789d02d111517d1abc870e83b6c5c4c8810eac40ca98114a539c66d99322bf87b8b66f0 SHA512 bca7e37cda0c9a3443204956ad336a9fe7ec55fc05fd38b320ef54863766f14a17a134693b7ec13473b74afbce28491ca47dd38799fd418311ec1cd20e1c2739
 EBUILD gnokii-9999.ebuild 3381 BLAKE2B ee5176de7d8a6b7ae3b186fb6c6879450b9cd417ab080581a6c7f4bebf198700ebf45b6a1149ad6c0f6102bca03e9aa1747d7bc0b73e782d2aadbf9982020ad7 SHA512 cc38a495499a49cedcb13704e008bf8730d1ba03190a61d46efdc3983505e041d77c52dbfb698d2f48fdee398f87bbe96f526e522793b70ce606f51959790d0a
 MISC metadata.xml 756 BLAKE2B 840e51ec7099b1ae34694dfa328d908147c90a32689165201a98bbc6559c1d6db8c63dffc0264210203775ba502d1c64d3245b32c4def375abf7a7685539c458 SHA512 7fbdd7684cd7810fe6114146a3378c346ca8d01df54adbbea292b0727fb039d5ceec29e4a5fd4d3031c17f9f229a4de0d635ae23e57eb507103255ebcb057983
diff --git a/app-mobilephone/gnokii/files/gnokii-0.6.31-gcc7.patch b/app-mobilephone/gnokii/files/gnokii-0.6.31-gcc7.patch
new file mode 100644
index 000000000000..6637a6af62c4
--- /dev/null
+++ b/app-mobilephone/gnokii/files/gnokii-0.6.31-gcc7.patch
@@ -0,0 +1,17 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for gnokii <= 0.6.31 to avoid
+build failures with GCC 7.x as "../common/.libs/libgnokii.so: undefined reference
+to `local_atoi'". The "inline" is only a hint that the compiler doesn't complain
+about double defined symbols, but does not guarantee that a function is inlined
+or that a symbol is generated when needed.
+
+--- gnokii-0.6.31/common/gsm-filetypes.c	2011-12-02 15:53:04.000000000 +0100
++++ gnokii-0.6.31/common/gsm-filetypes.c.gcc7	2017-02-12 00:55:39.000000000 +0100
+@@ -1409,7 +1409,7 @@
+ #define GET_NEXT_TOKEN()	o = get_next_token(line + offset, ';')
+ #define STORE_TOKEN(a)		strip_slashes(a, line + offset, sizeof(a) - 1, o - 1)
+ 
+-inline int local_atoi(char *str, int len)
++static int local_atoi(char *str, int len)
+ {
+ 	int retval;
+ 	char *aux = strndup(str, len);
diff --git a/app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild b/app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild
index 17779551f5d6..d85decce8d49 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
 inherit autotools eutils linux-info
 
 HOMEPAGE="http://www.gnokii.org/"
@@ -32,11 +31,13 @@ RDEPEND="
 		mysql? ( virtual/mysql:= )
 	)
 	usb? ( virtual/libusb:0 )
-	X? ( x11-libs/gtk+:2 )"
+	X? ( x11-libs/gtk+:2 )
+"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	irda? ( virtual/os-headers )
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
 
 CONFIG_CHECK="~UNIX98_PTYS"
 
@@ -50,6 +51,7 @@ IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 PATCHES=(
 	"${FILESDIR}"/${P}-fix_xgnokii_inclusion.patch
 	"${FILESDIR}"/${P}-gcc5.patch
+	"${FILESDIR}"/${P}-gcc7.patch
 )
 
 src_prepare() {