gentoo Easter resync : 12.04.2020

6 files changed, 24 insertions, 13 deletions

diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index 2f21530bb22a..f3dbe1ff8e26 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -16,11 +16,11 @@ AUX sysklogd.rc9 1550 BLAKE2B 8bfa8e31e42c4d06b630a79b80031c6e8ad5334bf8353b2217
 DIST sysklogd-1.5.1.tar.gz 90011 BLAKE2B c40bd8d5769f7d3d4141d602c74ac41e05a140743d18c4923d9368da7ba193ccb89a6837173994f0b7a9c290cc23f64513040434d7ab8df81b5d09b73b0263ad SHA512 a72196a1a172d25be1c4791ef6256fe71fa2ba8c1383d230e646e93f8a65c3a57c535189726325da4c792fdb2e9cb119bba43c878816a8e78e78189fd32b12b7
 DIST sysklogd-2.0.3.tar.gz 466919 BLAKE2B d9ada06dadb5a43ca7102cb24eaffa0494af2743f4714bab7d362cf480835ea9c3fc51ee171e4eb3b90380d63abe78c759bdfc5d946ec4d5bf8fce748cd916b9 SHA512 95ed0465e37b438d624b0a78d74c1194c57d117890492b5773c9ccefa7aa2c1f54ed510e54a29019fb2d7274200370031fe822a9316c154e64a2a01cb912d7a8
 DIST sysklogd-2.1.1.tar.gz 560806 BLAKE2B 576da4c75a5f75f9df438764083d5f4a26a29edce7d8d2ce8e27e35b1b3460289aa366ac5e7e3dd887f0c2bc08fdea8fcca5dedcf5e7c34aaf677ddb5745a0be SHA512 7b486a123b651e9393a4f4d0340e6356e9cf73f344c4a51f84b732134a6d61bf7ee09125d723dda3a2137c3b93c4df156b79193a8111d1ae5c339a668debada3
-DIST sysklogd-2.1.tar.gz 560611 BLAKE2B 727f78a639d88fd67b5fe6106534a10f9b37717b0675772346b07691481d7d5297963d54d3e36eae7cf14431e8429eaf0da1c551970c7a916f4e6c891c7ad70c SHA512 48fa0eed0013a9ff0a8bae0fe35bb82f46e012d3754da424bce0bcd339b4e016a1cbc93b134c02342f8da6e42721cdcdb3d28c3c71c571748d77a234460cb0c7
+DIST sysklogd-2.1.2.tar.gz 561286 BLAKE2B f70c2d116740930761677b9fdf715242844a583a59cd93c2e3408f985ce856d1a9eabc3ba736d18af44e8d154cdadec88035fc357db83eb504b4c6f800ea1f1d SHA512 dcd715939b4285e08ead0a1e797d09a8845156f456d3776cfcd0bcff7fbb9a306cb84a2b22731b430e2199d59ba42ab975fed6e675cf9d8a78833575c1490268
 DIST sysklogd_1.5-6.diff.gz 25677 BLAKE2B 3cb1f596490998b6002d4656a2321a500ce9941a37737c0b9d4702bbb87d7bc9ba21b68e06d175e3c1714a701adc6b3312e18a556ebc9ef395d8968762830cb5 SHA512 816961a835a43057569f62fd20d9f7b5e0bfcfcb173b68947457708504db3ce47e635956c8a9564f9bd577d8f3c49dfc725d321dfd3370b2de918363c30f838e
