gentoo resync : 29.06.2020

6 files changed, 5 insertions, 87 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index c56abee26623..2dccf32a0002 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/hstr/Manifest b/app-shells/hstr/Manifest
index f2f2f0431b66..bf0011447303 100644
--- a/app-shells/hstr/Manifest
+++ b/app-shells/hstr/Manifest
@@ -1,7 +1,6 @@
 AUX hstr-2.0-fix-ncurses-configure.patch 2626 BLAKE2B 69fb12826fcab4f086b9e951b4e75daf84565f96c519776593d4b6f5f6d16c1745867742849b590bc29e1ab58ca1609f85a5645713da688c5e53fc22712c3c81 SHA512 65e29a8e2b5840d335d741072df44d2a36b260c24cd6e8df68b45b4bd2d6cb18e729d0b695703b95bb968dfc44c6dde28f26ab61c458444200c40862a6281a99
-AUX hstr-2.1-fix-ncurses-configure.patch 2626 BLAKE2B 69fb12826fcab4f086b9e951b4e75daf84565f96c519776593d4b6f5f6d16c1745867742849b590bc29e1ab58ca1609f85a5645713da688c5e53fc22712c3c81 SHA512 65e29a8e2b5840d335d741072df44d2a36b260c24cd6e8df68b45b4bd2d6cb18e729d0b695703b95bb968dfc44c6dde28f26ab61c458444200c40862a6281a99
 DIST hstr-2.0.tar.gz 1242802 BLAKE2B 24f1a870e6aa12b6544a38601c6bc654e01aa1a185c4f7735559aa3220ed8d9fb840e298526b9e4a177000f2ec5c08caee5da97e13783e4114bde5276ee1e85e SHA512 50d5e8e61aa853dab0093f4225d3329e98bc59609d8d59abf832cd4cb616d78a2fa091d1ad8d16f3543276c4ead95a419f33a13a96f423bf93dc648da32740b7
 DIST hstr-2.1.tar.gz 1244067 BLAKE2B aa37f26a5ba8ee465a03212cc80e55b9581e59cbb535f17fda8e59bed062f0b0065d456d8566927c089595b92270b83235f0bf73f26ac88704bd933c1926cd5b SHA512 ea217ac2b6dcb7e283f83d15524b47f88c5c8cfb82e5728537750a2ec8526f03304503a5bb67970d893e10057aba087aa86a67548aa361c892b6ee3e81903122
 EBUILD hstr-2.0.ebuild 642 BLAKE2B 83c4bdcd14bea1f873828f3856183a529144bca3876b960895b86c2c1f2bb82d66d48d9d68a541aa719c9e07f2a072ce7d77783bc32dbc2a5db89de945503140 SHA512 30d50d5190f4476969aa97af6e1af4111f91cbe457fca2b51b34c9c4ac42e24d9e68fb305cd1898c3088faa23ad581b27c03084fc306992b8af4b657304d6a07
-EBUILD hstr-2.1.ebuild 644 BLAKE2B 94d5fe5cb75e3e6c718de6b62c55456393c1ecbb2e3250c9d746000ebb048d04ab0c156c65838d15f9cd284dcb54e0f3956be7778243abf0b8f7da0886832a70 SHA512 64c8372683a3b43ce27845c0b168e99263fc6b06defc2ebd498654711c683873e9bcf9e8c2317be19a19c8f4e4ab2f4b82d9a310b7c702a3481d03676776f204
+EBUILD hstr-2.1.ebuild 649 BLAKE2B e71c9b05847367cbd4b9f2fdb2f00343a7d27b49e7e891958760876bae7daff742b357fcd384df029e3fa4d3b5e10c3a5d491ec5910b67aaaf813709ac3db890 SHA512 56b66c6985ffdce179d99e2456c95a87ff26eaebcbda4dec771786ddf5120d13381dac342c62d97f8ccb39fded57431041061bc2562150c666d570019699fa61
 MISC metadata.xml 453 BLAKE2B f0d991ae15d9b76c28a58f73be00cbb4824451019e9ef2858611681c4472c13cc4367166a130b3a313ac8ecafb859593610c52dab6c0cb7783ab079e31abeb27 SHA512 07997cef95d27c283b525f9a09d2762338c5bc8c2129904672cabf85e0d441ef7dc9b06608c0d38f0ae8d5d86e3fe8fc22bf8ebc7b29a81f8e9469436e62cf3e
