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 A0C7C138332 for ; Sun, 14 Jan 2018 15:48:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED45FE0903; Sun, 14 Jan 2018 15:48:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CE349E0903 for ; Sun, 14 Jan 2018 15:48:34 +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 BD332335C51 for ; Sun, 14 Jan 2018 15:48:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58F251B8 for ; Sun, 14 Jan 2018 15:48:32 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1515944908.2acbbbc26d72a0e838067e593e43d85864979fb6.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/uftp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/uftp/uftp-3.7.1.ebuild net-misc/uftp/uftp-4.9.4.ebuild X-VCS-Directories: net-misc/uftp/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: 2acbbbc26d72a0e838067e593e43d85864979fb6 X-VCS-Branch: master Date: Sun, 14 Jan 2018 15:48:32 +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: 7c34fae0-4fb1-4571-b187-6faba2bc13fa X-Archives-Hash: af463b9cc628acf6bbf0587ab3f9c4fa commit: 2acbbbc26d72a0e838067e593e43d85864979fb6 Author: Azamat H. Hackimov gmail com> AuthorDate: Fri Dec 15 06:02:40 2017 +0000 Commit: Patrice Clement gentoo org> CommitDate: Sun Jan 14 15:48:28 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2acbbbc2 net-misc/uftp: additional enhancements. More fixes for slot dependency, used PATCHES, migration to EAPI 6. Package-Manager: Portage-2.3.13, Repoman-2.3.3 net-misc/uftp/uftp-3.7.1.ebuild | 12 ++++++------ net-misc/uftp/uftp-4.9.4.ebuild | 11 +++++------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/net-misc/uftp/uftp-3.7.1.ebuild b/net-misc/uftp/uftp-3.7.1.ebuild index 4b12b671c17..41aed30ba67 100644 --- a/net-misc/uftp/uftp-3.7.1.ebuild +++ b/net-misc/uftp/uftp-3.7.1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Encrypted UDP based FTP with multicast" HOMEPAGE="http://www.tcnj.edu/~bush/uftp.html" @@ -14,12 +14,12 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+server ssl" -DEPEND="ssl? ( dev-libs/openssl:0 )" +DEPEND="ssl? ( dev-libs/openssl:0= )" RDEPEND="${DEPEND}" -src_prepare() { - epatch "${FILESDIR}/${PN}-3.7_makefile.patch" -} +PATCHES=( + "${FILESDIR}/${PN}-3.7_makefile.patch" +) src_compile() { use ssl || local opt="NO_ENCRYPTION=1" diff --git a/net-misc/uftp/uftp-4.9.4.ebuild b/net-misc/uftp/uftp-4.9.4.ebuild index ffc9e730c61..74358db417d 100644 --- a/net-misc/uftp/uftp-4.9.4.ebuild +++ b/net-misc/uftp/uftp-4.9.4.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Encrypted UDP based FTP with multicast" HOMEPAGE="http://uftp-multicast.sourceforge.net/" @@ -14,13 +14,12 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+server ssl" -DEPEND="ssl? ( dev-libs/openssl:0 )" +DEPEND="ssl? ( dev-libs/openssl:0= )" RDEPEND="${DEPEND}" -src_prepare() { - epatch "${FILESDIR}/${P}_makefile.patch" - default -} +PATCHES=( + "${FILESDIR}/${P}_makefile.patch" +) src_compile() { use ssl || local opt="NO_ENCRYPTION=1"