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 247721382C5 for ; Fri, 12 Mar 2021 11:29:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68AD2E0AC6; Fri, 12 Mar 2021 11:29: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 50427E0AC6 for ; Fri, 12 Mar 2021 11:29:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 72801340BBD for ; Fri, 12 Mar 2021 11:29:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD2F4597 for ; Fri, 12 Mar 2021 11:29:16 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1615548546.eabc7b7cbc5bedb05f248a3b8c0d5d66ba5cdce3.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/dar/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-backup/dar/dar-2.6.13-r1.ebuild X-VCS-Directories: app-backup/dar/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: eabc7b7cbc5bedb05f248a3b8c0d5d66ba5cdce3 X-VCS-Branch: master Date: Fri, 12 Mar 2021 11:29:16 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 141c7b31-d91f-4cc1-a15a-ac774caa3979 X-Archives-Hash: 6660c64df9b8a6c0ad4a7157c37f75a3 commit: eabc7b7cbc5bedb05f248a3b8c0d5d66ba5cdce3 Author: Viorel Munteanu gmail com> AuthorDate: Sat Mar 6 14:29:27 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Fri Mar 12 11:29:06 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eabc7b7c app-backup/dar: remove USE static and static-libs Closes: https://bugs.gentoo.org/767454 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Viorel Munteanu gmail.com> Signed-off-by: Joonas Niilola gentoo.org> app-backup/dar/dar-2.6.13-r1.ebuild | 57 +++++++++++++------------------------ 1 file changed, 19 insertions(+), 38 deletions(-) diff --git a/app-backup/dar/dar-2.6.13-r1.ebuild b/app-backup/dar/dar-2.6.13-r1.ebuild index c343b6ed056..d082367d6a5 100644 --- a/app-backup/dar/dar-2.6.13-r1.ebuild +++ b/app-backup/dar/dar-2.6.13-r1.ebuild @@ -12,47 +12,38 @@ SRC_URI="mirror://sourceforge/dar/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux" -IUSE="curl dar32 dar64 doc gcrypt gpg lzo nls rsync static static-libs xattr" +IUSE="curl dar32 dar64 doc gcrypt gpg lzo nls rsync xattr" RESTRICT="test" # need to be run as root RDEPEND=" + app-arch/bzip2:= + app-arch/xz-utils:= + sys-libs/libcap >=sys-libs/zlib-1.2.3:= - !static? ( - app-arch/bzip2:= - app-arch/xz-utils:= - sys-libs/libcap - curl? ( net-misc/curl ) - gcrypt? ( dev-libs/libgcrypt:0= ) - gpg? ( app-crypt/gpgme ) - lzo? ( dev-libs/lzo:= ) - rsync? ( net-libs/librsync:= ) - xattr? ( sys-apps/attr:= ) - )" - -DEPEND=" - ${RDEPEND} - static? ( - app-arch/bzip2[static-libs] - app-arch/xz-utils[static-libs] - sys-libs/libcap[static-libs] - sys-libs/zlib[static-libs] - curl? ( net-misc/curl[static-libs] ) - lzo? ( dev-libs/lzo[static-libs] ) - xattr? ( sys-apps/attr[static-libs] ) - ) + curl? ( net-misc/curl ) + gcrypt? ( dev-libs/libgcrypt:0= ) + gpg? ( app-crypt/gpgme ) + lzo? ( dev-libs/lzo:= ) + rsync? ( net-libs/librsync:= ) + xattr? ( sys-apps/attr:= ) " + +DEPEND="${RDEPEND}" + BDEPEND=" + doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext virtual/libintl ) - doc? ( app-doc/doxygen ) " REQUIRED_USE="?? ( dar32 dar64 ) gpg? ( gcrypt )" +DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) + src_configure() { # configure.ac is totally funked up regarding the AC_ARG_ENABLE # logic. @@ -61,7 +52,9 @@ src_configure() { # Do _not_ use $(use_enable) until you have verified that the # logic has been fixed by upstream. local myconf=( + --disable-dar-static --disable-python-binding + --disable-static --disable-upx $(usex curl '' --disable-libcurl-linking) $(usex dar32 --enable-mode=32 '') @@ -79,27 +72,15 @@ src_configure() { # Bug 103741 filter-flags -fomit-frame-pointer - if ! use static ; then - myconf+=( --disable-dar-static ) - if ! use static-libs ; then - myconf+=( --disable-static ) - fi - fi - econf "${myconf[@]}" } src_install() { emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install - local DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) einstalldocs - find "${ED}" -name '*.la' -delete || die - - if ! use static-libs ; then - find "${ED}" -name '*.a' -delete || die - fi + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die # Bug 729150 rm "${ED}/usr/share/doc/${PF}/html/samples/MyBackup.sh.tar.gz" || die