diff --git a/app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch b/app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch
deleted file mode 100644
index 215fd5cedfc9..000000000000
--- a/app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 1676ec8..73c8be5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -47,39 +47,33 @@ then
- fi
- 
- # PKG_CHECK_MODULES macro is NOT used to avoid confusing syntax errors in case that pkg-config is NOT installed
--AC_CHECK_LIB(ncursesw, killwchar, [],
--[
--    AC_CHECK_LIB(ncurses, killwchar, [], 
--    [
--        AC_SUBST([NCURSESW_CFLAGS])
--        AC_SUBST([NCURSESW_LIBS])
--        if pkg-config --exists ncursesw
--        then
--            AC_MSG_NOTICE([Module ncursesw found])
--            NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
--            NCURSESW_LIBS=`pkg-config --libs ncursesw`
--        else
--            if pkg-config --exists ncurses
--            then
--                AC_MSG_NOTICE([Module ncurses found])
--                NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
--                NCURSESW_LIBS=`pkg-config --libs ncurses`
--            else
--                AS_CASE([$host_os],
--                  [darwin*],
--                    [
--                      AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
--                      AC_CHECK_HEADER(curses.h)
--                    ],
--                  [
--                    AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
--                    AC_CHECK_HEADER(ncursesw/curses.h)
--                  ]
--                )
--            fi
--        fi
--    ]) # FAIL of ncurses
--]) # FAIL of ncursesw
-+AC_SUBST([NCURSESW_CFLAGS])
-+AC_SUBST([NCURSESW_LIBS])
-+if pkg-config --exists ncursesw
-+then
-+		AC_MSG_NOTICE([Module ncursesw found])
-+		NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
-+		NCURSESW_LIBS=`pkg-config --libs ncursesw`
-+else
-+		if pkg-config --exists ncurses
-+		then
-+				AC_MSG_NOTICE([Module ncurses found])
-+				NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
-+				NCURSESW_LIBS=`pkg-config --libs ncurses`
-+		else
-+				AS_CASE([$host_os],
-+					[darwin*],
-+						[
-+							AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
-+							AC_CHECK_HEADER(curses.h)
-+						],
-+					[
-+						AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
-+						AC_CHECK_HEADER(ncursesw/curses.h)
-+					]
-+				)
-+		fi
-+fi
- 
- 
- # Checks for libraries.
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 7640d21..17a82b7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -37,4 +37,4 @@ hstr_SOURCES = 						\
- install-exec-hook:
- 	ln $(DESTDIR)$(bindir)/hstr$(EXEEXT) $(DESTDIR)$(bindir)/hh$(EXEEXT)
- 
--hstr_LDADD = $(NCURSES_LIBS)
-+hstr_LDADD = $(NCURSESW_LIBS)
diff --git a/app-shells/hstr/hstr-2.1.ebuild b/app-shells/hstr/hstr-2.1.ebuild
index f9bffba4e61d..95a0c74991ac 100644
--- a/app-shells/hstr/hstr-2.1.ebuild
+++ b/app-shells/hstr/hstr-2.1.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 
 DOCS=( CONFIGURATION.md README.md )
 
