diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2020-10-22 14:16:12 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2020-10-22 14:16:12 -0400 |
| commit | ccdef30aadb3c545028c23ee0f104b6d77c2ad7a (patch) | |
| tree | bdaac5e49d683739303342830a1a6dbada9268b2 /net-misc | |
| parent | dev-util/catalyst: Check for UTS_NS IPC_NS Kconfig options (diff) | |
| download | gentoo-ccdef30aadb3c545028c23ee0f104b6d77c2ad7a.tar.gz gentoo-ccdef30aadb3c545028c23ee0f104b6d77c2ad7a.tar.bz2 gentoo-ccdef30aadb3c545028c23ee0f104b6d77c2ad7a.zip | |
net-misc/rsync: drop static USE flag
Closes: https://bugs.gentoo.org/741116
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/rsync/rsync-3.2.3-r1.ebuild (renamed from net-misc/rsync/rsync-3.2.3.ebuild) | 25 | ||||
| -rw-r--r-- | 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 index a502102dad2c..1d28b731fa4b 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 3624db6822a5..e2cd8e201356 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 |