gentoo resync : 18.12.2017

4 files changed, 6 insertions, 78 deletions

diff --git a/sys-apps/paxctld/Manifest b/sys-apps/paxctld/Manifest
index 7a398ca24dd5..7cea5684448b 100644
--- a/sys-apps/paxctld/Manifest
+++ b/sys-apps/paxctld/Manifest
@@ -1,7 +1,3 @@
-DIST paxctld_1.1.orig.tar.gz 15977 BLAKE2B 695e1f9b09fc11ba3bebb5c5ad3f283f1572382f9ca6c1b532bee1583794ca715223e2dbe77d46588fd1c26dfe395535dabe6431cdeb59e0dad22a8c2f15a2cc SHA512 82b18d1b5d47831ac865b149dbd02c35062baf3da755312bbc2d7adeb31308b995be3441adb6d4a33ba19e79413df77bb4a7bc71d202bef6e1eb25f2c4f31631
-DIST paxctld_1.2.1.orig.tar.gz 16347 BLAKE2B fdaceeb76110a128c6e6cc8eb65f903ab9e4df50ca6e4f95f9aedcb2c71f039c939c3112e4fdb9415f53c9ad3e7bbb2f8f3882806c7c93209a3f05efe5d2c5c8 SHA512 3daa072155d7eef6911fa716e2ffefe503d4351d375dfc89efaad0434da7e9f879a07f0da0f58f3a70361c5661cb1d5760b8c85fa88dc086dc8c1f113fdaa6a1
-DIST paxctld_1.2.orig.tar.gz 16080 BLAKE2B 57cca82b7c60cddacc9fc3e4aa03d641aee33c78b269836b60e34d75b02174ebe89ee79aeec806fd911f236e6a60cf6eb81995406034e352d99d0c875000d605 SHA512 9b181fdc9e6b4d76fc7670e0773263c598164f90fe0db0c180601e8ba68e9baec4ef23281bba9ebac385e53edc20d8b79fbd7c9646e057334c21c6602013e198
-EBUILD paxctld-1.1.ebuild 720 BLAKE2B 46e2c5c87d26622cec00b94bd23a911a1020255ab42ac2273daef6a57b182a0eab08c9d203c11a47f3208392b98b327fe547fcf5e3098c28136a4bfe791db400 SHA512 b924d46a92be6099e38ec63bb3c2c7cb0dc38d456bc4fc71c997cb64a1711efefa5779c2c1b3acac812429fcab7ec314a8530d27ff75e50fccf2a0550ef3e6d5
-EBUILD paxctld-1.2.1.ebuild 720 BLAKE2B 46e2c5c87d26622cec00b94bd23a911a1020255ab42ac2273daef6a57b182a0eab08c9d203c11a47f3208392b98b327fe547fcf5e3098c28136a4bfe791db400 SHA512 b924d46a92be6099e38ec63bb3c2c7cb0dc38d456bc4fc71c997cb64a1711efefa5779c2c1b3acac812429fcab7ec314a8530d27ff75e50fccf2a0550ef3e6d5
-EBUILD paxctld-1.2.ebuild 720 BLAKE2B 46e2c5c87d26622cec00b94bd23a911a1020255ab42ac2273daef6a57b182a0eab08c9d203c11a47f3208392b98b327fe547fcf5e3098c28136a4bfe791db400 SHA512 b924d46a92be6099e38ec63bb3c2c7cb0dc38d456bc4fc71c997cb64a1711efefa5779c2c1b3acac812429fcab7ec314a8530d27ff75e50fccf2a0550ef3e6d5
+DIST paxctld_1.2.2.orig.tar.gz 16302 BLAKE2B 051be5210704a0a8447eab46f3a8528fccbb43b6ab60725a38e6210da68ae0e60b83e563ab4796dbde9bccce93982ebfd14b4288466b5531c5b1e261a4020e6c SHA512 f3944b752bcaab2644c640a7992d8f267e882ff8528b85664cc3d7926de042d3540044030bac2f5c64121ff5ed0caff60ca41d3837a77fe2cdf19ad58c6b7c81
+EBUILD paxctld-1.2.2.ebuild 734 BLAKE2B 9444984ed05de69499fb53c199c30ae3de416dd69c16f357f58a7ca199aa8ef75e62fd1d118db98555ec8650df6000efe1eab186aa4db28a8dcddbb2d4c29c45 SHA512 eff832df5a89bbb07674f1d315ab2c4a701b1477577c806395b579cdbec07a351d1b315c9ec6924a19e8a39c2e0f224082347bec515acd715b11116491dc9e83
 MISC metadata.xml 363 BLAKE2B 27b81c37d5a0f685942eda5610d73a0933a7654282c851a92bc352f27676c609452b6c7a3f3bb94c0fa358fa360c5c113aac6acd24e186347912f61cf4a0bdf3 SHA512 b848c5de5ed09c4843c3e75d59ea4697c5d1c1fa2ce8c9e9a0bf38b5102d57f25aa626f3c6295f4f3a345b1cedc15553fb45b460bf41e73df43eb2eef6e00281
