diff options
Diffstat (limited to 'net-misc/rsync')
| -rw-r--r-- | net-misc/rsync/Manifest | 4 | ||||
| -rw-r--r-- | net-misc/rsync/rsync-3.2.3-r1.ebuild (renamed from net-misc/rsync/rsync-3.2.3.ebuild) | 26 | ||||
| -rw-r--r-- | net-misc/rsync/rsync-9999.ebuild | 26 |
3 files changed, 24 insertions, 32 deletions
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index 29412b0c9695..2629e6b664a9 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -5,6 +5,6 @@ AUX rsyncd.logrotate 105 BLAKE2B 82430036a5ca123ba20bc80040e98869734b3b397440968 AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99acefb38c16b8ae9430a5257440c070b88b71a1295cc6360d89458e1b6696ec9897e722699f162769e SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215 DIST rsync-3.2.3.tar.gz 1069784 BLAKE2B 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25 SHA512 48b68491f3ef644dbbbfcaec5ab90a1028593e02d50367ce161fd9d3d0bd0a3628bc57c5e5dec4be3a1d213f784f879b8a8fcdfd789ba0f99837cba16e1ae70e -EBUILD rsync-3.2.3.ebuild 4489 BLAKE2B 79ad583ddad8ad04d81b6bbc81c2528d5b4d4d22ac496599e34ce3b2debd36d1f8436a25f52a15bf74069e5e63dfea1a8073d2f5586883729cf065dc0d3e9861 SHA512 accd8273fd7877972798f2f57989686ebad200e138bf7aae2cb2e1c11251333491a54da1ec5b365b77e97ae9c5a5b872fa66d643bc010c595efd7e152180c5b3 -EBUILD rsync-9999.ebuild 4498 BLAKE2B 7d88aaf267cb0b8701fcdb13693acdb88f19b7155d3e13f8e3c64ca334ef5fab569543f47973a0f5f0522d2a657267c17e7aa982937b95e998a187d6bb482ddc SHA512 4054e8fd9154880c001e66f059b9e980084e34f9e1c8aacc4fb366668180c2ed0ef011f79ede25d3fc902db170b80327b0df4dbf9ea223d2e098e6f7e7f22166 +EBUILD rsync-3.2.3-r1.ebuild 4158 BLAKE2B 8799f0a6a3dfe57698dac66df7d25144146f89104a58a6d2a5861f5cae1b96c517893f5b780f5345be69987918986ac555a869358a9f192ee34c2d6304ece056 SHA512 eceb635395432be8a69244b75cbe780ce04d9587c190d7a44fe7b3387bd37a397d3f19c3581ec31387625c97f937950422c7f9323ce7bbb58819c4f97e02feb4 +EBUILD rsync-9999.ebuild 4167 BLAKE2B 620f61d37aaeb85d756c2f169b0c96b50bf94495988a17f8ae6fa44356e6347754e0db4511147469258ee5bc8f7ad06aef8c8ccab742280dedd5e805aacd5011 SHA512 86f77788bc0e25448240ab3e7f3d85cafd3be94aaa11ea4e38503e2e9ed196a10c0e6dc9534fc8d09be8aec3cfdeab9246cfb8eb2863710fe468345215b4b355 MISC metadata.xml 654 BLAKE2B 28ea5b4e47a5e420ab64c1b688425995d9ab4e556a27b56b27f512a15ec337aa6a1028449ae0a2f9fa313df2b5b5e98b6cf98a38dac82eb83ca3b4871f3b1514 SHA512 3e23d80d1c4fffdc38287e0f1a09f44040a53eb1b395dd8e9b47aa6d467ed4cf4a0b379ce578f1ecf6438a4f322375b633dc47fd2a50e7badd5f94054bfb558d diff --git a/net-misc/rsync/rsync-3.2.3.ebuild b/net-misc/rsync/rsync-3.2.3-r1.ebuild index a502102dad2c..def4e99c5ffe 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 @@ -90,7 +87,6 @@ src_configure() { fi econf "${myeconfargs[@]}" - [[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625 } src_install() { diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild index 3624db6822a5..8cc796e01d64 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 @@ -90,7 +87,6 @@ src_configure() { fi econf "${myeconfargs[@]}" - [[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625 } src_install() { |