From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 409E5139694 for ; Sun, 28 May 2017 22:39:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 741B1E0CB9; Sun, 28 May 2017 22:39:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4AE03E0CB9 for ; Sun, 28 May 2017 22:39:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6FDDA3416B7 for ; Sun, 28 May 2017 22:39:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B3E7745F for ; Sun, 28 May 2017 22:39:36 +0000 (UTC) From: "Manuel Rüger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Manuel Rüger" Message-ID: <1496011161.a85313eceb8e3e8d4031051c0d35336e41f42d7d.mrueg@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/openvpn/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/openvpn/openvpn-2.4.2-r1.ebuild net-vpn/openvpn/openvpn-2.4.2.ebuild net-vpn/openvpn/openvpn-9999.ebuild X-VCS-Directories: net-vpn/openvpn/ X-VCS-Committer: mrueg X-VCS-Committer-Name: Manuel Rüger X-VCS-Revision: a85313eceb8e3e8d4031051c0d35336e41f42d7d X-VCS-Branch: master Date: Sun, 28 May 2017 22:39:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 55c1209b-9bce-4867-bd43-1615ec6cf807 X-Archives-Hash: 75cea63a3a2d627d4f7f0fdbdb991aaa commit: a85313eceb8e3e8d4031051c0d35336e41f42d7d Author: Alexander Tsoy tsoy me> AuthorDate: Wed May 17 08:13:29 2017 +0000 Commit: Manuel Rüger gentoo org> CommitDate: Sun May 28 22:39:21 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a85313ec net-vpn/openvpn: fix installation of systemd units and tmpfiles Bug: https://bugs.gentoo.org/618722 net-vpn/openvpn/{openvpn-2.4.2.ebuild => openvpn-2.4.2-r1.ebuild} | 6 ++---- net-vpn/openvpn/openvpn-9999.ebuild | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/net-vpn/openvpn/openvpn-2.4.2.ebuild b/net-vpn/openvpn/openvpn-2.4.2-r1.ebuild similarity index 94% rename from net-vpn/openvpn/openvpn-2.4.2.ebuild rename to net-vpn/openvpn/openvpn-2.4.2-r1.ebuild index 09d3fffa7ae..830141cf3bb 100644 --- a/net-vpn/openvpn/openvpn-2.4.2.ebuild +++ b/net-vpn/openvpn/openvpn-2.4.2-r1.ebuild @@ -66,6 +66,8 @@ src_prepare() { src_configure() { use static && append-ldflags -Xcompiler -static + SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ + TMPFILES_DIR="/usr/lib/tmpfiles.d" \ econf \ $(usex mbedtls '--with-crypto-library=mbedtls' '') \ $(use_enable inotify async-push) \ @@ -110,10 +112,6 @@ src_install() { insinto /usr/share/doc/${PF}/examples doins -r sample contrib fi - - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf - use systemd && systemd_newunit distro/systemd/openvpn-client@.service openvpn-client@.service - use systemd && systemd_newunit distro/systemd/openvpn-server@.service openvpn-server@.service } pkg_postinst() { diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild index 125b8c14fee..8a34713832c 100644 --- a/net-vpn/openvpn/openvpn-9999.ebuild +++ b/net-vpn/openvpn/openvpn-9999.ebuild @@ -64,6 +64,8 @@ src_prepare() { src_configure() { use static && append-ldflags -Xcompiler -static + SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ + TMPFILES_DIR="/usr/lib/tmpfiles.d" \ econf \ --with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \ $(usex mbedtls 'with-crypto-library' 'mbedtls' '' '') \ @@ -109,10 +111,6 @@ src_install() { insinto /usr/share/doc/${PF}/examples doins -r sample contrib fi - - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf - systemd_newunit distro/systemd/openvpn-client@.service openvpn-client@.service - systemd_newunit distro/systemd/openvpn-server@.service openvpn-server@.service } pkg_postinst() {