gentoo resync : 30.09.2018

5 files changed, 15 insertions, 61 deletions

diff --git a/dev-libs/openct/Manifest b/dev-libs/openct/Manifest
index f5a08fe118bc..94284a823361 100644
--- a/dev-libs/openct/Manifest
+++ b/dev-libs/openct/Manifest
@@ -1,5 +1,4 @@
-AUX openct.rc 484 BLAKE2B 95296abb9d8ec3fd6c3305f880161286177968d12b8af3d7ddc76bce1811b1319a8e07d6936956219de03327f9b9d7deccc7b9affbdd412a61ab74459a4033d4 SHA512 25ea30add05fc5658187e2a3b44fd0f4038873dd9f5d8917c2cbe3ee9ff6514197c8a7eca269634bd2629e8263973cfcbe25ce54f0d5a47a07fc72bd84cbf4da
-AUX openct.rc.2 541 BLAKE2B b9f487432383b07282accc01d9f804bc114503cde32e1e2c5128003c9cddbab4b94e64b677ef3104b5d1791383ea521d0a08381d0f1f9d4389ab28d8469fad95 SHA512 0703dddea09de62a25abbeab1514b265ca2207eef558d42a7cba35e6a1d9d720ab5664f417e16df8e263d3a7742eaa89b34432beac81a2a5851473e645072c5d
+AUX openct.initd 502 BLAKE2B 5f583c50b138d9017aecbda25aeb74f09643ea461be3449c50c4ca61a0379c50bf22036cfe46ec3e606519ddd94a49add053da48f8987d5e6f2e790408ad48d5 SHA512 18cb14070252c3f1babe117d5f6fe91639b1bdb07fab953573ba143e5cc49b55964ae56427f0cc741fb3d90e54eb2eec863864a340229929ad5f2aab21723f23
 DIST openct-0.6.20.tar.gz 702818 BLAKE2B 13637fa914394e1e553d750062535c879ba11c6587c42570e2bc92c4af9f732a9b0dfc06e2140f4965480363f8d65bc5831f905910d734c36034ccf1916ad302 SHA512 5175b418847200dbd4af0d8ab09546d94568639c67db67bdea93c68cb042c7ef901bb356784d6b1d9f4de914535eee5a450b39a15d1ab9a676ffce790a408a3e
-EBUILD openct-0.6.20-r4.ebuild 2072 BLAKE2B 3fd05b6e1ebfaae38532a617a3ad3e2170ac46fb3ffb43c1e7eff9a238780718528cf2be10cf0a441b5fc1c2bd4095860473b6948e74711c7927c91781e5ad98 SHA512 89b766b866135d070537f20057c45ac5abcf3ccf0023b9d1ceb8f990df00c84566812ec6f1ac2e2316f17a7d1688a8de7e5a5839ff8f3beaf3739a3041d269f3
-MISC metadata.xml 729 BLAKE2B 7dcf616566e472bbd409f7fe0e5ceacba97aa730eda70de860ad284a49e26359e92533d09a5f9d5ee0fc493e79d9b53bee43a15cc15a65a1bbb748baa0d4da0c SHA512 6c5ecfcb09ebfd79ddd7d68243d16fc5bcf556b833d84bf167cfc06715d47cf078005acfa5811a40a8f4f422f7c02d3fbb9d79846c8469843a241e137bd93365
+EBUILD openct-0.6.20-r4.ebuild 1805 BLAKE2B 6faebe36e660b15fd98c49cb2e1b5a3b423278e205f84b652747b62ba89a1f2b49f3172f9a365a442233677324ca3e183038d25b7a4f453ece26d8e04600ce1d SHA512 9886983cab35370185aad4560a66000a15277bd47961692870e8aece959133e1a869f825f01a6f72b898e59d3607703940930ec5564ac4c329ad907296f7647f
+MISC metadata.xml 632 BLAKE2B 4f55695056c4bf2b65a264e6fe4e97619e7c033c21cb2d0f7fe9220cc329650f2bf7031ba0d592be18726d1cfc5c78d8ad153678b6a5a401b34e9e746eb07fcb SHA512 8366cc1730d888c16122a3e3a12514e5953b6470c8968b9119e3c987dc8538073e6bf6167fd179077d74332494f06e8652fc055a450651c984a62bc34f94ce06
diff --git a/dev-libs/openct/files/openct.rc.2 b/dev-libs/openct/files/openct.initd
index d07cc6116262..ecf574f2e31c 100644
--- a/dev-libs/openct/files/openct.rc.2
+++ b/dev-libs/openct/files/openct.initd
@@ -1,24 +1,20 @@
 #!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
 	need localmount
 }
 