diff --git a/sys-apps/paxctld/paxctld-1.2.1.ebuild b/sys-apps/paxctld/paxctld-1.2.1.ebuild
deleted file mode 100644
index 7d222c6d4c29..000000000000
--- a/sys-apps/paxctld/paxctld-1.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit systemd
-
-DESCRIPTION="PaX flags maintenance daemon"
-HOMEPAGE="http://www.grsecurity.net/"
-SRC_URI="https://www.grsecurity.net/${PN}/${PN}_${PV}.orig.tar.gz
-	https://dev.gentoo.org/~blueness/hardened-sources/${PN}/${PN}_${PV}.orig.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="pam"
-
-RDEPEND=""
-DEPEND=""
-
-src_prepare() {
-	# Respect Gentoo flags and don't strip
-	sed -i \
-		-e '/^CC/d' \
-		-e '/^CFLAGS/d' \
-		-e '/^LDFLAGS/d' \
-		-e '/STRIP/d' \
-		Makefile
-}
-
-src_install() {
-	default
-
-	systemd_dounit "${S}"/rpm/${PN}.service
-}
diff --git a/sys-apps/paxctld/paxctld-1.1.ebuild b/sys-apps/paxctld/paxctld-1.2.2.ebuild
index 7d222c6d4c29..02319f8ac64a 100644
--- a/sys-apps/paxctld/paxctld-1.1.ebuild
+++ b/sys-apps/paxctld/paxctld-1.2.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 inherit systemd
 
@@ -26,6 +26,8 @@ src_prepare() {
 		-e '/^LDFLAGS/d' \
 		-e '/STRIP/d' \
 		Makefile
+
+	eapply_user
 }
 
 src_install() {
diff --git a/sys-apps/paxctld/paxctld-1.2.ebuild b/sys-apps/paxctld/paxctld-1.2.ebuild
deleted file mode 100644
index 7d222c6d4c29..000000000000
--- a/sys-apps/paxctld/paxctld-1.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit systemd
-
-DESCRIPTION="PaX flags maintenance daemon"
-HOMEPAGE="http://www.grsecurity.net/"
-SRC_URI="https://www.grsecurity.net/${PN}/${PN}_${PV}.orig.tar.gz
-	https://dev.gentoo.org/~blueness/hardened-sources/${PN}/${PN}_${PV}.orig.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="pam"
-
-RDEPEND=""
-DEPEND=""
-
-src_prepare() {
-	# Respect Gentoo flags and don't strip
-	sed -i \
-		-e '/^CC/d' \
-		-e '/^CFLAGS/d' \
-		-e '/^LDFLAGS/d' \
-		-e '/STRIP/d' \
-		Makefile
-}
-
-src_install() {
-	default
-
-	systemd_dounit "${S}"/rpm/${PN}.service
-}