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 2834413835B for ; Wed, 10 Mar 2021 01:24:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 743AFE0867; Wed, 10 Mar 2021 01:24:29 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 5FBC3E0867 for ; Wed, 10 Mar 2021 01:24:29 +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 7C1CE340D1F for ; Wed, 10 Mar 2021 01:24:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C58E45AE for ; Wed, 10 Mar 2021 01:24:24 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1615337568.e7577b1e87d1029c888b5f692abd699677d6aba8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/dmraid/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild X-VCS-Directories: sys-fs/dmraid/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e7577b1e87d1029c888b5f692abd699677d6aba8 X-VCS-Branch: master Date: Wed, 10 Mar 2021 01:24:24 +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: 02b2b3b9-82f4-4515-92bf-c1f6fb396f81 X-Archives-Hash: 2c44ca01e579ddbc637dab829960a3f6 commit: e7577b1e87d1029c888b5f692abd699677d6aba8 Author: Sam James gentoo org> AuthorDate: Wed Mar 10 00:52:48 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Mar 10 00:52:48 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7577b1e sys-fs/dmraid: partly modernise latest version Signed-off-by: Sam James gentoo.org> sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild index 7d42581d1fd..ac268a35d6c 100644 --- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild +++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,6 +10,7 @@ MY_PV=${PV/_/.}-3 DESCRIPTION="Device-mapper RAID tool and library" HOMEPAGE="https://people.redhat.com/~heinzm/sw/dmraid/" SRC_URI="https://people.redhat.com/~heinzm/sw/dmraid/src/${PN}-${MY_PV}.tar.bz2" +S="${WORKDIR}/${PN}/${MY_PV}/${PN}" LICENSE="GPL-2" SLOT="0" @@ -17,13 +18,14 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="intel_led led mini static" RDEPEND=">=sys-fs/lvm2-2.02.45" -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} static? ( sys-fs/lvm2[static-libs] ) " -BDEPEND="virtual/pkgconfig - app-arch/tar" - -S="${WORKDIR}/${PN}/${MY_PV}/${PN}" +BDEPEND=" + app-arch/tar + virtual/pkgconfig +" pkg_setup() { if kernel_is lt 2 6 ; then @@ -43,15 +45,18 @@ src_prepare() { # pkg_check_modules is not in aclocal.m4 by default, and eautoreconf doesnt add it einfo "Appending pkg.m4 from system to aclocal.m4" cat "${BROOT}"/usr/share/aclocal/pkg.m4 >>"${S}"/aclocal.m4 || die "Could not append pkg.m4" - eapply_user + + default eautoreconf einfo "Creating prepatched source archive for use with Genkernel" # archive the patched source for use with genkernel cd "${WORKDIR}" || die mkdir -p "tmp/${PN}" || die + cp -a "${PN}/${MY_PV}/${PN}" "tmp/${PN}" || die mv "tmp/${PN}/${PN}" "tmp/${PN}/${MY_PV}" || die + cd tmp || die tar -jcf ${PN}-${MY_PV}-prepatched.tar.bz2 ${PN} || die mv ${PN}-${MY_PV}-prepatched.tar.bz2 .. || die @@ -59,7 +64,8 @@ src_prepare() { src_configure() { # disable klibc and dietlibc, bug #653392 - econf --with-usrlibdir='${prefix}'/$(get_libdir) \ + econf \ + --with-usrlibdir='${prefix}'/$(get_libdir) \ --disable-klibc \ --disable-dietlibc \ $(use_enable static static_link) \ @@ -70,7 +76,9 @@ src_configure() { src_install() { emake DESTDIR="${D}" install + dodoc CHANGELOG README TODO KNOWN_BUGS doc/* + insinto /usr/share/${PN} doins "${WORKDIR}"/${PN}-${MY_PV}-prepatched.tar.bz2 }