-checkconfig() {
+start_pre() {
 	if [ ! -e /etc/openct.conf ] ; then
 		eerror "You need an /etc/openct.conf file to run OpenCT"
 		return 1
 	fi
-	return 0
+	checkpath -d -m 0750 -o openctd:openct /var/run/openct
 }
 
 start() {
-	checkconfig || return 1
-
-	checkpath -d -m 0750 -o openctd:openct /var/run/openct
-
 	ebegin "Starting OpenCT"
 	/usr/sbin/openct-control init
 	eend $?
diff --git a/dev-libs/openct/files/openct.rc b/dev-libs/openct/files/openct.rc
deleted file mode 100644
index b3ff33e974eb..000000000000
--- a/dev-libs/openct/files/openct.rc
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-}
-
-checkconfig() {
-	if [ ! -e /etc/openct.conf ] ; then
-		eerror "You need an /etc/openct.conf file to run OpenCT"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting OpenCT"
-	/usr/sbin/openct-control init
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping OpenCT"
-	/usr/sbin/openct-control shutdown
-	eend $?
-}
diff --git a/dev-libs/openct/metadata.xml b/dev-libs/openct/metadata.xml
index 38be29df0b18..769c5bd3d17e 100644
--- a/dev-libs/openct/metadata.xml
+++ b/dev-libs/openct/metadata.xml
@@ -13,9 +13,6 @@
 		<flag name="debug">
 			Add debug output to the driver library for pcsc-lite.
 		</flag>
-		<flag name="udev">
-			Install rules for <pkg>sys-fs/udev</pkg> to auto-start openct.
-		</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">OpenSC/openct</remote-id>
diff --git a/dev-libs/openct/openct-0.6.20-r4.ebuild b/dev-libs/openct/openct-0.6.20-r4.ebuild
index b675d41066d2..cb39d7698bf9 100644
--- a/dev-libs/openct/openct-0.6.20-r4.ebuild
+++ b/dev-libs/openct/openct-0.6.20-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic ltprune multilib udev user
+inherit flag-o-matic multilib udev user
 
 DESCRIPTION="library for accessing smart card terminals"
 HOMEPAGE="https://github.com/OpenSC/openct/wiki"
@@ -13,22 +13,13 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="doc pcsc-lite usb debug +udev"
+IUSE="doc pcsc-lite usb debug"
 
-# Drop the libtool dep once libltdl goes stable.
 RDEPEND="pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= )
 	usb? ( virtual/libusb:0 )
 	dev-libs/libltdl:0="
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-# udev is not required at all at build-time as it's only a matter of
-# installing the rules; add openrc for the checkpath used in the new
-# init script
-RDEPEND="${RDEPEND}
-	udev? ( virtual/udev )
-	sys-apps/openrc"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 pkg_setup() {
 	enewgroup openct
@@ -56,12 +47,12 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 	rm "${D}"/usr/$(get_libdir)/openct-ifd.*
 
-	use udev && udev_newrules etc/openct.udev 70-openct.rules
+	udev_newrules etc/openct.udev 70-openct.rules
 
-	newinitd "${FILESDIR}"/openct.rc.2 openct
+	newinitd "${FILESDIR}"/openct.initd openct
 }
 
 pkg_postinst() {