gentoo resync : 06.01.2018

5 files changed, 46 insertions, 2 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 5595f2ae4ff7..1188a2e32bb6 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 6c278b81c3fc..920d56a1c96c 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -4,6 +4,6 @@ DIST keepalived-1.2.24.tar.gz 601873 BLAKE2B d2bbf6189f789dd2b61207e80d4262ca6ff
 DIST keepalived-1.3.5.tar.gz 683183 BLAKE2B 6242cbe61e8cbe80d094dbad3882b0116fc3cd129c5f0f082ec821d794dff53ab22a661feb1c11d2c5386bcea3c2727ed899ea2968dfa8a7ed4272b8596f0839 SHA512 ebd710167becd4b99b665877953d19477c11f1d1c736eb580a05dedd4946363b756553e20607f34aa6c35f57b7252d8a22287beedc316b62a745fccc4243a720
 DIST keepalived-1.4.0.tar.gz 731936 BLAKE2B b6adf7925cc81a4c6e6f69afaa28bd72f6c13076be03f2971775a63c823dac5c6fec46e0b6724af1a7ac9036a749b285429ba3ffad2d9ecc39ccc213cbe2cb28 SHA512 485eda5912d68663f011b8e79263ce1e38ed785919055b113536f63aab52c0d5f581a9ab1951c7f62362ac0a68ee921efc41934a4e535d6df7e59249ef32d6d3
 EBUILD keepalived-1.2.24.ebuild 1412 BLAKE2B 4319c70c9cf0acae2ed7e6cf283fee6aa86b2149367b94ba7500b5ac885a723cd6fc266f57c1e25618394f1f0ff114019b73c3ef1ea7fbf622870ee2a67973fb SHA512 3c4a6951cf0cb39bdd604af88f41f3895d5cf72c283d022b506c0fae841cb86adda7b11aa1d23247be17e26cd6cdf826fd45bae39b018f3477820a4dd2c26588
-EBUILD keepalived-1.3.5.ebuild 1539 BLAKE2B d69b34a4ca3dde74e1557bd6e11aa6766f44992b64c3c45baa28c0e78463b2f003570d7fbc6c4859d9082de45c0751bbe12dfb3e6943bb89f913a019262b3e2a SHA512 df18b8cae956594c478d305667e13d17ad615f2f9359a2b8d32f144750fa5d57b1e1232e87d9ebdde71173d0ababcfff6ea49f3388ae239dafb4b4b4a48e8295
+EBUILD keepalived-1.3.5.ebuild 1537 BLAKE2B 798886e3536651e6ab49896ebc9a188310f0356f68849dce6c4424f8f6fe2472d97fb909e2aa24c5f9e9cb002338dc33ac1c0e91bb2e0bf2da45c8727942f4ba SHA512 3ae55193581379e963aa9223d7d6c57c62729ab7a2d948e8da5aa2ce3e72166cbc599a67525c30f62b82e5ea346c88668167d8712403295b601655e987d0a7b4
 EBUILD keepalived-1.4.0.ebuild 1597 BLAKE2B 603fcdc04cc9906fd72a6075fbf1646569aa85cc6194a04db9b16cdbadd976bdfdb466e231cd0252a6ca45b20b807eace3c532fd0d6044c06247a67088e8876d SHA512 a88d95101d4a108b791d64050097fa6db3885e7f7f59b6c97d0068fd6823781b504e8291cbc114e5c1ea9c90641c6b011f37ff74751019b164dd15ab2c13a54a
 MISC metadata.xml 471 BLAKE2B 2dfba9fe3d7d39f8484baa1f1be9a59b5da8f6cc0da4a3af1ec07e5daf4f2522f802af51048463dfad54bfbffe0286ce8a3b9ff8889139ca32693bad378937e3 SHA512 203c93aaf60f7d0dcc6150fff2a4a3dd61fa4d6cfab26452d8efeed1d79096b17db7e47700582475b7e6607ae70521c32cc91015e7852dde22a7d828740946af
diff --git a/sys-cluster/keepalived/keepalived-1.3.5.ebuild b/sys-cluster/keepalived/keepalived-1.3.5.ebuild
index efb2b36f7ed5..bc1103649b3d 100644
--- a/sys-cluster/keepalived/keepalived-1.3.5.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc ~x86"
 IUSE="dbus debug ipv6 snmp"
 
 RDEPEND="dev-libs/libnl:=
diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index b81ad8a0e9e5..6f8dedf0dee4 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,6 +1,8 @@
 AUX singularity-2.3.1-slurm.patch 1597 BLAKE2B d8e7a03909197e3743639edf8bd5042238d4d7bd1bab00a2443044fdfdf6dbeb6f3837899a6659d80174244a211f90feee0a3cbd7c9b1ebe7f6cee49486f0f32 SHA512 174dc15dcd5bff0a0b6796d4623f829fb4b7d0e8483308cafe179beb6321d31cf3ee9913decd91aebac0689a62181096cc0ac3a283f8c88927c00e113a476224
 DIST singularity-2.3.1.tar.gz 643021 BLAKE2B 4c5648330005af22515435d5daf4a27e39b79cfa52de36bdc48b63877b703329f36c81f782c1e9d8394b6668e8503961ef682d5bd71f48f665b3691df8f70a93 SHA512 36c581e8dba57d133013c2fcfea26886b54a1a9a9165b011d2cebacb2a6249fe0f8e5aa91ed90f7a18855c658300682436c431a226629408f31422cc8a036600
+DIST singularity-2.4.2.tar.gz 691214 BLAKE2B c82f48d20d0a0b6e8086e275fa1621b0e3cae5ecd515719543d69f0ba286f3c09d9fc479e8be3b78921ef32014325dcb5482d2ce813e4388db683a408d27e3a7 SHA512 2c26af6cd092bc030113cdb2a79430d82d51b7438330a6cd0706e46438296feed4d86b08d57efff0b7df148ca0e08f706b8a214f03439bccd7d196714cd06dbc
 DIST singularity-2.4.tar.gz 689760 BLAKE2B 03ec88405bb1316ae3098c8ec9620f7e0dac8417b10c7d20cf0411983f0089e8e32e58a4e2ca5c4c40aeebaf044cc3d45261d5635146de6b043f33f92871a227 SHA512 b445e73d9794f344ab72ce17d8f802390d0c0c153791b837f416254eadabf19365f1abd29f0b498be5486b600f32cd7fe53e5dc131eee3465ab890c9d6b171f4
 EBUILD singularity-2.3.1.ebuild 952 BLAKE2B 13fb3009a33dfcd20eba0da765098db7446ba930effa41e54c2b4f4deb28ddde9a0f7ca1fa06b82d22e38567d1138913f38fa4b0180db59daf219d5dc3e2a142 SHA512 60ed34f1ab7543ae5f728b51595640dc671ebb514028dce2fb82c72f1d192ca896c761fe38b4c786641f1df678adfd45d855eac262b68ee00c2b1048072e6d2c
+EBUILD singularity-2.4.2.ebuild 859 BLAKE2B b7e4e8ddd3b55676d27b611be5e0e166e7f8540d0d6471428933d0382d1ba2681d4b4d8a9cf6d0d48f3a181b930f49a8a588c8d7555133bfa16b424c68083467 SHA512 08a662fc6a1fe33f5675b48f20028763ed64184b9c8873ffb317362d652a7ec8de4a1a23bf8358f1ef117b08ac78ada5318b41a4a1e9acd16d8ae221ea885f07
 EBUILD singularity-2.4.ebuild 859 BLAKE2B 2ea5361fc3c020c2ba8f89091e837bb4c39cbf924aba8cb820c49cb65d7ab7c7072da02c96be0dda4daa6d9fd608b9f7e6f9dbe7c5001095c0610732e31087c3 SHA512 e031db7fa7673b631096714279b4bcb8372386984b5606aa7c6811c240e4fb47c8860e4bf5e4bd2c66295c0004489f95b74135f66ce056567f179b5f34b11606
 MISC metadata.xml 440 BLAKE2B 2e25f2660dc2bb7db8b59f033737cad8486848a3f6e04301a782439cd6451d5b2915a1558a5d1d78cad15083d212f18a6872c779141957cd45866f97ab964b13 SHA512 d8363de6994afc68b776ee6330a56b6a5e6d3156f440633c01160a9e9967654e4a564e235fc126be9400f436ec099fb05bd7754739cf8221666913b244d3b559
diff --git a/sys-cluster/singularity/singularity-2.4.2.ebuild b/sys-cluster/singularity/singularity-2.4.2.ebuild
new file mode 100644
index 000000000000..458dfc186eb9
--- /dev/null
+++ b/sys-cluster/singularity/singularity-2.4.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit autotools eutils python-single-r1
+
+DESCRIPTION="Application containers for Linux"
+HOMEPAGE="http://singularity.lbl.gov/"
+SRC_URI="https://github.com/${PN}ware/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="cctbx-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples static-libs +suid"
+
+RDEPEND="
+	sys-fs/squashfs-tools:0
+"
+
+src_prepare() {
+	default
+	# automake version hardcoding
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-userns \
+		$(usex suid "" "--disable-suid") \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	MAKEOPTS+=" -j1"
+	default
+	prune_libtool_files
+	dodoc README.md CONTRIBUTORS.md CONTRIBUTING.md
+	use examples && dodoc -r examples
+}