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 375F3138334 for ; Sun, 2 Dec 2018 14:55:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24FB5E08C9; Sun, 2 Dec 2018 14:55:52 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 D7CFBE08C9 for ; Sun, 2 Dec 2018 14:55:51 +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 B8942335C8C for ; Sun, 2 Dec 2018 14:55:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E9392A7 for ; Sun, 2 Dec 2018 14:55:47 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1543762540.ac121538f7d68721ca7ee4159a6c3647ba8565ea.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-cdr/cdw/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-cdr/cdw/cdw-0.8.0.ebuild app-cdr/cdw/cdw-9999.ebuild X-VCS-Directories: app-cdr/cdw/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: ac121538f7d68721ca7ee4159a6c3647ba8565ea X-VCS-Branch: master Date: Sun, 2 Dec 2018 14:55:47 +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: 7d88e40d-7379-4541-8d17-658da3d19b74 X-Archives-Hash: d8477844ae7c1c9d5896718c3bde490d commit: ac121538f7d68721ca7ee4159a6c3647ba8565ea Author: Jeroen Roovers gentoo org> AuthorDate: Sun Dec 2 14:45:23 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sun Dec 2 14:55:40 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac121538 app-cdr/cdw: Fix building against sys-libs/ncurses[tinfo] Fixes: https://bugs.gentoo.org/672394 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Jeroen Roovers gentoo.org> app-cdr/cdw/cdw-0.8.0.ebuild | 25 ++++++++++++++++--------- app-cdr/cdw/cdw-9999.ebuild | 24 ++++++++++++++++-------- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/app-cdr/cdw/cdw-0.8.0.ebuild b/app-cdr/cdw/cdw-0.8.0.ebuild index 2bcc1069a8b..5a20e7099a1 100644 --- a/app-cdr/cdw/cdw-0.8.0.ebuild +++ b/app-cdr/cdw/cdw-0.8.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=6 +inherit toolchain-funcs DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools" HOMEPAGE="http://cdw.sourceforge.net" @@ -11,17 +11,24 @@ SRC_URI="mirror://sourceforge/cdw/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc x86" -IUSE="" -DEPEND="virtual/cdrtools +RDEPEND=" + virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] - sys-libs/ncurses[unicode]" -RDEPEND=${DEPEND} + sys-libs/ncurses[unicode] +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${P}-uclibc.patch +) -src_prepare() { - epatch "${FILESDIR}"/${P}-uclibc.patch +src_configure() { + econf LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" } src_install() { diff --git a/app-cdr/cdw/cdw-9999.ebuild b/app-cdr/cdw/cdw-9999.ebuild index 68ab7c086d5..2072bb68651 100644 --- a/app-cdr/cdw/cdw-9999.ebuild +++ b/app-cdr/cdw/cdw-9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 ECVS_SERVER="cdw.cvs.sourceforge.net:/cvsroot/cdw" ECVS_MODULE="cdw" ECVS_TOPDIR="${DISTDIR}/cvs-src/${ECVS_MODULE}" -inherit autotools eutils cvs +inherit autotools cvs toolchain-funcs MY_P=${PN}_${PV} DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools" @@ -15,21 +15,29 @@ HOMEPAGE="http://cdw.sourceforge.net" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="" -DEPEND="virtual/cdrtools +RDEPEND=" + virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] - sys-libs/ncurses[unicode]" -RDEPEND=${DEPEND} - + sys-libs/ncurses[unicode] +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" S=${WORKDIR}/${ECVS_MODULE} src_prepare() { + default eautoreconf } +src_configure() { + econf LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" +} + src_install() { DOCS="AUTHORS ChangeLog NEWS README THANKS cdw.conf" \ default