-EBUILD sysklogd-1.5.1-r1.ebuild 1701 BLAKE2B a1344b56825a4f7560ba644740429129e95ccbbd4c2b5106cf53c47aea4255ad0cb65fdae4a6334e644e48d1477718b0cf90da8eb63fe2b6e7e362af415f44c0 SHA512 b944d4ad99d071c6aba6e16a2b4ec38253130a4a788d3aa917db61734778e43a99f377fc9d297d7821151b28b4918686b0caf4e3a1c463721bad999ef487e8d2
-EBUILD sysklogd-2.0.3.ebuild 1820 BLAKE2B af54756110e0528f3c5f59e1e9fd7ab890f305903649a22a4d3c37bd6b90e0a9eb93c5f4319c232bcf2726891a38b800478dcb8d3a585f55ec0308b72dc14c35 SHA512 c1c8f47062fcf0adfbde35a7d711744f5fcec56d922b057cc56dd6ec404e327643db70df3d4d1d7fc3ca630ecf27ba96a0d2fc08f6766429b7b05eefe3f63bce
-EBUILD sysklogd-2.1.1.ebuild 2081 BLAKE2B 319de960e0b50c64d623d5f787dee51cc01e35a5c9ab9847710bc1765e3493c4805ca4afa13cfaa997f43e93b1ef3eb43cad9aa9e06dfff180d96e402bd16454 SHA512 f49ab7183a8779dc1015e12ee52b8128a610f3a34af9af2650060884592fd9508432f1bec623987ed6d9ac21038a5b5a4a3ed9f2775c79a982699c8cc4df3dba
-EBUILD sysklogd-2.1.ebuild 1885 BLAKE2B 766fc16c3ddbb0bcbe7eb260878988254b308a3f3bd0cb67949786a470ef2ecb2f03baa9235730dff4aab25a1414715b4f43cbe23af6b13c0100a1187be4a0ab SHA512 13721c80d8c9e2f8b7f07abd4e2f1868c7f0915b27bbc4cfb54e0ec9d88d4bfed8b64ebbef83a3d58361bd40132ceddeebb028cb1d18059b3e68ddbfcf3cfb7c
-EBUILD sysklogd-9999.ebuild 2081 BLAKE2B 319de960e0b50c64d623d5f787dee51cc01e35a5c9ab9847710bc1765e3493c4805ca4afa13cfaa997f43e93b1ef3eb43cad9aa9e06dfff180d96e402bd16454 SHA512 f49ab7183a8779dc1015e12ee52b8128a610f3a34af9af2650060884592fd9508432f1bec623987ed6d9ac21038a5b5a4a3ed9f2775c79a982699c8cc4df3dba
+EBUILD sysklogd-1.5.1-r1.ebuild 1698 BLAKE2B ea86766e53c00480c5ee34ad978e5abf138e7292ed49ff96d7a46f2fed4294729ba029da780d21c67fb688ebd26d669dabb939718542897563e7287ed22e138f SHA512 39232dbb53a7baa81ee2904bcb24f4626da3d5c1ae8acf9357c1e185f308a844c23f11d751655da6aed3067085e667e2c3392738fa66a36233d477a5f32ccf7a
+EBUILD sysklogd-2.0.3.ebuild 1816 BLAKE2B e76c43c7baa2e932aa8177def561beaaacd4fdc4c5980a489737cedb032662c8ec600bedcb5edd4ffbfe8c34d05b1328b7b0030ef3bafe2f522cf41fe7d86bd0 SHA512 bb9beab5a739c694841b699ce078c160b7b021f2c8ff51dc0daacad9ae776a05f1131358172aa387a1ac321ec2860098dccf9dd83aa4018dd300b02aced9cc1c
+EBUILD sysklogd-2.1.1.ebuild 2077 BLAKE2B 7d87b09abd93c2feac26b14e7005e8203e538748fd935f62c408526a1ef82e57bd4bbe98976232d679e515454f5e82fed5e7c3663335543c2858f4330392cfd2 SHA512 6ea17133dde836a6090a8fd61c19246a66d921303cfd5bde944eb31e7b28fc03beec84301a016602ce634437e80fca796a4fcfd45bb18ee5688a59df7b93ec8d
+EBUILD sysklogd-2.1.2.ebuild 2077 BLAKE2B 7d87b09abd93c2feac26b14e7005e8203e538748fd935f62c408526a1ef82e57bd4bbe98976232d679e515454f5e82fed5e7c3663335543c2858f4330392cfd2 SHA512 6ea17133dde836a6090a8fd61c19246a66d921303cfd5bde944eb31e7b28fc03beec84301a016602ce634437e80fca796a4fcfd45bb18ee5688a59df7b93ec8d
+EBUILD sysklogd-9999.ebuild 2077 BLAKE2B 7d87b09abd93c2feac26b14e7005e8203e538748fd935f62c408526a1ef82e57bd4bbe98976232d679e515454f5e82fed5e7c3663335543c2858f4330392cfd2 SHA512 6ea17133dde836a6090a8fd61c19246a66d921303cfd5bde944eb31e7b28fc03beec84301a016602ce634437e80fca796a4fcfd45bb18ee5688a59df7b93ec8d
 MISC metadata.xml 513 BLAKE2B dbb65f1982fba7751a6c64809adcbe4d44ee4313693b9999dbd8d4e6596325fcbea9d8eef294821967f5ccef4f3f5da32510474dbfcc0d29743d42237e1efa85 SHA512 76e47e89a7eef4aa7156145447003085cea5670881e2228c2b8baad238a4bb1b0efe95c3829656119d9f6d291fd49ca0b424f66d17e8989ec71f39355c504218
diff --git a/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild b/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
index 574518ceb8d8..ac6a9f5aa0c1 100644
--- a/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
+++ b/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.infodrom.org/projects/sysklogd/download/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="logrotate"
 RESTRICT="test"
 
diff --git a/app-admin/sysklogd/sysklogd-2.0.3.ebuild b/app-admin/sysklogd/sysklogd-2.0.3.ebuild
index be89e5f845c6..0830400639b1 100644
--- a/app-admin/sysklogd/sysklogd-2.0.3.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.0.3.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="klogd logger logrotate systemd"
 RESTRICT="test"
 
diff --git a/app-admin/sysklogd/sysklogd-2.1.1.ebuild b/app-admin/sysklogd/sysklogd-2.1.1.ebuild
index bd1e8726ca4d..ad19247bad98 100644
--- a/app-admin/sysklogd/sysklogd-2.1.1.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.1.1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
 else
 	SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/app-admin/sysklogd/sysklogd-2.1.ebuild b/app-admin/sysklogd/sysklogd-2.1.2.ebuild
index fba04a0bc315..ad19247bad98 100644
--- a/app-admin/sysklogd/sysklogd-2.1.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.1.2.ebuild
@@ -7,11 +7,17 @@ inherit flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="Standard log daemons"
 HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
-SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
+
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
+else
+	SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="logger logrotate systemd"
 RESTRICT="test"
 
@@ -30,6 +36,11 @@ pkg_setup() {
 	tc-export CC
 }
 
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
 src_configure() {
 	local myeconfargs=(
 		--runstatedir="${EPREFIX}"/run
diff --git a/app-admin/sysklogd/sysklogd-9999.ebuild b/app-admin/sysklogd/sysklogd-9999.ebuild
index bd1e8726ca4d..ad19247bad98 100644
--- a/app-admin/sysklogd/sysklogd-9999.ebuild
+++ b/app-admin/sysklogd/sysklogd-9999.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
 else
 	SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 LICENSE="BSD"