gentoo resync : 22.06.2019

4 files changed, 11 insertions, 10 deletions

diff --git a/app-misc/getopt/Manifest b/app-misc/getopt/Manifest
index 3635d78eab4c..ae3a16152b2d 100644
--- a/app-misc/getopt/Manifest
+++ b/app-misc/getopt/Manifest
@@ -1,7 +1,8 @@
-AUX getopt-1.1.4-irix.patch 357 BLAKE2B 12ec0e7a6dc156967731d8a09bae4fc91f6dfda55a3ffd549d3fa1292ff7fb6d8106aff44428adbba0bdf0e05c976b063c0f91848e8a9938d4c8cebd05d4b545 SHA512 001949835eafe86d5f1f9dfef9892ebbf6b1c5a3d870cf57c4ac7543c048c061429c8f7cb754260ff16e2694bb497ed89c0d4e746f1c7064883a55940563dd92
-AUX getopt-1.1.5-libintl.patch 353 BLAKE2B fa5f6c7eac124d16344b52227ab704656cc448c86ae871f67adb1d871000d74536d9c434285d046ec3667c53f3442b16db10da88a9ddabdb14e6a3b17a8b2046 SHA512 eca001588a940f5bc50f95c0f93fc352f5dc647325a5b1ff0c7ddf0bf93e2c8fd2ac4f735c0ae5d48e4c9b2c54799e6d6028a5602147a3b9a28dc5e65e66f5ec
+AUX getopt-1.1.4-irix.patch 356 BLAKE2B c280d4c3139736c37e23f7a4af713d13e810fe4650a51b2fd357031583e19837546ec9a01b0232aa7804dba16a133d2aeb230a079d65aa393034900646932543 SHA512 39a1ee552cfc52ddc6d87f7f53d6e01e6f04069ce0c6971cdc3fa052aa3f26062f6b21680ecd2e45f6bb36ee0ff6ccc30df99b280966f1d47857604b8973291f
+AUX getopt-1.1.5-libintl.patch 352 BLAKE2B 39cb63285b1124a2c8577bd52128e04e0e86b7e182e341d6d537a4247e2438b8d4714b4a357ac2b1a155f314dcc5d0b983bf483c0c4369bf943b07c8483ee63b SHA512 4135853267364087e104aef064e40c18c2f94157e2a8f1d70302599eb57e17b7d84c200925b736fc637d62f1d767d01c93be88abf003029b1b2041f193a71453
 AUX getopt-1.1.5-setlocale.patch 323 BLAKE2B ee68f23549c402bdb91cd4475ee0b1d30d8254d5161874eb029ce7536b3679fe5f323590c86d28af2dec9c2c6ba8ac95b0a3ac6103cda13fe8349629c13c872c SHA512 1ceb4353355cd1af697b5d46bd58b092b8792a2add97fb8498bfa6e036487e8c811333b03d0461117f1c2c5e90a3f33cf773cb9b0732c753beb8d75345e6c36e
 AUX getopt-1.1.6-longrename.patch 3013 BLAKE2B 608ad737eaad184436a321797b5099bbe5a1436e812a40a2ee30aa7b80e86f360e9e3c18629ae96e5edd6d0090a74758b99699833052dee2db7e76bd055f2659 SHA512 7157f9bd2bc660519972898bd24f0f04f01196a54c44a3a3ba4b0fda0acfb9b13cabba7cfbd1e784e9f5b3c94f2955325f47933e5d6affcb1a0f740d933206b9
 DIST getopt-1.1.6.tar.gz 58926 BLAKE2B 839b9c1701c21425cbc6b68ab245eb693e0e575a0673f62e3cca8f6932485c1124f42710c0ebeb3c157ab89e56e02b251a99aca7a12723735c63f33443003007 SHA512 aa5476e729f33ddd3f32f38b2565da319fdfe034f11549218d5d9953e70dad764e0d9a82bb10efe4043c86ae87f944619b8a2f29a197f592bd855699961d8e10