-PATCHES=( ${FILESDIR}/${P}-fix-ncurses-configure.patch )
+PATCHES=( ${FILESDIR}/${PN}-2.0-fix-ncurses-configure.patch )
 
 src_prepare() {
 	default
diff --git a/app-shells/rrs/Manifest b/app-shells/rrs/Manifest
index a485c63b5072..e2cf89a221af 100644
--- a/app-shells/rrs/Manifest
+++ b/app-shells/rrs/Manifest
@@ -1,5 +1,5 @@
 AUX rrs-1.70-asneeded.patch 1436 BLAKE2B ab35e22a351024935c13433d49e9c7e1ae452b597e179810a58a9e181895d6731a81d472abd2147865ff76bd4ad338429d41eadcead229a5ce243a66b66e8c17 SHA512 05972478d2e27290a430b0d80343f25c494a9f0f82ad87df2bc400dc652775dff447d8914e367d3092db2fcb5c4700e5d5873452767943e3d0b27410bef51188
 AUX rrs-1.70-drop-old-ssl-algos.patch 2855 BLAKE2B 86194d554b477bd1efb0e2b6950cde48202224efb0e87675f4b571efd95e509a9262236a6852a2e821b20f0e25c68d4d748a2cac3c6019b972a30366076b17e7 SHA512 9b5516a32a0c824dfb52d3cee07747b1931432ed3f7db96ca5121ecef914065b024ea4bb920e9b560f344dfad5d0eb6429ed7fcaff7cf0acc05b62a9b5135b45
 DIST rrs-1.70.tar.gz 49579 BLAKE2B 0345f559239f64d51891100c11f3b80d2b41277eaa0e283c86dbd990496f083e1da60aa6937c870c133bfe8e7f905848d0da1a17b827a2bb07bd8ee1be4b36de SHA512 58a3d34bd80f2ddaa62112819d83ab2175daf1b9e66605d0b629a15d1fc6b43b482e1a4a763b99a07d85bbb0fa6df339d0dfcc203e3a3da3d5cfdabbd14a4bfa
-EBUILD rrs-1.70-r2.ebuild 763 BLAKE2B 106557e897790963e75a34d7765c10df70a1305ea40a5084d566279ee61150f33f69420bbf0f68ac90ab43344e9ac1a3a960739986bab465c2d2e492482ce5f9 SHA512 d2c90454a1dd04cd86c4143782a6a1582f57152699744fff5b49843088854ec60ff34680657e82b0b31d0bdf9db233bacc5db3524231ed1ba475a8e37008b978
+EBUILD rrs-1.70-r2.ebuild 776 BLAKE2B b2b00b21fae82ab9be96e7cc13d845ff95ec562ad46c7e64263c2ec563db57728a7bdccafb666c768b31cef46a1e8036c0fa8c696962423e05805e7412979981 SHA512 e1ec88ca60e30c912ed9f3d9620e463f371319a48be7c982614cdcbeb5caf6cc62f61dda1a34f1523613e94245ba734216787a1fdc450e480c65ca403221b205
 MISC metadata.xml 317 BLAKE2B 79bf68384cb06bb254c6bd8757a368e929ae41d5dcd793c7123ea0e336c9187c9062013fc4feeb032c18515fa865d05f1f61272555f2e137e419c23b289246e7 SHA512 b80e5e730f8ee1225f73e1c1651c9cec243f117f3b983ef0814699ba367f373ada228e1fe2b6b8f1928eeb5cd854c1a7bf07d59075607a992a4a0e0dd3482ee4
diff --git a/app-shells/rrs/rrs-1.70-r2.ebuild b/app-shells/rrs/rrs-1.70-r2.ebuild
index 50056840ca19..58f401d896ac 100644
--- a/app-shells/rrs/rrs-1.70-r2.ebuild
+++ b/app-shells/rrs/rrs-1.70-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Reverse Remote Shell"
-HOMEPAGE="http://freecode.com/projects/rrs"
+HOMEPAGE="http://freshmeat.sourceforge.net/projects/rrs"
 SRC_URI="http://www.cycom.se/uploads/36/19/${P}.tar.gz"
 
 LICENSE="MIT"