From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1216961-garchives=archives.gentoo.org@lists.gentoo.org>
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 09194138359
for <garchives@archives.gentoo.org>; Thu, 22 Oct 2020 18:17:21 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4B01BE0857;
Thu, 22 Oct 2020 18:17:20 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 2CD29E0857
for <gentoo-commits@lists.gentoo.org>; Thu, 22 Oct 2020 18:17:20 +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 8351033BF05
for <gentoo-commits@lists.gentoo.org>; Thu, 22 Oct 2020 18:17:18 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 103783AB
for <gentoo-commits@lists.gentoo.org>; Thu, 22 Oct 2020 18:17:17 +0000 (UTC)
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" <floppym@gentoo.org>
Message-ID: <1603390572.ccdef30aadb3c545028c23ee0f104b6d77c2ad7a.floppym@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-misc/rsync/rsync-3.2.3-r1.ebuild net-misc/rsync/rsync-3.2.3.ebuild net-misc/rsync/rsync-9999.ebuild
X-VCS-Directories: net-misc/rsync/
X-VCS-Committer: floppym
X-VCS-Committer-Name: Mike Gilbert
X-VCS-Revision: ccdef30aadb3c545028c23ee0f104b6d77c2ad7a
X-VCS-Branch: master
Date: Thu, 22 Oct 2020 18:17:17 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 63d20a0e-47c9-491b-8d7e-06782f79bf61
X-Archives-Hash: ead4ed2e734821428484e5b3141323ff
commit: ccdef30aadb3c545028c23ee0f104b6d77c2ad7a
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 22 18:16:12 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Oct 22 18:16:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccdef30a
net-misc/rsync: drop static USE flag
Closes: https://bugs.gentoo.org/741116
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../{rsync-3.2.3.ebuild => rsync-3.2.3-r1.ebuild} | 25 ++++++++++------------
net-misc/rsync/rsync-9999.ebuild | 25 ++++++++++------------
2 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/net-misc/rsync/rsync-3.2.3.ebuild b/net-misc/rsync/rsync-3.2.3-r1.ebuild
similarity index 85%
rename from net-misc/rsync/rsync-3.2.3.ebuild
rename to net-misc/rsync/rsync-3.2.3-r1.ebuild
index a502102dad2..1d28b731fa4 100644
--- a/net-misc/rsync/rsync-3.2.3.ebuild
+++ b/net-misc/rsync/rsync-3.2.3-r1.ebuild
@@ -25,24 +25,22 @@ fi
LICENSE="GPL-3"
SLOT="0"
IUSE_CPU_FLAGS_X86=" sse2"
-IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
+IUSE="acl examples iconv ipv6 libressl lz4 ssl stunnel system-zlib xattr xxhash zstd"
IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
- lz4? ( app-arch/lz4[static-libs(+)] )
+RDEPEND="acl? ( virtual/acl )
+ lz4? ( app-arch/lz4 )
ssl? (
- !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
- libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
)
- system-zlib? ( sys-libs/zlib[static-libs(+)] )
- xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
- xxhash? ( dev-libs/xxhash[static-libs(+)] )
- zstd? ( >=app-arch/zstd-1.4[static-libs(+)] )
- >=dev-libs/popt-1.5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+ system-zlib? ( sys-libs/zlib )
+ xattr? ( kernel_linux? ( sys-apps/attr ) )
+ xxhash? ( dev-libs/xxhash )
+ zstd? ( >=app-arch/zstd-1.4 )
+ >=dev-libs/popt-1.5
iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
+DEPEND="${RDEPEND}"
if [[ "${PV}" == *9999 ]] ; then
BDEPEND="${PYTHON_DEPS}
@@ -66,7 +64,6 @@ src_prepare() {
}
src_configure() {
- use static && append-ldflags -static
local myeconfargs=(
--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
--without-included-popt
diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild
index 3624db6822a..e2cd8e20135 100644
--- a/net-misc/rsync/rsync-9999.ebuild
+++ b/net-misc/rsync/rsync-9999.ebuild
@@ -25,24 +25,22 @@ fi
LICENSE="GPL-3"
SLOT="0"
IUSE_CPU_FLAGS_X86=" sse2"
-IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
+IUSE="acl examples iconv ipv6 libressl lz4 ssl stunnel system-zlib xattr xxhash zstd"
IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
- lz4? ( app-arch/lz4[static-libs(+)] )
+RDEPEND="acl? ( virtual/acl )
+ lz4? ( app-arch/lz4 )
ssl? (
- !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
- libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
)
- system-zlib? ( sys-libs/zlib[static-libs(+)] )
- xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
- xxhash? ( dev-libs/xxhash[static-libs(+)] )
- zstd? ( >=app-arch/zstd-1.4[static-libs(+)] )
- >=dev-libs/popt-1.5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+ system-zlib? ( sys-libs/zlib )
+ xattr? ( kernel_linux? ( sys-apps/attr ) )
+ xxhash? ( dev-libs/xxhash )
+ zstd? ( >=app-arch/zstd-1.4 )
+ >=dev-libs/popt-1.5
iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
+DEPEND="${RDEPEND}"
if [[ "${PV}" == *9999 ]] ; then
BDEPEND="${PYTHON_DEPS}
@@ -66,7 +64,6 @@ src_prepare() {
}
src_configure() {
- use static && append-ldflags -static
local myeconfargs=(
--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
--without-included-popt