-EBUILD getopt-1.1.6.ebuild 1819 BLAKE2B ccbc8ea5b3c29b2149ce2526d2e83c096fd4960a76fd567d43611f32508b7c26278711eaa27ad9af5a330ec884ad7af9ff871422a799c933497ef6c5f2fb93c0 SHA512 b29609ee136d2897954ed29c182688d9a3d83260db11e8968bd62798e337168cf626c2b0d001bdf6a9f1e9479847b8f9c8bd38640948d8952613d19930662684
+EBUILD getopt-1.1.6-r1.ebuild 1725 BLAKE2B cbd0ac71f36d1aa953ac893828e212c0b9606034c5a3e536587af1fb9320c46cb49c875ac423c07db052cf4fb88334e0636384d89326c6bc0d7bebe241080414 SHA512 f1c902aeff9f5204385f32827851b6f021237dd317e54eca372d362080b289952681b69e2e99c40ce05e35f7652d3bba2e818a2c921f81dc8492427d1bacb34c
+EBUILD getopt-1.1.6.ebuild 1819 BLAKE2B 953d9c9457a19cbd4b39643f1d092858034d486f88a8882a463b5cdc6fe1766cd4ea9136ca1902445ab583e90045392ddef9835182b8c82b6bec8a945b62e51d SHA512 7e938cd0e900fe6046f194dbea40d1051a33b1af6f243236b90d4d1d316a438cfe3124c08c699a4e1ffe6270fb2440154dec1462f02afb50026f1252232c20bf
 MISC metadata.xml 342 BLAKE2B 799fd88b4f38206d301039f579ea9b29920c98946ad0c5fdc57d2ae32d280843c5dfbd4db50d3f4cf7aee7f287d79361878d366ecc8b415406182639a3cffca0 SHA512 90fdb073ca1dcd23506cb421440ec9719517f4bbb6839f5944898a3368bd01aba189346c26a27928a777ef59b22256ea5046ed9180b5b2ff034afbc7b4374b05
diff --git a/app-misc/getopt/files/getopt-1.1.4-irix.patch b/app-misc/getopt/files/getopt-1.1.4-irix.patch
index 0c344a80131a..1fd38c3b0a20 100644
--- a/app-misc/getopt/files/getopt-1.1.4-irix.patch
+++ b/app-misc/getopt/files/getopt-1.1.4-irix.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/show_bug.cgi?id=211499
 
---- gnu/getopt.c.dist
-+++ gnu/getopt.c
+--- a/gnu/getopt.c
++++ b/gnu/getopt.c
 @@ -69,12 +69,7 @@
  #include <unistd.h>
  #endif	/* GNU C library.  */
diff --git a/app-misc/getopt/files/getopt-1.1.5-libintl.patch b/app-misc/getopt/files/getopt-1.1.5-libintl.patch
index b40367105ed0..0b39b4ecbdc0 100644
--- a/app-misc/getopt/files/getopt-1.1.5-libintl.patch
+++ b/app-misc/getopt/files/getopt-1.1.5-libintl.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2012-12-28 11:40:09.524686698 +0100
-+++ Makefile	2012-12-28 11:41:20.646157275 +0100
+--- a/Makefile	2012-12-28 11:40:09.524686698 +0100
++++ b/Makefile	2012-12-28 11:41:20.646157275 +0100
 @@ -61,7 +61,7 @@
  	-$(RM) $(objects) $(binaries) 
  
diff --git a/app-misc/getopt/getopt-1.1.6.ebuild b/app-misc/getopt/getopt-1.1.6.ebuild
index 0c611893fdec..c8484dcababf 100644
--- a/app-misc/getopt/getopt-1.1.6.ebuild
+++ b/app-misc/getopt/getopt-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -6,10 +6,10 @@ EAPI=4
 inherit toolchain-funcs eutils
 
 DESCRIPTION="getopt(1) replacement supporting GNU-style long options"
-HOMEPAGE="http://software.frodo.looijaard.name/getopt/"
+HOMEPAGE="http://frodo.looijaard.name/project/getopt/"
 SRC_URI="http://frodo.looijaard.name/system/files/software/getopt/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"